diff --git a/slsDetectorServers/.gitignore b/slsDetectorServers/.gitignore
new file mode 100644
index 000000000..825dda897
--- /dev/null
+++ b/slsDetectorServers/.gitignore
@@ -0,0 +1,4 @@
+*.o
+*~
+#*#
+.project
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c b/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c
rename to slsDetectorServers/eigerDetectorServer/9mhvserial_bf.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.c b/slsDetectorServers/eigerDetectorServer/Beb.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.c
rename to slsDetectorServers/eigerDetectorServer/Beb.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.h b/slsDetectorServers/eigerDetectorServer/Beb.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Beb.h
rename to slsDetectorServers/eigerDetectorServer/Beb.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.c b/slsDetectorServers/eigerDetectorServer/Feb.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.c
rename to slsDetectorServers/eigerDetectorServer/Feb.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.h b/slsDetectorServers/eigerDetectorServer/Feb.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Feb.h
rename to slsDetectorServers/eigerDetectorServer/Feb.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.c
rename to slsDetectorServers/eigerDetectorServer/FebControl.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.h b/slsDetectorServers/eigerDetectorServer/FebControl.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebControl.h
rename to slsDetectorServers/eigerDetectorServer/FebControl.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.c b/slsDetectorServers/eigerDetectorServer/FebInterface.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.c
rename to slsDetectorServers/eigerDetectorServer/FebInterface.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.h b/slsDetectorServers/eigerDetectorServer/FebInterface.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebInterface.h
rename to slsDetectorServers/eigerDetectorServer/FebInterface.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h b/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
rename to slsDetectorServers/eigerDetectorServer/FebRegisterDefs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.c b/slsDetectorServers/eigerDetectorServer/HardwareIO.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.c
rename to slsDetectorServers/eigerDetectorServer/HardwareIO.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.h b/slsDetectorServers/eigerDetectorServer/HardwareIO.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareIO.h
rename to slsDetectorServers/eigerDetectorServer/HardwareIO.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h b/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h
rename to slsDetectorServers/eigerDetectorServer/HardwareMMappingDefs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c
rename to slsDetectorServers/eigerDetectorServer/LocalLinkInterface.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h b/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h
rename to slsDetectorServers/eigerDetectorServer/LocalLinkInterface.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile b/slsDetectorServers/eigerDetectorServer/Makefile
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile
rename to slsDetectorServers/eigerDetectorServer/Makefile
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile.virtual b/slsDetectorServers/eigerDetectorServer/Makefile.virtual
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/Makefile.virtual
rename to slsDetectorServers/eigerDetectorServer/Makefile.virtual
diff --git a/slsDetectorServers/eigerDetectorServer/ansi.h b/slsDetectorServers/eigerDetectorServer/ansi.h
new file mode 120000
index 000000000..4a82d0575
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/ansi.h
@@ -0,0 +1 @@
+../../slsSupportLib/include/ansi.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor
similarity index 89%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor
rename to slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor
index 2daff2e25..e07602041 100755
Binary files a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor and b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_refactor differ
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
rename to slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave b/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
rename to slsDetectorServers/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1 b/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1
rename to slsDetectorServers/eigerDetectorServer/bin/hv9m_blackfin_serverv3.0.0.1
diff --git a/slsDetectorServers/eigerDetectorServer/communication_funcs.c b/slsDetectorServers/eigerDetectorServer/communication_funcs.c
new file mode 120000
index 000000000..eacf9f393
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/communication_funcs.c
@@ -0,0 +1 @@
+../../slsSupportLib/include/communication_funcs.c
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/communication_funcs.h b/slsDetectorServers/eigerDetectorServer/communication_funcs.h
new file mode 120000
index 000000000..72c567747
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/communication_funcs.h
@@ -0,0 +1 @@
+../../slsSupportLib/include/communication_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/gitInfo.txt b/slsDetectorServers/eigerDetectorServer/gitInfo.txt
new file mode 100644
index 000000000..bf3fd184c
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/gitInfo.txt
@@ -0,0 +1,9 @@
+Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer 
+URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
+Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
+Repsitory UUID: c24a9b223cbb066d3851599f4d977ae835feffe4 
+Revision: 0 
+Branch: refactor 
+Last Changed Author: Dhanya_Thattil 
+Last Changed Rev: 4099 
+Last Changed Date: 2018-10-11 13:46:08.000000002 +0200 ./xparameters.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h b/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
similarity index 54%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
rename to slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
index 3a8464eae..ab7cbff4d 100644
--- a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
+++ b/slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1"
+#define GITREPUUID "c24a9b223cbb066d3851599f4d977ae835feffe4"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4067
-#define GITDATE 0x20181008
+#define GITREV 0x4099
+#define GITDATE 0x20181011
 #define GITBRANCH "refactor"
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfoEigerTmp.h b/slsDetectorServers/eigerDetectorServer/gitInfoEigerTmp.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfoEigerTmp.h
rename to slsDetectorServers/eigerDetectorServer/gitInfoEigerTmp.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/renameServer.sh b/slsDetectorServers/eigerDetectorServer/renameServer.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/renameServer.sh
rename to slsDetectorServers/eigerDetectorServer/renameServer.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
rename to slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
rename to slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer.c b/slsDetectorServers/eigerDetectorServer/slsDetectorServer.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer.c
rename to slsDetectorServers/eigerDetectorServer/slsDetectorServer.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
rename to slsDetectorServers/eigerDetectorServer/slsDetectorServer_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c
rename to slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h
rename to slsDetectorServers/eigerDetectorServer/slsDetectorServer_funcs.h
diff --git a/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h b/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h
new file mode 120000
index 000000000..2af30d73a
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h
@@ -0,0 +1 @@
+../../slsSupportLib/include/sls_detector_defs.h
\ No newline at end of file
diff --git a/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h b/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h
new file mode 120000
index 000000000..3f48959a9
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h
@@ -0,0 +1 @@
+../../slsSupportLib/include/sls_detector_funcs.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/updateAPIVersion.sh b/slsDetectorServers/eigerDetectorServer/updateAPIVersion.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/updateAPIVersion.sh
rename to slsDetectorServers/eigerDetectorServer/updateAPIVersion.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh b/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh
similarity index 90%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh
rename to slsDetectorServers/eigerDetectorServer/updateGitVersion.sh
index 52fcd1d16..05a336696 100755
--- a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh
+++ b/slsDetectorServers/eigerDetectorServer/updateGitVersion.sh
@@ -1,11 +1,11 @@
 SERVER=eigerDetectorServer
 MAINDIR=slsDetectorPackage
