From 100c1b81f80985921573c1009e9b425e155b9aa7 Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 2 Oct 2018 16:32:37 +0200
Subject: [PATCH] moved all the common header files from receiverSoftware to
 commonFiles

---
 .../src => commonFiles}/MySocketTCP.cpp       |   0
 .../include => commonFiles}/MySocketTCP.h     |   0
 .../include => commonFiles}/ZmqSocket.h       |   0
 .../include => commonFiles}/ansi.h            |   0
 .../include => commonFiles}/genericSocket.h   |   0
 .../include => commonFiles}/libzmq.a          | Bin
 .../include => commonFiles}/logger.h          |   0
 .../rapidjson/allocators.h                    |   0
 .../rapidjson/document.h                      |   0
 .../rapidjson/encodedstream.h                 |   0
 .../rapidjson/encodings.h                     |   0
 .../rapidjson/error/en.h                      |   0
 .../rapidjson/error/error.h                   |   0
 .../rapidjson/filereadstream.h                |   0
 .../rapidjson/filewritestream.h               |   0
 .../include => commonFiles}/rapidjson/fwd.h   |   0
 .../rapidjson/internal/biginteger.h           |   0
 .../rapidjson/internal/diyfp.h                |   0
 .../rapidjson/internal/dtoa.h                 |   0
 .../rapidjson/internal/ieee754.h              |   0
 .../rapidjson/internal/itoa.h                 |   0
 .../rapidjson/internal/meta.h                 |   0
 .../rapidjson/internal/pow10.h                |   0
 .../rapidjson/internal/regex.h                |   0
 .../rapidjson/internal/stack.h                |   0
 .../rapidjson/internal/strfunc.h              |   0
 .../rapidjson/internal/strtod.h               |   0
 .../rapidjson/internal/swap.h                 |   0
 .../rapidjson/istreamwrapper.h                |   0
 .../rapidjson/memorybuffer.h                  |   0
 .../rapidjson/memorystream.h                  |   0
 .../rapidjson/msinttypes/inttypes.h           |   0
 .../rapidjson/msinttypes/stdint.h             |   0
 .../rapidjson/ostreamwrapper.h                |   0
 .../rapidjson/pointer.h                       |   0
 .../rapidjson/prettywriter.h                  |   0
 .../rapidjson/rapidjson.h                     |   0
 .../rapidjson/reader.h                        |   0
 .../rapidjson/schema.h                        |   0
 .../rapidjson/stream.h                        |   0
 .../rapidjson/stringbuffer.h                  |   0
 .../rapidjson/writer.h                        |   0
 .../sls_receiver_defs.h                       |   0
 .../sls_receiver_exceptions.h                 |   0
 .../sls_receiver_funcs.h                      |   0
 .../utilities.cpp => commonFiles/utilities.h  |  33 +++++++++---------
 .../include => commonFiles}/zmq.h             |   0
 manual/manual-api/CMakeLists.txt              |   2 +-
 manual/manual-api/Makefile                    |   4 +--
 slsDetectorSoftware/CMakeLists.txt            |   6 ++--
 slsDetectorSoftware/Makefile                  |   4 +--
 slsDetectorSoftware/doxy.config               |  23 ++++++------
 slsReceiverSoftware/CMakeLists.txt            |  17 ++++-----
 slsReceiverSoftware/Makefile                  |   9 ++---
 slsReceiverSoftware/include/utilities.h       |  15 --------
 slsReceiverSoftware/include/versionAPI.h      |   1 -
 56 files changed, 50 insertions(+), 64 deletions(-)
 rename {slsReceiverSoftware/src => commonFiles}/MySocketTCP.cpp (100%)
 rename {slsReceiverSoftware/include => commonFiles}/MySocketTCP.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/ZmqSocket.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/ansi.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/genericSocket.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/libzmq.a (100%)
 rename {slsReceiverSoftware/include => commonFiles}/logger.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/allocators.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/document.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/encodedstream.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/encodings.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/error/en.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/error/error.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/filereadstream.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/filewritestream.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/fwd.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/biginteger.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/diyfp.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/dtoa.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/ieee754.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/itoa.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/meta.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/pow10.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/regex.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/stack.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/strfunc.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/strtod.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/internal/swap.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/istreamwrapper.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/memorybuffer.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/memorystream.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/msinttypes/inttypes.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/msinttypes/stdint.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/ostreamwrapper.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/pointer.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/prettywriter.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/rapidjson.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/reader.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/schema.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/stream.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/stringbuffer.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/rapidjson/writer.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/sls_receiver_defs.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/sls_receiver_exceptions.h (100%)
 rename {slsReceiverSoftware/include => commonFiles}/sls_receiver_funcs.h (100%)
 rename slsReceiverSoftware/src/utilities.cpp => commonFiles/utilities.h (93%)
 rename {slsReceiverSoftware/include => commonFiles}/zmq.h (100%)
 delete mode 100644 slsReceiverSoftware/include/utilities.h
 delete mode 120000 slsReceiverSoftware/include/versionAPI.h

