diff --git a/.gitattributes b/.gitattributes
index a219a7a8f28bc0401b3588ff3f71d5de8a679f8c..86e2cc6b0953375927cd1d48d41555d17682bf29 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2531,42 +2531,6 @@ LCS/MSLofar/test/tBeamTables.in_during_filled -text
 LCS/MSLofar/test/tBeamTables.in_hd/CS001-iHBADeltas.conf -text
 LCS/MSLofar/test/tBeamTables.in_hd/DE601-iHBADeltas.conf -text
 LCS/MSLofar/test/tBeamTables.in_hd/RS106-iHBADeltas.conf -text
-LCS/MessageBus/cpp/CMakeLists.txt -text
-LCS/MessageBus/cpp/include/Messaging/ApertifMessage.h -text
-LCS/MessageBus/cpp/include/Messaging/ApertifMessages.h -text
-LCS/MessageBus/cpp/include/Messaging/CMakeLists.txt -text
-LCS/MessageBus/cpp/include/Messaging/DefaultSettings.h -text
-LCS/MessageBus/cpp/include/Messaging/EventMessage.h -text
-LCS/MessageBus/cpp/include/Messaging/Exceptions.h -text
-LCS/MessageBus/cpp/include/Messaging/FromBus.h -text
-LCS/MessageBus/cpp/include/Messaging/Message.h -text
-LCS/MessageBus/cpp/include/Messaging/Message.h.orig -text
-LCS/MessageBus/cpp/include/Messaging/MonitoringMessage.h -text
-LCS/MessageBus/cpp/include/Messaging/ProgressMessage.h -text
-LCS/MessageBus/cpp/include/Messaging/ServiceMessage.h -text
-LCS/MessageBus/cpp/include/Messaging/ToBus.h -text
-LCS/MessageBus/cpp/package.dox -text
-LCS/MessageBus/cpp/patch.txt -text
-LCS/MessageBus/cpp/src/ApertifMessage.cc -text
-LCS/MessageBus/cpp/src/CMakeLists.txt -text
-LCS/MessageBus/cpp/src/DefaultSettings.cc -text
-LCS/MessageBus/cpp/src/EventMessage.cc -text
-LCS/MessageBus/cpp/src/FromBus.cc -text
-LCS/MessageBus/cpp/src/Helpers.cc -text
-LCS/MessageBus/cpp/src/Helpers.h -text
-LCS/MessageBus/cpp/src/Message.cc -text
-LCS/MessageBus/cpp/src/Message.cc.ok -text
-LCS/MessageBus/cpp/src/Message.h.ok -text
-LCS/MessageBus/cpp/src/MonitoringMessage.cc -text
-LCS/MessageBus/cpp/src/ProgressMessage.cc -text
-LCS/MessageBus/cpp/src/ServiceMessage.cc -text
-LCS/MessageBus/cpp/src/ToBus.cc -text
-LCS/MessageBus/cpp/test/CMakeLists.txt -text
-LCS/MessageBus/cpp/test/tApertifMessages.cc -text
-LCS/MessageBus/cpp/test/tApertifMessages.log_prop -text
-LCS/MessageBus/cpp/test/tApertifMessages.sh -text
-LCS/MessageBus/cpp/test/tMessaging.cc -text
-LCS/MessageBus/cpp/test/tTimeOut.cc -text
 LCS/MessageBus/data/feedback_dp_44833.txt -text
 LCS/MessageBus/data/feedback_dp_empty.txt -text
 LCS/MessageBus/data/feedback_dp_no_ids.txt -text
@@ -2576,27 +2540,6 @@ LCS/MessageBus/data/task_spec_system_empty.txt -text
 LCS/MessageBus/data/task_spec_system_no_ids.txt -text
 LCS/MessageBus/data/task_spec_system_xml_error.txt -text
 LCS/MessageBus/include/MessageBus/Protocols/TaskSpecificationSystem.h -text
