From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Wed, 7 Sep 2011 22:19:09 +0000 (+0000)
Subject: 2.0. Updated namespaces.
X-Git-Tag: 2.0.1~6
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=ac7b3acb915f90de6b224e54a2240023fc221e5a

2.0. Updated namespaces.


git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1351 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/modules/bluefish/bluefish.cpp b/modules/bluefish/bluefish.cpp
index a658786c5..73a7c8bc3 100644
--- a/modules/bluefish/bluefish.cpp
+++ b/modules/bluefish/bluefish.cpp
@@ -30,16 +30,16 @@
 
 #include <boost/lexical_cast.hpp>
 
-namespace caspar {
+namespace caspar { namespace bluefish {
 
-void init_bluefish()
+void init()
 {
 	try
 	{
 		blue_initialize();
 		core::register_consumer_factory([](const std::vector<std::wstring>& params)
 		{
-			return create_bluefish_consumer(params);
+			return create_consumer(params);
 		});
 	}
 	catch(...)
@@ -49,7 +49,7 @@ void init_bluefish()
 	}
 }
 
-std::wstring get_bluefish_version()
+std::wstring get_version()
 {
 	try
 	{
@@ -66,7 +66,7 @@ std::wstring get_bluefish_version()
 	return widen(std::string(BlueVelvetVersion()));
 }
 
-std::vector<std::wstring> get_bluefish_device_list()
+std::vector<std::wstring> get_device_list()
 {
 	std::vector<std::wstring> devices;
 
@@ -86,4 +86,5 @@ std::vector<std::wstring> get_bluefish_device_list()
 
 	return devices;
 }
-}
\ No newline at end of file
+
+}}
\ No newline at end of file
diff --git a/modules/bluefish/bluefish.h b/modules/bluefish/bluefish.h
index cbd0b9894..9e3b93d70 100644
--- a/modules/bluefish/bluefish.h
+++ b/modules/bluefish/bluefish.h
@@ -22,11 +22,11 @@
 #include <string>
 #include <vector>
 