diff --git a/slsReceiverSoftware/src/MySocketTCP.cpp b/commonFiles/MySocketTCP.cpp
similarity index 100%
rename from slsReceiverSoftware/src/MySocketTCP.cpp
rename to commonFiles/MySocketTCP.cpp
diff --git a/slsReceiverSoftware/include/MySocketTCP.h b/commonFiles/MySocketTCP.h
similarity index 100%
rename from slsReceiverSoftware/include/MySocketTCP.h
rename to commonFiles/MySocketTCP.h
diff --git a/slsReceiverSoftware/include/ZmqSocket.h b/commonFiles/ZmqSocket.h
similarity index 100%
rename from slsReceiverSoftware/include/ZmqSocket.h
rename to commonFiles/ZmqSocket.h
diff --git a/slsReceiverSoftware/include/ansi.h b/commonFiles/ansi.h
similarity index 100%
rename from slsReceiverSoftware/include/ansi.h
rename to commonFiles/ansi.h
diff --git a/slsReceiverSoftware/include/genericSocket.h b/commonFiles/genericSocket.h
similarity index 100%
rename from slsReceiverSoftware/include/genericSocket.h
rename to commonFiles/genericSocket.h
diff --git a/slsReceiverSoftware/include/libzmq.a b/commonFiles/libzmq.a
similarity index 100%
rename from slsReceiverSoftware/include/libzmq.a
rename to commonFiles/libzmq.a
diff --git a/slsReceiverSoftware/include/logger.h b/commonFiles/logger.h
similarity index 100%
rename from slsReceiverSoftware/include/logger.h
rename to commonFiles/logger.h
diff --git a/slsReceiverSoftware/include/rapidjson/allocators.h b/commonFiles/rapidjson/allocators.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/allocators.h
rename to commonFiles/rapidjson/allocators.h
diff --git a/slsReceiverSoftware/include/rapidjson/document.h b/commonFiles/rapidjson/document.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/document.h
rename to commonFiles/rapidjson/document.h
diff --git a/slsReceiverSoftware/include/rapidjson/encodedstream.h b/commonFiles/rapidjson/encodedstream.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/encodedstream.h
rename to commonFiles/rapidjson/encodedstream.h
diff --git a/slsReceiverSoftware/include/rapidjson/encodings.h b/commonFiles/rapidjson/encodings.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/encodings.h
rename to commonFiles/rapidjson/encodings.h
diff --git a/slsReceiverSoftware/include/rapidjson/error/en.h b/commonFiles/rapidjson/error/en.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/error/en.h
rename to commonFiles/rapidjson/error/en.h
diff --git a/slsReceiverSoftware/include/rapidjson/error/error.h b/commonFiles/rapidjson/error/error.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/error/error.h
rename to commonFiles/rapidjson/error/error.h
diff --git a/slsReceiverSoftware/include/rapidjson/filereadstream.h b/commonFiles/rapidjson/filereadstream.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/filereadstream.h
rename to commonFiles/rapidjson/filereadstream.h
diff --git a/slsReceiverSoftware/include/rapidjson/filewritestream.h b/commonFiles/rapidjson/filewritestream.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/filewritestream.h
rename to commonFiles/rapidjson/filewritestream.h
diff --git a/slsReceiverSoftware/include/rapidjson/fwd.h b/commonFiles/rapidjson/fwd.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/fwd.h
rename to commonFiles/rapidjson/fwd.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/biginteger.h b/commonFiles/rapidjson/internal/biginteger.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/biginteger.h
rename to commonFiles/rapidjson/internal/biginteger.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/diyfp.h b/commonFiles/rapidjson/internal/diyfp.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/diyfp.h
rename to commonFiles/rapidjson/internal/diyfp.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/dtoa.h b/commonFiles/rapidjson/internal/dtoa.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/dtoa.h
rename to commonFiles/rapidjson/internal/dtoa.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/ieee754.h b/commonFiles/rapidjson/internal/ieee754.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/ieee754.h
rename to commonFiles/rapidjson/internal/ieee754.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/itoa.h b/commonFiles/rapidjson/internal/itoa.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/itoa.h
rename to commonFiles/rapidjson/internal/itoa.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/meta.h b/commonFiles/rapidjson/internal/meta.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/meta.h
rename to commonFiles/rapidjson/internal/meta.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/pow10.h b/commonFiles/rapidjson/internal/pow10.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/pow10.h
rename to commonFiles/rapidjson/internal/pow10.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/regex.h b/commonFiles/rapidjson/internal/regex.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/regex.h
rename to commonFiles/rapidjson/internal/regex.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/stack.h b/commonFiles/rapidjson/internal/stack.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/stack.h
rename to commonFiles/rapidjson/internal/stack.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/strfunc.h b/commonFiles/rapidjson/internal/strfunc.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/strfunc.h
rename to commonFiles/rapidjson/internal/strfunc.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/strtod.h b/commonFiles/rapidjson/internal/strtod.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/strtod.h
rename to commonFiles/rapidjson/internal/strtod.h
diff --git a/slsReceiverSoftware/include/rapidjson/internal/swap.h b/commonFiles/rapidjson/internal/swap.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/internal/swap.h
rename to commonFiles/rapidjson/internal/swap.h
diff --git a/slsReceiverSoftware/include/rapidjson/istreamwrapper.h b/commonFiles/rapidjson/istreamwrapper.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/istreamwrapper.h
rename to commonFiles/rapidjson/istreamwrapper.h
diff --git a/slsReceiverSoftware/include/rapidjson/memorybuffer.h b/commonFiles/rapidjson/memorybuffer.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/memorybuffer.h
rename to commonFiles/rapidjson/memorybuffer.h
diff --git a/slsReceiverSoftware/include/rapidjson/memorystream.h b/commonFiles/rapidjson/memorystream.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/memorystream.h
rename to commonFiles/rapidjson/memorystream.h
diff --git a/slsReceiverSoftware/include/rapidjson/msinttypes/inttypes.h b/commonFiles/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/msinttypes/inttypes.h
rename to commonFiles/rapidjson/msinttypes/inttypes.h
diff --git a/slsReceiverSoftware/include/rapidjson/msinttypes/stdint.h b/commonFiles/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/msinttypes/stdint.h
rename to commonFiles/rapidjson/msinttypes/stdint.h
diff --git a/slsReceiverSoftware/include/rapidjson/ostreamwrapper.h b/commonFiles/rapidjson/ostreamwrapper.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/ostreamwrapper.h
rename to commonFiles/rapidjson/ostreamwrapper.h
diff --git a/slsReceiverSoftware/include/rapidjson/pointer.h b/commonFiles/rapidjson/pointer.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/pointer.h
rename to commonFiles/rapidjson/pointer.h
diff --git a/slsReceiverSoftware/include/rapidjson/prettywriter.h b/commonFiles/rapidjson/prettywriter.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/prettywriter.h
rename to commonFiles/rapidjson/prettywriter.h
diff --git a/slsReceiverSoftware/include/rapidjson/rapidjson.h b/commonFiles/rapidjson/rapidjson.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/rapidjson.h
rename to commonFiles/rapidjson/rapidjson.h
diff --git a/slsReceiverSoftware/include/rapidjson/reader.h b/commonFiles/rapidjson/reader.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/reader.h
rename to commonFiles/rapidjson/reader.h
diff --git a/slsReceiverSoftware/include/rapidjson/schema.h b/commonFiles/rapidjson/schema.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/schema.h
rename to commonFiles/rapidjson/schema.h
diff --git a/slsReceiverSoftware/include/rapidjson/stream.h b/commonFiles/rapidjson/stream.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/stream.h
rename to commonFiles/rapidjson/stream.h
diff --git a/slsReceiverSoftware/include/rapidjson/stringbuffer.h b/commonFiles/rapidjson/stringbuffer.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/stringbuffer.h
rename to commonFiles/rapidjson/stringbuffer.h
diff --git a/slsReceiverSoftware/include/rapidjson/writer.h b/commonFiles/rapidjson/writer.h
similarity index 100%
rename from slsReceiverSoftware/include/rapidjson/writer.h
rename to commonFiles/rapidjson/writer.h
diff --git a/slsReceiverSoftware/include/sls_receiver_defs.h b/commonFiles/sls_receiver_defs.h
similarity index 100%
rename from slsReceiverSoftware/include/sls_receiver_defs.h
rename to commonFiles/sls_receiver_defs.h
diff --git a/slsReceiverSoftware/include/sls_receiver_exceptions.h b/commonFiles/sls_receiver_exceptions.h
similarity index 100%
rename from slsReceiverSoftware/include/sls_receiver_exceptions.h
rename to commonFiles/sls_receiver_exceptions.h
diff --git a/slsReceiverSoftware/include/sls_receiver_funcs.h b/commonFiles/sls_receiver_funcs.h
similarity index 100%
rename from slsReceiverSoftware/include/sls_receiver_funcs.h
rename to commonFiles/sls_receiver_funcs.h
diff --git a/slsReceiverSoftware/src/utilities.cpp b/commonFiles/utilities.h
similarity index 93%
rename from slsReceiverSoftware/src/utilities.cpp
rename to commonFiles/utilities.h
index 60215c96b..eaf97046a 100644
--- a/slsReceiverSoftware/src/utilities.cpp
+++ b/commonFiles/utilities.h
@@ -1,20 +1,23 @@
+#pragma once
+
+#include "utilities.h"
+#include "logger.h"
+#include "sls_receiver_defs.h"
+
 #include <iostream>
 #include <string>
 #include <sstream>
 #include <iostream>