-LCS/MessageBus/python/CMakeLists.txt -text
-LCS/MessageBus/python/common/CMakeLists.txt -text
-LCS/MessageBus/python/common/__init__.py -text
-LCS/MessageBus/python/common/factory.py -text
-LCS/MessageBus/python/common/util.py -text
-LCS/MessageBus/python/examples/ToUpperClient -text
-LCS/MessageBus/python/examples/ToUpperMapClient -text
-LCS/MessageBus/python/examples/ToUpperService -text
-LCS/MessageBus/python/messaging/CMakeLists.txt -text
-LCS/MessageBus/python/messaging/RPC.py -text
-LCS/MessageBus/python/messaging/Service.py -text
-LCS/MessageBus/python/messaging/__init__.py -text
-LCS/MessageBus/python/messaging/exceptions.py -text
-LCS/MessageBus/python/messaging/messagebus.py -text
-LCS/MessageBus/python/messaging/messages.py -text
-LCS/MessageBus/python/messaging/test/CMakeLists.txt -text
-LCS/MessageBus/python/messaging/test/t_messagebus.py -text
-LCS/MessageBus/python/messaging/test/t_messagebus.run -text
-LCS/MessageBus/python/messaging/test/t_messagebus.sh -text
-LCS/MessageBus/python/messaging/test/t_messages.py -text
-LCS/MessageBus/python/messaging/test/t_messages.sh -text
 LCS/MessageBus/qpid/local/bin/addqueue -text
 LCS/MessageBus/qpid/local/bin/addtopic -text
 LCS/MessageBus/qpid/local/bin/delfed -text
@@ -2632,6 +2575,63 @@ LCS/MessageDaemons/test/tMessageRouter.sh eol=lf
 LCS/MessageDaemons/webmonitor/QPIDWebserverJSON -text
 LCS/MessageDaemons/webmonitor/Schema.svg.ccu001 -text
 LCS/MessageDaemons/webmonitor/Schema.svg.ccu099 -text
+LCS/Messaging/CMakeLists.txt -text
+LCS/Messaging/include/Messaging/ApertifMessage.h -text
+LCS/Messaging/include/Messaging/ApertifMessages.h -text
+LCS/Messaging/include/Messaging/CMakeLists.txt -text
+LCS/Messaging/include/Messaging/DefaultSettings.h -text
+LCS/Messaging/include/Messaging/EventMessage.h -text
+LCS/Messaging/include/Messaging/Exceptions.h -text
+LCS/Messaging/include/Messaging/FromBus.h -text
+LCS/Messaging/include/Messaging/Message.h -text
+LCS/Messaging/include/Messaging/Message.h.orig -text
+LCS/Messaging/include/Messaging/MonitoringMessage.h -text
+LCS/Messaging/include/Messaging/ProgressMessage.h -text
+LCS/Messaging/include/Messaging/ServiceMessage.h -text
+LCS/Messaging/include/Messaging/ToBus.h -text
+LCS/Messaging/package.dox -text
+LCS/Messaging/patch.txt -text
+LCS/Messaging/python/CMakeLists.txt -text
+LCS/Messaging/python/common/CMakeLists.txt -text
+LCS/Messaging/python/common/__init__.py -text
+LCS/Messaging/python/common/factory.py -text
+LCS/Messaging/python/common/util.py -text
+LCS/Messaging/python/examples/ToUpperClient -text
+LCS/Messaging/python/examples/ToUpperMapClient -text
+LCS/Messaging/python/examples/ToUpperService -text
+LCS/Messaging/python/messaging/CMakeLists.txt -text
+LCS/Messaging/python/messaging/RPC.py -text
+LCS/Messaging/python/messaging/Service.py -text
+LCS/Messaging/python/messaging/__init__.py -text
+LCS/Messaging/python/messaging/exceptions.py -text
+LCS/Messaging/python/messaging/messagebus.py -text
+LCS/Messaging/python/messaging/messages.py -text
+LCS/Messaging/python/messaging/test/CMakeLists.txt -text
+LCS/Messaging/python/messaging/test/t_messagebus.py -text
+LCS/Messaging/python/messaging/test/t_messagebus.run -text
+LCS/Messaging/python/messaging/test/t_messagebus.sh -text
+LCS/Messaging/python/messaging/test/t_messages.py -text
+LCS/Messaging/python/messaging/test/t_messages.sh -text
+LCS/Messaging/src/ApertifMessage.cc -text
+LCS/Messaging/src/CMakeLists.txt -text
+LCS/Messaging/src/DefaultSettings.cc -text
+LCS/Messaging/src/EventMessage.cc -text
+LCS/Messaging/src/FromBus.cc -text
+LCS/Messaging/src/Helpers.cc -text
+LCS/Messaging/src/Helpers.h -text
+LCS/Messaging/src/Message.cc -text
+LCS/Messaging/src/Message.cc.ok -text
+LCS/Messaging/src/Message.h.ok -text
+LCS/Messaging/src/MonitoringMessage.cc -text
+LCS/Messaging/src/ProgressMessage.cc -text
+LCS/Messaging/src/ServiceMessage.cc -text
+LCS/Messaging/src/ToBus.cc -text
+LCS/Messaging/test/CMakeLists.txt -text
+LCS/Messaging/test/tApertifMessages.cc -text
+LCS/Messaging/test/tApertifMessages.log_prop -text
+LCS/Messaging/test/tApertifMessages.sh -text
+LCS/Messaging/test/tMessaging.cc -text
+LCS/Messaging/test/tTimeOut.cc -text
 LCS/Tools/src/checkcomp.py -text
 LCS/Tools/src/countalllines -text
 LCS/Tools/src/countlines -text