-SPECDIR=slsDetectorSoftware/slsDetectorServers/$SERVER
+SPECDIR=slsDetectorServers/$SERVER
 TMPFILE=gitInfoEigerTmp.h
 INCLFILE=gitInfoEiger.h
 
 #evaluate the variables
-EVALFILE=../../../evalVersionVariables.sh
+EVALFILE=../../evalVersionVariables.sh
 source $EVALFILE
 
 
@@ -24,7 +24,7 @@ OLDDATE=$(more $INCLFILE | grep '#define GITDATE' | awk '{print $3}')
 #update INCLFILE if changes
 if [ "$OLDDATE" != "$NEWDATE" ]; then
 	echo Path: ${MAINDIR}/${SPECDIR}  $'\n'URL: ${GITREPO}  $'\n'Repository Root: ${GITREPO}  $'\n'Repsitory UUID: ${REPUID}  $'\n'Revision: ${FOLDERREV}  $'\n'Branch: ${BRANCH}  $'\n'Last Changed Author: ${AUTH1}_${AUTH2}  $'\n'Last Changed Rev: ${REV}  $'\n'Last Changed Date: ${RDATE} > gitInfo.txt 
-	cd ../../../
+	cd ../../
 	./genVersionHeader.sh $SPECDIR/gitInfo.txt $SPECDIR/$TMPFILE $SPECDIR/$INCLFILE 
 	cd $WD
 fi
