diff --git a/slsDetectorServers/moenchDetectorServer/AD9257.h b/slsDetectorServers/moenchDetectorServer/AD9257.h
deleted file mode 120000
index 87b70e097..000000000
--- a/slsDetectorServers/moenchDetectorServer/AD9257.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/AD9257.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/ALTERA_PLL.h b/slsDetectorServers/moenchDetectorServer/ALTERA_PLL.h
deleted file mode 120000
index e665f009d..000000000
--- a/slsDetectorServers/moenchDetectorServer/ALTERA_PLL.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/ALTERA_PLL.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/LTC2620.h b/slsDetectorServers/moenchDetectorServer/LTC2620.h
deleted file mode 120000
index 13157cb8b..000000000
--- a/slsDetectorServers/moenchDetectorServer/LTC2620.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/LTC2620.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/MAX1932.h b/slsDetectorServers/moenchDetectorServer/MAX1932.h
deleted file mode 120000
index 8f7b239ea..000000000
--- a/slsDetectorServers/moenchDetectorServer/MAX1932.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/MAX1932.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/Makefile b/slsDetectorServers/moenchDetectorServer/Makefile
index 65960a021..2f2cda415 100755
--- a/slsDetectorServers/moenchDetectorServer/Makefile
+++ b/slsDetectorServers/moenchDetectorServer/Makefile
@@ -1,15 +1,18 @@
+current_dir = $(shell pwd)
+main_server = ../slsDetectorServer/
+support_lib = ../../slsSupportLib/include/
+
 CROSS  		= bfin-uclinux-
 CC    		= $(CROSS)gcc
-CFLAGS		+=  -Wall -DMOENCHD  -DSTOP_SERVER  -DDEBUG1# -DVERBOSEI #-DVERBOSE
-LDLIBS		+= 	-lm  -lstdc++ 
-
+CFLAGS		+=  -Wall -DMOENCHD  -DSTOP_SERVER -I$(main_server) -I$(support_lib) -I$(current_dir)#-DVERBOSEI #-DVERBOSE 
+LDLIBS		+= 	-lm  
 PROGS		= 	moenchDetectorServer 
 DESTDIR		?= 	bin
 INSTMODE	= 	0777
 
-SRC_CLNT	=	communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
-OBJS 		= 	$(SRC_CLNT:.c=.o) 
- 
+SRCS 		= 	$(main_server)communication_funcs.c $(main_server)slsDetectorServer.c $(main_server)slsDetectorServer_funcs.c  slsDetectorFunctionList.c 
+OBJS 		= 	$(SRCS:.c=.o) 
+
 all: clean versioning $(PROGS)
 
 boot: $(OBJS) 
@@ -28,7 +31,7 @@ $(PROGS): $(OBJS)
 	rm *.gdb
 
 clean:
-	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb
+	rm -rf $(DESTDIR)/$(PROGS)  *.o *.gdb $(main_server)*.o
 	
 
 	
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/UDPPacketHeaderGenerator.h b/slsDetectorServers/moenchDetectorServer/UDPPacketHeaderGenerator.h
deleted file mode 120000
index eb0223a3e..000000000
--- a/slsDetectorServers/moenchDetectorServer/UDPPacketHeaderGenerator.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/UDPPacketHeaderGenerator.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/ansi.h b/slsDetectorServers/moenchDetectorServer/ansi.h
deleted file mode 120000
index 4a82d0575..000000000
--- a/slsDetectorServers/moenchDetectorServer/ansi.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/ansi.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/blackfin.h b/slsDetectorServers/moenchDetectorServer/blackfin.h
deleted file mode 120000
index 2873c7dc6..000000000
--- a/slsDetectorServers/moenchDetectorServer/blackfin.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/blackfin.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/common.h b/slsDetectorServers/moenchDetectorServer/common.h
deleted file mode 120000
index 6776eb607..000000000
--- a/slsDetectorServers/moenchDetectorServer/common.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/common.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/commonServerFunctions.h b/slsDetectorServers/moenchDetectorServer/commonServerFunctions.h
deleted file mode 120000
index 33bdd8d53..000000000
--- a/slsDetectorServers/moenchDetectorServer/commonServerFunctions.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/commonServerFunctions.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/communication_funcs.c b/slsDetectorServers/moenchDetectorServer/communication_funcs.c
deleted file mode 120000
index 30435fdc4..000000000
--- a/slsDetectorServers/moenchDetectorServer/communication_funcs.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs.c
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/communication_funcs.h b/slsDetectorServers/moenchDetectorServer/communication_funcs.h
deleted file mode 120000
index c0c144994..000000000
--- a/slsDetectorServers/moenchDetectorServer/communication_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/communication_funcs_UDP.h b/slsDetectorServers/moenchDetectorServer/communication_funcs_UDP.h
deleted file mode 120000
index 0d434a97d..000000000
--- a/slsDetectorServers/moenchDetectorServer/communication_funcs_UDP.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/communication_funcs_UDP.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/logger.h b/slsDetectorServers/moenchDetectorServer/logger.h
deleted file mode 120000
index ff1930ce3..000000000
--- a/slsDetectorServers/moenchDetectorServer/logger.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/logger.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/programfpga.h b/slsDetectorServers/moenchDetectorServer/programfpga.h
deleted file mode 120000
index 72c54d21d..000000000
--- a/slsDetectorServers/moenchDetectorServer/programfpga.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/programfpga.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.h b/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.h
deleted file mode 120000
index 345b8c029..000000000
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorFunctionList.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer.c b/slsDetectorServers/moenchDetectorServer/slsDetectorServer.c
deleted file mode 120000
index a7eb59acb..000000000
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer.c
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_funcs.c b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_funcs.c
deleted file mode 120000
index a7532ccd4..000000000
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_funcs.c
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer_funcs.c
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_funcs.h b/slsDetectorServers/moenchDetectorServer/slsDetectorServer_funcs.h
deleted file mode 120000
index 7569daf47..000000000
--- a/slsDetectorServers/moenchDetectorServer/slsDetectorServer_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../slsDetectorServer/slsDetectorServer_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/sls_detector_defs.h b/slsDetectorServers/moenchDetectorServer/sls_detector_defs.h
deleted file mode 120000
index 2af30d73a..000000000
--- a/slsDetectorServers/moenchDetectorServer/sls_detector_defs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/sls_detector_defs.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/sls_detector_funcs.h b/slsDetectorServers/moenchDetectorServer/sls_detector_funcs.h
deleted file mode 120000
index 3f48959a9..000000000
--- a/slsDetectorServers/moenchDetectorServer/sls_detector_funcs.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/sls_detector_funcs.h
\ No newline at end of file
diff --git a/slsDetectorServers/moenchDetectorServer/versionAPI.h b/slsDetectorServers/moenchDetectorServer/versionAPI.h
deleted file mode 120000
index 5e580d8bb..000000000
--- a/slsDetectorServers/moenchDetectorServer/versionAPI.h
+++ /dev/null
@@ -1 +0,0 @@
-../../slsSupportLib/include/versionAPI.h
\ No newline at end of file
diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h
index 943f78d64..b88b5af91 100644
--- a/slsSupportLib/include/versionAPI.h
+++ b/slsSupportLib/include/versionAPI.h
@@ -3,8 +3,8 @@
 #define APILIB 0x190723
 #define APIRECEIVER 0x190722
 #define APIGUI 0x190723
-#define APIMOENCH 0x190816
 #define APIEIGER 0x190816
 #define APIJUNGFRAU 0x190819
 #define APIGOTTHARD 0x190819
 #define APICTB 0x190819
+#define APIMOENCH 0x190819