-namespace caspar {
+namespace caspar { namespace bluefish {
 
-void init_bluefish();
+void init();
 
-std::wstring get_bluefish_version();
-std::vector<std::wstring> get_bluefish_device_list();
+std::wstring get_version();
+std::vector<std::wstring> get_device_list();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/bluefish/consumer/bluefish_consumer.cpp b/modules/bluefish/consumer/bluefish_consumer.cpp
index d2e5a7f07..62e840670 100644
--- a/modules/bluefish/consumer/bluefish_consumer.cpp
+++ b/modules/bluefish/consumer/bluefish_consumer.cpp
@@ -43,7 +43,7 @@
 #include <memory>
 #include <array>
 
-namespace caspar { 
+namespace caspar { namespace bluefish { 
 			
 struct bluefish_consumer : boost::noncopyable
 {
@@ -356,7 +356,7 @@ public:
 	}
 };	
 
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const std::vector<std::wstring>& params)
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)
 {
 	if(params.size() < 1 || params[0] != L"BLUEFISH")
 		return core::frame_consumer::empty();
@@ -369,7 +369,7 @@ safe_ptr<core::frame_consumer> create_bluefish_consumer(const std::vector<std::w
 	return make_safe<bluefish_consumer_proxy>(device_index, embedded_audio, key_only);
 }
 
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const boost::property_tree::ptree& ptree) 
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree) 
 {	
 	const auto device_index		= ptree.get("device",		  1);
 	const auto embedded_audio	= ptree.get("embedded-audio", false);
@@ -378,4 +378,4 @@ safe_ptr<core::frame_consumer> create_bluefish_consumer(const boost::property_tr
 	return make_safe<bluefish_consumer_proxy>(device_index, embedded_audio, key_only);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/bluefish/consumer/bluefish_consumer.h b/modules/bluefish/consumer/bluefish_consumer.h
index 90249d471..8b954580e 100644
--- a/modules/bluefish/consumer/bluefish_consumer.h
+++ b/modules/bluefish/consumer/bluefish_consumer.h
@@ -30,8 +30,10 @@ namespace caspar {
 namespace core {
 	struct frame_consumer;
 }
-			
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const std::vector<std::wstring>& params);
-safe_ptr<core::frame_consumer> create_bluefish_consumer(const boost::property_tree::ptree& ptree);
+	 
+namespace bluefish {
 
-}
\ No newline at end of file
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree);
+
+}}
\ No newline at end of file
diff --git a/modules/bluefish/util/blue_velvet.cpp b/modules/bluefish/util/blue_velvet.cpp
index b4c5651d3..f2accffbd 100644
--- a/modules/bluefish/util/blue_velvet.cpp
+++ b/modules/bluefish/util/blue_velvet.cpp
@@ -6,7 +6,7 @@
 
 #include <core/video_format.h>
 
-namespace caspar {
+namespace caspar { namespace bluefish {
 	
 CBlueVelvet4* (*BlueVelvetFactory4)() = nullptr;
 void (*BlueVelvetDestroy)(CBlueVelvet4* pObj) = nullptr;
@@ -165,4 +165,4 @@ safe_ptr<CBlueVelvet4> create_blue(size_t device_index)
 	return blue;
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/bluefish/util/blue_velvet.h b/modules/bluefish/util/blue_velvet.h
index 0fee25ef6..79270729f 100644
--- a/modules/bluefish/util/blue_velvet.h
+++ b/modules/bluefish/util/blue_velvet.h
@@ -35,6 +35,8 @@ struct video_format_desc;
 
 }
 
+namespace bluefish {
+
 extern const char* (*BlueVelvetVersion)();
 extern BLUE_UINT32 (*encode_hanc_frame)(struct hanc_stream_info_struct * hanc_stream_ptr, void * audio_pcm_ptr,BLUE_UINT32 no_audio_ch,BLUE_UINT32 no_audio_samples,BLUE_UINT32 nTypeOfSample,BLUE_UINT32 emb_audio_flag);
 extern BLUE_UINT32 (*encode_hanc_frame_ex)(BLUE_UINT32 card_type, struct hanc_stream_info_struct * hanc_stream_ptr, void * audio_pcm_ptr, BLUE_UINT32 no_audio_ch,	BLUE_UINT32 no_audio_samples, BLUE_UINT32 nTypeOfSample, BLUE_UINT32 emb_audio_flag);
@@ -56,4 +58,4 @@ int set_card_property(T& pSdk, ULONG prop, ULONG value)
 	return (pSdk->SetCardProperty(prop,variantValue));
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/bluefish/util/memory.h b/modules/bluefish/util/memory.h
index d86874a36..018477da5 100644
--- a/modules/bluefish/util/memory.h
+++ b/modules/bluefish/util/memory.h
@@ -27,7 +27,7 @@
 
 #include <vector>
 
-namespace caspar { 
+namespace caspar { namespace bluefish {
 	
 static const size_t MAX_HANC_BUFFER_SIZE = 256*1024;
 static const size_t MAX_VBI_BUFFER_SIZE = 36*1920*4;
@@ -59,4 +59,4 @@ private:
 };
 typedef std::shared_ptr<blue_dma_buffer> blue_dma_buffer_ptr;
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/decklink/consumer/decklink_consumer.cpp b/modules/decklink/consumer/decklink_consumer.cpp
index 03131d310..d4abdfa52 100644
--- a/modules/decklink/consumer/decklink_consumer.cpp
+++ b/modules/decklink/consumer/decklink_consumer.cpp
@@ -43,7 +43,7 @@
 #include <boost/circular_buffer.hpp>
 #include <boost/timer.hpp>
 
-namespace caspar { 
+namespace caspar { namespace decklink { 
 	
 struct configuration
 {
@@ -452,7 +452,7 @@ public:
 	}
 };	
 
-safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::wstring>& params) 
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params) 
 {
 	if(params.size() < 1 || params[0] != L"DECKLINK")
 		return core::frame_consumer::empty();
@@ -470,7 +470,7 @@ safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::w
 	return make_safe<decklink_consumer_proxy>(config);
 }
 
-safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tree::ptree& ptree) 
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree) 
 {
 	configuration config;
 
@@ -483,7 +483,7 @@ safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tr
 	return make_safe<decklink_consumer_proxy>(config);
 }
 
-}
+}}
 
 /*
 ##############################################################################
diff --git a/modules/decklink/consumer/decklink_consumer.h b/modules/decklink/consumer/decklink_consumer.h
index 3d8a9f3a1..9597b615f 100644
--- a/modules/decklink/consumer/decklink_consumer.h
+++ b/modules/decklink/consumer/decklink_consumer.h
@@ -28,13 +28,15 @@
 #include <string>
 #include <vector>
 
-namespace caspar { 
+namespace caspar {
 
 namespace core {
 	struct frame_consumer;
 }
-	
-safe_ptr<core::frame_consumer> create_decklink_consumer(const std::vector<std::wstring>& params);
-safe_ptr<core::frame_consumer> create_decklink_consumer(const boost::property_tree::ptree& ptree);
 
-}
\ No newline at end of file
+namespace decklink {
+
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree);
+
+}}
\ No newline at end of file
diff --git a/modules/decklink/decklink.cpp b/modules/decklink/decklink.cpp
index cea6d03c6..94a8ba556 100644
--- a/modules/decklink/decklink.cpp
+++ b/modules/decklink/decklink.cpp
@@ -40,15 +40,15 @@
 
 #pragma warning(push)
 
-namespace caspar{
+namespace caspar { namespace decklink {
 
-void init_decklink()
+void init()
 {
-	core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_decklink_consumer(params);});
-	core::register_producer_factory(create_decklink_producer);
+	core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});
+	core::register_producer_factory(create_producer);
 }
 
-std::wstring get_decklink_version() 
+std::wstring get_version() 
 {
 	std::wstring version = L"Not found";
 
@@ -65,7 +65,7 @@ std::wstring get_decklink_version()
 	return version;
 }
 
-std::vector<std::wstring> get_decklink_device_list()
+std::vector<std::wstring> get_device_list()
 {
 	std::vector<std::wstring> devices;
 
@@ -90,4 +90,4 @@ std::vector<std::wstring> get_decklink_device_list()
 	return devices;
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/decklink/decklink.h b/modules/decklink/decklink.h
index 9cf0267ab..721a2e867 100644
--- a/modules/decklink/decklink.h
+++ b/modules/decklink/decklink.h
@@ -22,11 +22,11 @@
 #include <string>
 #include <vector>
 
-namespace caspar {
+namespace caspar { namespace decklink {
 
-void init_decklink();
+void init();
 
-std::wstring get_decklink_version();
-std::vector<std::wstring> get_decklink_device_list();
+std::wstring get_version();
+std::vector<std::wstring> get_device_list();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/decklink/producer/decklink_producer.cpp b/modules/decklink/producer/decklink_producer.cpp
index 420256641..902d78e21 100644
--- a/modules/decklink/producer/decklink_producer.cpp
+++ b/modules/decklink/producer/decklink_producer.cpp
@@ -71,7 +71,7 @@ extern "C"
 
 #include <functional>
 
-namespace caspar { 
+namespace caspar { namespace decklink {
 		
 class decklink_producer : boost::noncopyable, public IDeckLinkInputCallback
 {	
@@ -91,9 +91,9 @@ class decklink_producer : boost::noncopyable, public IDeckLinkInputCallback
 	tbb::concurrent_bounded_queue<safe_ptr<core::basic_frame>>	frame_buffer_;
 
 	std::exception_ptr											exception_;
-	filter														filter_;
+	ffmpeg::filter												filter_;
 		
-	frame_muxer													muxer_;
+	ffmpeg::frame_muxer											muxer_;
 
 public:
 	decklink_producer(const core::video_format_desc& format_desc, size_t device_index, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter)
@@ -104,7 +104,7 @@ public:
 		, device_index_(device_index)
 		, frame_factory_(frame_factory)
 		, filter_(filter)
-		, muxer_(double_rate(filter) ? format_desc.fps * 2.0 : format_desc.fps, frame_factory)
+		, muxer_(ffmpeg::double_rate(filter) ? format_desc.fps * 2.0 : format_desc.fps, frame_factory)
 	{
 		frame_buffer_.set_capacity(2);
 		
@@ -285,7 +285,7 @@ public:
 	}
 };
 
-safe_ptr<core::frame_producer> create_decklink_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
 {
 	if(params.empty() || !boost::iequals(params[0], "decklink"))
 		return core::frame_producer::empty();
@@ -305,4 +305,4 @@ safe_ptr<core::frame_producer> create_decklink_producer(const safe_ptr<core::fra
 	return make_safe<decklink_producer_proxy>(frame_factory, format_desc, device_index, filter_str, length);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/decklink/producer/decklink_producer.h b/modules/decklink/producer/decklink_producer.h
index 09b9c99d2..934e09c6a 100644
--- a/modules/decklink/producer/decklink_producer.h
+++ b/modules/decklink/producer/decklink_producer.h
@@ -24,8 +24,8 @@
 #include <string>
 #include <vector>
 
-namespace caspar { 
+namespace caspar { namespace decklink {
 	
-safe_ptr<core::frame_producer> create_decklink_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
 
-}
+}}
diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 37006c9d1..09bca5196 100644
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -31,7 +31,7 @@
 
 #include <string>
 
-namespace caspar { 
+namespace caspar { namespace decklink {
 	
 static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt) 
 {
@@ -152,4 +152,4 @@ static std::wstring get_model_name(const T& device)
 	return std::wstring(pModelName);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 13089c16c..87e1e0083 100644
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -46,7 +46,7 @@ extern "C"
 	#include <libavfilter/avfilter.h>
 }
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 int ffmpeg_lock_callback(void **mutex, enum AVLockOp op) 
 { 
@@ -151,7 +151,7 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
     //colored_fputs(av_clip(level>>3, 0, 6), line);
 }
 
-void init_ffmpeg()
+void init()
 {
     avfilter_register_all();
 	av_register_all();
@@ -161,10 +161,10 @@ void init_ffmpeg()
 	av_log_set_callback(log_callback);
 	
 	//core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});
-	core::register_producer_factory(create_ffmpeg_producer);
+	core::register_producer_factory(create_producer);
 }
 
-void uninit_ffmpeg()
+void uninit()
 {
 	avfilter_uninit();
 	av_lockmgr_register(nullptr);
@@ -202,4 +202,4 @@ std::wstring get_swscale_version()
 	return make_version(swscale_version());
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/ffmpeg.h b/modules/ffmpeg/ffmpeg.h
index 679182ab3..d496924b5 100644
--- a/modules/ffmpeg/ffmpeg.h
+++ b/modules/ffmpeg/ffmpeg.h
@@ -21,10 +21,10 @@
 
 #include <string>
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
-void init_ffmpeg();
-void uninit_ffmpeg();
+void init();
+void uninit();
 
 std::wstring get_avcodec_version();
 std::wstring get_avformat_version();
@@ -32,4 +32,4 @@ std::wstring get_avutil_version();
 std::wstring get_avfilter_version();
 std::wstring get_swscale_version();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/ffmpeg_error.h b/modules/ffmpeg/ffmpeg_error.h
index b50efee45..017b13c75 100644
--- a/modules/ffmpeg/ffmpeg_error.h
+++ b/modules/ffmpeg/ffmpeg_error.h
@@ -13,7 +13,7 @@ extern "C"
 
 #pragma warning(pop)
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
 struct ffmpeg_error : virtual caspar_exception{};
 
@@ -56,4 +56,4 @@ static std::string av_error_str(int errn)
 		return ret;															\
 	}();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/audio/audio_decoder.cpp b/modules/ffmpeg/producer/audio/audio_decoder.cpp
index a71c672c2..3f5fe7f72 100644
--- a/modules/ffmpeg/producer/audio/audio_decoder.cpp
+++ b/modules/ffmpeg/producer/audio/audio_decoder.cpp
@@ -44,7 +44,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 struct audio_decoder::implementation : boost::noncopyable
 {	
@@ -166,4 +166,5 @@ void audio_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(pa
 bool audio_decoder::ready() const{return impl_->ready();}
 std::vector<std::shared_ptr<core::audio_buffer>> audio_decoder::poll(){return impl_->poll();}
 int64_t audio_decoder::nb_frames() const{return impl_->nb_frames_;}
-}
\ No newline at end of file
+
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/audio/audio_decoder.h b/modules/ffmpeg/producer/audio/audio_decoder.h
index e2c978cf8..e446bd20f 100644
--- a/modules/ffmpeg/producer/audio/audio_decoder.h
+++ b/modules/ffmpeg/producer/audio/audio_decoder.h
@@ -38,6 +38,8 @@ struct video_format_desc;
 
 }
 
+namespace ffmpeg {
+
 class audio_decoder : boost::noncopyable
 {
 public:
@@ -54,4 +56,4 @@ private:
 	safe_ptr<implementation> impl_;
 };
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/audio/audio_resampler.cpp b/modules/ffmpeg/producer/audio/audio_resampler.cpp
index baa24774b..179d09cc5 100644
--- a/modules/ffmpeg/producer/audio/audio_resampler.cpp
+++ b/modules/ffmpeg/producer/audio/audio_resampler.cpp
@@ -16,8 +16,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
 struct audio_resampler::implementation
 {	
@@ -83,4 +82,4 @@ audio_resampler::audio_resampler(size_t output_channels, size_t input_channels,
 				: impl_(new implementation(output_channels, input_channels, output_sample_rate, input_sample_rate, output_sample_format, input_sample_format)){}
 std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> audio_resampler::resample(std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>&& data){return impl_->resample(std::move(data));}
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/audio/audio_resampler.h b/modules/ffmpeg/producer/audio/audio_resampler.h
index bc03bcb22..e25d06bf5 100644
--- a/modules/ffmpeg/producer/audio/audio_resampler.h
+++ b/modules/ffmpeg/producer/audio/audio_resampler.h
@@ -4,7 +4,7 @@
 
 #include <libavutil/samplefmt.h>
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
 class audio_resampler
 {
@@ -19,4 +19,4 @@ private:
 	std::shared_ptr<implementation> impl_;
 };
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d1ca8c029..480e95b8d 100644
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -46,7 +46,7 @@
 
 #include <tbb/parallel_invoke.h>
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 				
 struct ffmpeg_producer : public core::frame_producer
 {
@@ -221,7 +221,7 @@ public:
 	}
 };
 
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
 {		
 	static const std::vector<std::wstring> extensions = boost::assign::list_of
 		(L"mpg")(L"mpeg")(L"m2v")(L"m4v")(L"mp3")(L"mp4")(L"mpga")
@@ -259,4 +259,4 @@ safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame
 	return make_safe<ffmpeg_producer>(frame_factory, path, filter_str, loop, start, length);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/ffmpeg_producer.h b/modules/ffmpeg/producer/ffmpeg_producer.h
index 9bbb5ffa2..0158a1092 100644
--- a/modules/ffmpeg/producer/ffmpeg_producer.h
+++ b/modules/ffmpeg/producer/ffmpeg_producer.h
@@ -33,6 +33,8 @@ struct frame_factory;
 
 }
 	
-safe_ptr<core::frame_producer> create_ffmpeg_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
+namespace ffmpeg {
 
-}
\ No newline at end of file
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
+
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/filter/filter.cpp b/modules/ffmpeg/producer/filter/filter.cpp
index 2475bf710..1fcf62bc5 100644
--- a/modules/ffmpeg/producer/filter/filter.cpp
+++ b/modules/ffmpeg/producer/filter/filter.cpp
@@ -29,7 +29,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 struct filter::implementation
 {
@@ -167,4 +167,5 @@ filter::filter(const std::wstring& filters, const std::vector<PixelFormat>& pix_
 filter::filter(filter&& other) : impl_(std::move(other.impl_)){}
 filter& filter::operator=(filter&& other){impl_ = std::move(other.impl_); return *this;}
 std::vector<safe_ptr<AVFrame>> filter::execute(const std::shared_ptr<AVFrame>& frame) {return impl_->execute(frame);}
-}
\ No newline at end of file
+
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/filter/filter.h b/modules/ffmpeg/producer/filter/filter.h
index 6fabbd673..7b3078518 100644
--- a/modules/ffmpeg/producer/filter/filter.h
+++ b/modules/ffmpeg/producer/filter/filter.h
@@ -10,7 +10,7 @@
 struct AVFrame;
 enum PixelFormat;
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 		
 static bool double_rate(const std::wstring& filters)
 {
@@ -37,4 +37,4 @@ private:
 	safe_ptr<implementation> impl_;
 };
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.cpp b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
index 97b31ef19..0f2f04f1a 100644
--- a/modules/ffmpeg/producer/filter/parallel_yadif.cpp
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
@@ -76,7 +76,7 @@ void parallel_yadif_filter_line(parallel_yadif_context& ctx, uint8_t *dst, uint8
 	}
 }
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 tbb::concurrent_bounded_queue<decltype(org_yadif_filter_line)> parallel_line_func_pool;
 std::array<parallel_yadif_context, 18> ctxs;
@@ -125,8 +125,8 @@ std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx)
 			++index;
 
 		ctxs[index].last_index = 0;
-		for (int y = 0; y < ctx->inputs[0]->h; y++)
-		{
+		for (int y = 0; y < ctx->inputs[0]->h; y++)
+		{
             if ((y ^ yadif->parity) & 1)
 				++ctxs[index].last_index;
 		}
@@ -137,4 +137,4 @@ std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx)
 	return std::shared_ptr<void>(func, return_parallel_yadif);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.h b/modules/ffmpeg/producer/filter/parallel_yadif.h
index 44a0e8721..44fc679f7 100644
--- a/modules/ffmpeg/producer/filter/parallel_yadif.h
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.h
@@ -4,8 +4,8 @@
 
 struct AVFilterContext;
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/format/flv.cpp b/modules/ffmpeg/producer/format/flv.cpp
index 2e7b85649..37b197717 100644
--- a/modules/ffmpeg/producer/format/flv.cpp
+++ b/modules/ffmpeg/producer/format/flv.cpp
@@ -10,7 +10,7 @@
 
 #include <unordered_map>
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 std::map<std::string, std::string> read_flv_meta_info(const std::string& filename)
 {
@@ -78,4 +78,4 @@ std::map<std::string, std::string> read_flv_meta_info(const std::string& filenam
     return values;
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/format/flv.h b/modules/ffmpeg/producer/format/flv.h
index 931e7fffb..c104f5b8f 100644
--- a/modules/ffmpeg/producer/format/flv.h
+++ b/modules/ffmpeg/producer/format/flv.h
@@ -1,7 +1,7 @@
 #pragma once
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 std::map<std::string, std::string> read_flv_meta_info(const std::string& filename);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/frame_muxer.cpp b/modules/ffmpeg/producer/frame_muxer.cpp
index 4dfbcebf2..807b86e82 100644
--- a/modules/ffmpeg/producer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/frame_muxer.cpp
@@ -41,7 +41,7 @@ extern "C"
 
 using namespace caspar::core;
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
 struct display_mode
 {
@@ -419,4 +419,4 @@ bool frame_muxer::video_ready() const{return impl_->video_ready();}
 bool frame_muxer::audio_ready() const{return impl_->audio_ready();}
 int64_t frame_muxer::calc_nb_frames(int64_t nb_frames) const {return impl_->calc_nb_frames(nb_frames);}
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/frame_muxer.h b/modules/ffmpeg/producer/frame_muxer.h
index 9390f0b85..8aa79834c 100644
--- a/modules/ffmpeg/producer/frame_muxer.h
+++ b/modules/ffmpeg/producer/frame_muxer.h
@@ -20,6 +20,8 @@ struct frame_factory;
 
 }
 
+namespace ffmpeg {
+
 class frame_muxer : boost::noncopyable
 {
 public:
@@ -44,4 +46,4 @@ private:
 	safe_ptr<implementation> impl_;
 };
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp
index 480e7e5d5..c8b32cd4a 100644
--- a/modules/ffmpeg/producer/input.cpp
+++ b/modules/ffmpeg/producer/input.cpp
@@ -55,7 +55,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
 static const size_t MAX_BUFFER_COUNT = 100;
 static const size_t MIN_BUFFER_COUNT = 4;
@@ -290,4 +290,4 @@ bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(pac
 safe_ptr<AVFormatContext> input::context(){return make_safe(impl_->format_context_);}
 size_t input::nb_frames() const {return impl_->nb_frames();}
 size_t input::nb_loops() const {return impl_->nb_loops();}
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/input.h b/modules/ffmpeg/producer/input.h
index 66e8e547e..6b391581f 100644
--- a/modules/ffmpeg/producer/input.h
+++ b/modules/ffmpeg/producer/input.h
@@ -36,7 +36,9 @@ namespace diagnostics {
 class graph;
 
 }
-	
+	 
+namespace ffmpeg {
+
 class input : boost::noncopyable
 {
 public:
@@ -55,4 +57,4 @@ private:
 };
 
 	
-}
+}}
diff --git a/modules/ffmpeg/producer/util.cpp b/modules/ffmpeg/producer/util.cpp
index 2a2595680..79fae01a8 100644
--- a/modules/ffmpeg/producer/util.cpp
+++ b/modules/ffmpeg/producer/util.cpp
@@ -33,7 +33,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 
 core::field_mode::type get_mode(AVFrame& frame)
 {
@@ -287,4 +287,4 @@ void fix_meta_data(AVFormatContext& context)
 	video_context.time_base.den = static_cast<int>(closest_fps*1000000.0);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/util.h b/modules/ffmpeg/producer/util.h
index 67560676c..7b32ff9f0 100644
--- a/modules/ffmpeg/producer/util.h
+++ b/modules/ffmpeg/producer/util.h
@@ -23,6 +23,8 @@ struct frame_factory;
 
 }
 
+namespace ffmpeg {
+
 static const PixelFormat	CASPAR_PIX_FMT_LUMA = PIX_FMT_MONOBLACK; // Just hijack some unual pixel format.
 
 core::field_mode::type		get_mode(AVFrame& frame);
@@ -33,4 +35,4 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
 
 void fix_meta_data(AVFormatContext& context);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/video/video_decoder.cpp b/modules/ffmpeg/producer/video/video_decoder.cpp
index f365a7c96..4e2ba9664 100644
--- a/modules/ffmpeg/producer/video/video_decoder.cpp
+++ b/modules/ffmpeg/producer/video/video_decoder.cpp
@@ -48,7 +48,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 struct video_decoder::implementation : boost::noncopyable
 {
@@ -215,4 +215,5 @@ double video_decoder::fps() const{return impl_->fps();}
 int64_t video_decoder::nb_frames() const{return impl_->nb_frames_;}
 size_t video_decoder::width() const{return impl_->width_;}
 size_t video_decoder::height() const{return impl_->height_;}
-}
\ No newline at end of file
+
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/producer/video/video_decoder.h b/modules/ffmpeg/producer/video/video_decoder.h
index 743bf749a..1351e881b 100644
--- a/modules/ffmpeg/producer/video/video_decoder.h
+++ b/modules/ffmpeg/producer/video/video_decoder.h
@@ -38,6 +38,8 @@ namespace core {
 	class write_frame;
 }
 
+namespace ffmpeg {
+
 class video_decoder : boost::noncopyable
 {
 public:
@@ -58,4 +60,4 @@ private:
 	safe_ptr<implementation> impl_;
 };
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/tbb_avcodec.cpp b/modules/ffmpeg/tbb_avcodec.cpp
index 27925b553..71d623d60 100644
--- a/modules/ffmpeg/tbb_avcodec.cpp
+++ b/modules/ffmpeg/tbb_avcodec.cpp
@@ -27,7 +27,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 		
 int thread_execute(AVCodecContext* s, int (*func)(AVCodecContext *c2, void *arg2), void* arg, int* ret, int count, int size)
 {
@@ -111,4 +111,4 @@ int tbb_avcodec_close(AVCodecContext* avctx)
 	return avcodec_close(avctx); 
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ffmpeg/tbb_avcodec.h b/modules/ffmpeg/tbb_avcodec.h
index e2aa3e9af..2b2ab3918 100644
--- a/modules/ffmpeg/tbb_avcodec.h
+++ b/modules/ffmpeg/tbb_avcodec.h
@@ -3,9 +3,9 @@
 struct AVCodecContext;
 struct AVCodec;
 
-namespace caspar {
+namespace caspar { namespace ffmpeg {
 	
 int tbb_avcodec_open(AVCodecContext *avctx, AVCodec *codec);
 int tbb_avcodec_close(AVCodecContext *avctx);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/flash/flash.cpp b/modules/flash/flash.cpp
index b103e4e61..9378a073d 100644
--- a/modules/flash/flash.cpp
+++ b/modules/flash/flash.cpp
@@ -26,9 +26,9 @@
 
 #include <common/env.h>
 
-namespace caspar{
+namespace caspar { namespace flash {
 
-void init_flash()
+void init()
 {
 	core::register_producer_factory(create_ct_producer);
 }
@@ -38,7 +38,7 @@ std::wstring get_cg_version()
 	return L"Unknown";
 }
 
-std::wstring get_flash_version()
+std::wstring get_version()
 {		
 	std::wstring version = L"Not found";
 #ifdef WIN32
@@ -61,4 +61,4 @@ std::wstring get_flash_version()
 	return version;
 }
 
-}
+}}
diff --git a/modules/flash/flash.h b/modules/flash/flash.h
index 10f275e17..a597f1481 100644
--- a/modules/flash/flash.h
+++ b/modules/flash/flash.h
@@ -21,11 +21,11 @@
 
 #include <string>
 
-namespace caspar{
+namespace caspar { namespace flash {
 
-void init_flash();
+void init();
 
 std::wstring get_cg_version();
-std::wstring get_flash_version();
+std::wstring get_version();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/flash/producer/cg_producer.cpp b/modules/flash/producer/cg_producer.cpp
index 1cb9c09b6..fb1604d45 100644
--- a/modules/flash/producer/cg_producer.cpp
+++ b/modules/flash/producer/cg_producer.cpp
@@ -30,7 +30,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 		
-namespace caspar {
+namespace caspar { namespace flash {
 	
 struct cg_producer::implementation : boost::noncopyable
 {
@@ -115,7 +115,7 @@ safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel
 
 	if(flash_producer->print().find(L"flash[") == std::string::npos) // UGLY hack
 	{
-		flash_producer = create_flash_producer(video_channel->mixer(), boost::assign::list_of<std::wstring>());	
+		flash_producer = flash::create_producer(video_channel->mixer(), boost::assign::list_of<std::wstring>());	
 		video_channel->stage()->load(render_layer, flash_producer); 
 		video_channel->stage()->play(render_layer);
 	}
@@ -129,7 +129,7 @@ safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_fac
 	if(!boost::filesystem::exists(filename))
 		return core::frame_producer::empty();
 	
-	auto flash_producer = create_flash_producer(frame_factory, boost::assign::list_of<std::wstring>());	
+	auto flash_producer = flash::create_producer(frame_factory, boost::assign::list_of<std::wstring>());	
 	auto producer = make_safe<cg_producer>(flash_producer);
 	producer->add(0, filename, 1);
 
@@ -149,4 +149,4 @@ void cg_producer::update(int layer, const std::wstring& data){impl_->update(laye
 void cg_producer::invoke(int layer, const std::wstring& label){impl_->invoke(layer, label);}
 std::wstring cg_producer::print() const{return impl_->print();}
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/flash/producer/cg_producer.h b/modules/flash/producer/cg_producer.h
index 0ca345fde..e631a6475 100644
--- a/modules/flash/producer/cg_producer.h
+++ b/modules/flash/producer/cg_producer.h
@@ -26,7 +26,7 @@
 
 #include <string>
 
-namespace caspar {
+namespace caspar { namespace flash {
 		
 class cg_producer : public core::frame_producer
 {
@@ -58,4 +58,4 @@ safe_ptr<cg_producer> get_default_cg_producer(const safe_ptr<core::video_channel
 
 safe_ptr<core::frame_producer> create_ct_producer(const safe_ptr<core::frame_factory> frame_factory, const std::vector<std::wstring>& params);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/flash/producer/flash_producer.cpp b/modules/flash/producer/flash_producer.cpp
index c285ba9fc..13a0fa342 100644
--- a/modules/flash/producer/flash_producer.cpp
+++ b/modules/flash/producer/flash_producer.cpp
@@ -49,7 +49,7 @@
 
 #include <tbb/spin_mutex.h>
 
-namespace caspar {
+namespace caspar { namespace flash {
 		
 class bitmap
 {
@@ -404,14 +404,14 @@ public:
 	}
 };
 
-safe_ptr<core::frame_producer> create_flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
 {
 	auto template_host = get_template_host(frame_factory->get_video_format_desc());
 	
 	return make_safe<flash_producer>(frame_factory, env::template_folder() + L"\\" + widen(template_host.filename), template_host.width, template_host.height);
 }
 
-std::wstring find_flash_template(const std::wstring& template_name)
+std::wstring find_template(const std::wstring& template_name)
 {
 	if(boost::filesystem::exists(template_name + L".ft")) 
 		return template_name + L".ft";
@@ -422,4 +422,4 @@ std::wstring find_flash_template(const std::wstring& template_name)
 	return L"";
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/flash/producer/flash_producer.h b/modules/flash/producer/flash_producer.h
index a5362d206..85b299cf0 100644
--- a/modules/flash/producer/flash_producer.h
+++ b/modules/flash/producer/flash_producer.h
@@ -26,10 +26,10 @@
 #include <vector>
 #include <string>
 
-namespace caspar {
+namespace caspar { namespace flash {
 
-safe_ptr<core::frame_producer> create_flash_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
 
-std::wstring find_flash_template(const std::wstring& templateName);
+std::wstring find_template(const std::wstring& templateName);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/consumer/image_consumer.cpp b/modules/image/consumer/image_consumer.cpp
index 529fdab42..bee70d1fc 100644
--- a/modules/image/consumer/image_consumer.cpp
+++ b/modules/image/consumer/image_consumer.cpp
@@ -38,7 +38,7 @@
 
 #include <vector>
 
-namespace caspar {
+namespace caspar { namespace image {
 	
 struct image_consumer : public core::frame_consumer
 {
@@ -91,7 +91,7 @@ public:
 	}
 };
 
-safe_ptr<core::frame_consumer> create_image_consumer(const std::vector<std::wstring>& params)
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)
 {
 	if(params.size() < 1 || params[0] != L"IMAGE")
 		return core::frame_consumer::empty();
@@ -99,5 +99,4 @@ safe_ptr<core::frame_consumer> create_image_consumer(const std::vector<std::wstr
 	return make_safe<image_consumer>();
 }
 
-
-}
+}}
diff --git a/modules/image/consumer/image_consumer.h b/modules/image/consumer/image_consumer.h
index 2c5bf92f2..e7ecc751a 100644
--- a/modules/image/consumer/image_consumer.h
+++ b/modules/image/consumer/image_consumer.h
@@ -33,7 +33,9 @@ namespace caspar {
 namespace core {
 	struct frame_consumer;
 }
+
+namespace image {
 	
-safe_ptr<core::frame_consumer> create_image_consumer(const std::vector<std::wstring>& params);
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/image.cpp b/modules/image/image.cpp
index 4ede95b6d..971a6c4c0 100644
--- a/modules/image/image.cpp
+++ b/modules/image/image.cpp
@@ -30,18 +30,18 @@
 
 #include <FreeImage.h>
 
-namespace caspar {
+namespace caspar { namespace image {
 
-void init_image()
+void init()
 {
-	core::register_producer_factory(create_image_scroll_producer);
-	core::register_producer_factory(create_image_producer);
-	core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_image_consumer(params);});
+	core::register_producer_factory(create_scroll_producer);
+	core::register_producer_factory(create_producer);
+	core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});
 }
 
-std::wstring get_image_version()
+std::wstring get_version()
 {
 	return widen(std::string(FreeImage_GetVersion()));
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/image.h b/modules/image/image.h
index 6c60c9d7c..b13422ea5 100644
--- a/modules/image/image.h
+++ b/modules/image/image.h
@@ -21,10 +21,10 @@
 
 #include <string>
 
-namespace caspar{
+namespace caspar { namespace image {
 
-void init_image();
+void init();
 
-std::wstring get_image_version();
+std::wstring get_version();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/producer/image_producer.cpp b/modules/image/producer/image_producer.cpp
index 3b0fad69f..b3084f919 100644
--- a/modules/image/producer/image_producer.cpp
+++ b/modules/image/producer/image_producer.cpp
@@ -36,7 +36,7 @@
 
 using namespace boost::assign;
 
-namespace caspar {
+namespace caspar { namespace image {
 
 struct image_producer : public core::frame_producer
 {	
@@ -70,7 +70,7 @@ struct image_producer : public core::frame_producer
 	}
 };
 
-safe_ptr<core::frame_producer> create_image_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
 {
 	static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");
 	std::wstring filename = env::media_folder() + L"\\" + params[0];
@@ -87,4 +87,4 @@ safe_ptr<core::frame_producer> create_image_producer(const safe_ptr<core::frame_
 }
 
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/producer/image_producer.h b/modules/image/producer/image_producer.h
index 49b51e01c..6c8772a92 100644
--- a/modules/image/producer/image_producer.h
+++ b/modules/image/producer/image_producer.h
@@ -24,8 +24,8 @@
 #include <string>
 #include <vector>
 
-namespace caspar { 
+namespace caspar { namespace image {
 
-safe_ptr<core::frame_producer> create_image_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
+safe_ptr<core::frame_producer> create_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/producer/image_scroll_producer.cpp b/modules/image/producer/image_scroll_producer.cpp
index 6e888e59f..4a7b8d195 100644
--- a/modules/image/producer/image_scroll_producer.cpp
+++ b/modules/image/producer/image_scroll_producer.cpp
@@ -45,7 +45,7 @@
 
 using namespace boost::assign;
 
-namespace caspar {
+namespace caspar { namespace image {
 		
 struct image_scroll_producer : public core::frame_producer
 {	
@@ -211,7 +211,7 @@ struct image_scroll_producer : public core::frame_producer
 	}
 };
 
-safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
+safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params)
 {
 	static const std::vector<std::wstring> extensions = list_of(L"png")(L"tga")(L"bmp")(L"jpg")(L"jpeg")(L"gif")(L"tiff")(L"tif")(L"jp2")(L"jpx")(L"j2k")(L"j2c");
 	std::wstring filename = env::media_folder() + L"\\" + params[0];
@@ -238,5 +238,4 @@ safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core:
 	return make_safe<image_scroll_producer>(frame_factory, filename + L"." + *ext, speed);
 }
 
-
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/producer/image_scroll_producer.h b/modules/image/producer/image_scroll_producer.h
index 11c101460..90ca2e183 100644
--- a/modules/image/producer/image_scroll_producer.h
+++ b/modules/image/producer/image_scroll_producer.h
@@ -24,8 +24,8 @@
 #include <string>
 #include <vector>
 
-namespace caspar { 
+namespace caspar { namespace image {
 
-safe_ptr<core::frame_producer> create_image_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
+safe_ptr<core::frame_producer> create_scroll_producer(const safe_ptr<core::frame_factory>& frame_factory, const std::vector<std::wstring>& params);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/util/image_loader.cpp b/modules/image/util/image_loader.cpp
index a4b51962f..ae4d461bf 100644
--- a/modules/image/util/image_loader.cpp
+++ b/modules/image/util/image_loader.cpp
@@ -29,7 +29,7 @@
 #include <boost/exception/errinfo_file_name.hpp>
 #include <boost/filesystem.hpp>
 
-namespace caspar { 
+namespace caspar { namespace image {
 
 std::shared_ptr<FIBITMAP> load_image(const std::string& filename)
 {
@@ -61,4 +61,4 @@ std::shared_ptr<FIBITMAP> load_image(const std::wstring& filename)
 	return load_image(narrow(filename));
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/image/util/image_loader.h b/modules/image/util/image_loader.h
index c6cdaa9d1..b13b31e97 100644
--- a/modules/image/util/image_loader.h
+++ b/modules/image/util/image_loader.h
@@ -24,9 +24,9 @@
 #include <memory>
 #include <string>
 
-namespace caspar { 
+namespace caspar { namespace image {
 
 std::shared_ptr<FIBITMAP> load_image(const std::string& filename);
 std::shared_ptr<FIBITMAP> load_image(const std::wstring& filename);
 
-}
+}}
diff --git a/modules/oal/consumer/oal_consumer.cpp b/modules/oal/consumer/oal_consumer.cpp
index cd0130a5f..35ef456d0 100644
--- a/modules/oal/consumer/oal_consumer.cpp
+++ b/modules/oal/consumer/oal_consumer.cpp
@@ -39,7 +39,7 @@
 
 #include <tbb/concurrent_queue.h>
 
-namespace caspar {
+namespace caspar { namespace oal {
 
 struct oal_consumer : public core::frame_consumer,  public sf::SoundStream
 {
@@ -123,7 +123,7 @@ public:
 	}
 };
 
-safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params)
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)
 {
 	if(params.size() < 1 || params[0] != L"AUDIO")
 		return core::frame_consumer::empty();
@@ -131,9 +131,9 @@ safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstrin
 	return make_safe<oal_consumer>();
 }
 
-safe_ptr<core::frame_consumer> create_oal_consumer()
+safe_ptr<core::frame_consumer> create_consumer()
 {
 	return make_safe<oal_consumer>();
 }
 
-}
+}}
diff --git a/modules/oal/consumer/oal_consumer.h b/modules/oal/consumer/oal_consumer.h
index 64e87eb0f..0f3a8a9fb 100644
--- a/modules/oal/consumer/oal_consumer.h
+++ b/modules/oal/consumer/oal_consumer.h
@@ -25,13 +25,15 @@
 
 #include <vector>
 
-namespace caspar {
+namespace caspar { 
 
 namespace core {
 	struct frame_consumer;
 }	
 
-safe_ptr<core::frame_consumer> create_oal_consumer(const std::vector<std::wstring>& params);
-safe_ptr<core::frame_consumer> create_oal_consumer();
+namespace oal {
+	
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);
+safe_ptr<core::frame_consumer> create_consumer();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/oal/oal.cpp b/modules/oal/oal.cpp
index 8c27fd251..d574361eb 100644
--- a/modules/oal/oal.cpp
+++ b/modules/oal/oal.cpp
@@ -23,12 +23,11 @@
 
 #include <core/consumer/frame_consumer.h>
 
-namespace caspar
-{
+namespace caspar { namespace oal {
 
-void init_oal()
+void init()
 {
-	core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_oal_consumer(params);});
+	core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/oal/oal.h b/modules/oal/oal.h
index d5cc43b83..d7c2d2695 100644
--- a/modules/oal/oal.h
+++ b/modules/oal/oal.h
@@ -19,8 +19,8 @@
 */
 #pragma once
 
-namespace caspar{
+namespace caspar { namespace oal {
 
-void init_oal();
+void init();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ogl/consumer/ogl_consumer.cpp b/modules/ogl/consumer/ogl_consumer.cpp
index 11c90d435..9550a5a1e 100644
--- a/modules/ogl/consumer/ogl_consumer.cpp
+++ b/modules/ogl/consumer/ogl_consumer.cpp
@@ -66,7 +66,7 @@ extern "C"
 #pragma warning (pop)
 #endif
 
-namespace caspar {
+namespace caspar { namespace ogl {
 		
 enum stretch
 {
@@ -81,15 +81,15 @@ struct configuration
 	size_t		screen_index;
 	stretch		stretch;
 	bool		windowed;
-	bool		key_only;
 	bool		auto_deinterlace;
+	bool		key_only;
 
 	configuration()
 		: screen_index(0)
 		, stretch(fill)
 		, windowed(true)
-		, key_only(false)
 		, auto_deinterlace(true)
+		, key_only(false)
 	{
 	}
 };
@@ -123,7 +123,7 @@ struct ogl_consumer : boost::noncopyable
 	tbb::atomic<bool>		is_running_;
 
 	
-	filter					filter_;
+	ffmpeg::filter			filter_;
 public:
 	ogl_consumer(const configuration& config, const core::video_format_desc& format_desc) 
 		: config_(config)
@@ -463,7 +463,7 @@ public:
 	}
 };	
 
-safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstring>& params)
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params)
 {
 	if(params.size() < 1 || params[0] != L"SCREEN")
 		return core::frame_consumer::empty();
@@ -481,7 +481,7 @@ safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstrin
 	return make_safe<ogl_consumer_proxy>(config);
 }
 
-safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::ptree& ptree) 
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree) 
 {
 	configuration config;
 	config.screen_index		= ptree.get("device",   config.screen_index);
@@ -498,4 +498,4 @@ safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::p
 	return make_safe<ogl_consumer_proxy>(config);
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ogl/consumer/ogl_consumer.h b/modules/ogl/consumer/ogl_consumer.h
index 382aae89c..e2d391eec 100644
--- a/modules/ogl/consumer/ogl_consumer.h
+++ b/modules/ogl/consumer/ogl_consumer.h
@@ -24,13 +24,16 @@
 #include <vector>
 #include <boost/property_tree/ptree.hpp>
 
-namespace caspar {
-
+namespace caspar { 
+	
 namespace core {
 	struct frame_consumer;
 }
 
-safe_ptr<core::frame_consumer> create_ogl_consumer(const std::vector<std::wstring>& params);
-safe_ptr<core::frame_consumer> create_ogl_consumer(const boost::property_tree::ptree& ptree);
+namespace ogl {
+
+
+safe_ptr<core::frame_consumer> create_consumer(const std::vector<std::wstring>& params);
+safe_ptr<core::frame_consumer> create_consumer(const boost::property_tree::ptree& ptree);
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ogl/ogl.cpp b/modules/ogl/ogl.cpp
index b387512e7..08e9f3ede 100644
--- a/modules/ogl/ogl.cpp
+++ b/modules/ogl/ogl.cpp
@@ -23,12 +23,11 @@
 
 #include <core/consumer/frame_consumer.h>
 
-namespace caspar
-{
+namespace caspar { namespace ogl {
 
-void init_ogl()
+void init()
 {
-	core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ogl_consumer(params);});
+	caspar::core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_consumer(params);});
 }
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/modules/ogl/ogl.h b/modules/ogl/ogl.h
index fe1eb2be3..ddaf4cfc4 100644
--- a/modules/ogl/ogl.h
+++ b/modules/ogl/ogl.h
@@ -19,8 +19,8 @@
 */
 #pragma once
 
-namespace caspar{
+namespace caspar { namespace ogl {
 
-void init_ogl();
+void init();
 
-}
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp
index a5e1d8377..0af1ed891 100644
--- a/protocol/amcp/AMCPCommandsImpl.cpp
+++ b/protocol/amcp/AMCPCommandsImpl.cpp
@@ -590,7 +590,7 @@ bool LoadCommand::DoExecute()
 //		std::wstring filename = templatename;
 //		filename.append(extension);
 //
-//		flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))
+//		flash::flash::get_default_cg_producer(info.video_channel, std::max<int>(DEFAULT_CHANNEL_LAYER+1, info.layer_index))
 //			->add(flash_layer_index, filename, play_on_load, start_label, data);
 //
 //		CASPAR_LOG(info) << L"Executed [amcp_channel_cg_add]";
@@ -908,14 +908,14 @@ bool CGCommand::DoExecuteAdd() {
 		}
 	}
 
-	std::wstring fullFilename = find_flash_template(env::template_folder() + _parameters[2]);
+	std::wstring fullFilename = flash::find_template(env::template_folder() + _parameters[2]);
 	if(!fullFilename.empty())
 	{
 		std::wstring extension = boost::filesystem::wpath(fullFilename).extension();
 		std::wstring filename = _parameters[2];
 		filename.append(extension);
 
-		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));
+		flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT(""));
 		SetReplyString(TEXT("202 CG OK\r\n"));
 	}
 	else
@@ -936,7 +936,7 @@ bool CGCommand::DoExecutePlay()
 			return false;
 		}
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer);
+		flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer);
 	}
 	else
 	{
@@ -958,7 +958,7 @@ bool CGCommand::DoExecuteStop()
 			return false;
 		}
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0);
+		flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0);
 	}
 	else 
 	{
@@ -981,7 +981,7 @@ bool CGCommand::DoExecuteNext()
 		}
 
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer);
+		flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->next(layer);
 	}
 	else 
 	{
@@ -1004,7 +1004,7 @@ bool CGCommand::DoExecuteRemove()
 		}
 
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer);
+		flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->remove(layer);
 	}
 	else 
 	{
@@ -1018,7 +1018,7 @@ bool CGCommand::DoExecuteRemove()
 
 bool CGCommand::DoExecuteClear() 
 {
-	GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER));
+	GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER));
 	SetReplyString(TEXT("202 CG OK\r\n"));
 	return true;
 }