diff --git a/LCS/CMakeLists.txt b/LCS/CMakeLists.txt
index eaf721a214020ba8ed6cfc3118664179f15592c1..e0a5f530ab2cb77bfe159a96c481021a30a39c66 100644
--- a/LCS/CMakeLists.txt
+++ b/LCS/CMakeLists.txt
@@ -6,6 +6,7 @@ lofar_add_package(ApplCommon)     # Application common stuff
 lofar_add_package(Blob)           # Binary Large Objects
 lofar_add_package(Common)         # Common stuff
 lofar_add_package(MessageBus)     # Support for QPID message exchange
+lofar_add_package(Messaging)      # Support for new QPID messaging libraries
 lofar_add_package(MessageDaemons) # Daemons to do message routing and handling
 lofar_add_package(MSLofar)        # MS for LOFAR based on ICD
 lofar_add_package(pyparameterset) # Python ParameterSet bindings
@@ -14,4 +15,5 @@ lofar_add_package(Stream)         # Low-level support for streaming data
 lofar_add_package(Tools)          # Useful tools
 lofar_add_package(Transport)      # Low-level transport library
 lofar_add_package(MSLofar)        # LOFAR MeasurementSet definition
-lofar_add_package(LofarStMan)   # Storage Manager for the main table of a LOFAR MS
+lofar_add_package(LofarStMan)     # Storage Manager for the main table of a LOFAR MS
+
diff --git a/LCS/MessageBus/CMakeLists.txt b/LCS/MessageBus/CMakeLists.txt
index 622e45e1e9b4390bf6cec19175bf061f123d9722..41113fb9e24557eb4f044f12f7be3e99f53068a2 100644
--- a/LCS/MessageBus/CMakeLists.txt
+++ b/LCS/MessageBus/CMakeLists.txt
@@ -10,5 +10,3 @@ lofar_find_package(UnitTest++)
 add_subdirectory(include/MessageBus)
 add_subdirectory(src)
 add_subdirectory(test)
-add_subdirectory(python)
-add_subdirectory(cpp)
\ No newline at end of file
diff --git a/LCS/MessageBus/cpp/CMakeLists.txt b/LCS/Messaging/CMakeLists.txt
similarity index 81%
rename from LCS/MessageBus/cpp/CMakeLists.txt
rename to LCS/Messaging/CMakeLists.txt
index cf4e72768205f21aea7a10aac3b6a48e0eb13f14..96d98ebaf71332c3758c4ee7dc6c5e0d7e753c78 100644
--- a/LCS/MessageBus/cpp/CMakeLists.txt
+++ b/LCS/Messaging/CMakeLists.txt
@@ -4,7 +4,7 @@ lofar_package(Messaging 1.0 DEPENDS Common)
 
 include(LofarFindPackage)
 lofar_find_package(QPID REQUIRED)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 add_subdirectory(include/Messaging)
 add_subdirectory(src)
 add_subdirectory(test)
