diff --git a/src/Defs.mak b/src/Defs.mak
new file mode 100644
index 00000000..115d088a
--- /dev/null
+++ b/src/Defs.mak
@@ -0,0 +1,5 @@
+ifndef ARCH
+	ARCH = $(shell uname -m)
+endif
+
+
diff --git a/src/Macros.mak b/src/Macros.mak
index ba5aa73d..c62f3649 100644
--- a/src/Macros.mak
+++ b/src/Macros.mak
@@ -18,11 +18,6 @@ GNUTLS_LDFLAGS=
 endif
 
 
-ifndef ARCH
-	ARCH = $(shell uname -m)
-endif
-
-
 ifeq ($(CC),clang)
 LDFLAGS		+= -g -L/usr/local/lib 
 CFLAGS 		+= -fPIC -g -O0 -D_REENTRANT  -I /usr/local/include -I../
diff --git a/src/ac/Makefile b/src/ac/Makefile
index c965d646..41c8880f 100644
--- a/src/ac/Makefile
+++ b/src/ac/Makefile
@@ -1,3 +1,5 @@
+include ../Defs.mak
+
 include ../Config.mak
 include ../ACConfig.mak
 -include ../Config.local.mak
diff --git a/src/cw/Makefile b/src/cw/Makefile
index 8fb1cb7e..858313c1 100644
--- a/src/cw/Makefile
+++ b/src/cw/Makefile
@@ -1,3 +1,4 @@
+include ../Defs.mak
 include ../CWConfig.mak
 -include ../Config.local.mak
 include ../Macros.mak
diff --git a/src/cw/cw_addelem_cisco_wtp_radio_cfg.c b/src/cw/cw_addelem_cisco_wtp_radio_cfg.c
index c34c5397..513ae893 100644
--- a/src/cw/cw_addelem_cisco_wtp_radio_cfg.c
+++ b/src/cw/cw_addelem_cisco_wtp_radio_cfg.c
@@ -1,5 +1,5 @@
 #include "capwap.h"
-
+#include "cw.h"
 
 int cw_addelem_cisco_wtp_radio_cfg(uint8_t*dst,struct radioinfo *ri)
 {
diff --git a/src/mod/Mod.mak b/src/mod/Mod.mak
index 65cbfcbc..e7f601d1 100644
--- a/src/mod/Mod.mak
+++ b/src/mod/Mod.mak
@@ -23,12 +23,12 @@ $(OBJDIR)/%.o:%.c
 $(SNAME) : $(OBJS) $(MODOBJS)
 	@mkdir -p $(LIBARCHDIR)
 	@echo "  $(AR) $(SNAME)"
-	@$(AR) rcs $(SNAME) $(OBJS) $(MODOBJS)
+	$(AR) rcs $(SNAME) $(OBJS) $(MODOBJS)
 
 $(DNAME) : $(OBJS) $(MODOBJS)
 	@mkdir -p $(LIBARCHDIR)
 	@echo "  $(CC) $(DNAME)"
-	@$(LD) -L$(LIBARCHDIR) $(LDFLAGS) -shared -o $(DNAME) $(OBJS) $(MODOBJS) $(SLIBS) $(LIBS)
+	$(LD) -L$(LIBARCHDIR) $(LDFLAGS) -shared -o $(DNAME) $(OBJS) $(MODOBJS) $(SLIBS) $(LIBS)
 
 $(MODNAME) : $(DNAME)
 	cp $(DNAME) $(MODNAME)
diff --git a/src/mod/capwap/Makefile b/src/mod/capwap/Makefile
index a840ecc1..4a5e46c3 100644
--- a/src/mod/capwap/Makefile
+++ b/src/mod/capwap/Makefile
@@ -1,4 +1,4 @@
-
+include ../../Defs.mak
 
 
 OBJS=\
diff --git a/src/cw/cw_cisco_id_to_str.c b/src/mod/cisco/cw_cisco_id_to_str.c
similarity index 100%
rename from src/cw/cw_cisco_id_to_str.c
rename to src/mod/cisco/cw_cisco_id_to_str.c
diff --git a/src/wtp/Makefile b/src/wtp/Makefile
index e00a267c..3d4f6a8b 100644
--- a/src/wtp/Makefile
+++ b/src/wtp/Makefile
@@ -1,3 +1,4 @@
+include ../Defs.mak
 include ../Config.mak
 include ../WtpConfig.mak
 -include ../Config.local.mak