diff --git a/src/ac/Makefile b/src/ac/Makefile
index 0a689ce7..ed8c732d 100644
--- a/src/ac/Makefile
+++ b/src/ac/Makefile
@@ -10,11 +10,13 @@ ifndef ARCH
 	ARCH = $(shell $(CC) -dumpmachine)
 endif
 
-LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../capwap/$(ARCH)
+LDFLAGS+=-g -D_REENTRANT -L/usr/local/lib -L../lib/$(ARCH) 
 CFLAGS += -Werror -g -O0 -D_REENTRANT -DIPV6 -I/usr/local/include -I../ -DSYS_ARCH=\"${ARCH}\"
 
 
 LIBS+=-lcapwap
+LIBS+=-lcipwap
+LIBS+=-lcw
 LIBS+=-lrt
 LIBS+=-lpthread
 LIBS+=-lconfuse
@@ -75,7 +77,7 @@ all: $(AC_NAME)
 
 
 $(AC_NAME): $(AC_OBJS) 
-	$(CC) $(AC_OBJS) -o $(AC_NAME) $(LDFLAGS) $(LIBS)
+	$(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
 
 
 clean: 
diff --git a/src/ac/conf.c b/src/ac/conf.c
index 4a2528fa..15afa9ba 100644
--- a/src/ac/conf.c
+++ b/src/ac/conf.c
@@ -134,7 +134,7 @@ static int init_acname()
 	return 1;
 }
 
-#include "capwap/mod.h"
+#include "../mod/modload.h"
 
 
 struct mod_ac * conf_mods[10];
