diff --git a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
index 449ef09f5..61e1d440b 100755
Binary files a/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer and b/slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer differ
diff --git a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
index f42eed37e..e40696de4 100755
--- a/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include "communication_funcs_UDP.h"
 #include "UDPPacketHeaderGenerator.h"
diff --git a/slsDetectorServers/eigerDetectorServer/Beb.c b/slsDetectorServers/eigerDetectorServer/Beb.c
index caa9e9857..d1e941db6 100755
--- a/slsDetectorServers/eigerDetectorServer/Beb.c
+++ b/slsDetectorServers/eigerDetectorServer/Beb.c
@@ -1,4 +1,4 @@
-#include "logger.h"
+#include "clogger.h"
 #include "Beb.h"
 #include "FebRegisterDefs.h"
 #include "xparameters.h"
diff --git a/slsDetectorServers/eigerDetectorServer/CMakeLists.txt b/slsDetectorServers/eigerDetectorServer/CMakeLists.txt
index 4208fe5c6..2e68c33b2 100644
--- a/slsDetectorServers/eigerDetectorServer/CMakeLists.txt
+++ b/slsDetectorServers/eigerDetectorServer/CMakeLists.txt
@@ -1,8 +1,13 @@
 set(src 
     slsDetectorFunctionList.c
-    slsDetectorServer.c
-    slsDetectorServer_funcs.c
-    communication_funcs.c
+    ../slsDetectorServer/slsDetectorServer.c
+    ../slsDetectorServer/slsDetectorServer_funcs.c
+    ../slsDetectorServer/communication_funcs.c
+)
+
+include_directories(
+    ../slsDetectorServer
+    ../../slsSupportLib/include
 )
 
 add_executable(eigerDetectorServerMaster 
diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c
index e3594772b..c05d17aa7 100755
--- a/slsDetectorServers/eigerDetectorServer/FebControl.c
+++ b/slsDetectorServers/eigerDetectorServer/FebControl.c
@@ -1,7 +1,7 @@
 #include "FebControl.h"
 #include "FebRegisterDefs.h"
 #include "slsDetectorServer_defs.h"
-#include "logger.h"
+#include "clogger.h"
 #include "Beb.h"
 
 #include <unistd.h>
diff --git a/slsDetectorServers/eigerDetectorServer/FebInterface.c b/slsDetectorServers/eigerDetectorServer/FebInterface.c
index 9c7d33051..d4fa1815c 100755
--- a/slsDetectorServers/eigerDetectorServer/FebInterface.c
+++ b/slsDetectorServers/eigerDetectorServer/FebInterface.c
@@ -1,7 +1,7 @@
 #include "FebInterface.h"
 #include "LocalLinkInterface.h"
 #include "xparameters.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include <unistd.h>
 
diff --git a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c
index 3e47cd61a..0e3cc52bc 100755
--- a/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c
+++ b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c
@@ -1,6 +1,6 @@
 #include "LocalLinkInterface.h"
 #include "HardwareMMappingDefs.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include <unistd.h>
 #include <sys/mman.h>
diff --git a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer
index 802dbd841..2caab4127 100755
Binary files a/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_developer differ
diff --git a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
index 2cbc68982..eedc0b4d6 100755
--- a/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 #include "common.h"
 
 #ifndef VIRTUAL
diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer
index 70f74637b..a6acd6dcf 100755
Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServer_developer differ
diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
index c8b277102..9c2bbebb7 100755
--- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 #include "RegisterDefs.h"
 
 #ifndef VIRTUAL
diff --git a/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt b/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt
index 50574aa34..a7461a986 100644
--- a/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt
+++ b/slsDetectorServers/jungfrauDetectorServer/CMakeLists.txt
@@ -1,8 +1,13 @@
 add_executable(jungfrauDetectorServer
     slsDetectorFunctionList.c
-    slsDetectorServer.c
-    slsDetectorServer_funcs.c
-    communication_funcs.c
+    ../slsDetectorServer/slsDetectorServer.c
+    ../slsDetectorServer/slsDetectorServer_funcs.c
+    ../slsDetectorServer/communication_funcs.c
+)
+
+include_directories(
+    ../slsDetectorServer/
+    ../../slsSupportLib/include
 )
 
 target_include_directories(jungfrauDetectorServer
diff --git a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer
index 3f3b9d796..085e1a7aa 100755
Binary files a/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer differ
diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
index 3af6300e4..4c2fb1fbb 100755
--- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 #include <sys/select.h>
 #include "AD9257.h"		// commonServerFunctions.h, blackfin.h, ansi.h
 #include "LTC2620.h"    // dacs
diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
index b86eed9c0..9dcca2085 100755
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
@@ -1,6 +1,6 @@
 #include "slsDetectorFunctionList.h"
 #include "versionAPI.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include "communication_funcs_UDP.h"
 #include "UDPPacketHeaderGenerator.h"
diff --git a/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h b/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h
index 9350d4bd6..7e9c47263 100755
--- a/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h
+++ b/slsDetectorServers/slsDetectorServer/UDPPacketHeaderGenerator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logger.h"
+#include "clogger.h"
 #include "sls_detector_defs.h"
 
 
diff --git a/slsDetectorServers/slsDetectorServer/logger.h b/slsDetectorServers/slsDetectorServer/clogger.h
similarity index 100%
rename from slsDetectorServers/slsDetectorServer/logger.h
rename to slsDetectorServers/slsDetectorServer/clogger.h
diff --git a/slsDetectorServers/slsDetectorServer/communication_funcs.c b/slsDetectorServers/slsDetectorServer/communication_funcs.c
index 3c4bae02e..756530280 100755
--- a/slsDetectorServers/slsDetectorServer/communication_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/communication_funcs.c
@@ -1,5 +1,5 @@
 #include "communication_funcs.h" 
-#include "logger.h"
+#include "clogger.h"
 
 #include <string.h>
 #include <errno.h>
diff --git a/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h b/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h
index 622e92694..0182ae46e 100755
--- a/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h
+++ b/slsDetectorServers/slsDetectorServer/communication_funcs_UDP.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logger.h"
+#include "clogger.h"
 #include "sls_detector_defs.h"
 
 
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
index 381ea21cb..03734d2e5 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
@@ -1,7 +1,7 @@
 #include "sls_detector_defs.h"
 #include "slsDetectorServer_defs.h" // DAC_INDEX, ADC_INDEX, also include RegisterDefs.h
 #ifdef GOTTHARDD
-#include "logger.h"                 // runState(enum TLogLevel)
+#include "clogger.h"                 // runState(enum TLogLevel)
 #endif
 #include <stdlib.h>
 #include <stdio.h>					// FILE
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
index 46ede3893..64c64a4b6 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
@@ -2,7 +2,7 @@
    The port number is passed as an argument */
 
 #include "sls_detector_defs.h"
-#include "logger.h"
+#include "clogger.h"
 #include "communication_funcs.h"
 #include "slsDetectorServer_funcs.h"
 #include "slsDetectorServer_defs.h"
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
index 79e946b11..5e23140ce 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
@@ -1,7 +1,7 @@
 #include "slsDetectorServer_funcs.h"
 #include "slsDetectorFunctionList.h"
 #include "communication_funcs.h"
-#include "logger.h"
+#include "clogger.h"
 
 #include <string.h>
 #include <arpa/inet.h>
diff --git a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
index 181d1bd21..90f5836f2 100755
--- a/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "sls_detector_defs.h"
-#include "logger.h"
+#include "clogger.h"
 
 enum numberMode {DEC, HEX};
 #define GOODBYE 					(-200)
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index c1c9c91c8..38452d4d8 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -3,8 +3,8 @@
 #define APILIB 0x190723
 #define APIRECEIVER 0x190722
 #define APIGUI 0x190723
-#define APIJUNGFRAU 0x190819
-#define APIGOTTHARD 0x190819
-#define APICTB 0x190819
-#define APIMOENCH 0x190819
-#define APIEIGER 0x190819
+#define APICTB 0x190820
+#define APIGOTTHARD 0x190820
+#define APIJUNGFRAU 0x190820
+#define APIMOENCH 0x190820
+#define APIEIGER 0x190820