@@ -1056,7 +1056,7 @@ bool CGCommand::DoExecuteUpdate()
 		}		
 
 		int layer = _ttoi(_parameters.at(1).c_str());
-		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, dataString);
+		flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString);
 	}
 	catch(...)
 	{
@@ -1078,7 +1078,7 @@ bool CGCommand::DoExecuteInvoke()
 			return false;
 		}
 		int layer = _ttoi(_parameters[1].c_str());
-		get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);
+		flash::get_default_cg_producer(safe_ptr<core::video_channel>(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]);
 	}
 	else 
 	{
@@ -1093,7 +1093,7 @@ bool CGCommand::DoExecuteInvoke()
 bool CGCommand::DoExecuteInfo() 
 {
 	// TODO
-	//get_default_cg_producer(GetChannel())->Info();
+	//flash::get_default_cg_producer(GetChannel())->Info();
 	SetReplyString(TEXT("600 CG FAILED\r\n"));
 	return true;
 }
@@ -1307,9 +1307,9 @@ bool VersionCommand::DoExecute()
 	if(_parameters.size() > 0)
 	{
 		if(_parameters[0] == L"FLASH")
-			replyString = TEXT("201 VERSION OK\r\n FLASH: ") + get_flash_version() + TEXT("\r\n");
+			replyString = TEXT("201 VERSION OK\r\n FLASH: ") + flash::get_version() + TEXT("\r\n");
 		else if(_parameters[0] == L"TEMPLATEHOST")
-			replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + get_cg_version() + TEXT("\r\n");
+			replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + flash::get_cg_version() + TEXT("\r\n");
 		else if(_parameters[0] != L"SERVER")
 			replyString = TEXT("403 VERSION ERROR\r\n");
 	}
diff --git a/protocol/cii/CIICommandsImpl.cpp b/protocol/cii/CIICommandsImpl.cpp
index acdb1115b..7e1957fba 100644
--- a/protocol/cii/CIICommandsImpl.cpp
+++ b/protocol/cii/CIICommandsImpl.cpp
@@ -141,7 +141,7 @@ void MiscellaneousCommand::Execute()
 
 	//TODO: Need to be checked for validity
 	else if(state_ == 1)
-		get_default_cg_producer(pCIIStrategy_->GetChannel())->add(layer_, filename_, false, TEXT(""), xmlData_);
+		flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->add(layer_, filename_, false, TEXT(""), xmlData_);
 }
 
 