+add_subdirectory(python)
diff --git a/LCS/MessageBus/cpp/include/Messaging/ApertifMessage.h b/LCS/Messaging/include/Messaging/ApertifMessage.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/ApertifMessage.h
rename to LCS/Messaging/include/Messaging/ApertifMessage.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/ApertifMessages.h b/LCS/Messaging/include/Messaging/ApertifMessages.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/ApertifMessages.h
rename to LCS/Messaging/include/Messaging/ApertifMessages.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/CMakeLists.txt b/LCS/Messaging/include/Messaging/CMakeLists.txt
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/CMakeLists.txt
rename to LCS/Messaging/include/Messaging/CMakeLists.txt
diff --git a/LCS/MessageBus/cpp/include/Messaging/DefaultSettings.h b/LCS/Messaging/include/Messaging/DefaultSettings.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/DefaultSettings.h
rename to LCS/Messaging/include/Messaging/DefaultSettings.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/EventMessage.h b/LCS/Messaging/include/Messaging/EventMessage.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/EventMessage.h
rename to LCS/Messaging/include/Messaging/EventMessage.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/Exceptions.h b/LCS/Messaging/include/Messaging/Exceptions.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/Exceptions.h
rename to LCS/Messaging/include/Messaging/Exceptions.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/FromBus.h b/LCS/Messaging/include/Messaging/FromBus.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/FromBus.h
rename to LCS/Messaging/include/Messaging/FromBus.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/Message.h b/LCS/Messaging/include/Messaging/Message.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/Message.h
rename to LCS/Messaging/include/Messaging/Message.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/Message.h.orig b/LCS/Messaging/include/Messaging/Message.h.orig
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/Message.h.orig
rename to LCS/Messaging/include/Messaging/Message.h.orig
diff --git a/LCS/MessageBus/cpp/include/Messaging/MonitoringMessage.h b/LCS/Messaging/include/Messaging/MonitoringMessage.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/MonitoringMessage.h
rename to LCS/Messaging/include/Messaging/MonitoringMessage.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/ProgressMessage.h b/LCS/Messaging/include/Messaging/ProgressMessage.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/ProgressMessage.h
rename to LCS/Messaging/include/Messaging/ProgressMessage.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/ServiceMessage.h b/LCS/Messaging/include/Messaging/ServiceMessage.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/ServiceMessage.h
rename to LCS/Messaging/include/Messaging/ServiceMessage.h
diff --git a/LCS/MessageBus/cpp/include/Messaging/ToBus.h b/LCS/Messaging/include/Messaging/ToBus.h
similarity index 100%
rename from LCS/MessageBus/cpp/include/Messaging/ToBus.h
rename to LCS/Messaging/include/Messaging/ToBus.h
diff --git a/LCS/MessageBus/cpp/package.dox b/LCS/Messaging/package.dox
similarity index 100%
rename from LCS/MessageBus/cpp/package.dox
rename to LCS/Messaging/package.dox
diff --git a/LCS/MessageBus/cpp/patch.txt b/LCS/Messaging/patch.txt
similarity index 100%
rename from LCS/MessageBus/cpp/patch.txt
rename to LCS/Messaging/patch.txt
diff --git a/LCS/MessageBus/python/CMakeLists.txt b/LCS/Messaging/python/CMakeLists.txt
similarity index 100%
rename from LCS/MessageBus/python/CMakeLists.txt
rename to LCS/Messaging/python/CMakeLists.txt
diff --git a/LCS/MessageBus/python/common/CMakeLists.txt b/LCS/Messaging/python/common/CMakeLists.txt
similarity index 100%
rename from LCS/MessageBus/python/common/CMakeLists.txt
rename to LCS/Messaging/python/common/CMakeLists.txt
diff --git a/LCS/MessageBus/python/common/__init__.py b/LCS/Messaging/python/common/__init__.py
similarity index 100%
rename from LCS/MessageBus/python/common/__init__.py
rename to LCS/Messaging/python/common/__init__.py
diff --git a/LCS/MessageBus/python/common/factory.py b/LCS/Messaging/python/common/factory.py
similarity index 100%
rename from LCS/MessageBus/python/common/factory.py
rename to LCS/Messaging/python/common/factory.py
diff --git a/LCS/MessageBus/python/common/util.py b/LCS/Messaging/python/common/util.py
similarity index 100%
rename from LCS/MessageBus/python/common/util.py
rename to LCS/Messaging/python/common/util.py
diff --git a/LCS/MessageBus/python/examples/ToUpperClient b/LCS/Messaging/python/examples/ToUpperClient
similarity index 100%
rename from LCS/MessageBus/python/examples/ToUpperClient
rename to LCS/Messaging/python/examples/ToUpperClient
diff --git a/LCS/MessageBus/python/examples/ToUpperMapClient b/LCS/Messaging/python/examples/ToUpperMapClient
similarity index 100%
rename from LCS/MessageBus/python/examples/ToUpperMapClient
rename to LCS/Messaging/python/examples/ToUpperMapClient
diff --git a/LCS/MessageBus/python/examples/ToUpperService b/LCS/Messaging/python/examples/ToUpperService
similarity index 100%
rename from LCS/MessageBus/python/examples/ToUpperService
rename to LCS/Messaging/python/examples/ToUpperService
diff --git a/LCS/MessageBus/python/messaging/CMakeLists.txt b/LCS/Messaging/python/messaging/CMakeLists.txt
similarity index 100%
rename from LCS/MessageBus/python/messaging/CMakeLists.txt
rename to LCS/Messaging/python/messaging/CMakeLists.txt
diff --git a/LCS/MessageBus/python/messaging/RPC.py b/LCS/Messaging/python/messaging/RPC.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/RPC.py
rename to LCS/Messaging/python/messaging/RPC.py
diff --git a/LCS/MessageBus/python/messaging/Service.py b/LCS/Messaging/python/messaging/Service.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/Service.py
rename to LCS/Messaging/python/messaging/Service.py
diff --git a/LCS/MessageBus/python/messaging/__init__.py b/LCS/Messaging/python/messaging/__init__.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/__init__.py
rename to LCS/Messaging/python/messaging/__init__.py
diff --git a/LCS/MessageBus/python/messaging/exceptions.py b/LCS/Messaging/python/messaging/exceptions.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/exceptions.py
rename to LCS/Messaging/python/messaging/exceptions.py
diff --git a/LCS/MessageBus/python/messaging/messagebus.py b/LCS/Messaging/python/messaging/messagebus.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/messagebus.py
rename to LCS/Messaging/python/messaging/messagebus.py
diff --git a/LCS/MessageBus/python/messaging/messages.py b/LCS/Messaging/python/messaging/messages.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/messages.py
rename to LCS/Messaging/python/messaging/messages.py
diff --git a/LCS/MessageBus/python/messaging/test/CMakeLists.txt b/LCS/Messaging/python/messaging/test/CMakeLists.txt
similarity index 100%
rename from LCS/MessageBus/python/messaging/test/CMakeLists.txt
rename to LCS/Messaging/python/messaging/test/CMakeLists.txt
diff --git a/LCS/MessageBus/python/messaging/test/t_messagebus.py b/LCS/Messaging/python/messaging/test/t_messagebus.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/test/t_messagebus.py
rename to LCS/Messaging/python/messaging/test/t_messagebus.py
diff --git a/LCS/MessageBus/python/messaging/test/t_messagebus.run b/LCS/Messaging/python/messaging/test/t_messagebus.run
similarity index 100%
rename from LCS/MessageBus/python/messaging/test/t_messagebus.run
rename to LCS/Messaging/python/messaging/test/t_messagebus.run
diff --git a/LCS/MessageBus/python/messaging/test/t_messagebus.sh b/LCS/Messaging/python/messaging/test/t_messagebus.sh
similarity index 100%
rename from LCS/MessageBus/python/messaging/test/t_messagebus.sh
rename to LCS/Messaging/python/messaging/test/t_messagebus.sh
diff --git a/LCS/MessageBus/python/messaging/test/t_messages.py b/LCS/Messaging/python/messaging/test/t_messages.py
similarity index 100%
rename from LCS/MessageBus/python/messaging/test/t_messages.py
rename to LCS/Messaging/python/messaging/test/t_messages.py
diff --git a/LCS/MessageBus/python/messaging/test/t_messages.sh b/LCS/Messaging/python/messaging/test/t_messages.sh
similarity index 100%
rename from LCS/MessageBus/python/messaging/test/t_messages.sh
rename to LCS/Messaging/python/messaging/test/t_messages.sh
diff --git a/LCS/MessageBus/cpp/src/ApertifMessage.cc b/LCS/Messaging/src/ApertifMessage.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/ApertifMessage.cc
rename to LCS/Messaging/src/ApertifMessage.cc
diff --git a/LCS/MessageBus/cpp/src/CMakeLists.txt b/LCS/Messaging/src/CMakeLists.txt
similarity index 100%
rename from LCS/MessageBus/cpp/src/CMakeLists.txt
rename to LCS/Messaging/src/CMakeLists.txt
diff --git a/LCS/MessageBus/cpp/src/DefaultSettings.cc b/LCS/Messaging/src/DefaultSettings.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/DefaultSettings.cc
rename to LCS/Messaging/src/DefaultSettings.cc
diff --git a/LCS/MessageBus/cpp/src/EventMessage.cc b/LCS/Messaging/src/EventMessage.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/EventMessage.cc
rename to LCS/Messaging/src/EventMessage.cc
diff --git a/LCS/MessageBus/cpp/src/FromBus.cc b/LCS/Messaging/src/FromBus.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/FromBus.cc
rename to LCS/Messaging/src/FromBus.cc
diff --git a/LCS/MessageBus/cpp/src/Helpers.cc b/LCS/Messaging/src/Helpers.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/Helpers.cc
rename to LCS/Messaging/src/Helpers.cc
diff --git a/LCS/MessageBus/cpp/src/Helpers.h b/LCS/Messaging/src/Helpers.h
similarity index 100%
rename from LCS/MessageBus/cpp/src/Helpers.h
rename to LCS/Messaging/src/Helpers.h
diff --git a/LCS/MessageBus/cpp/src/Message.cc b/LCS/Messaging/src/Message.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/Message.cc
rename to LCS/Messaging/src/Message.cc
diff --git a/LCS/MessageBus/cpp/src/Message.cc.ok b/LCS/Messaging/src/Message.cc.ok
similarity index 100%
rename from LCS/MessageBus/cpp/src/Message.cc.ok
rename to LCS/Messaging/src/Message.cc.ok
diff --git a/LCS/MessageBus/cpp/src/Message.h.ok b/LCS/Messaging/src/Message.h.ok
similarity index 100%
rename from LCS/MessageBus/cpp/src/Message.h.ok
rename to LCS/Messaging/src/Message.h.ok
diff --git a/LCS/MessageBus/cpp/src/MonitoringMessage.cc b/LCS/Messaging/src/MonitoringMessage.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/MonitoringMessage.cc
rename to LCS/Messaging/src/MonitoringMessage.cc
diff --git a/LCS/MessageBus/cpp/src/ProgressMessage.cc b/LCS/Messaging/src/ProgressMessage.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/ProgressMessage.cc
rename to LCS/Messaging/src/ProgressMessage.cc
diff --git a/LCS/MessageBus/cpp/src/ServiceMessage.cc b/LCS/Messaging/src/ServiceMessage.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/ServiceMessage.cc
rename to LCS/Messaging/src/ServiceMessage.cc
diff --git a/LCS/MessageBus/cpp/src/ToBus.cc b/LCS/Messaging/src/ToBus.cc
similarity index 100%
rename from LCS/MessageBus/cpp/src/ToBus.cc
rename to LCS/Messaging/src/ToBus.cc
diff --git a/LCS/MessageBus/cpp/test/CMakeLists.txt b/LCS/Messaging/test/CMakeLists.txt
similarity index 100%
rename from LCS/MessageBus/cpp/test/CMakeLists.txt
rename to LCS/Messaging/test/CMakeLists.txt
diff --git a/LCS/MessageBus/cpp/test/tApertifMessages.cc b/LCS/Messaging/test/tApertifMessages.cc
similarity index 100%
rename from LCS/MessageBus/cpp/test/tApertifMessages.cc
rename to LCS/Messaging/test/tApertifMessages.cc
diff --git a/LCS/MessageBus/cpp/test/tApertifMessages.log_prop b/LCS/Messaging/test/tApertifMessages.log_prop
similarity index 100%
rename from LCS/MessageBus/cpp/test/tApertifMessages.log_prop
rename to LCS/Messaging/test/tApertifMessages.log_prop
diff --git a/LCS/MessageBus/cpp/test/tApertifMessages.sh b/LCS/Messaging/test/tApertifMessages.sh
similarity index 100%
rename from LCS/MessageBus/cpp/test/tApertifMessages.sh
rename to LCS/Messaging/test/tApertifMessages.sh
diff --git a/LCS/MessageBus/cpp/test/tMessaging.cc b/LCS/Messaging/test/tMessaging.cc
similarity index 100%
rename from LCS/MessageBus/cpp/test/tMessaging.cc
rename to LCS/Messaging/test/tMessaging.cc
diff --git a/LCS/MessageBus/cpp/test/tTimeOut.cc b/LCS/Messaging/test/tTimeOut.cc
similarity index 100%
rename from LCS/MessageBus/cpp/test/tTimeOut.cc
rename to LCS/Messaging/test/tTimeOut.cc