-#include <stdio.h>
-#include <fstream>
-
 #include <map>
-
-#include "utilities.h"
-#include "logger.h"
+#include <fstream>
+#include <stdio.h>
 
 
 
 
-int read_config_file(std::string fname, int *tcpip_port_no, std::map<std::string, std::string> * configuration_map ){
-	
+
+int read_config_file(std::string fname, int *tcpip_port_no, std::map<std::string, std::string> * configuration_map) {
+
 	std::ifstream infile;
 	std::string sLine,sargname, sargvalue;
 	int iline = 0;
@@ -33,9 +36,9 @@ int read_config_file(std::string fname, int *tcpip_port_no, std::map<std::string
 		while(infile.good()){
 			getline(infile,sLine);
 			iline++;
-			
+
 			//VERBOSE_PRINT(sLine);
-			
+
 			if(sLine.find('#') != std::string::npos)
 				continue;
 
@@ -44,11 +47,11 @@ int read_config_file(std::string fname, int *tcpip_port_no, std::map<std::string
 
 			else{
 				std::istringstream sstr(sLine);
-				
+
 				//parameter name
 				if(sstr.good()){
 					sstr >> sargname;
-				
+
 					if (! sstr.good())
 						continue;
 
@@ -71,10 +74,8 @@ int read_config_file(std::string fname, int *tcpip_port_no, std::map<std::string
 		}
 		infile.close();
 	}
-	
+
 	return success;
 }
-
-
-
+}
 
diff --git a/slsReceiverSoftware/include/zmq.h b/commonFiles/zmq.h
similarity index 100%
rename from slsReceiverSoftware/include/zmq.h
rename to commonFiles/zmq.h
diff --git a/manual/manual-api/CMakeLists.txt b/manual/manual-api/CMakeLists.txt
index 0f7841626..00de96101 100644
--- a/manual/manual-api/CMakeLists.txt
+++ b/manual/manual-api/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SOURCES
 )
 
 include_directories(
-    ../../slsReceiverSoftware/include
+    ../../commonFiles/include
     ../../slsDetectorSoftware/slsDetectorAnalysis 
     ../../build/bin 
     ../../slsdetectorSoftware/slsDetector 
diff --git a/manual/manual-api/Makefile b/manual/manual-api/Makefile
index 3acbcf9d4..55122f7a5 100644
--- a/manual/manual-api/Makefile
+++ b/manual/manual-api/Makefile
@@ -1,9 +1,9 @@
 PKGDIR		=	../..
 LIBDIR		=   $(PKGDIR)/build/bin
-INCLUDES	=   -I . -I$(PKGDIR)/slsReceiverSoftware/include -I$(PKGDIR)/slsDetectorSoftware/slsDetectorAnalysis -I$(LIBDIR) -I$(PKGDIR)/slsDetectorSoftware/slsDetector 
+INCLUDES	=   -I . -I$(PKGDIR)/commonFiles -I$(PKGDIR)/slsDetectorSoftware/slsDetectorAnalysis -I$(LIBDIR) -I$(PKGDIR)/slsDetectorSoftware/slsDetector 
 SRC_DET		= 	mainClient.cpp 	
 SRC_REC		=   mainReceiver.cpp
-ZMQLIBDIR	= 	$(PKGDIR)/slsReceiverSoftware/include
+ZMQLIBDIR	= 	$(PKGDIR)/commonFiles
 LDFLAG_DET 	=	-I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq
 LDFLAG_REC 	=	-I. -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread -lrt -L$(ZMQLIBDIR) -Wl,-rpath=$(ZMQLIBDIR) -lzmq
 DESTDIR		?=	../docs
diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt
index 861e74625..f32671b9a 100644
--- a/slsDetectorSoftware/CMakeLists.txt
+++ b/slsDetectorSoftware/CMakeLists.txt
@@ -25,8 +25,6 @@ slsDetectorCommand
 slsDetectorAnalysis 
 slsReceiverInterface 
 threadFiles
-../slsReceiverSoftware/include 
-../slsReceiverSoftware/MySocketTCP 
 )
 
 add_definitions(
@@ -49,7 +47,7 @@ add_library(slsDetectorShared SHARED
 
 add_library(zmq STATIC IMPORTED GLOBAL)
 
-set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../slsReceiverSoftware/include/libzmq.a)
+set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a)
 set_target_properties(zmq PROPERTIES
     IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
 )
@@ -63,6 +61,7 @@ set(PUBLICHEADERS
     ../commonFiles/sls_detector_funcs.h
     ../commonFiles/error_defs.h
     ../commonFiles/versionAPI.h
+    ../commonFiles/sls_receiver_exceptions.h
     sharedMemory/SharedMemory.h
     slsDetector/slsDetectorUtils.h
     slsDetector/slsDetector.h
@@ -72,7 +71,6 @@ set(PUBLICHEADERS
     slsDetectorAnalysis/detectorData.h
     multiSlsDetector/multiSlsDetector.h
     slsReceiverInterface/receiverInterface.h
-    ../slsReceiverSoftware/include/sls_receiver_exceptions.h
 )
 set_target_properties(slsDetectorShared PROPERTIES
     LIBRARY_OUTPUT_NAME SlsDetector
diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile
index ff28be163..07aa6bf7b 100644
--- a/slsDetectorSoftware/Makefile
+++ b/slsDetectorSoftware/Makefile
@@ -13,11 +13,11 @@ INCLUDES?= -I../commonFiles -IslsDetector -I../slsReceiverSoftware/MySocketTCP
 
 #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/$(EPICS_HOST_ARCH) -Wl,-R/usr/local/epics/base/lib/$(EPICS_HOST_ARCH)  -lca -lCom 
 
-LIBZMQDIR = ../slsReceiverSoftware/include
+LIBZMQDIR = ../commonFiles
 LIBZMQ =  -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
 
 SRC_CLNT=  slsDetector/slsDetectorUtils.cpp slsDetector/slsDetectorCommand.cpp slsDetectorAnalysis/postProcessing.cpp slsDetector/slsDetector.cpp multiSlsDetector/multiSlsDetector.cpp slsReceiverInterface/receiverInterface.cpp slsDetector/slsDetectorUsers.cpp threadFiles/CondVar.cpp  threadFiles/Mutex.cpp threadFiles/ThreadPool.cpp sharedMemory/SharedMemory.cpp #../slsReceiverSoftware/MySocketTCP/MySocketTCP.cpp 
-DEPSINCLUDES = $(LIBZMQDIR)/sls_receiver_defs.h $(LIBZMQDIR)/sls_receiver_funcs.h $(LIBZMQDIR)/ansi.h ../commonFiles/sls_detector_defs.h  ../commonFiles/sls_detector_funcs.h ../commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/detectorData.h  threadFiles/Global.h threadFiles/Task.h sharedMemory/SharedMemory.h $(LIBZMQDIR)/sls_receiver_exceptions.h ../commonFiles/versionAPI.h
+DEPSINCLUDES = ../commonFiles/sls_receiver_defs.h ../commonFiles/sls_receiver_funcs.h ../commonFiles/ansi.h ../commonFiles/sls_detector_defs.h  ../commonFiles/sls_detector_funcs.h ../commonFiles/error_defs.h slsDetector/slsDetectorBase.h slsDetectorAnalysis/detectorData.h  threadFiles/Global.h threadFiles/Task.h sharedMemory/SharedMemory.h ../commonFiles/sls_receiver_exceptions.h ../commonFiles/versionAPI.h
 
 
 
diff --git a/slsDetectorSoftware/doxy.config b/slsDetectorSoftware/doxy.config
index 441454b78..259566611 100644
--- a/slsDetectorSoftware/doxy.config
+++ b/slsDetectorSoftware/doxy.config
@@ -80,10 +80,18 @@ LATEX_HIDE_INDICES = YES
 
 PREDEFINED           = __cplusplus
 
-INPUT		=	../commonfiles/communication_funcs.h									\
+INPUT		=	../commonfiles/communication_funcs.h								\
 				../commonfiles/error_defs.h											\
-				../commonfiles/sls_detector_defs.h										\
+				../commonfiles/sls_detector_defs.h									\
 				../commonfiles/sls_detector_funcs.h									\
+				../commonfiles/ansi.h		  										\
+				../commonfiles/include/genericSocket.h	  							\
+				../commonfiles/include/logger.h	  									\
+				../commonfiles/include/MySocketTCP.h	  							\
+				../commonfiles/include/sls_receiver_defs.h	  						\
+				../commonfiles/include/sls_receiver_funcs.h	  						\
+				../commonfiles/include/utilities.h	  								\
+				../commonfiles/include/ZmqSocket.h									\
 				multiSlsDetector/multiSlsDetectorClient.h							\
 				multiSlsDetector/multiSlsDetectorCommand.h							\
 				multiSlsDetector/multiSlsDetector.h									\
@@ -102,7 +110,6 @@ INPUT		=	../commonfiles/communication_funcs.h									\
 				threadFiles/Single.h												\
 				threadFiles/Task.h													\
 				threadFiles/ThreadPool.h											\
-				../slsReceiverSoftware/include/ansi.h		  						\
 				../slsReceiverSoftware/include/BinaryFile.h	  						\
 				../slsReceiverSoftware/include/BinaryFileStatic.h	  				\
 				../slsReceiverSoftware/include/circularFifo.h	  					\
@@ -111,24 +118,18 @@ INPUT		=	../commonfiles/communication_funcs.h									\
 				../slsReceiverSoftware/include/Fifo.h	  							\
 				../slsReceiverSoftware/include/File.h	  							\
 				../slsReceiverSoftware/include/GeneralData.h	  					\
-				../slsReceiverSoftware/include/genericSocket.h	  					\
 				../slsReceiverSoftware/include/HDF5File.h	  						\
 				../slsReceiverSoftware/include/HDF5FileStatic.h	  					\
 				../slsReceiverSoftware/include/Listener.h	  						\
-				../slsReceiverSoftware/include/logger.h	  							\
-				../slsReceiverSoftware/include/MySocketTCP.h	  					\
 				../slsReceiverSoftware/include/receiver_defs.h	  					\
-				../slsReceiverSoftware/include/sls_receiver_defs.h	  				\
-				../slsReceiverSoftware/include/sls_receiver_funcs.h	  				\
 				../slsReceiverSoftware/include/slsReceiver.h	  					\
 				../slsReceiverSoftware/include/slsReceiverTCPIPInterface.h	  		\
 				../slsReceiverSoftware/include/slsReceiverUsers.h	  				\
 				../slsReceiverSoftware/include/ThreadObject.h	  					\
 				../slsReceiverSoftware/include/UDPBaseImplementation.h	  			\
 				../slsReceiverSoftware/include/UDPInterface.h	  					\
-				../slsReceiverSoftware/include/UDPStandardImplementation.h	  		\
-				../slsReceiverSoftware/include/utilities.h	  						\
-				../slsReceiverSoftware/include/ZmqSocket.h
+				../slsReceiverSoftware/include/UDPStandardImplementation.h	  		
+
 			
 				
 				
diff --git a/slsReceiverSoftware/CMakeLists.txt b/slsReceiverSoftware/CMakeLists.txt
index 7fdc5d042..c48c40763 100644
--- a/slsReceiverSoftware/CMakeLists.txt
+++ b/slsReceiverSoftware/CMakeLists.txt
@@ -39,11 +39,12 @@ add_definitions(
 
 include_directories(
     include
+    ../commonFiles
 )
 
 add_library(zmq STATIC IMPORTED GLOBAL)
 
-set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/include/libzmq.a)
+set(ZMQ_STATIC_ARCHIVE ${CMAKE_CURRENT_SOURCE_DIR}/../commonFiles/libzmq.a)
 set_target_properties(zmq PROPERTIES
     IMPORTED_LOCATION ${ZMQ_STATIC_ARCHIVE}
 )
@@ -63,13 +64,13 @@ add_library(slsReceiverShared SHARED
 )
 
 set(PUBLICHEADERS
-    include/sls_receiver_defs.h
-    include/ansi.h
-    include/sls_receiver_funcs.h
-    include/MySocketTCP.h
-    include/genericSocket.h
-    include/logger.h
-	include/sls_receiver_exceptions.h
+    ../commonfiles/sls_receiver_defs.h
+    ../commonfiles/ansi.h
+    ../commonfiles/sls_receiver_funcs.h
+    ../commonfiles/MySocketTCP.h
+    ../commonfiles/genericSocket.h
+    ../commonfiles/logger.h
+	../commonfiles/sls_receiver_exceptions.h
 )
 
 
diff --git a/slsReceiverSoftware/Makefile b/slsReceiverSoftware/Makefile
index 655d0c1dc..e7895bcc3 100644
--- a/slsReceiverSoftware/Makefile
+++ b/slsReceiverSoftware/Makefile
@@ -5,6 +5,7 @@ LIBDIR		?=	../bin
 DOCDIR 		?= 	docs
 SRCDIR		=	src
 INCDIR		=   include
+COMMONDIR	=	../commonFiles
 TESTDIR		=	test
 BUILDDIR	=	build
 PROGS		= 	$(DESTDIR)/slsReceiver 
@@ -15,18 +16,18 @@ CFLAGS= -g -DC_ONLY -fPIC
 
 DFLAGS= -g -DDACS_INT  -DSLS_RECEIVER_UDP_FUNCTIONS #-DVERBOSE
 
-INCLUDES?= $(INCLUDESRXR) -I include/ 
+INCLUDES?= $(INCLUDESRXR) -I $(INCDIR) -I $(COMMONDIR)
 
 ##############################################################
 # ZMQ specific: in this case, you need ZMQ libraries already included in this package
 ###########################################################
-LIBZMQDIR = include
+LIBZMQDIR = ../commonFiles
 LIBZMQ =  -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
 
 
 
 SRC_CLNT = MySocketTCP.cpp  ThreadObject.cpp Listener.cpp DataProcessor.cpp DataStreamer.cpp Fifo.cpp File.cpp BinaryFile.cpp UDPInterface.cpp  UDPBaseImplementation.cpp UDPStandardImplementation.cpp slsReceiverTCPIPInterface.cpp slsReceiver.cpp slsReceiverUsers.cpp utilities.cpp
-DEPSINCLUDES = $(INCDIR)/ansi.h $(INCDIR)/sls_receiver_defs.h $(INCDIR)/sls_receiver_funcs.h $(INCDIR)/GeneralData.h  $(INCDIR)/circularFifo.h $(INCDIR)/genericSocket.h  $(INCDIR)/logger.h $(INCDIR)/receiver_defs.h $(INCDIR)/UDPInterface.h $(INCDIR)/utilities.h $(INCDIR)/ZmqSocket.h $(INCDIR)/BinaryFileStatic.h $(INCDIR)/HDF5FileStatic.h $(INCDIR)/sls_receiver_exceptions.h
+DEPSINCLUDES = $(COMMONDIR)/ansi.h $(COMMONDIR)/sls_receiver_defs.h $(COMMONDIR)/sls_receiver_funcs.h $(COMMONDIR)/GeneralData.h  $(INCDIR)/circularFifo.h $(COMMONDIR)/genericSocket.h  $(COMMONDIR)/logger.h $(INCDIR)/receiver_defs.h $(INCDIR)/UDPInterface.h $(COMMONDIR)/utilities.h $(COMMONDIR)/ZmqSocket.h $(INCDIR)/BinaryFileStatic.h $(INCDIR)/HDF5FileStatic.h $(COMMONDIR)/sls_receiver_exceptions.h
 
 
 ifeq ($(HDF5),yes)
@@ -54,7 +55,7 @@ dummy: $(DESTDIR)/dummyReceiver
 intdoc: $(SRC_H) $(SRC_CLNT) 
 	doxygen doxy.config
 
-$(BUILDDIR)/%.o : $(SRCDIR)/%.cpp $(INCDIR)/%.h $(DEPSINCLUDES) Makefile
+$(BUILDDIR)/%.o : $(SRCDIR)/%.cpp $(INCDIR)/%.h $(COMMONDIR)/%.h $(DEPSINCLUDES) Makefile
 ifeq ($(ROOTSLS),yes)
 	$(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS)  $(ROOTFLAGS) -fPIC  $(EPICSFLAGS) $(LDFLAGRXR) -L/usr/lib64/ $(FLAGS) 
 else	
diff --git a/slsReceiverSoftware/include/utilities.h b/slsReceiverSoftware/include/utilities.h
deleted file mode 100644
index 5db78e8e1..000000000
--- a/slsReceiverSoftware/include/utilities.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <map>
-
-#include "sls_receiver_defs.h"
-
-/* uncomment next line to enable debug output */
-//#define EIGER_DEBUG
-
-
-int read_config_file(std::string fname, int *tcpip_port_no, std::map<std::string, std::string> * configuration_map);
-
diff --git a/slsReceiverSoftware/include/versionAPI.h b/slsReceiverSoftware/include/versionAPI.h
deleted file mode 120000
index a4d75aa2a..000000000
--- a/slsReceiverSoftware/include/versionAPI.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsDetectorSoftware/commonFiles/versionAPI.h
\ No newline at end of file