diff --git a/CMake/LofarPackageList.cmake b/CMake/LofarPackageList.cmake
index 1b5fa3d8bf03049ab009b6c0df8c017b1ac3ed19..7ef24f940967af4980f86ff3996979b414cf4c55 100644
--- a/CMake/LofarPackageList.cmake
+++ b/CMake/LofarPackageList.cmake
@@ -69,6 +69,8 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
set(CASATools_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CASATools)
set(TestSuite_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/TestSuite)
set(CUDaemons_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CUDaemons)
+ set(CT_StartDaemon_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CUDaemons/CT_StartDaemon)
+ set(Service_Broker_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CUDaemons/Service_Broker)
set(CURTDBDaemons_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/CURTDBDaemons)
set(PIC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PIC)
set(PAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/MAC/APL/PAC)
diff --git a/MAC/APL/CUDaemons/CMakeLists.txt b/MAC/APL/CUDaemons/CMakeLists.txt
index 94240e20992eb001f750e2f05a81422e71134eed..796bac5402943646ac20d6825d068c2a1feeca86 100644
--- a/MAC/APL/CUDaemons/CMakeLists.txt
+++ b/MAC/APL/CUDaemons/CMakeLists.txt
@@ -1,9 +1,18 @@
# $Id$
# Do not split the following line, otherwise makeversion will fail!
-lofar_package(CUDaemons 1.0 DEPENDS Common ApplCommon APLCommon GCFTM MACIO)
+#lofar_package(CUDaemons 1.0 DEPENDS Common ApplCommon GCFTM MACIO)
-add_definitions(-DBOOST_DISABLE_THREADS)
+#add_definitions(-DBOOST_DISABLE_THREADS)
-add_subdirectory(src)
-#add_subdirectory(test) # Tests currently do not compile!
+#add_subdirectory(src)
+##add_subdirectory(test) # Tests currently do not compile!
+
+
+
+#include(LofarPackageVersion)
+
+#lofar_add_library(cudaemons Package__Version.cc)
+
+lofar_add_package(Service_Broker)
+lofar_add_package(CT_StartDaemon)
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/CMakeLists.txt b/MAC/APL/CUDaemons/CT_StartDaemon/CMakeLists.txt
similarity index 52%
rename from MAC/APL/CUDaemons/src/CTStartDaemon/CMakeLists.txt
rename to MAC/APL/CUDaemons/CT_StartDaemon/CMakeLists.txt
index 5e5e9ca7526c4fd33631f415e72be95cd4e36d96..1f13ae77dff07ec04105c75a42bbfac4a06e3abb 100644
--- a/MAC/APL/CUDaemons/src/CTStartDaemon/CMakeLists.txt
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CMakeLists.txt
@@ -1,5 +1,13 @@
# $Id$
+lofar_package(CT_StartDaemon 1.0 DEPENDS Common ApplCommon GCFTM MACIO APLCommon)
+
+include(LofarPackageVersion)
+
+lofar_add_library(ctstartdaemon
+ Package__Version.cc)
+
lofar_add_bin_program(CTStartDaemon CTStartDaemonMain.cc CTStartDaemon.cc)
+
install(PROGRAMS startController.sh DESTINATION bin)
install(FILES CTStartDaemon.conf DESTINATION etc)
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
similarity index 99%
rename from MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc
rename to MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
index 4ed741946521270728fd1d74b3b0bb756fb79121..da1c15c822fff82280933259da8eaa66044414eb 100644
--- a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.cc
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
@@ -36,7 +36,7 @@
#include <APL/APLCommon/ControllerDefines.h>
#include <APL/APLCommon/StartDaemon_Protocol.ph>
#include "CTStartDaemon.h"
-#include <CUDaemons/Package__Version.h>
+#include <CT_StartDaemon/Package__Version.h>
using namespace LOFAR::GCF::TM;
@@ -56,7 +56,7 @@ CTStartDaemon::CTStartDaemon(const string& name) :
itsTimerPort (0)
{
LOG_TRACE_FLOW(formatString("CTStartDaemon(%s)", getName().c_str()));
- LOG_INFO(Version::getInfo<CUDaemonsVersion>("CTStartDaemon"));
+ LOG_INFO(Version::getInfo<CT_StartDaemonVersion>("CTStartDaemon"));
itsListener = new GCFTCPPort(*this, MAC_SVCMASK_STARTDAEMON,
GCFPortInterface::MSPP, STARTDAEMON_PROTOCOL);
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.conf b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.conf
similarity index 100%
rename from MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.conf
rename to MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.conf
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.h b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
similarity index 100%
rename from MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemon.h
rename to MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemonMain.cc b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
similarity index 100%
rename from MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemonMain.cc
rename to MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
diff --git a/MAC/APL/CUDaemons/src/CTStartDaemon/startController.sh b/MAC/APL/CUDaemons/CT_StartDaemon/startController.sh
similarity index 100%
rename from MAC/APL/CUDaemons/src/CTStartDaemon/startController.sh
rename to MAC/APL/CUDaemons/CT_StartDaemon/startController.sh
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/CMakeLists.txt b/MAC/APL/CUDaemons/Service_Broker/CMakeLists.txt
similarity index 60%
rename from MAC/APL/CUDaemons/src/ServiceBroker/CMakeLists.txt
rename to MAC/APL/CUDaemons/Service_Broker/CMakeLists.txt
index 447161c480aa880f04347cd2ac953c2f2aa06ba6..4a8f64a31a8ed183f213e76763f21ca4d3a42f4c 100644
--- a/MAC/APL/CUDaemons/src/ServiceBroker/CMakeLists.txt
+++ b/MAC/APL/CUDaemons/Service_Broker/CMakeLists.txt
@@ -1,8 +1,14 @@
# $Id$
+lofar_package(Service_Broker 1.0 DEPENDS Common GCFTM MACIO)
# Add current directory to the -I path.
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include(LofarPackageVersion)
+
+lofar_add_library(servicebroker
+ Package__Version.cc)
+
lofar_add_bin_program(ServiceBroker ServiceBrokerMain.cc ServiceBroker.cc)
install(FILES ServiceBroker.conf DESTINATION etc)
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
similarity index 99%
rename from MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
rename to MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
index 068dcd45f8ca31de41b5cbdf3afc960b5d925561..44732d926469aeba30b8930a05f58aca553a1f02 100644
--- a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.cc
+++ b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
@@ -32,7 +32,7 @@
#include <MACIO/GCF_Event.h>
//#include <GCF/TM/GCF_Protocols.h>
#include "ServiceBroker.h"
-#include <CUDaemons/Package__Version.h>
+#include <Service_Broker/Package__Version.h>
namespace LOFAR {
using namespace MACIO;
@@ -54,7 +54,7 @@ ServiceBroker::ServiceBroker() :
itsNrPorts(0),
itsNrFreePorts(0)
{
- LOG_INFO(Version::getInfo<CUDaemonsVersion>("ServiceBroker"));
+ LOG_INFO(Version::getInfo<Service_BrokerVersion>("ServiceBroker"));
// register the protocol for debugging purposes
registerProtocol(SB_PROTOCOL, SB_PROTOCOL_STRINGS);
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.conf b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.conf
similarity index 100%
rename from MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.conf
rename to MAC/APL/CUDaemons/Service_Broker/ServiceBroker.conf
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.h b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
similarity index 100%
rename from MAC/APL/CUDaemons/src/ServiceBroker/ServiceBroker.h
rename to MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
diff --git a/MAC/APL/CUDaemons/src/ServiceBroker/ServiceBrokerMain.cc b/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc
similarity index 100%
rename from MAC/APL/CUDaemons/src/ServiceBroker/ServiceBrokerMain.cc
rename to MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc