diff --git a/actube.workspace b/actube.workspace
index e0162c79..b8870938 100644
--- a/actube.workspace
+++ b/actube.workspace
@@ -3,9 +3,9 @@
   <Project Name="ac" Path="ac.project" Active="No"/>
   <Project Name="wtp" Path="wtp.project" Active="No"/>
   <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
-  <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
+  <Project Name="mod_capwap" Path="mod_capwap.project" Active="Yes"/>
   <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
-  <Project Name="libcw" Path="libcw.project" Active="Yes"/>
+  <Project Name="libcw" Path="libcw.project" Active="No"/>
   <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
   <BuildMatrix>
diff --git a/libcw.project b/libcw.project
index f849bb58..34bca75d 100644
--- a/libcw.project
+++ b/libcw.project
@@ -11,7 +11,6 @@
       <File Name="src/cw/mbag_type_dword.c"/>
       <File Name="src/cw/sock_getport.c"/>
       <File Name="src/cw/dtls_gnutls_get_peers_cert.c"/>
-      <File Name="src/cw/cw_in_vendor_specific_payload.c"/>
       <File Name="src/cw/conn_process_packet.c"/>
       <File Name="src/cw/cw_cisco_id_to_str.c"/>
       <File Name="src/cw/lw_put_sockaddr.c"/>
diff --git a/mod_capwap.project b/mod_capwap.project
index 3d95263b..f6f63feb 100644
--- a/mod_capwap.project
+++ b/mod_capwap.project
@@ -18,6 +18,7 @@
         <File Name="src/mod/capwap/capwap_out_get_session_id.c"/>
         <File Name="src/mod/capwap/capwap_out_get_idle_timeout.c"/>
         <File Name="src/mod/capwap/capwap_actions_ac.c"/>
+        <File Name="src/mod/capwap/capwap_in_vendor_specific_payload.c"/>
       </VirtualDirectory>
     </VirtualDirectory>
   </VirtualDirectory>
diff --git a/src/cw/cw.h b/src/cw/cw.h
index ebe486b6..3dc60380 100644
--- a/src/cw/cw.h
+++ b/src/cw/cw.h
@@ -368,10 +368,11 @@ extern int cw_in_wtp_reboot_statistics(struct conn *conn, struct cw_action_in *a
 extern int cw_in_wtp_board_data(struct conn *conn, struct cw_action_in *a, uint8_t * data,
 				int len, struct sockaddr *from);
 
-					 
+/*					 
 int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
 				struct cw_ElemHandlerParams *params,
 				  uint8_t * data, int len);
+*/
 
 extern int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
 					   uint8_t * data, int len,
diff --git a/src/cw/cw_process_element.c b/src/cw/cw_process_element.c
index 8a8e3a4d..c7f68579 100644
--- a/src/cw/cw_process_element.c
+++ b/src/cw/cw_process_element.c
@@ -15,8 +15,6 @@
 int cw_process_element(struct cw_ElemHandlerParams *params, int proto, int vendor,int elem_id,
 		uint8_t  * data, int len){
 	
-printf("The process elemnt handler is here \n");
-
 	struct cw_ElemHandler * handler;
 	struct cw_ElemData * elem_data, elem_data_search;
 
diff --git a/src/mod/capwap/Makefile b/src/mod/capwap/Makefile
index 460f4081..8baa0de1 100644
--- a/src/mod/capwap/Makefile
+++ b/src/mod/capwap/Makefile
@@ -15,6 +15,7 @@ OBJS=\
 	capwap_in_wtp_descriptor.o \
 	capwap_out_ac_ip_list.o \
 	capwap_in_session_id.o \
+	capwap_in_vendor_specific_payload.o \
 
 
 LIBDIR		:= ../../../lib
diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c
index 5e5d8db7..bfe636bf 100644
--- a/src/mod/capwap/capwap_actions_ac.c
+++ b/src/mod/capwap/capwap_actions_ac.c
@@ -85,7 +85,7 @@ static struct cw_ElemHandler handlers[] = {
 		0,0,					/* min/max length */
 		NULL,					/* type */
 		"vendor_specific_payload",		/* Key */
-		cw_in_vendor_specific_payload		/* get */
+		capwap_in_vendor_specific_payload		/* get */
 	}
 	,
 	
diff --git a/src/cw/cw_in_vendor_specific_payload.c b/src/mod/capwap/capwap_in_vendor_specific_payload.c
similarity index 82%
rename from src/cw/cw_in_vendor_specific_payload.c
rename to src/mod/capwap/capwap_in_vendor_specific_payload.c
index f77d0d5a..26c5e548 100644
--- a/src/cw/cw_in_vendor_specific_payload.c
+++ b/src/mod/capwap/capwap_in_vendor_specific_payload.c
@@ -1,7 +1,6 @@
 
-#include "cw.h"
-#include "dbg.h"
-#include "log.h"
+#include "cw/dbg.h"
+#include "cw/log.h"
 
 /** 
  * @file 
@@ -11,7 +10,7 @@
 /**
  * Default handler for Vendor Specific Payload message elements.
  */
-int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
+int capwap_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
 				struct cw_ElemHandlerParams *params,
 				  uint8_t * data, int len)
 {
@@ -23,7 +22,6 @@ int cw_in_vendor_specific_payload(struct cw_ElemHandler *handler,
 	vendor_id = cw_get_dword(data);
 	elem_id = cw_get_word(data + 4);
 
-	printf("Spec handler looking for %d %d %d\n",0,vendor_id,elem_id);
 	vhandler = cw_msgset_get_elemhandler(params->conn->msgset,0,vendor_id,elem_id);
 	
 	
diff --git a/src/mod/capwap/mod_capwap.h b/src/mod/capwap/mod_capwap.h
index a1bf45a0..cf1b0b66 100644
--- a/src/mod/capwap/mod_capwap.h
+++ b/src/mod/capwap/mod_capwap.h
@@ -18,7 +18,12 @@ extern int capwap_in_wtp_board_data(struct conn *conn, struct cw_ElemHandler *a,
 				    uint8_t * data, int len, struct sockaddr *from);
 */ 
 int capwap_in_wtp_board_data(struct cw_ElemHandler *eh, struct cw_ElemHandlerParams *params, 
-			uint8_t * data,	 int len);				    
+			uint8_t * data,	 int len);
+
+
+int capwap_in_vendor_specific_payload(struct cw_ElemHandler *handler, 
+				struct cw_ElemHandlerParams *params,
+				  uint8_t * data, int len);				    
 
 /*
 extern int capwap_out_wtp_descriptor(struct conn *conn, struct cw_action_out *a,