@@ -142,8 +142,8 @@ struct mod_ac * conf_mods[10];
 static int init_mods()
 {
 	
-	conf_mods[0]=cw_get_mod_ac("cipwap");
-	conf_mods[1]=cw_get_mod_ac("capwap");
+	conf_mods[0]=modload_ac("cipwap");
+	conf_mods[1]=modload_ac("capwap");
 	conf_mods[2]=NULL;
 
 
diff --git a/src/capwap/Makefile b/src/capwap/Makefile
index a74cee72..43c84baf 100644
--- a/src/capwap/Makefile
+++ b/src/capwap/Makefile
@@ -18,7 +18,8 @@ endif
 #OPENSSLINC=$(OPENSSLINC) 
 #../contrib/openssl-1.0.1i/include
 
-NAME=libcapwap.a
+NAME=libcw.a
+LIBDIR=../lib/$(ARCH)
 
 SOCKOBJS=\
 	sock_create.o\
@@ -47,7 +48,6 @@ LOGOBJS=log.o \
 	log_file.o \
 	dbg_strings.o\
 	dbg.o \
-	cw_get_mod_ac.o
 
 
 WTPINFOOBJS =\
@@ -277,7 +277,7 @@ OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
 
 
 
-CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I /usr/local/include
+CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I /usr/local/include -I../
 #CFLAGS = -Wall  -Os -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I/usr/local/include
 
 CFLAGS += $(GNUTLS_CFLAGS) \
@@ -292,8 +292,8 @@ CFLAGS += $(GNUTLS_CFLAGS) \
 
 
 #SRCS = $(OBJS:.o=.c) 
-MODOBJS=$(wildcard ./mod/cipwap/$(ARCH)/*.o)
-MODOBJS+=$(wildcard ./mod/capwap/$(ARCH)/*.o)
+#MODOBJS=$(wildcard ./mod/cipwap/$(ARCH)/*.o)
+#MODOBJS+=$(wildcard ./mod/capwap/$(ARCH)/*.o)
 
 $(ARCH)/%.o:%.c
 	@mkdir -p $(ARCH)
@@ -301,9 +301,10 @@ $(ARCH)/%.o:%.c
 	@$(CC) -c $(CFLAGS) $< -o $@
 #	@$(CC) -MM $(CFLAGS) $< > $*.d
 
-$(ARCH)/$(NAME) : $(OBJS) $(MODOBJS)
-	@echo "  AR $(ARCH)/$(NAME)"
-	@$(AR) rcs $(ARCH)/$(NAME) $(OBJS) $(MODOBJS)
+$(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
+	@mkdir -p $(LIBDIR)
+	@echo "  AR $(LIBDIR)/$(NAME)"
+	@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
 
 
 SRCS = $(OBJS:.o=.c) 
@@ -314,19 +315,11 @@ DEPS := $(OBJS:.o=.d)
 
 
 # top-level rule, to compile everything. 
-all:
-	$(MAKE) mod_cipwap
-	$(MAKE) capwap
-
-
-capwap: $(ARCH)/$(NAME)
+all: $(ARCH)/$(NAME)
 
 
 
 
-mod_cipwap:
-	$(MAKE) -C mod/cipwap
-
 
 clean: 
 	$(RM) $(ARCH)/*
diff --git a/src/capwap/mod.h b/src/capwap/mod.h
index 8dc45d61..0af58b11 100644
--- a/src/capwap/mod.h
+++ b/src/capwap/mod.h
@@ -4,8 +4,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "sock.h"
-#include "conn.h"
+#include "capwap/sock.h"
+#include "capwap/conn.h"
 
 struct mod_ac
 {
@@ -24,13 +24,13 @@ struct mod_ac
 };
 
 
-#include "mod/cipwap/mod_cipwap.h"
-#include "mod/capwap/mod_capwap.h"
+//#include "cipwap/mod_cipwap.h"
+//#include "capwap/mod_capwap.h"
 
 
-#define MODS_AC { mod_capwap_ac,mod_cipwap_ac,NULL }
+//#define MODS_AC { mod_capwap_ac,mod_cipwap_ac,NULL }
 
 
-extern struct mod_ac * cw_get_mod_ac(const char *name);
+//extern struct mod_ac * cw_get_mod_ac(const char *name);
 
 #endif
diff --git a/src/mod/capwap/Makefile b/src/mod/capwap/Makefile
index 0e5d477d..f0911a40 100644
--- a/src/mod/capwap/Makefile
+++ b/src/mod/capwap/Makefile
@@ -1,5 +1,5 @@
-include ../../../Macros.mak
-include ../../../Config.mak
+include ../../Macros.mak
+include ../../Config.mak
 
 OBJS=\
 	mod_capwap_ac.o \
@@ -10,8 +10,10 @@ OBJS=\
 OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
 
 
-CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../../
+CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../ -I../
 
+NAME=libcapwap.a
+LIBDIR=../../lib/$(ARCH)
 
 SRCS = $(OBJS:.o=.c) 
 
@@ -21,7 +23,14 @@ $(ARCH)/%.o:%.c
 	@$(CC) -c $(CFLAGS) $< -o $@
 
 
-all: $(OBJS)
+$(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
+	@mkdir -p $(LIBDIR)
+	@echo "  AR $(LIBDIR)/$(NAME)"
+	@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
+
+
+all: $(LIBDIR)/$(NAME)
 
 clean: 
 	rm -rf $(ARCH)
+	rm -f $(LIBDIR)/$(NAME)
diff --git a/src/mod/capwap/mod_capwap_ac.c b/src/mod/capwap/mod_capwap_ac.c
index 5f8576b0..0a99d841 100644
--- a/src/mod/capwap/mod_capwap_ac.c
+++ b/src/mod/capwap/mod_capwap_ac.c
@@ -1,5 +1,5 @@
 
-#include "capwap/mod.h"
+#include "mod.h"
 #include "capwap/log.h"
 #include "capwap/dbg.h"
 
diff --git a/src/mod/cipwap/Makefile b/src/mod/cipwap/Makefile
index 17b77e56..099c6736 100644
--- a/src/mod/cipwap/Makefile
+++ b/src/mod/cipwap/Makefile
@@ -1,5 +1,5 @@
-include ../../../Macros.mak
-include ../../../Config.mak
+include ../../Macros.mak
+include ../../Config.mak
 
 OBJS=\
 	mod_cipwap_ac.o
@@ -7,9 +7,12 @@ OBJS=\
 OBJS:=$(patsubst %.o,$(ARCH)/%.o,$(OBJS))
 
 
-CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../../
+CFLAGS = -Wall -g -O0 -D_REENTRANT -DWITH_IPV6 -DWITH_RMAC_SUPPORT -I ../../ -I../
 
 
+NAME=libcipwap.a
+LIBDIR=../../lib/$(ARCH)
+
 SRCS = $(OBJS:.o=.c) 
 
 $(ARCH)/%.o:%.c
@@ -17,8 +20,13 @@ $(ARCH)/%.o:%.c
 	@echo "  CC "$<
 	@$(CC) -c $(CFLAGS) $< -o $@
 
+$(LIBDIR)/$(NAME) : $(OBJS) $(MODOBJS)
+	@mkdir -p $(LIBDIR)
+	@echo "  AR $(LIBDIR)/$(NAME)"
+	@$(AR) rcs $(LIBDIR)/$(NAME) $(OBJS) $(MODOBJS)
 
-all: $(OBJS)
+
+all: $(LIBDIR)/$(NAME)
 
 clean: 
 	rm -rf $(ARCH)
diff --git a/src/mod/cipwap/mod_cipwap_ac.c b/src/mod/cipwap/mod_cipwap_ac.c
index 4c943f4e..e2514dd3 100644
--- a/src/mod/cipwap/mod_cipwap_ac.c
+++ b/src/mod/cipwap/mod_cipwap_ac.c
@@ -1,5 +1,5 @@
 
-#include "capwap/mod.h"
+#include "mod.h"
 #include "capwap/log.h"
 
 #include "mod_cipwap.h"