@@ -155,11 +155,11 @@ void KeydataCommand::Execute()
 
 	//TODO: Need to be checked for validity
 	else if(state_ == 1)
-		get_default_cg_producer(pCIIStrategy_->GetChannel())->stop(layer_, 0);
+		flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->stop(layer_, 0);
 	else if(state_ == 2)
-		pCIIStrategy_->GetChannel()->stage()->clear(cg_producer::DEFAULT_LAYER);
+		pCIIStrategy_->GetChannel()->stage()->clear(flash::cg_producer::DEFAULT_LAYER);
 	else if(state_ == 3)
-		get_default_cg_producer(pCIIStrategy_->GetChannel())->play(layer_);
+		flash::get_default_cg_producer(pCIIStrategy_->GetChannel())->play(layer_);
 }
 
 void KeydataCommand::Setup(const std::vector<std::wstring>& parameters) {
diff --git a/protocol/cii/CIIProtocolStrategy.cpp b/protocol/cii/CIIProtocolStrategy.cpp
index 1bf718356..f07685553 100644
--- a/protocol/cii/CIIProtocolStrategy.cpp
+++ b/protocol/cii/CIIProtocolStrategy.cpp
@@ -173,14 +173,14 @@ void CIIProtocolStrategy::WriteTemplateData(const std::wstring& templateName, co
 		fullTemplateFilename += TEXT("\\");
 	}
 	fullTemplateFilename += templateName;
-	fullTemplateFilename = find_flash_template(fullTemplateFilename);
+	fullTemplateFilename = flash::find_template(fullTemplateFilename);
 	if(fullTemplateFilename.empty())
 	{
 		CASPAR_LOG(error) << "Failed to save instance of " << templateName << TEXT(" as ") << titleName << TEXT(", template ") << fullTemplateFilename << " not found";
 		return;
 	}
 	
-	auto producer = create_flash_producer(this->GetChannel()->mixer(), boost::assign::list_of(env::template_folder()+TEXT("CG.fth")));
+	auto producer = flash::create_producer(this->GetChannel()->mixer(), boost::assign::list_of(env::template_folder()+TEXT("CG.fth")));
 
 	std::wstringstream flashParam;
 	flashParam << TEXT("<invoke name=\"Add\" returntype=\"xml\"><arguments><number>1</number><string>") << currentProfile_ << '/' <<  templateName << TEXT("</string><number>0</number><true/><string> </string><string><![CDATA[ ") << xmlData << TEXT(" ]]></string></arguments></invoke>");
diff --git a/protocol/clk/CLKProtocolStrategy.cpp b/protocol/clk/CLKProtocolStrategy.cpp
index e7c2f6228..5d25b86bd 100644
--- a/protocol/clk/CLKProtocolStrategy.cpp
+++ b/protocol/clk/CLKProtocolStrategy.cpp
@@ -115,7 +115,7 @@ void CLKProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInf
 
 			if(currentCommand_.command_ == CLKCommand::CLKReset) 
 			{
-				pChannel_->stage()->clear(cg_producer::DEFAULT_LAYER);
+				pChannel_->stage()->clear(flash::cg_producer::DEFAULT_LAYER);
 				bClockLoaded_ = false;
 				
 				CASPAR_LOG(info) << L"CLK: Recieved and executed reset-command";
@@ -124,11 +124,11 @@ void CLKProtocolStrategy::Parse(const TCHAR* pData, int charCount, IO::ClientInf
 			{
 				if(!bClockLoaded_) 
 				{
-					get_default_cg_producer(pChannel_)->add(0, TEXT("hawrysklocka/clock.ft"), true, TEXT(""), currentCommand_.GetData());
+					flash::get_default_cg_producer(pChannel_)->add(0, TEXT("hawrysklocka/clock.ft"), true, TEXT(""), currentCommand_.GetData());
 					bClockLoaded_ = true;
 				}
 				else 
-					get_default_cg_producer(pChannel_)->update(0, currentCommand_.GetData());
+					flash::get_default_cg_producer(pChannel_)->update(0, currentCommand_.GetData());
 				
 				CASPAR_LOG(debug) << L"CLK: Clockdata sent: " << currentCommand_.GetData();
 				CASPAR_LOG(debug) << L"CLK: Executed valid command: " << currentCommandString_.str();
diff --git a/shell/casparcg.config b/shell/casparcg.config
index 6c39b8f1e..ff5f37edd 100644
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -39,6 +39,7 @@
             <device>1</device>
             <embedded-audio>true</embedded-audio>
           </decklink>
+          <screen></screen>
         </consumers>
       </channel>
     </channels>
diff --git a/shell/main.cpp b/shell/main.cpp
index dec2f600c..97c9760b1 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -122,28 +122,28 @@ void print_info()
 	CASPAR_LOG(info) << L"on " << caspar::get_win_product_name() << L" " << caspar::get_win_sp_version();
 	CASPAR_LOG(info) << caspar::get_cpu_info();
 	CASPAR_LOG(info) << caspar::get_system_product_name();
-	CASPAR_LOG(info) << L"Flash " << caspar::get_flash_version();
-	CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::get_cg_version();
-	CASPAR_LOG(info) << L"FreeImage " << caspar::get_image_version();
+	CASPAR_LOG(info) << L"Flash " << caspar::flash::get_version();
+	CASPAR_LOG(info) << L"Flash-Template-Host " << caspar::flash::get_cg_version();
+	CASPAR_LOG(info) << L"FreeImage " << caspar::image::get_version();
 	
-	CASPAR_LOG(info) << L"Decklink " << caspar::get_decklink_version();
-	auto deck = caspar::get_decklink_device_list();
+	CASPAR_LOG(info) << L"Decklink " << caspar::decklink::get_version();
+	auto deck = caspar::decklink::get_device_list();
 	std::for_each(deck.begin(), deck.end(), [](const std::wstring& device)
 	{
 		CASPAR_LOG(info) << device;
 	});
 		
-	auto blue = caspar::get_bluefish_device_list();
+	auto blue = caspar::bluefish::get_device_list();
 	std::for_each(blue.begin(), blue.end(), [](const std::wstring& device)
 	{
 		CASPAR_LOG(info) << device;
 	});
 	
-	CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::get_avcodec_version();
-	CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::get_avformat_version();
-	CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::get_avfilter_version();
-	CASPAR_LOG(info) << L"FFMPEG-avutil " << caspar::get_avutil_version();
-	CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::get_swscale_version();
+	CASPAR_LOG(info) << L"FFMPEG-avcodec "  << caspar::ffmpeg::get_avcodec_version();
+	CASPAR_LOG(info) << L"FFMPEG-avformat " << caspar::ffmpeg::get_avformat_version();
+	CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::ffmpeg::get_avfilter_version();
+	CASPAR_LOG(info) << L"FFMPEG-avutil "	<< caspar::ffmpeg::get_avutil_version();
+	CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::ffmpeg::get_swscale_version();
 	CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n";
 }
 
diff --git a/shell/server.cpp b/shell/server.cpp
index b121b8098..5d9bf906f 100644
--- a/shell/server.cpp
+++ b/shell/server.cpp
@@ -68,14 +68,14 @@ struct server::implementation : boost::noncopyable
 
 	implementation()												
 	{			
-		init_ffmpeg();
-		init_bluefish();
-		init_decklink();
-		init_flash();
-		init_oal();
-		init_ogl();
+		ffmpeg::init();
+		bluefish::init();
+		decklink::init();
+		flash::init();
+		oal::init();
+		ogl::init();
 		//init_silverlight();
-		init_image();
+		image::init();
 
 		setup_channels(env::properties());
 		setup_controllers(env::properties());
@@ -83,7 +83,7 @@ struct server::implementation : boost::noncopyable
 
 	~implementation()
 	{		
-		uninit_ffmpeg();
+		ffmpeg::uninit();
 
 		async_servers_.clear();
 		channels_.clear();
@@ -107,15 +107,15 @@ struct server::implementation : boost::noncopyable
 				{
 					const std::string name = xml_consumer.first;
 					if(name == "screen")
-						channels_.back()->output()->add(index++, create_ogl_consumer(xml_consumer.second));					
+						channels_.back()->output()->add(index++, ogl::create_consumer(xml_consumer.second));					
 					else if(name == "bluefish")					
-						channels_.back()->output()->add(index++, create_bluefish_consumer(xml_consumer.second));					
+						channels_.back()->output()->add(index++, bluefish::create_consumer(xml_consumer.second));					
 					else if(name == "decklink")					
-						channels_.back()->output()->add(index++, create_decklink_consumer(xml_consumer.second));				
+						channels_.back()->output()->add(index++, decklink::create_consumer(xml_consumer.second));				
 					//else if(name == "file")					
 					//	channels_.back()->output()->add(index++, create_ffmpeg_consumer(xml_consumer.second));						
 					else if(name == "audio")
-						channels_.back()->output()->add(index++, create_oal_consumer());		
+						channels_.back()->output()->add(index++, oal::create_consumer());		
 					else if(name != "<xmlcomment>")
 						CASPAR_LOG(warning) << "Invalid consumer: " << widen(name);	
 				}