diff --git a/slsDetectorServers/eigerDetectorServer/versionAPI.h b/slsDetectorServers/eigerDetectorServer/versionAPI.h
new file mode 120000
index 000000000..5e580d8bb
--- /dev/null
+++ b/slsDetectorServers/eigerDetectorServer/versionAPI.h
@@ -0,0 +1 @@
+../../slsSupportLib/include/versionAPI.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xfs_types.h b/slsDetectorServers/eigerDetectorServer/xfs_types.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xfs_types.h
rename to slsDetectorServers/eigerDetectorServer/xfs_types.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xparameters.h b/slsDetectorServers/eigerDetectorServer/xparameters.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/xparameters.h
rename to slsDetectorServers/eigerDetectorServer/xparameters.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/.target-makefrag b/slsDetectorServers/gotthardDetectorServer/.target-makefrag
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/.target-makefrag
rename to slsDetectorServers/gotthardDetectorServer/.target-makefrag
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/AD9257.h b/slsDetectorServers/gotthardDetectorServer/AD9257.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/AD9257.h
rename to slsDetectorServers/gotthardDetectorServer/AD9257.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile b/slsDetectorServers/gotthardDetectorServer/Makefile
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile
rename to slsDetectorServers/gotthardDetectorServer/Makefile
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile.virtual b/slsDetectorServers/gotthardDetectorServer/Makefile.virtual
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/Makefile.virtual
rename to slsDetectorServers/gotthardDetectorServer/Makefile.virtual
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/ansi.h b/slsDetectorServers/gotthardDetectorServer/ansi.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/ansi.h
rename to slsDetectorServers/gotthardDetectorServer/ansi.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h b/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h
rename to slsDetectorServers/gotthardDetectorServer/commonServerFunctions.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.c b/slsDetectorServers/gotthardDetectorServer/communication_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.c
rename to slsDetectorServers/gotthardDetectorServer/communication_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.h b/slsDetectorServers/gotthardDetectorServer/communication_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/communication_funcs.h
rename to slsDetectorServers/gotthardDetectorServer/communication_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/config.txt b/slsDetectorServers/gotthardDetectorServer/config.txt
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/config.txt
rename to slsDetectorServers/gotthardDetectorServer/config.txt
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.c b/slsDetectorServers/gotthardDetectorServer/firmware_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.c
rename to slsDetectorServers/gotthardDetectorServer/firmware_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.h b/slsDetectorServers/gotthardDetectorServer/firmware_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/firmware_funcs.h
rename to slsDetectorServers/gotthardDetectorServer/firmware_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfo.txt b/slsDetectorServers/gotthardDetectorServer/gitInfo.txt
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfo.txt
rename to slsDetectorServers/gotthardDetectorServer/gitInfo.txt
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
rename to slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h b/slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h
rename to slsDetectorServers/gotthardDetectorServer/gitInfoGotthardTmp.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor b/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor
rename to slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_refactor
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual b/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual
rename to slsDetectorServers/gotthardDetectorServer/gotthardDetectorServer_virtual
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/registers_g.h b/slsDetectorServers/gotthardDetectorServer/registers_g.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/registers_g.h
rename to slsDetectorServers/gotthardDetectorServer/registers_g.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server.c b/slsDetectorServers/gotthardDetectorServer/server.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server.c
rename to slsDetectorServers/gotthardDetectorServer/server.c
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_defs.h b/slsDetectorServers/gotthardDetectorServer/server_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_defs.h
rename to slsDetectorServers/gotthardDetectorServer/server_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.c b/slsDetectorServers/gotthardDetectorServer/server_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.c
rename to slsDetectorServers/gotthardDetectorServer/server_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.h b/slsDetectorServers/gotthardDetectorServer/server_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/server_funcs.h
rename to slsDetectorServers/gotthardDetectorServer/server_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_defs.h
rename to slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h b/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_detector_funcs.h
rename to slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_defs.h b/slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_defs.h
rename to slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/sls_receiver_funcs.h
rename to slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/stop_server.c b/slsDetectorServers/gotthardDetectorServer/stop_server.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/stop_server.c
rename to slsDetectorServers/gotthardDetectorServer/stop_server.c
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh b/slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh
rename to slsDetectorServers/gotthardDetectorServer/updateAPIVersion.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh b/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh
rename to slsDetectorServers/gotthardDetectorServer/updateGitVersion.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/versionAPI.h b/slsDetectorServers/gotthardDetectorServer/versionAPI.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/versionAPI.h
rename to slsDetectorServers/gotthardDetectorServer/versionAPI.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/AD9257.h b/slsDetectorServers/jctbDetectorServer/AD9257.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/AD9257.h
rename to slsDetectorServers/jctbDetectorServer/AD9257.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/Makefile b/slsDetectorServers/jctbDetectorServer/Makefile
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/Makefile
rename to slsDetectorServers/jctbDetectorServer/Makefile
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/ansi.h b/slsDetectorServers/jctbDetectorServer/ansi.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/ansi.h
rename to slsDetectorServers/jctbDetectorServer/ansi.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/bf_init.sh b/slsDetectorServers/jctbDetectorServer/bf_init.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/bf_init.sh
rename to slsDetectorServers/jctbDetectorServer/bf_init.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.c b/slsDetectorServers/jctbDetectorServer/blackfin.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.c
rename to slsDetectorServers/jctbDetectorServer/blackfin.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.h b/slsDetectorServers/jctbDetectorServer/blackfin.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/blackfin.h
rename to slsDetectorServers/jctbDetectorServer/blackfin.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/commonServerFunctions.h b/slsDetectorServers/jctbDetectorServer/commonServerFunctions.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/commonServerFunctions.h
rename to slsDetectorServers/jctbDetectorServer/commonServerFunctions.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.c b/slsDetectorServers/jctbDetectorServer/communication_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.c
rename to slsDetectorServers/jctbDetectorServer/communication_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.h b/slsDetectorServers/jctbDetectorServer/communication_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/communication_funcs.h
rename to slsDetectorServers/jctbDetectorServer/communication_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c b/slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c
rename to slsDetectorServers/jctbDetectorServer/convert_pof_to_raw.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.c b/slsDetectorServers/jctbDetectorServer/firmware_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.c
rename to slsDetectorServers/jctbDetectorServer/firmware_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.h b/slsDetectorServers/jctbDetectorServer/firmware_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/firmware_funcs.h
rename to slsDetectorServers/jctbDetectorServer/firmware_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/get_server.sh b/slsDetectorServers/jctbDetectorServer/get_server.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/get_server.sh
rename to slsDetectorServers/jctbDetectorServer/get_server.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfo.txt b/slsDetectorServers/jctbDetectorServer/gitInfo.txt
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfo.txt
rename to slsDetectorServers/jctbDetectorServer/gitInfo.txt
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoench.h b/slsDetectorServers/jctbDetectorServer/gitInfoMoench.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoench.h
rename to slsDetectorServers/jctbDetectorServer/gitInfoMoench.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h b/slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h
rename to slsDetectorServers/jctbDetectorServer/gitInfoMoenchTmp.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer b/slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer
rename to slsDetectorServers/jctbDetectorServer/jctbDetectorServer_developer
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.c b/slsDetectorServers/jctbDetectorServer/mcb_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.c
rename to slsDetectorServers/jctbDetectorServer/mcb_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.h b/slsDetectorServers/jctbDetectorServer/mcb_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/mcb_funcs.h
rename to slsDetectorServers/jctbDetectorServer/mcb_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh b/slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh
rename to slsDetectorServers/jctbDetectorServer/patternGenerator/generate.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c b/slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c
rename to slsDetectorServers/jctbDetectorServer/patternGenerator/generator.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/test.p b/slsDetectorServers/jctbDetectorServer/patternGenerator/test.p
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/patternGenerator/test.p
rename to slsDetectorServers/jctbDetectorServer/patternGenerator/test.p
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/program_fpga.sh b/slsDetectorServers/jctbDetectorServer/program_fpga.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/program_fpga.sh
rename to slsDetectorServers/jctbDetectorServer/program_fpga.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/registers_m.h b/slsDetectorServers/jctbDetectorServer/registers_m.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/registers_m.h
rename to slsDetectorServers/jctbDetectorServer/registers_m.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server.c b/slsDetectorServers/jctbDetectorServer/server.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server.c
rename to slsDetectorServers/jctbDetectorServer/server.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_defs.h b/slsDetectorServers/jctbDetectorServer/server_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_defs.h
rename to slsDetectorServers/jctbDetectorServer/server_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.c b/slsDetectorServers/jctbDetectorServer/server_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.c
rename to slsDetectorServers/jctbDetectorServer/server_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.h b/slsDetectorServers/jctbDetectorServer/server_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/server_funcs.h
rename to slsDetectorServers/jctbDetectorServer/server_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.c b/slsDetectorServers/jctbDetectorServer/sharedmemory.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.c
rename to slsDetectorServers/jctbDetectorServer/sharedmemory.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.h b/slsDetectorServers/jctbDetectorServer/sharedmemory.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sharedmemory.h
rename to slsDetectorServers/jctbDetectorServer/sharedmemory.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.c b/slsDetectorServers/jctbDetectorServer/slow_adc.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.c
rename to slsDetectorServers/jctbDetectorServer/slow_adc.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.h b/slsDetectorServers/jctbDetectorServer/slow_adc.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/slow_adc.h
rename to slsDetectorServers/jctbDetectorServer/slow_adc.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_defs.h b/slsDetectorServers/jctbDetectorServer/sls_detector_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_defs.h
rename to slsDetectorServers/jctbDetectorServer/sls_detector_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h b/slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h
rename to slsDetectorServers/jctbDetectorServer/sls_detector_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h b/slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h
rename to slsDetectorServers/jctbDetectorServer/sls_receiver_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h
rename to slsDetectorServers/jctbDetectorServer/sls_receiver_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/stop_server.c b/slsDetectorServers/jctbDetectorServer/stop_server.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/stop_server.c
rename to slsDetectorServers/jctbDetectorServer/stop_server.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/updateGitVersion.sh b/slsDetectorServers/jctbDetectorServer/updateGitVersion.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jctbDetectorServer/updateGitVersion.sh
rename to slsDetectorServers/jctbDetectorServer/updateGitVersion.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/AD9257.h b/slsDetectorServers/jungfrauDetectorServer/AD9257.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/AD9257.h
rename to slsDetectorServers/jungfrauDetectorServer/AD9257.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile b/slsDetectorServers/jungfrauDetectorServer/Makefile
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile
rename to slsDetectorServers/jungfrauDetectorServer/Makefile
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile.virtual b/slsDetectorServers/jungfrauDetectorServer/Makefile.virtual
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/Makefile.virtual
rename to slsDetectorServers/jungfrauDetectorServer/Makefile.virtual
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
rename to slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/ansi.h b/slsDetectorServers/jungfrauDetectorServer/ansi.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/ansi.h
rename to slsDetectorServers/jungfrauDetectorServer/ansi.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor
rename to slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_refactor
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual b/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
rename to slsDetectorServers/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/blackfin.h b/slsDetectorServers/jungfrauDetectorServer/blackfin.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/blackfin.h
rename to slsDetectorServers/jungfrauDetectorServer/blackfin.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h b/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h
rename to slsDetectorServers/jungfrauDetectorServer/commonServerFunctions.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.c b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.c
rename to slsDetectorServers/jungfrauDetectorServer/communication_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.h b/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/communication_funcs.h
rename to slsDetectorServers/jungfrauDetectorServer/communication_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt b/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
rename to slsDetectorServers/jungfrauDetectorServer/gitInfo.txt
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
rename to slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrau.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h b/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h
rename to slsDetectorServers/jungfrauDetectorServer/gitInfoJungfrauTmp.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/programfpga.h b/slsDetectorServers/jungfrauDetectorServer/programfpga.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/programfpga.h
rename to slsDetectorServers/jungfrauDetectorServer/programfpga.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h
rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c
rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c
rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h
rename to slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_defs.h
rename to slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h b/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_detector_funcs.h
rename to slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h b/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_defs.h
rename to slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h b/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/sls_receiver_funcs.h
rename to slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh b/slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh
rename to slsDetectorServers/jungfrauDetectorServer/updateAPIVersion.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh b/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh
rename to slsDetectorServers/jungfrauDetectorServer/updateGitVersion.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/versionAPI.h b/slsDetectorServers/jungfrauDetectorServer/versionAPI.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/gotthardDetectorServer/versionAPI.h
rename to slsDetectorServers/jungfrauDetectorServer/versionAPI.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/AD9257.h b/slsDetectorServers/mythen3DetectorServer/AD9257.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/AD9257.h
rename to slsDetectorServers/mythen3DetectorServer/AD9257.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile b/slsDetectorServers/mythen3DetectorServer/Makefile
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile
rename to slsDetectorServers/mythen3DetectorServer/Makefile
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile.virtual b/slsDetectorServers/mythen3DetectorServer/Makefile.virtual
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/Makefile.virtual
rename to slsDetectorServers/mythen3DetectorServer/Makefile.virtual
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h b/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/RegisterDefs.h
rename to slsDetectorServers/mythen3DetectorServer/RegisterDefs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/ansi.h b/slsDetectorServers/mythen3DetectorServer/ansi.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/ansi.h
rename to slsDetectorServers/mythen3DetectorServer/ansi.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/blackfin.h b/slsDetectorServers/mythen3DetectorServer/blackfin.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/blackfin.h
rename to slsDetectorServers/mythen3DetectorServer/blackfin.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h b/slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h
rename to slsDetectorServers/mythen3DetectorServer/commonServerFunctions.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.c b/slsDetectorServers/mythen3DetectorServer/communication_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.c
rename to slsDetectorServers/mythen3DetectorServer/communication_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.h b/slsDetectorServers/mythen3DetectorServer/communication_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/communication_funcs.h
rename to slsDetectorServers/mythen3DetectorServer/communication_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfo.txt b/slsDetectorServers/mythen3DetectorServer/gitInfo.txt
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfo.txt
rename to slsDetectorServers/mythen3DetectorServer/gitInfo.txt
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h b/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h
rename to slsDetectorServers/mythen3DetectorServer/gitInfoMythen3.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h b/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h
rename to slsDetectorServers/mythen3DetectorServer/gitInfoMythen3Tmp.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server b/slsDetectorServers/mythen3DetectorServer/mythen3Server
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server
rename to slsDetectorServers/mythen3DetectorServer/mythen3Server
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb b/slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb
rename to slsDetectorServers/mythen3DetectorServer/mythen3Server.gdb
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/programfpga.h b/slsDetectorServers/mythen3DetectorServer/programfpga.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/programfpga.h
rename to slsDetectorServers/mythen3DetectorServer/programfpga.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
rename to slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h
rename to slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c
rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer.c
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c
rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h
rename to slsDetectorServers/mythen3DetectorServer/slsDetectorServer_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h b/slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h
rename to slsDetectorServers/mythen3DetectorServer/sls_detector_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h b/slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h
rename to slsDetectorServers/mythen3DetectorServer/sls_detector_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h b/slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h
rename to slsDetectorServers/mythen3DetectorServer/sls_receiver_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h b/slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h
rename to slsDetectorServers/mythen3DetectorServer/sls_receiver_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh b/slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh
rename to slsDetectorServers/mythen3DetectorServer/updateGitVersion.sh
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/AD9257.h b/slsDetectorServers/slsDetectorServer/AD9257.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/AD9257.h
rename to slsDetectorServers/slsDetectorServer/AD9257.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/Makefile b/slsDetectorServers/slsDetectorServer/Makefile
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/Makefile
rename to slsDetectorServers/slsDetectorServer/Makefile
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/blackfin.h b/slsDetectorServers/slsDetectorServer/blackfin.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/blackfin.h
rename to slsDetectorServers/slsDetectorServer/blackfin.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/commonServerFunctions.h b/slsDetectorServers/slsDetectorServer/commonServerFunctions.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/commonServerFunctions.h
rename to slsDetectorServers/slsDetectorServer/commonServerFunctions.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.c b/slsDetectorServers/slsDetectorServer/communication_funcs.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.c
rename to slsDetectorServers/slsDetectorServer/communication_funcs.c
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.h b/slsDetectorServers/slsDetectorServer/communication_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/communication_funcs.h
rename to slsDetectorServers/slsDetectorServer/communication_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/programfpga.h b/slsDetectorServers/slsDetectorServer/programfpga.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/programfpga.h
rename to slsDetectorServers/slsDetectorServer/programfpga.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c
rename to slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.c
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
rename to slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer.c
rename to slsDetectorServers/slsDetectorServer/slsDetectorServer.c
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h
rename to slsDetectorServers/slsDetectorServer/slsDetectorServer_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
similarity index 99%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
rename to slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
index 2c9d70a7b..e0e0f9d8f 100755
--- a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
@@ -92,7 +92,8 @@ int decode_function(int file_des) {
 	n = receiveData(file_des,&fnum,sizeof(fnum),INT32);
 	if (n <= 0) {
 #ifdef VERBOSE
-		printf("ERROR reading from socket %d, %d %d (%s)\n", n, fnum, file_des, getFunctionName((enum detFuncs)fnum));
+		printf("ERROR reading from socket %d, %d %d (%s)\n",
+				n, fnum, file_des, getFunctionName((enum detFuncs)fnum));
 #endif
 		return FAIL;
 	}
@@ -101,24 +102,31 @@ int decode_function(int file_des) {
 		printf("size of data received %d\n",n);
 #endif
 
-#ifdef VERBOSE
-	printf(" calling function fnum=%d, (%s) located at 0x%x\n", fnum,  getFunctionName((enum detFuncs)fnum), (unsigned int)flist[fnum]);
-#endif
 #ifdef JUNGFRAUD
-	if ((debugflag == PROGRAMMING_MODE) &&
-			((fnum != F_PROGRAM_FPGA) && (fnum != F_GET_DETECTOR_TYPE) &&
-					(fnum != F_RESET_FPGA) && (fnum != F_UPDATE_CLIENT) && (fnum != F_CHECK_VERSION))) {
-		sprintf(mess,"This Function %s cannot be executed. ", getFunctionName((enum detFuncs)fnum));
+	if ((debugflag == PROGRAMMING_MODE) && (
+			(fnum != F_PROGRAM_FPGA) &&
+			(fnum != F_GET_DETECTOR_TYPE) &&
+			(fnum != F_RESET_FPGA) &&
+			(fnum != F_UPDATE_CLIENT) &&
+			(fnum != F_CHECK_VERSION))) {
+		sprintf(mess,"This Function %s cannot be executed. ",
+				getFunctionName((enum detFuncs)fnum));
 		ret=(M_nofuncMode)(file_des);
 	} else
 #endif
 	if (fnum<0 || fnum>=NUM_DET_FUNCTIONS) {
 		cprintf(BG_RED,"Unknown function enum %d\n", fnum);
 		ret=(M_nofunc)(file_des);
-	}else
+	}else {
+#ifdef VERBOSE
+	printf(" calling function fnum=%d, (%s) located at 0x%x\n",
+			fnum,  getFunctionName((enum detFuncs)fnum), (unsigned int)flist[fnum]);
+#endif
 		ret=(*flist[fnum])(file_des);
-	if (ret == FAIL)
-		cprintf(RED, "Error executing the function = %d (%s)\n", fnum, getFunctionName((enum detFuncs)fnum));
+		if (ret == FAIL)
+			cprintf(RED, "Error executing the function = %d (%s)\n",
+					fnum, getFunctionName((enum detFuncs)fnum));
+	}
 	return ret;
 }
 
@@ -251,7 +259,7 @@ void function_table() {
     flist[F_SOFTWARE_TRIGGER]                 	= &software_trigger;
 
 	// check
-	if (NUM_DET_FUNCTIONS  >= TOO_MANY_FUNCTIONS_DEFINED) {
+	if (NUM_DET_FUNCTIONS  >= RECEIVER_ENUM_START) {
 		cprintf(BG_RED,"The last detector function enum has reached its limit\nGoodbye!\n");
 		exit(EXIT_FAILURE);
 	}
@@ -260,7 +268,8 @@ void function_table() {
 	{
 		int i=0;
 		for (i = 0; i < NUM_DET_FUNCTIONS ; i++) {
-			printf("function fnum=%d, (%s) located at 0x%x\n", i,  getFunctionName((enum detFuncs)i), (unsigned int)flist[i]);
+			printf("function fnum=%d, (%s) located at 0x%x\n", i,
+					getFunctionName((enum detFuncs)i), (unsigned int)flist[i]);
 		}
 	}
 #endif
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
rename to slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c b/slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c
rename to slsDetectorServers/slsDetectorServer/slsDetector_stopServer.c
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_defs.h b/slsDetectorServers/slsDetectorServer/sls_detector_defs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_defs.h
rename to slsDetectorServers/slsDetectorServer/sls_detector_defs.h
diff --git a/slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_funcs.h b/slsDetectorServers/slsDetectorServer/sls_detector_funcs.h
similarity index 100%
rename from slsDetectorSoftware/slsDetectorServers/slsDetectorServer/sls_detector_funcs.h
rename to slsDetectorServers/slsDetectorServer/sls_detector_funcs.h
diff --git a/slsDetectorSoftware/gitInfo.txt b/slsDetectorSoftware/gitInfo.txt
index 1c744e668..53b993d33 100644
--- a/slsDetectorSoftware/gitInfo.txt
+++ b/slsDetectorSoftware/gitInfo.txt
@@ -1,9 +1,9 @@
 Path: slsDetectorsPackage/slsDetectorSoftware 
 URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
 Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: def79807f6f40ed1797b8154240adbc0e35c95e0 
-Revision: 2044 
+Repsitory UUID: c24a9b223cbb066d3851599f4d977ae835feffe4 
+Revision: 2098 
 Branch: refactor 
 Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4039 
-Last Changed Date: 2018-10-02 15:03:24.000000002 +0200 ./CMakeLists.txt
+Last Changed Rev: 4099 
+Last Changed Date: 2018-10-11 13:56:19.000000002 +0200 ./doxy.config
diff --git a/slsDetectorSoftware/slsDetector/gitInfoLib.h b/slsDetectorSoftware/slsDetector/gitInfoLib.h
index fbb980f19..ab7cbff4d 100644
--- a/slsDetectorSoftware/slsDetector/gitInfoLib.h
+++ b/slsDetectorSoftware/slsDetector/gitInfoLib.h
@@ -1,6 +1,6 @@
 #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
-#define GITREPUUID "def79807f6f40ed1797b8154240adbc0e35c95e0"
+#define GITREPUUID "c24a9b223cbb066d3851599f4d977ae835feffe4"
 #define GITAUTH "Dhanya_Thattil"
-#define GITREV 0x4039
-#define GITDATE 0x20181002
+#define GITREV 0x4099
+#define GITDATE 0x20181011
 #define GITBRANCH "refactor"
diff --git a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfo.txt
deleted file mode 100644
index 7426425d3..000000000
--- a/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer/gitInfo.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Path: slsDetectorPackage/slsDetectorSoftware/slsDetectorServers/eigerDetectorServer 
-URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git 
-Repsitory UUID: b9f97f42a6a369dfb5c484bffeaa7a417e9cbca1 
-Revision: 1 
-Branch: refactor 
-Last Changed Author: Dhanya_Thattil 
-Last Changed Rev: 4067 
-Last Changed Date: 2018-10-08 11:18:41.000000002 +0200 ./Makefile
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h
deleted file mode 120000
index 1f2dbc999..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/ansi.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/ansi.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c
deleted file mode 120000
index 19b563862..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/communication_funcs.c
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h
deleted file mode 120000
index 7f8c3d192..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/communication_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/communication_funcs.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h
deleted file mode 120000
index 108fdd66a..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_defs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/sls_detector_defs.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h
deleted file mode 120000
index a21957495..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_detector_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/sls_detector_funcs.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h
deleted file mode 120000
index fbea73b31..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_defs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/sls_receiver_defs.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h
deleted file mode 120000
index 8f221c967..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/sls_receiver_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/sls_receiver_funcs.h
\ No newline at end of file
diff --git a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h b/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h
deleted file mode 120000
index 5336e713b..000000000
--- a/slsDetectorSoftware/slsDetectorServers/jungfrauDetectorServer/versionAPI.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../slsSupportLib/include/versionAPI.h
\ No newline at end of file
diff --git a/slsSupportLib/include/sls_detector_funcs.h b/slsSupportLib/include/sls_detector_funcs.h
index 2f3ee8516..e44df8fb2 100644
--- a/slsSupportLib/include/sls_detector_funcs.h
+++ b/slsSupportLib/include/sls_detector_funcs.h
@@ -70,6 +70,7 @@ enum detFuncs{
 	F_SOFTWARE_TRIGGER,/** < software trigger */
 	NUM_DET_FUNCTIONS,
 
+	RECEIVER_ENUM_START = 128, /**< detector function should not exceed this (detector server should not compile anyway) */
 	F_EXEC_RECEIVER_COMMAND,/**< command is executed */
 	F_EXIT_RECEIVER,/**< turn off receiver server */
 	F_LOCK_RECEIVER,/**< Locks/Unlocks server communication to the given client */
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index 09cedecb6..f9f45cea5 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -1,6 +1,6 @@
 /** API versions */
 #define APIRECEIVER 0x180927
-#define APIEIGER 0x180820
+#define APIEIGER 0x181008
 #define APIJUNGFRAU 0x180925
 #define APIGOTTHARD 0x180928