diff --git a/src/ac/ac.h b/src/ac/ac.h
index 6b457af4..581a6fae 100644
--- a/src/ac/ac.h
+++ b/src/ac/ac.h
@@ -1,5 +1,5 @@
-#include "capwap/capwap.h"
-#include "capwap/mbag.h"
+#include "cw/capwap.h"
+#include "cw/mbag.h"
 
 extern struct ac_status ac_global_status;
 extern int ac_global_init();
diff --git a/src/ac/ac_global.c b/src/ac/ac_global.c
index 2c1f2a13..1d4321d8 100644
--- a/src/ac/ac_global.c
+++ b/src/ac/ac_global.c
@@ -3,11 +3,11 @@
 
 #include "ac.h"
 #include "conf.h"
-#include "capwap/capwap.h"
-#include "capwap/capwap_items.h"
-#include "capwap/aciplist.h"
+#include "cw/capwap.h"
+#include "cw/capwap_items.h"
+#include "cw/aciplist.h"
 #include "socklist.h"
-#include "capwap/sock.h"
+#include "cw/sock.h"
 
 struct cw_ac_status ac_status;
 
diff --git a/src/ac/ac_interface.c b/src/ac/ac_interface.c
index 4c0bdd0d..7cd7c13e 100644
--- a/src/ac/ac_interface.c
+++ b/src/ac/ac_interface.c
@@ -4,14 +4,14 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "capwap/sock.h"
+#include "cw/sock.h"
 
 #include "socklist.h"
 #include "conf.h"
 
-#include "capwap/capwap.h"
-#include "capwap/capwap_80211.h"
-#include "capwap/aciplist.h"
+#include "cw/capwap.h"
+#include "cw/capwap_80211.h"
+#include "cw/aciplist.h"
 
 
 /*
diff --git a/src/ac/ac_main.c b/src/ac/ac_main.c
index 1dea5882..b947c840 100644
--- a/src/ac/ac_main.c
+++ b/src/ac/ac_main.c
@@ -25,25 +25,25 @@
 
 #include "actube.h"
 #include "wtplist.h"
-#include "capwap/dtls.h"
-#include "capwap/log.h"
-#include "capwap/dbg.h"
-#include "capwap/sock.h"
+#include "cw/dtls.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
+#include "cw/sock.h"
 #include "conf.h"
 
 #include "socklist.h"
 
 #include "db.h"
-#include "capwap/capwap_items.h"
-#include "capwap/capwap_cisco.h"
-#include "capwap/capwap_80211.h"
-#include "capwap/action.h"
-#include "capwap/capwap_crypto.h"
-#include "capwap/mbag.h"
+#include "cw/capwap_items.h"
+#include "cw/capwap_cisco.h"
+#include "cw/capwap_80211.h"
+#include "cw/action.h"
+#include "cw/capwap_crypto.h"
+#include "cw/mbag.h"
 
 
 #include "ac.h"
-#include "capwap/format.h"
+#include "cw/format.h"
 
 int ac_run();
 
@@ -80,10 +80,10 @@ static int parse_args(int argc, char *argv[])
 }
 
 
-#include "capwap/mod.h"
+#include "cw/mod.h"
 extern struct mod_ac * cw_get_mod_ac(const char *name);
 
-#include "capwap/mlist.h"
+#include "cw/mlist.h"
 
 static int mcmp(void *v1,void*v2)
 {
diff --git a/src/ac/conf.c b/src/ac/conf.c
index e5522469..1429a5f1 100644
--- a/src/ac/conf.c
+++ b/src/ac/conf.c
@@ -21,15 +21,15 @@
 
 #include <confuse.h>
 
-#include "capwap/capwap.h"
-#include "capwap/sock.h"
+#include "cw/capwap.h"
+#include "cw/sock.h"
 
 #include "conf.h"
 
-#include "capwap/log.h"
-#include "capwap/dbg.h"
-#include "capwap/cw_util.h"
-#include "capwap/action.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
+#include "cw/cw_util.h"
+#include "cw/action.h"
 
 #include "ac.h"
 
@@ -440,7 +440,7 @@ static char *conf_default_mcast_groups_ipv6[] = {
 #endif
 
 //#include "avltree"
-#include "capwap/stravltree.h"
+#include "cw/stravltree.h"
 
 
 
diff --git a/src/ac/conf.h b/src/ac/conf.h
index 197d2086..ea5c9d7f 100644
--- a/src/ac/conf.h
+++ b/src/ac/conf.h
@@ -26,10 +26,10 @@
 #include <net/if.h>
 
 
-#include "capwap/capwap.h"
-#include "capwap/lwapp.h"
-#include "capwap/bstr.h"
-#include "capwap/mod.h"
+#include "cw/capwap.h"
+#include "cw/lwapp.h"
+#include "cw/bstr.h"
+#include "cw/mod.h"
 
 
 extern struct mod_ac * conf_mods[10];
diff --git a/src/ac/db.c b/src/ac/db.c
index 8e5b64b2..b2c62d38 100644
--- a/src/ac/db.c
+++ b/src/ac/db.c
@@ -1,11 +1,11 @@
 
 #include <sqlite3.h>
 
-#include "capwap/log.h"
-#include "capwap/dbg.h"
-#include "capwap/capwap_items.h"
-#include "capwap/conn.h"
-#include "capwap/item.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
+#include "cw/capwap_items.h"
+#include "cw/conn.h"
+#include "cw/item.h"
 
 #include "conf.h"
 
diff --git a/src/ac/db.h b/src/ac/db.h
index 28650044..44a66cb0 100644
--- a/src/ac/db.h
+++ b/src/ac/db.h
@@ -1,7 +1,7 @@
 #ifndef CW_MAVL_H
 #define CW_MAVL_H
 
-#include "capwap/mavl.h"
+#include "cw/mavl.h"
 
 extern void db_ping();
 extern int db_init();
diff --git a/src/ac/socklist.c b/src/ac/socklist.c
index 5043a3e0..b18837fb 100644
--- a/src/ac/socklist.c
+++ b/src/ac/socklist.c
@@ -25,8 +25,8 @@
 #include <netinet/in.h>
 
 
-#include "capwap/log.h"
-#include "capwap/sock.h"
+#include "cw/log.h"
+#include "cw/sock.h"
 
 
 #include "socklist.h"
diff --git a/src/ac/wtplist.c b/src/ac/wtplist.c
index b88c4c7c..04edc952 100644
--- a/src/ac/wtplist.c
+++ b/src/ac/wtplist.c
@@ -30,12 +30,12 @@
 #include <stdio.h>
 
 #include "wtplist.h"
-#include "capwap/conn.h"
-#include "capwap/sock.h"
+#include "cw/conn.h"
+#include "cw/sock.h"
 
 
 #include "conf.h"
-#include "capwap/log.h"
+#include "cw/log.h"
 
 
 static struct connlist * connlist;
diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c
index 84c47f79..c8eeccf9 100644
--- a/src/ac/wtpman.c
+++ b/src/ac/wtpman.c
@@ -7,35 +7,35 @@
 
 #include "wtplist.h"
 
-#include "capwap/capwap.h"
-#include "capwap/sock.h"
+#include "cw/capwap.h"
+#include "cw/sock.h"
 #include "socklist.h"
 
-#include "capwap/conn.h"
+#include "cw/conn.h"
 #include "wtpman.h"
 #include "conf.h"
-#include "capwap/log.h"
-#include "capwap/timer.h"
+#include "cw/log.h"
+#include "cw/timer.h"
 
 
 
-#include "capwap/lwmsg.h"
-#include "capwap/lwapp.h"
+#include "cw/lwmsg.h"
+#include "cw/lwapp.h"
 
 
 #include <errno.h>
 
-#include "capwap/capwap_80211.h"
-#include "capwap/capwap_cisco.h"
+#include "cw/capwap_80211.h"
+#include "cw/capwap_cisco.h"
 
-#include "capwap/cw_util.h"
+#include "cw/cw_util.h"
 
-#include "capwap/capwap_items.h"
+#include "cw/capwap_items.h"
 #include "ac.h"
 
-#include "capwap/dtls.h"
+#include "cw/dtls.h"
 
-#include "capwap/dbg.h"
+#include "cw/dbg.h"
 
 
 extern struct cw_actiondef capwap_actions;
diff --git a/src/ac/wtpman.h b/src/ac/wtpman.h
index cdc3ad19..6b51e2ab 100644
--- a/src/ac/wtpman.h
+++ b/src/ac/wtpman.h
@@ -5,8 +5,8 @@
 #include <semaphore.h>
 #include <pthread.h>
 
-#include "capwap/capwap.h"
-#include "capwap/fragman.h"
+#include "cw/capwap.h"
+#include "cw/fragman.h"
 
 #define WTPMAN_QSIZE 1024
 
diff --git a/src/capwap/Doxyfile b/src/cw/Doxyfile
similarity index 100%
rename from src/capwap/Doxyfile
rename to src/cw/Doxyfile
diff --git a/src/capwap/Makefile b/src/cw/Makefile
similarity index 100%
rename from src/capwap/Makefile
rename to src/cw/Makefile
diff --git a/src/capwap/acinfo_print.c b/src/cw/acinfo_print.c
similarity index 100%
rename from src/capwap/acinfo_print.c
rename to src/cw/acinfo_print.c
diff --git a/src/capwap/aciplist.c b/src/cw/aciplist.c
similarity index 100%
rename from src/capwap/aciplist.c
rename to src/cw/aciplist.c
diff --git a/src/capwap/aciplist.h b/src/cw/aciplist.h
similarity index 100%
rename from src/capwap/aciplist.h
rename to src/cw/aciplist.h
diff --git a/src/capwap/acpriolist.c b/src/cw/acpriolist.c
similarity index 100%
rename from src/capwap/acpriolist.c
rename to src/cw/acpriolist.c
diff --git a/src/capwap/acpriolist.h b/src/cw/acpriolist.h
similarity index 100%
rename from src/capwap/acpriolist.h
rename to src/cw/acpriolist.h
diff --git a/src/capwap/action.c b/src/cw/action.c
similarity index 100%
rename from src/capwap/action.c
rename to src/cw/action.c
diff --git a/src/capwap/action.h b/src/cw/action.h
similarity index 100%
rename from src/capwap/action.h
rename to src/cw/action.h
diff --git a/src/capwap/avliter_next.c b/src/cw/avliter_next.c
similarity index 100%
rename from src/capwap/avliter_next.c
rename to src/cw/avliter_next.c
diff --git a/src/capwap/avliter_seek.c b/src/cw/avliter_seek.c
similarity index 100%
rename from src/capwap/avliter_seek.c
rename to src/cw/avliter_seek.c
diff --git a/src/capwap/avltree.h b/src/cw/avltree.h
similarity index 100%
rename from src/capwap/avltree.h
rename to src/cw/avltree.h
diff --git a/src/capwap/avltree_del_all.c b/src/cw/avltree_del_all.c
similarity index 100%
rename from src/capwap/avltree_del_all.c
rename to src/cw/avltree_del_all.c
diff --git a/src/capwap/avltree_foreach.c b/src/cw/avltree_foreach.c
similarity index 100%
rename from src/capwap/avltree_foreach.c
rename to src/cw/avltree_foreach.c
diff --git a/src/capwap/avltree_foreach_from_lr.c b/src/cw/avltree_foreach_from_lr.c
similarity index 100%
rename from src/capwap/avltree_foreach_from_lr.c
rename to src/cw/avltree_foreach_from_lr.c
diff --git a/src/capwap/avltree_foreach_lr.c b/src/cw/avltree_foreach_lr.c
similarity index 100%
rename from src/capwap/avltree_foreach_lr.c
rename to src/cw/avltree_foreach_lr.c
diff --git a/src/capwap/avltree_foreach_node.c b/src/cw/avltree_foreach_node.c
similarity index 100%
rename from src/capwap/avltree_foreach_node.c
rename to src/cw/avltree_foreach_node.c
diff --git a/src/capwap/avltree_foreach_rl.c b/src/cw/avltree_foreach_rl.c
similarity index 100%
rename from src/capwap/avltree_foreach_rl.c
rename to src/cw/avltree_foreach_rl.c
diff --git a/src/capwap/avltree_get.c b/src/cw/avltree_get.c
similarity index 100%
rename from src/capwap/avltree_get.c
rename to src/cw/avltree_get.c
diff --git a/src/capwap/avltree_get_node.c b/src/cw/avltree_get_node.c
similarity index 100%
rename from src/capwap/avltree_get_node.c
rename to src/cw/avltree_get_node.c
diff --git a/src/capwap/bstr.h b/src/cw/bstr.h
similarity index 100%
rename from src/capwap/bstr.h
rename to src/cw/bstr.h
diff --git a/src/capwap/bstr16_create_from_str.c b/src/cw/bstr16_create_from_str.c
similarity index 100%
rename from src/capwap/bstr16_create_from_str.c
rename to src/cw/bstr16_create_from_str.c
diff --git a/src/capwap/bstr16cfgstr.c b/src/cw/bstr16cfgstr.c
similarity index 100%
rename from src/capwap/bstr16cfgstr.c
rename to src/cw/bstr16cfgstr.c
diff --git a/src/capwap/bstr_create.c b/src/cw/bstr_create.c
similarity index 100%
rename from src/capwap/bstr_create.c
rename to src/cw/bstr_create.c
diff --git a/src/capwap/bstr_create_from_cfgstr.c b/src/cw/bstr_create_from_cfgstr.c
similarity index 100%
rename from src/capwap/bstr_create_from_cfgstr.c
rename to src/cw/bstr_create_from_cfgstr.c
diff --git a/src/capwap/bstr_create_from_str.c b/src/cw/bstr_create_from_str.c
similarity index 100%
rename from src/capwap/bstr_create_from_str.c
rename to src/cw/bstr_create_from_str.c
diff --git a/src/capwap/bstr_replace.c b/src/cw/bstr_replace.c
similarity index 100%
rename from src/capwap/bstr_replace.c
rename to src/cw/bstr_replace.c
diff --git a/src/capwap/bstr_to_str.c b/src/cw/bstr_to_str.c
similarity index 100%
rename from src/capwap/bstr_to_str.c
rename to src/cw/bstr_to_str.c
diff --git a/src/capwap/capwap.h b/src/cw/capwap.h
similarity index 100%
rename from src/capwap/capwap.h
rename to src/cw/capwap.h
diff --git a/src/capwap/capwap_80211.h b/src/cw/capwap_80211.h
similarity index 100%
rename from src/capwap/capwap_80211.h
rename to src/cw/capwap_80211.h
diff --git a/src/capwap/capwap_80211_actions.h b/src/cw/capwap_80211_actions.h
similarity index 100%
rename from src/capwap/capwap_80211_actions.h
rename to src/cw/capwap_80211_actions.h
diff --git a/src/capwap/capwap_80211_actions_ac.c b/src/cw/capwap_80211_actions_ac.c
similarity index 100%
rename from src/capwap/capwap_80211_actions_ac.c
rename to src/cw/capwap_80211_actions_ac.c
diff --git a/src/capwap/capwap_80211_actions_wtp.c b/src/cw/capwap_80211_actions_wtp.c
similarity index 100%
rename from src/capwap/capwap_80211_actions_wtp.c
rename to src/cw/capwap_80211_actions_wtp.c
diff --git a/src/capwap/capwap_action_helpers.c b/src/cw/capwap_action_helpers.c
similarity index 100%
rename from src/capwap/capwap_action_helpers.c
rename to src/cw/capwap_action_helpers.c
diff --git a/src/capwap/capwap_actions.h b/src/cw/capwap_actions.h
similarity index 100%
rename from src/capwap/capwap_actions.h
rename to src/cw/capwap_actions.h
diff --git a/src/capwap/capwap_actions_ac.c b/src/cw/capwap_actions_ac.c
similarity index 100%
rename from src/capwap/capwap_actions_ac.c
rename to src/cw/capwap_actions_ac.c
diff --git a/src/capwap/capwap_actions_wtp.c b/src/cw/capwap_actions_wtp.c
similarity index 100%
rename from src/capwap/capwap_actions_wtp.c
rename to src/cw/capwap_actions_wtp.c
diff --git a/src/capwap/capwap_cisco.h b/src/cw/capwap_cisco.h
similarity index 100%
rename from src/capwap/capwap_cisco.h
rename to src/cw/capwap_cisco.h
diff --git a/src/capwap/capwap_crypto.h b/src/cw/capwap_crypto.h
similarity index 100%
rename from src/capwap/capwap_crypto.h
rename to src/cw/capwap_crypto.h
diff --git a/src/capwap/capwap_items.c b/src/cw/capwap_items.c
similarity index 100%
rename from src/capwap/capwap_items.c
rename to src/cw/capwap_items.c
diff --git a/src/capwap/capwap_items.h b/src/cw/capwap_items.h
similarity index 100%
rename from src/capwap/capwap_items.h
rename to src/cw/capwap_items.h
diff --git a/src/capwap/capwap_msg_new.c b/src/cw/capwap_msg_new.c
similarity index 100%
rename from src/capwap/capwap_msg_new.c
rename to src/cw/capwap_msg_new.c
diff --git a/src/capwap/capwap_strings_elem.c b/src/cw/capwap_strings_elem.c
similarity index 100%
rename from src/capwap/capwap_strings_elem.c
rename to src/cw/capwap_strings_elem.c
diff --git a/src/capwap/capwap_strings_elem80211.c b/src/cw/capwap_strings_elem80211.c
similarity index 100%
rename from src/capwap/capwap_strings_elem80211.c
rename to src/cw/capwap_strings_elem80211.c
diff --git a/src/capwap/capwap_strings_item.c b/src/cw/capwap_strings_item.c
similarity index 100%
rename from src/capwap/capwap_strings_item.c
rename to src/cw/capwap_strings_item.c
diff --git a/src/capwap/capwap_strings_msg.c b/src/cw/capwap_strings_msg.c
similarity index 100%
rename from src/capwap/capwap_strings_msg.c
rename to src/cw/capwap_strings_msg.c
diff --git a/src/capwap/capwap_strings_result.c b/src/cw/capwap_strings_result.c
similarity index 100%
rename from src/capwap/capwap_strings_result.c
rename to src/cw/capwap_strings_result.c
diff --git a/src/capwap/capwap_strings_state.c b/src/cw/capwap_strings_state.c
similarity index 100%
rename from src/capwap/capwap_strings_state.c
rename to src/cw/capwap_strings_state.c
diff --git a/src/capwap/capwap_strings_vendor.c b/src/cw/capwap_strings_vendor.c
similarity index 100%
rename from src/capwap/capwap_strings_vendor.c
rename to src/cw/capwap_strings_vendor.c
diff --git a/src/capwap/cipwap.h b/src/cw/cipwap.h
similarity index 100%
rename from src/capwap/cipwap.h
rename to src/cw/cipwap.h
diff --git a/src/capwap/cipwap_actions.h b/src/cw/cipwap_actions.h
similarity index 100%
rename from src/capwap/cipwap_actions.h
rename to src/cw/cipwap_actions.h
diff --git a/src/capwap/cipwap_actions_ac.c b/src/cw/cipwap_actions_ac.c
similarity index 100%
rename from src/capwap/cipwap_actions_ac.c
rename to src/cw/cipwap_actions_ac.c
diff --git a/src/capwap/cipwap_actions_wtp.c b/src/cw/cipwap_actions_wtp.c
similarity index 100%
rename from src/capwap/cipwap_actions_wtp.c
rename to src/cw/cipwap_actions_wtp.c
diff --git a/src/capwap/cipwap_strings_elem.c b/src/cw/cipwap_strings_elem.c
similarity index 100%
rename from src/capwap/cipwap_strings_elem.c
rename to src/cw/cipwap_strings_elem.c
diff --git a/src/capwap/cisco.c b/src/cw/cisco.c
similarity index 100%
rename from src/capwap/cisco.c
rename to src/cw/cisco.c
diff --git a/src/capwap/conn.h b/src/cw/conn.h
similarity index 100%
rename from src/capwap/conn.h
rename to src/cw/conn.h
diff --git a/src/capwap/conn_create.c b/src/cw/conn_create.c
similarity index 100%
rename from src/capwap/conn_create.c
rename to src/cw/conn_create.c
diff --git a/src/capwap/conn_create_noq.c b/src/cw/conn_create_noq.c
similarity index 100%
rename from src/capwap/conn_create_noq.c
rename to src/cw/conn_create_noq.c
diff --git a/src/capwap/conn_destroy.c b/src/cw/conn_destroy.c
similarity index 100%
rename from src/capwap/conn_destroy.c
rename to src/cw/conn_destroy.c
diff --git a/src/capwap/conn_detect_capwap.c b/src/cw/conn_detect_capwap.c
similarity index 100%
rename from src/capwap/conn_detect_capwap.c
rename to src/cw/conn_detect_capwap.c
diff --git a/src/capwap/conn_get_message.c b/src/cw/conn_get_message.c
similarity index 100%
rename from src/capwap/conn_get_message.c
rename to src/cw/conn_get_message.c
diff --git a/src/capwap/conn_get_response.c b/src/cw/conn_get_response.c
similarity index 100%
rename from src/capwap/conn_get_response.c
rename to src/cw/conn_get_response.c
diff --git a/src/capwap/conn_init.c b/src/cw/conn_init.c
similarity index 100%
rename from src/capwap/conn_init.c
rename to src/cw/conn_init.c
diff --git a/src/capwap/conn_prepare_configuration_update_request.c b/src/cw/conn_prepare_configuration_update_request.c
similarity index 100%
rename from src/capwap/conn_prepare_configuration_update_request.c
rename to src/cw/conn_prepare_configuration_update_request.c
diff --git a/src/capwap/conn_prepare_image_data_request.c b/src/cw/conn_prepare_image_data_request.c
similarity index 100%
rename from src/capwap/conn_prepare_image_data_request.c
rename to src/cw/conn_prepare_image_data_request.c
diff --git a/src/capwap/conn_prepare_request.c b/src/cw/conn_prepare_request.c
similarity index 100%
rename from src/capwap/conn_prepare_request.c
rename to src/cw/conn_prepare_request.c
diff --git a/src/capwap/conn_process_packet.c b/src/cw/conn_process_packet.c
similarity index 100%
rename from src/capwap/conn_process_packet.c
rename to src/cw/conn_process_packet.c
diff --git a/src/capwap/conn_process_packet2.c b/src/cw/conn_process_packet2.c
similarity index 100%
rename from src/capwap/conn_process_packet2.c
rename to src/cw/conn_process_packet2.c
diff --git a/src/capwap/conn_q_add_packet.c b/src/cw/conn_q_add_packet.c
similarity index 100%
rename from src/capwap/conn_q_add_packet.c
rename to src/cw/conn_q_add_packet.c
diff --git a/src/capwap/conn_q_get_packet.c b/src/cw/conn_q_get_packet.c
similarity index 100%
rename from src/capwap/conn_q_get_packet.c
rename to src/cw/conn_q_get_packet.c
diff --git a/src/capwap/conn_q_recv_packet.c b/src/cw/conn_q_recv_packet.c
similarity index 100%
rename from src/capwap/conn_q_recv_packet.c
rename to src/cw/conn_q_recv_packet.c
diff --git a/src/capwap/conn_recv_packet.c b/src/cw/conn_recv_packet.c
similarity index 100%
rename from src/capwap/conn_recv_packet.c
rename to src/cw/conn_recv_packet.c
diff --git a/src/capwap/conn_send_msg.c b/src/cw/conn_send_msg.c
similarity index 100%
rename from src/capwap/conn_send_msg.c
rename to src/cw/conn_send_msg.c
diff --git a/src/capwap/conn_send_packet.c b/src/cw/conn_send_packet.c
similarity index 100%
rename from src/capwap/conn_send_packet.c
rename to src/cw/conn_send_packet.c
diff --git a/src/capwap/conn_send_request.c b/src/cw/conn_send_request.c
similarity index 100%
rename from src/capwap/conn_send_request.c
rename to src/cw/conn_send_request.c
diff --git a/src/capwap/conn_wait_for_message.c b/src/cw/conn_wait_for_message.c
similarity index 100%
rename from src/capwap/conn_wait_for_message.c
rename to src/cw/conn_wait_for_message.c
diff --git a/src/capwap/conn_wait_for_request.c b/src/cw/conn_wait_for_request.c
similarity index 100%
rename from src/capwap/conn_wait_for_request.c
rename to src/cw/conn_wait_for_request.c
diff --git a/src/capwap/connlist.c b/src/cw/connlist.c
similarity index 100%
rename from src/capwap/connlist.c
rename to src/cw/connlist.c
diff --git a/src/capwap/cw.h b/src/cw/cw.h
similarity index 100%
rename from src/capwap/cw.h
rename to src/cw/cw.h
diff --git a/src/capwap/cw_addelem_capwap_local_ip_addr.c b/src/cw/cw_addelem_capwap_local_ip_addr.c
similarity index 100%
rename from src/capwap/cw_addelem_capwap_local_ip_addr.c
rename to src/cw/cw_addelem_capwap_local_ip_addr.c
diff --git a/src/capwap/cw_addelem_cisco_wtp_radio_cfg.c b/src/cw/cw_addelem_cisco_wtp_radio_cfg.c
similarity index 100%
rename from src/capwap/cw_addelem_cisco_wtp_radio_cfg.c
rename to src/cw/cw_addelem_cisco_wtp_radio_cfg.c
diff --git a/src/capwap/cw_addelem_vendor_specific_payload.c b/src/cw/cw_addelem_vendor_specific_payload.c
similarity index 100%
rename from src/capwap/cw_addelem_vendor_specific_payload.c
rename to src/cw/cw_addelem_vendor_specific_payload.c
diff --git a/src/capwap/cw_check_missing_mand.c b/src/cw/cw_check_missing_mand.c
similarity index 100%
rename from src/capwap/cw_check_missing_mand.c
rename to src/cw/cw_check_missing_mand.c
diff --git a/src/capwap/cw_cisco_id_to_str.c b/src/cw/cw_cisco_id_to_str.c
similarity index 100%
rename from src/capwap/cw_cisco_id_to_str.c
rename to src/cw/cw_cisco_id_to_str.c
diff --git a/src/capwap/cw_get_mod_ac.c b/src/cw/cw_get_mod_ac.c
similarity index 100%
rename from src/capwap/cw_get_mod_ac.c
rename to src/cw/cw_get_mod_ac.c
diff --git a/src/capwap/cw_in_ac_descriptor.c b/src/cw/cw_in_ac_descriptor.c
similarity index 100%
rename from src/capwap/cw_in_ac_descriptor.c
rename to src/cw/cw_in_ac_descriptor.c
diff --git a/src/capwap/cw_in_ac_name_with_priority.c b/src/cw/cw_in_ac_name_with_priority.c
similarity index 100%
rename from src/capwap/cw_in_ac_name_with_priority.c
rename to src/cw/cw_in_ac_name_with_priority.c
diff --git a/src/capwap/cw_in_capwap_control_ipv4_address.c b/src/cw/cw_in_capwap_control_ipv4_address.c
similarity index 100%
rename from src/capwap/cw_in_capwap_control_ipv4_address.c
rename to src/cw/cw_in_capwap_control_ipv4_address.c
diff --git a/src/capwap/cw_in_check_cfg_update_req.c b/src/cw/cw_in_check_cfg_update_req.c
similarity index 100%
rename from src/capwap/cw_in_check_cfg_update_req.c
rename to src/cw/cw_in_check_cfg_update_req.c
diff --git a/src/capwap/cw_in_check_chng_state_evnt_req.c b/src/cw/cw_in_check_chng_state_evnt_req.c
similarity index 100%
rename from src/capwap/cw_in_check_chng_state_evnt_req.c
rename to src/cw/cw_in_check_chng_state_evnt_req.c
diff --git a/src/capwap/cw_in_check_cipwap_join_req.c b/src/cw/cw_in_check_cipwap_join_req.c
similarity index 100%
rename from src/capwap/cw_in_check_cipwap_join_req.c
rename to src/cw/cw_in_check_cipwap_join_req.c
diff --git a/src/capwap/cw_in_check_disc_req.c b/src/cw/cw_in_check_disc_req.c
similarity index 100%
rename from src/capwap/cw_in_check_disc_req.c
rename to src/cw/cw_in_check_disc_req.c
diff --git a/src/capwap/cw_in_check_disc_resp.c b/src/cw/cw_in_check_disc_resp.c
similarity index 100%
rename from src/capwap/cw_in_check_disc_resp.c
rename to src/cw/cw_in_check_disc_resp.c
diff --git a/src/capwap/cw_in_check_img_data_req_ac.c b/src/cw/cw_in_check_img_data_req_ac.c
similarity index 100%
rename from src/capwap/cw_in_check_img_data_req_ac.c
rename to src/cw/cw_in_check_img_data_req_ac.c
diff --git a/src/capwap/cw_in_check_img_data_req_wtp.c b/src/cw/cw_in_check_img_data_req_wtp.c
similarity index 100%
rename from src/capwap/cw_in_check_img_data_req_wtp.c
rename to src/cw/cw_in_check_img_data_req_wtp.c
diff --git a/src/capwap/cw_in_check_img_data_resp.c b/src/cw/cw_in_check_img_data_resp.c
similarity index 100%
rename from src/capwap/cw_in_check_img_data_resp.c
rename to src/cw/cw_in_check_img_data_resp.c
diff --git a/src/capwap/cw_in_check_join_req.c b/src/cw/cw_in_check_join_req.c
similarity index 100%
rename from src/capwap/cw_in_check_join_req.c
rename to src/cw/cw_in_check_join_req.c
diff --git a/src/capwap/cw_in_check_join_request.c b/src/cw/cw_in_check_join_request.c
similarity index 100%
rename from src/capwap/cw_in_check_join_request.c
rename to src/cw/cw_in_check_join_request.c
diff --git a/src/capwap/cw_in_check_join_resp.c b/src/cw/cw_in_check_join_resp.c
similarity index 100%
rename from src/capwap/cw_in_check_join_resp.c
rename to src/cw/cw_in_check_join_resp.c
diff --git a/src/capwap/cw_in_cisco_add_wlan.c b/src/cw/cw_in_cisco_add_wlan.c
similarity index 100%
rename from src/capwap/cw_in_cisco_add_wlan.c
rename to src/cw/cw_in_cisco_add_wlan.c
diff --git a/src/capwap/cw_in_cisco_image_identifier.c b/src/cw/cw_in_cisco_image_identifier.c
similarity index 100%
rename from src/capwap/cw_in_cisco_image_identifier.c
rename to src/cw/cw_in_cisco_image_identifier.c
diff --git a/src/capwap/cw_in_generic.c b/src/cw/cw_in_generic.c
similarity index 100%
rename from src/capwap/cw_in_generic.c
rename to src/cw/cw_in_generic.c
diff --git a/src/capwap/cw_in_generic2.c b/src/cw/cw_in_generic2.c
similarity index 100%
rename from src/capwap/cw_in_generic2.c
rename to src/cw/cw_in_generic2.c
diff --git a/src/capwap/cw_in_radio_administrative_state.c b/src/cw/cw_in_radio_administrative_state.c
similarity index 100%
rename from src/capwap/cw_in_radio_administrative_state.c
rename to src/cw/cw_in_radio_administrative_state.c
diff --git a/src/capwap/cw_in_radio_administrative_state_wtp.c b/src/cw/cw_in_radio_administrative_state_wtp.c
similarity index 100%
rename from src/capwap/cw_in_radio_administrative_state_wtp.c
rename to src/cw/cw_in_radio_administrative_state_wtp.c
diff --git a/src/capwap/cw_in_radio_operational_state.c b/src/cw/cw_in_radio_operational_state.c
similarity index 100%
rename from src/capwap/cw_in_radio_operational_state.c
rename to src/cw/cw_in_radio_operational_state.c
diff --git a/src/capwap/cw_in_vendor_specific_payload.c b/src/cw/cw_in_vendor_specific_payload.c
similarity index 100%
rename from src/capwap/cw_in_vendor_specific_payload.c
rename to src/cw/cw_in_vendor_specific_payload.c
diff --git a/src/capwap/cw_in_wtp_board_data.c b/src/cw/cw_in_wtp_board_data.c
similarity index 100%
rename from src/capwap/cw_in_wtp_board_data.c
rename to src/cw/cw_in_wtp_board_data.c
diff --git a/src/capwap/cw_in_wtp_descriptor.c b/src/cw/cw_in_wtp_descriptor.c
similarity index 100%
rename from src/capwap/cw_in_wtp_descriptor.c
rename to src/cw/cw_in_wtp_descriptor.c
diff --git a/src/capwap/cw_is_printable.c b/src/cw/cw_is_printable.c
similarity index 100%
rename from src/capwap/cw_is_printable.c
rename to src/cw/cw_is_printable.c
diff --git a/src/capwap/cw_load_file.c b/src/cw/cw_load_file.c
similarity index 100%
rename from src/capwap/cw_load_file.c
rename to src/cw/cw_load_file.c
diff --git a/src/capwap/cw_msg_init.c b/src/cw/cw_msg_init.c
similarity index 100%
rename from src/capwap/cw_msg_init.c
rename to src/cw/cw_msg_init.c
diff --git a/src/capwap/cw_out_ac_descriptor.c b/src/cw/cw_out_ac_descriptor.c
similarity index 100%
rename from src/capwap/cw_out_ac_descriptor.c
rename to src/cw/cw_out_ac_descriptor.c
diff --git a/src/capwap/cw_out_ac_name.c b/src/cw/cw_out_ac_name.c
similarity index 100%
rename from src/capwap/cw_out_ac_name.c
rename to src/cw/cw_out_ac_name.c
diff --git a/src/capwap/cw_out_ac_name_with_priority.c b/src/cw/cw_out_ac_name_with_priority.c
similarity index 100%
rename from src/capwap/cw_out_ac_name_with_priority.c
rename to src/cw/cw_out_ac_name_with_priority.c
diff --git a/src/capwap/cw_out_capwap_control_ip_addr_list.c b/src/cw/cw_out_capwap_control_ip_addr_list.c
similarity index 100%
rename from src/capwap/cw_out_capwap_control_ip_addr_list.c
rename to src/cw/cw_out_capwap_control_ip_addr_list.c
diff --git a/src/capwap/cw_out_capwap_local_ip_address.c b/src/cw/cw_out_capwap_local_ip_address.c
similarity index 100%
rename from src/capwap/cw_out_capwap_local_ip_address.c
rename to src/cw/cw_out_capwap_local_ip_address.c
diff --git a/src/capwap/cw_out_cisco_wtp_radio_cfg.c b/src/cw/cw_out_cisco_wtp_radio_cfg.c
similarity index 100%
rename from src/capwap/cw_out_cisco_wtp_radio_cfg.c
rename to src/cw/cw_out_cisco_wtp_radio_cfg.c
diff --git a/src/capwap/cw_out_generic.c b/src/cw/cw_out_generic.c
similarity index 100%
rename from src/capwap/cw_out_generic.c
rename to src/cw/cw_out_generic.c
diff --git a/src/capwap/cw_out_image_data.c b/src/cw/cw_out_image_data.c
similarity index 100%
rename from src/capwap/cw_out_image_data.c
rename to src/cw/cw_out_image_data.c
diff --git a/src/capwap/cw_out_init_session_id.c b/src/cw/cw_out_init_session_id.c
similarity index 100%
rename from src/capwap/cw_out_init_session_id.c
rename to src/cw/cw_out_init_session_id.c
diff --git a/src/capwap/cw_out_radio_info.c b/src/cw/cw_out_radio_info.c
similarity index 100%
rename from src/capwap/cw_out_radio_info.c
rename to src/cw/cw_out_radio_info.c
diff --git a/src/capwap/cw_out_radio_operational_state.c b/src/cw/cw_out_radio_operational_state.c
similarity index 100%
rename from src/capwap/cw_out_radio_operational_state.c
rename to src/cw/cw_out_radio_operational_state.c
diff --git a/src/capwap/cw_out_wtp_board_data.c b/src/cw/cw_out_wtp_board_data.c
similarity index 100%
rename from src/capwap/cw_out_wtp_board_data.c
rename to src/cw/cw_out_wtp_board_data.c
diff --git a/src/capwap/cw_out_wtp_descriptor.c b/src/cw/cw_out_wtp_descriptor.c
similarity index 100%
rename from src/capwap/cw_out_wtp_descriptor.c
rename to src/cw/cw_out_wtp_descriptor.c
diff --git a/src/capwap/cw_prepare_80211_wlan_configuration_request.c b/src/cw/cw_prepare_80211_wlan_configuration_request.c
similarity index 100%
rename from src/capwap/cw_prepare_80211_wlan_configuration_request.c
rename to src/cw/cw_prepare_80211_wlan_configuration_request.c
diff --git a/src/capwap/cw_prepare_change_state_event_request.c b/src/cw/cw_prepare_change_state_event_request.c
similarity index 100%
rename from src/capwap/cw_prepare_change_state_event_request.c
rename to src/cw/cw_prepare_change_state_event_request.c
diff --git a/src/capwap/cw_prepare_configuration_status_request.c b/src/cw/cw_prepare_configuration_status_request.c
similarity index 100%
rename from src/capwap/cw_prepare_configuration_status_request.c
rename to src/cw/cw_prepare_configuration_status_request.c
diff --git a/src/capwap/cw_put_image_data.c b/src/cw/cw_put_image_data.c
similarity index 100%
rename from src/capwap/cw_put_image_data.c
rename to src/cw/cw_put_image_data.c
diff --git a/src/capwap/cw_put_msg.c b/src/cw/cw_put_msg.c
similarity index 100%
rename from src/capwap/cw_put_msg.c
rename to src/cw/cw_put_msg.c
diff --git a/src/capwap/cw_rand.c b/src/cw/cw_rand.c
similarity index 100%
rename from src/capwap/cw_rand.c
rename to src/cw/cw_rand.c
diff --git a/src/capwap/cw_read_image_data_request.c b/src/cw/cw_read_image_data_request.c
similarity index 100%
rename from src/capwap/cw_read_image_data_request.c
rename to src/cw/cw_read_image_data_request.c
diff --git a/src/capwap/cw_read_wtp_descriptor.c b/src/cw/cw_read_wtp_descriptor.c
similarity index 100%
rename from src/capwap/cw_read_wtp_descriptor.c
rename to src/cw/cw_read_wtp_descriptor.c
diff --git a/src/capwap/cw_read_wtp_descriptor_7.c b/src/cw/cw_read_wtp_descriptor_7.c
similarity index 100%
rename from src/capwap/cw_read_wtp_descriptor_7.c
rename to src/cw/cw_read_wtp_descriptor_7.c
diff --git a/src/capwap/cw_read_wtp_descriptor_versions.c b/src/cw/cw_read_wtp_descriptor_versions.c
similarity index 100%
rename from src/capwap/cw_read_wtp_descriptor_versions.c
rename to src/cw/cw_read_wtp_descriptor_versions.c
diff --git a/src/capwap/cw_readelem_80211_wtp_radio_info.c b/src/cw/cw_readelem_80211_wtp_radio_info.c
similarity index 100%
rename from src/capwap/cw_readelem_80211_wtp_radio_info.c
rename to src/cw/cw_readelem_80211_wtp_radio_info.c
diff --git a/src/capwap/cw_readelem_ac_descriptor.c b/src/cw/cw_readelem_ac_descriptor.c
similarity index 100%
rename from src/capwap/cw_readelem_ac_descriptor.c
rename to src/cw/cw_readelem_ac_descriptor.c
diff --git a/src/capwap/cw_readelem_capwap_local_ip_addr.c b/src/cw/cw_readelem_capwap_local_ip_addr.c
similarity index 100%
rename from src/capwap/cw_readelem_capwap_local_ip_addr.c
rename to src/cw/cw_readelem_capwap_local_ip_addr.c
diff --git a/src/capwap/cw_readelem_cisco_wtp_radio_cfg.c b/src/cw/cw_readelem_cisco_wtp_radio_cfg.c
similarity index 100%
rename from src/capwap/cw_readelem_cisco_wtp_radio_cfg.c
rename to src/cw/cw_readelem_cisco_wtp_radio_cfg.c
diff --git a/src/capwap/cw_readelem_maximum_message_length.c b/src/cw/cw_readelem_maximum_message_length.c
similarity index 100%
rename from src/capwap/cw_readelem_maximum_message_length.c
rename to src/cw/cw_readelem_maximum_message_length.c
diff --git a/src/capwap/cw_readelem_mtu_discovery_padding.c b/src/cw/cw_readelem_mtu_discovery_padding.c
similarity index 100%
rename from src/capwap/cw_readelem_mtu_discovery_padding.c
rename to src/cw/cw_readelem_mtu_discovery_padding.c
diff --git a/src/capwap/cw_readelem_radio_operational_state.c b/src/cw/cw_readelem_radio_operational_state.c
similarity index 100%
rename from src/capwap/cw_readelem_radio_operational_state.c
rename to src/cw/cw_readelem_radio_operational_state.c
diff --git a/src/capwap/cw_readelem_statistics_timer.c b/src/cw/cw_readelem_statistics_timer.c
similarity index 100%
rename from src/capwap/cw_readelem_statistics_timer.c
rename to src/cw/cw_readelem_statistics_timer.c
diff --git a/src/capwap/cw_readelem_wtp_reboot_statistics.c b/src/cw/cw_readelem_wtp_reboot_statistics.c
similarity index 100%
rename from src/capwap/cw_readelem_wtp_reboot_statistics.c
rename to src/cw/cw_readelem_wtp_reboot_statistics.c
diff --git a/src/capwap/cw_readmsg_configuration_status_request.c b/src/cw/cw_readmsg_configuration_status_request.c
similarity index 100%
rename from src/capwap/cw_readmsg_configuration_status_request.c
rename to src/cw/cw_readmsg_configuration_status_request.c
diff --git a/src/capwap/cw_save_file.c b/src/cw/cw_save_file.c
similarity index 100%
rename from src/capwap/cw_save_file.c
rename to src/cw/cw_save_file.c
diff --git a/src/capwap/cw_send_echo_response.c b/src/cw/cw_send_echo_response.c
similarity index 100%
rename from src/capwap/cw_send_echo_response.c
rename to src/cw/cw_send_echo_response.c
diff --git a/src/capwap/cw_send_image_file.c b/src/cw/cw_send_image_file.c
similarity index 100%
rename from src/capwap/cw_send_image_file.c
rename to src/cw/cw_send_image_file.c
diff --git a/src/capwap/cw_setstr.c b/src/cw/cw_setstr.c
similarity index 100%
rename from src/capwap/cw_setstr.c
rename to src/cw/cw_setstr.c
diff --git a/src/capwap/cw_strlist_get_id.c b/src/cw/cw_strlist_get_id.c
similarity index 100%
rename from src/capwap/cw_strlist_get_id.c
rename to src/cw/cw_strlist_get_id.c
diff --git a/src/capwap/cw_strlist_get_str.c b/src/cw/cw_strlist_get_str.c
similarity index 100%
rename from src/capwap/cw_strlist_get_str.c
rename to src/cw/cw_strlist_get_str.c
diff --git a/src/capwap/cw_strnelem.c b/src/cw/cw_strnelem.c
similarity index 100%
rename from src/capwap/cw_strnelem.c
rename to src/cw/cw_strnelem.c
diff --git a/src/capwap/cw_util.c b/src/cw/cw_util.c
similarity index 100%
rename from src/capwap/cw_util.c
rename to src/cw/cw_util.c
diff --git a/src/capwap/cw_util.h b/src/cw/cw_util.h
similarity index 100%
rename from src/capwap/cw_util.h
rename to src/cw/cw_util.h
diff --git a/src/capwap/cwmsg.h b/src/cw/cwmsg.h
similarity index 100%
rename from src/capwap/cwmsg.h
rename to src/cw/cwmsg.h
diff --git a/src/capwap/cwmsg_addelem_80211_add_wlan.c b/src/cw/cwmsg_addelem_80211_add_wlan.c
similarity index 100%
rename from src/capwap/cwmsg_addelem_80211_add_wlan.c
rename to src/cw/cwmsg_addelem_80211_add_wlan.c
diff --git a/src/capwap/cwmsg_addelem_mtu_discovery_padding.c b/src/cw/cwmsg_addelem_mtu_discovery_padding.c
similarity index 100%
rename from src/capwap/cwmsg_addelem_mtu_discovery_padding.c
rename to src/cw/cwmsg_addelem_mtu_discovery_padding.c
diff --git a/src/capwap/cwmsg_addelem_vendor_cisco_mwar_addr.c b/src/cw/cwmsg_addelem_vendor_cisco_mwar_addr.c
similarity index 100%
rename from src/capwap/cwmsg_addelem_vendor_cisco_mwar_addr.c
rename to src/cw/cwmsg_addelem_vendor_cisco_mwar_addr.c
diff --git a/src/capwap/cwsend_conf_status_response.c b/src/cw/cwsend_conf_status_response.c
similarity index 100%
rename from src/capwap/cwsend_conf_status_response.c
rename to src/cw/cwsend_conf_status_response.c
diff --git a/src/capwap/cwsend_configuration_status_request.c b/src/cw/cwsend_configuration_status_request.c
similarity index 100%
rename from src/capwap/cwsend_configuration_status_request.c
rename to src/cw/cwsend_configuration_status_request.c
diff --git a/src/capwap/cwsend_discovery_request.c b/src/cw/cwsend_discovery_request.c
similarity index 100%
rename from src/capwap/cwsend_discovery_request.c
rename to src/cw/cwsend_discovery_request.c
diff --git a/src/capwap/cwsend_join_response.c b/src/cw/cwsend_join_response.c
similarity index 100%
rename from src/capwap/cwsend_join_response.c
rename to src/cw/cwsend_join_response.c
diff --git a/src/capwap/dbg.c b/src/cw/dbg.c
similarity index 100%
rename from src/capwap/dbg.c
rename to src/cw/dbg.c
diff --git a/src/capwap/dbg.h b/src/cw/dbg.h
similarity index 100%
rename from src/capwap/dbg.h
rename to src/cw/dbg.h
diff --git a/src/capwap/dbg_strings.c b/src/cw/dbg_strings.c
similarity index 100%
rename from src/capwap/dbg_strings.c
rename to src/cw/dbg_strings.c
diff --git a/src/capwap/doc.dox b/src/cw/doc.dox
similarity index 100%
rename from src/capwap/doc.dox
rename to src/cw/doc.dox
diff --git a/src/capwap/dtls.h b/src/cw/dtls.h
similarity index 100%
rename from src/capwap/dtls.h
rename to src/cw/dtls.h
diff --git a/src/capwap/dtls_bio.c b/src/cw/dtls_bio.c
similarity index 100%
rename from src/capwap/dtls_bio.c
rename to src/cw/dtls_bio.c
diff --git a/src/capwap/dtls_gnutls.c b/src/cw/dtls_gnutls.c
similarity index 100%
rename from src/capwap/dtls_gnutls.c
rename to src/cw/dtls_gnutls.c
diff --git a/src/capwap/dtls_gnutls.h b/src/cw/dtls_gnutls.h
similarity index 100%
rename from src/capwap/dtls_gnutls.h
rename to src/cw/dtls_gnutls.h
diff --git a/src/capwap/dtls_gnutls_accept.c b/src/cw/dtls_gnutls_accept.c
similarity index 100%
rename from src/capwap/dtls_gnutls_accept.c
rename to src/cw/dtls_gnutls_accept.c
diff --git a/src/capwap/dtls_gnutls_bio.c b/src/cw/dtls_gnutls_bio.c
similarity index 100%
rename from src/capwap/dtls_gnutls_bio.c
rename to src/cw/dtls_gnutls_bio.c
diff --git a/src/capwap/dtls_gnutls_connect.c b/src/cw/dtls_gnutls_connect.c
similarity index 100%
rename from src/capwap/dtls_gnutls_connect.c
rename to src/cw/dtls_gnutls_connect.c
diff --git a/src/capwap/dtls_gnutls_get_cipher.c b/src/cw/dtls_gnutls_get_cipher.c
similarity index 100%
rename from src/capwap/dtls_gnutls_get_cipher.c
rename to src/cw/dtls_gnutls_get_cipher.c
diff --git a/src/capwap/dtls_gnutls_get_peers_cert.c b/src/cw/dtls_gnutls_get_peers_cert.c
similarity index 100%
rename from src/capwap/dtls_gnutls_get_peers_cert.c
rename to src/cw/dtls_gnutls_get_peers_cert.c
diff --git a/src/capwap/dtls_openssl.c b/src/cw/dtls_openssl.c
similarity index 100%
rename from src/capwap/dtls_openssl.c
rename to src/cw/dtls_openssl.c
diff --git a/src/capwap/dtls_openssl.h b/src/cw/dtls_openssl.h
similarity index 100%
rename from src/capwap/dtls_openssl.h
rename to src/cw/dtls_openssl.h
diff --git a/src/capwap/dtls_openssl_accept.c b/src/cw/dtls_openssl_accept.c
similarity index 100%
rename from src/capwap/dtls_openssl_accept.c
rename to src/cw/dtls_openssl_accept.c
diff --git a/src/capwap/dtls_openssl_bio.c b/src/cw/dtls_openssl_bio.c
similarity index 100%
rename from src/capwap/dtls_openssl_bio.c
rename to src/cw/dtls_openssl_bio.c
diff --git a/src/capwap/dtls_openssl_connect.c b/src/cw/dtls_openssl_connect.c
similarity index 100%
rename from src/capwap/dtls_openssl_connect.c
rename to src/cw/dtls_openssl_connect.c
diff --git a/src/capwap/dtls_openssl_get_cipher.c b/src/cw/dtls_openssl_get_cipher.c
similarity index 100%
rename from src/capwap/dtls_openssl_get_cipher.c
rename to src/cw/dtls_openssl_get_cipher.c
diff --git a/src/capwap/file.h b/src/cw/file.h
similarity index 100%
rename from src/capwap/file.h
rename to src/cw/file.h
diff --git a/src/capwap/format.c b/src/cw/format.c
similarity index 100%
rename from src/capwap/format.c
rename to src/cw/format.c
diff --git a/src/capwap/format.h b/src/cw/format.h
similarity index 100%
rename from src/capwap/format.h
rename to src/cw/format.h
diff --git a/src/capwap/fragman.c b/src/cw/fragman.c
similarity index 100%
rename from src/capwap/fragman.c
rename to src/cw/fragman.c
diff --git a/src/capwap/fragman.h b/src/cw/fragman.h
similarity index 100%
rename from src/capwap/fragman.h
rename to src/cw/fragman.h
diff --git a/src/capwap/hdr_print.c b/src/cw/hdr_print.c
similarity index 100%
rename from src/capwap/hdr_print.c
rename to src/cw/hdr_print.c
diff --git a/src/capwap/intavltree.c b/src/cw/intavltree.c
similarity index 100%
rename from src/capwap/intavltree.c
rename to src/cw/intavltree.c
diff --git a/src/capwap/intavltree.h b/src/cw/intavltree.h
similarity index 100%
rename from src/capwap/intavltree.h
rename to src/cw/intavltree.h
diff --git a/src/capwap/item.c b/src/cw/item.c
similarity index 100%
rename from src/capwap/item.c
rename to src/cw/item.c
diff --git a/src/capwap/item.h b/src/cw/item.h
similarity index 100%
rename from src/capwap/item.h
rename to src/cw/item.h
diff --git a/src/capwap/item_strings.c b/src/cw/item_strings.c
similarity index 100%
rename from src/capwap/item_strings.c
rename to src/cw/item_strings.c
diff --git a/src/capwap/log.c b/src/cw/log.c
similarity index 100%
rename from src/capwap/log.c
rename to src/cw/log.c
diff --git a/src/capwap/log.h b/src/cw/log.h
similarity index 100%
rename from src/capwap/log.h
rename to src/cw/log.h
diff --git a/src/capwap/log_file.c b/src/cw/log_file.c
similarity index 100%
rename from src/capwap/log_file.c
rename to src/cw/log_file.c
diff --git a/src/capwap/log_syslog.c b/src/cw/log_syslog.c
similarity index 100%
rename from src/capwap/log_syslog.c
rename to src/cw/log_syslog.c
diff --git a/src/capwap/lw_addelem.c b/src/cw/lw_addelem.c
similarity index 100%
rename from src/capwap/lw_addelem.c
rename to src/cw/lw_addelem.c
diff --git a/src/capwap/lw_checksum.c b/src/cw/lw_checksum.c
similarity index 100%
rename from src/capwap/lw_checksum.c
rename to src/cw/lw_checksum.c
diff --git a/src/capwap/lw_cisco_id_to_str.c b/src/cw/lw_cisco_id_to_str.c
similarity index 100%
rename from src/capwap/lw_cisco_id_to_str.c
rename to src/cw/lw_cisco_id_to_str.c
diff --git a/src/capwap/lw_elem_id_to_str.c b/src/cw/lw_elem_id_to_str.c
similarity index 100%
rename from src/capwap/lw_elem_id_to_str.c
rename to src/cw/lw_elem_id_to_str.c
diff --git a/src/capwap/lw_msg_id_to_str.c b/src/cw/lw_msg_id_to_str.c
similarity index 100%
rename from src/capwap/lw_msg_id_to_str.c
rename to src/cw/lw_msg_id_to_str.c
diff --git a/src/capwap/lw_put_80211_wtp_wlan_radio_configuration.c b/src/cw/lw_put_80211_wtp_wlan_radio_configuration.c
similarity index 100%
rename from src/capwap/lw_put_80211_wtp_wlan_radio_configuration.c
rename to src/cw/lw_put_80211_wtp_wlan_radio_configuration.c
diff --git a/src/capwap/lw_put_ac_descriptor.c b/src/cw/lw_put_ac_descriptor.c
similarity index 100%
rename from src/capwap/lw_put_ac_descriptor.c
rename to src/cw/lw_put_ac_descriptor.c
diff --git a/src/capwap/lw_put_cisco_path_mtu.c b/src/cw/lw_put_cisco_path_mtu.c
similarity index 100%
rename from src/capwap/lw_put_cisco_path_mtu.c
rename to src/cw/lw_put_cisco_path_mtu.c
diff --git a/src/capwap/lw_put_image_data.c b/src/cw/lw_put_image_data.c
similarity index 100%
rename from src/capwap/lw_put_image_data.c
rename to src/cw/lw_put_image_data.c
diff --git a/src/capwap/lw_put_sockaddr.c b/src/cw/lw_put_sockaddr.c
similarity index 100%
rename from src/capwap/lw_put_sockaddr.c
rename to src/cw/lw_put_sockaddr.c
diff --git a/src/capwap/lw_readelem_80211_wtp_wlan_radio_configuration.c b/src/cw/lw_readelem_80211_wtp_wlan_radio_configuration.c
similarity index 100%
rename from src/capwap/lw_readelem_80211_wtp_wlan_radio_configuration.c
rename to src/cw/lw_readelem_80211_wtp_wlan_radio_configuration.c
diff --git a/src/capwap/lw_readelem_vendor_specific.c b/src/cw/lw_readelem_vendor_specific.c
similarity index 100%
rename from src/capwap/lw_readelem_vendor_specific.c
rename to src/cw/lw_readelem_vendor_specific.c
diff --git a/src/capwap/lw_readelem_wtp_board_data.c b/src/cw/lw_readelem_wtp_board_data.c
similarity index 100%
rename from src/capwap/lw_readelem_wtp_board_data.c
rename to src/cw/lw_readelem_wtp_board_data.c
diff --git a/src/capwap/lw_readelem_wtp_name.c b/src/cw/lw_readelem_wtp_name.c
similarity index 100%
rename from src/capwap/lw_readelem_wtp_name.c
rename to src/cw/lw_readelem_wtp_name.c
diff --git a/src/capwap/lwapp.h b/src/cw/lwapp.h
similarity index 100%
rename from src/capwap/lwapp.h
rename to src/cw/lwapp.h
diff --git a/src/capwap/lwapp_cisco.h b/src/cw/lwapp_cisco.h
similarity index 100%
rename from src/capwap/lwapp_cisco.h
rename to src/cw/lwapp_cisco.h
diff --git a/src/capwap/lwmsg.h b/src/cw/lwmsg.h
similarity index 100%
rename from src/capwap/lwmsg.h
rename to src/cw/lwmsg.h
diff --git a/src/capwap/lwmsg_init.c b/src/cw/lwmsg_init.c
similarity index 100%
rename from src/capwap/lwmsg_init.c
rename to src/cw/lwmsg_init.c
diff --git a/src/capwap/mavl.h b/src/cw/mavl.h
similarity index 100%
rename from src/capwap/mavl.h
rename to src/cw/mavl.h
diff --git a/src/capwap/mavl_add.c b/src/cw/mavl_add.c
similarity index 100%
rename from src/capwap/mavl_add.c
rename to src/cw/mavl_add.c
diff --git a/src/capwap/mavl_create.c b/src/cw/mavl_create.c
similarity index 100%
rename from src/capwap/mavl_create.c
rename to src/cw/mavl_create.c
diff --git a/src/capwap/mavl_create_conststr.c b/src/cw/mavl_create_conststr.c
similarity index 100%
rename from src/capwap/mavl_create_conststr.c
rename to src/cw/mavl_create_conststr.c
diff --git a/src/capwap/mavl_del.c b/src/cw/mavl_del.c
similarity index 100%
rename from src/capwap/mavl_del.c
rename to src/cw/mavl_del.c
diff --git a/src/capwap/mavl_del_all.c b/src/cw/mavl_del_all.c
similarity index 100%
rename from src/capwap/mavl_del_all.c
rename to src/cw/mavl_del_all.c
diff --git a/src/capwap/mavl_foreach.c b/src/cw/mavl_foreach.c
similarity index 100%
rename from src/capwap/mavl_foreach.c
rename to src/cw/mavl_foreach.c
diff --git a/src/capwap/mavl_foreach_lr.c b/src/cw/mavl_foreach_lr.c
similarity index 100%
rename from src/capwap/mavl_foreach_lr.c
rename to src/cw/mavl_foreach_lr.c
diff --git a/src/capwap/mavl_get.c b/src/cw/mavl_get.c
similarity index 100%
rename from src/capwap/mavl_get.c
rename to src/cw/mavl_get.c
diff --git a/src/capwap/mavl_get_node.c b/src/cw/mavl_get_node.c
similarity index 100%
rename from src/capwap/mavl_get_node.c
rename to src/cw/mavl_get_node.c
diff --git a/src/capwap/mavl_merge.c b/src/cw/mavl_merge.c
similarity index 100%
rename from src/capwap/mavl_merge.c
rename to src/cw/mavl_merge.c
diff --git a/src/capwap/mavliter_next.c b/src/cw/mavliter_next.c
similarity index 100%
rename from src/capwap/mavliter_next.c
rename to src/cw/mavliter_next.c
diff --git a/src/capwap/mavliter_seek.c b/src/cw/mavliter_seek.c
similarity index 100%
rename from src/capwap/mavliter_seek.c
rename to src/cw/mavliter_seek.c
diff --git a/src/capwap/mbag.c b/src/cw/mbag.c
similarity index 100%
rename from src/capwap/mbag.c
rename to src/cw/mbag.c
diff --git a/src/capwap/mbag.h b/src/cw/mbag.h
similarity index 100%
rename from src/capwap/mbag.h
rename to src/cw/mbag.h
diff --git a/src/capwap/mbag_type_bstr16.c b/src/cw/mbag_type_bstr16.c
similarity index 100%
rename from src/capwap/mbag_type_bstr16.c
rename to src/cw/mbag_type_bstr16.c
diff --git a/src/capwap/mbag_type_byte.c b/src/cw/mbag_type_byte.c
similarity index 100%
rename from src/capwap/mbag_type_byte.c
rename to src/cw/mbag_type_byte.c
diff --git a/src/capwap/mbag_type_dword.c b/src/cw/mbag_type_dword.c
similarity index 100%
rename from src/capwap/mbag_type_dword.c
rename to src/cw/mbag_type_dword.c
diff --git a/src/capwap/mbag_type_mbag.c b/src/cw/mbag_type_mbag.c
similarity index 100%
rename from src/capwap/mbag_type_mbag.c
rename to src/cw/mbag_type_mbag.c
diff --git a/src/capwap/mbag_type_sockaddr.c b/src/cw/mbag_type_sockaddr.c
similarity index 100%
rename from src/capwap/mbag_type_sockaddr.c
rename to src/cw/mbag_type_sockaddr.c
diff --git a/src/capwap/mbag_type_vendorstr.c b/src/cw/mbag_type_vendorstr.c
similarity index 100%
rename from src/capwap/mbag_type_vendorstr.c
rename to src/cw/mbag_type_vendorstr.c
diff --git a/src/capwap/mbag_type_word.c b/src/cw/mbag_type_word.c
similarity index 100%
rename from src/capwap/mbag_type_word.c
rename to src/cw/mbag_type_word.c
diff --git a/src/capwap/md5sum.c b/src/cw/md5sum.c
similarity index 100%
rename from src/capwap/md5sum.c
rename to src/cw/md5sum.c
diff --git a/src/capwap/mlist.c b/src/cw/mlist.c
similarity index 100%
rename from src/capwap/mlist.c
rename to src/cw/mlist.c
diff --git a/src/capwap/mlist.h b/src/cw/mlist.h
similarity index 100%
rename from src/capwap/mlist.h
rename to src/cw/mlist.h
diff --git a/src/capwap/mod.h b/src/cw/mod.h
similarity index 96%
rename from src/capwap/mod.h
rename to src/cw/mod.h
index ef7d3e82..5e7dfa17 100644
--- a/src/capwap/mod.h
+++ b/src/cw/mod.h
@@ -22,8 +22,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "capwap/sock.h"
-#include "capwap/conn.h"
+#include "sock.h"
+#include "conn.h"
 #include "action.h"
 
 struct cw_actiondef;
diff --git a/src/capwap/process_conf_status_request.c b/src/cw/process_conf_status_request.c
similarity index 100%
rename from src/capwap/process_conf_status_request.c
rename to src/cw/process_conf_status_request.c
diff --git a/src/capwap/radio.c b/src/cw/radio.c
similarity index 100%
rename from src/capwap/radio.c
rename to src/cw/radio.c
diff --git a/src/capwap/radio.h b/src/cw/radio.h
similarity index 100%
rename from src/capwap/radio.h
rename to src/cw/radio.h
diff --git a/src/capwap/radioinfo.h b/src/cw/radioinfo.h
similarity index 100%
rename from src/capwap/radioinfo.h
rename to src/cw/radioinfo.h
diff --git a/src/capwap/rand.h b/src/cw/rand.h
similarity index 100%
rename from src/capwap/rand.h
rename to src/cw/rand.h
diff --git a/src/capwap/send.c b/src/cw/send.c
similarity index 100%
rename from src/capwap/send.c
rename to src/cw/send.c
diff --git a/src/capwap/sock.h b/src/cw/sock.h
similarity index 100%
rename from src/capwap/sock.h
rename to src/cw/sock.h
diff --git a/src/capwap/sock_addrinit.c b/src/cw/sock_addrinit.c
similarity index 100%
rename from src/capwap/sock_addrinit.c
rename to src/cw/sock_addrinit.c
diff --git a/src/capwap/sock_addrlen.c b/src/cw/sock_addrlen.c
similarity index 100%
rename from src/capwap/sock_addrlen.c
rename to src/cw/sock_addrlen.c
diff --git a/src/capwap/sock_addrtostr.c b/src/cw/sock_addrtostr.c
similarity index 100%
rename from src/capwap/sock_addrtostr.c
rename to src/cw/sock_addrtostr.c
diff --git a/src/capwap/sock_cmpaddr.c b/src/cw/sock_cmpaddr.c
similarity index 100%
rename from src/capwap/sock_cmpaddr.c
rename to src/cw/sock_cmpaddr.c
diff --git a/src/capwap/sock_copyaddr.c b/src/cw/sock_copyaddr.c
similarity index 100%
rename from src/capwap/sock_copyaddr.c
rename to src/cw/sock_copyaddr.c
diff --git a/src/capwap/sock_create.c b/src/cw/sock_create.c
similarity index 100%
rename from src/capwap/sock_create.c
rename to src/cw/sock_create.c
diff --git a/src/capwap/sock_get_primary_if.c b/src/cw/sock_get_primary_if.c
similarity index 100%
rename from src/capwap/sock_get_primary_if.c
rename to src/cw/sock_get_primary_if.c
diff --git a/src/capwap/sock_getbroadcastaddr.c b/src/cw/sock_getbroadcastaddr.c
similarity index 100%
rename from src/capwap/sock_getbroadcastaddr.c
rename to src/cw/sock_getbroadcastaddr.c
diff --git a/src/capwap/sock_getifaddr.c b/src/cw/sock_getifaddr.c
similarity index 100%
rename from src/capwap/sock_getifaddr.c
rename to src/cw/sock_getifaddr.c
diff --git a/src/capwap/sock_getifhwaddr.c b/src/cw/sock_getifhwaddr.c
similarity index 100%
rename from src/capwap/sock_getifhwaddr.c
rename to src/cw/sock_getifhwaddr.c
diff --git a/src/capwap/sock_getifinfo.c b/src/cw/sock_getifinfo.c
similarity index 100%
rename from src/capwap/sock_getifinfo.c
rename to src/cw/sock_getifinfo.c
diff --git a/src/capwap/sock_getport.c b/src/cw/sock_getport.c
similarity index 100%
rename from src/capwap/sock_getport.c
rename to src/cw/sock_getport.c
diff --git a/src/capwap/sock_hwaddrtostr.c b/src/cw/sock_hwaddrtostr.c
similarity index 100%
rename from src/capwap/sock_hwaddrtostr.c
rename to src/cw/sock_hwaddrtostr.c
diff --git a/src/capwap/sock_mwait.c b/src/cw/sock_mwait.c
similarity index 100%
rename from src/capwap/sock_mwait.c
rename to src/cw/sock_mwait.c
diff --git a/src/capwap/sock_receive.c b/src/cw/sock_receive.c
similarity index 100%
rename from src/capwap/sock_receive.c
rename to src/cw/sock_receive.c
diff --git a/src/capwap/sock_set_dontfrag.c b/src/cw/sock_set_dontfrag.c
similarity index 100%
rename from src/capwap/sock_set_dontfrag.c
rename to src/cw/sock_set_dontfrag.c
diff --git a/src/capwap/sock_set_recvtimeout.c b/src/cw/sock_set_recvtimeout.c
similarity index 100%
rename from src/capwap/sock_set_recvtimeout.c
rename to src/cw/sock_set_recvtimeout.c
diff --git a/src/capwap/sock_setport.c b/src/cw/sock_setport.c
similarity index 100%
rename from src/capwap/sock_setport.c
rename to src/cw/sock_setport.c
diff --git a/src/capwap/sock_strtoaddr.c b/src/cw/sock_strtoaddr.c
similarity index 100%
rename from src/capwap/sock_strtoaddr.c
rename to src/cw/sock_strtoaddr.c
diff --git a/src/capwap/stravltree.c b/src/cw/stravltree.c
similarity index 100%
rename from src/capwap/stravltree.c
rename to src/cw/stravltree.c
diff --git a/src/capwap/stravltree.h b/src/cw/stravltree.h
similarity index 100%
rename from src/capwap/stravltree.h
rename to src/cw/stravltree.h
diff --git a/src/capwap/strheap.c b/src/cw/strheap.c
similarity index 100%
rename from src/capwap/strheap.c
rename to src/cw/strheap.c
diff --git a/src/capwap/strheap.h b/src/cw/strheap.h
similarity index 100%
rename from src/capwap/strheap.h
rename to src/cw/strheap.h
diff --git a/src/capwap/strlist.h b/src/cw/strlist.h
similarity index 100%
rename from src/capwap/strlist.h
rename to src/cw/strlist.h
diff --git a/src/capwap/timer.h b/src/cw/timer.h
similarity index 100%
rename from src/capwap/timer.h
rename to src/cw/timer.h
diff --git a/src/capwap/utf8.c b/src/cw/utf8.c
similarity index 100%
rename from src/capwap/utf8.c
rename to src/cw/utf8.c
diff --git a/src/capwap/vendorstr_create_from_str.c b/src/cw/vendorstr_create_from_str.c
similarity index 100%
rename from src/capwap/vendorstr_create_from_str.c
rename to src/cw/vendorstr_create_from_str.c
diff --git a/src/capwap/wtpinfo_lwreadelem_wtp_descriptor.c b/src/cw/wtpinfo_lwreadelem_wtp_descriptor.c
similarity index 100%
rename from src/capwap/wtpinfo_lwreadelem_wtp_descriptor.c
rename to src/cw/wtpinfo_lwreadelem_wtp_descriptor.c
diff --git a/src/capwap/wtpinfo_print.c b/src/cw/wtpinfo_print.c
similarity index 100%
rename from src/capwap/wtpinfo_print.c
rename to src/cw/wtpinfo_print.c
diff --git a/src/capwap/wtpinfo_readelem_wtp_board_data.c b/src/cw/wtpinfo_readelem_wtp_board_data.c
similarity index 100%
rename from src/capwap/wtpinfo_readelem_wtp_board_data.c
rename to src/cw/wtpinfo_readelem_wtp_board_data.c
diff --git a/src/capwap/wtpinfo_readelem_wtp_radio_info.c b/src/cw/wtpinfo_readelem_wtp_radio_info.c
similarity index 100%
rename from src/capwap/wtpinfo_readelem_wtp_radio_info.c
rename to src/cw/wtpinfo_readelem_wtp_radio_info.c
diff --git a/src/capwap/wtpinfo_set_location.c b/src/cw/wtpinfo_set_location.c
similarity index 100%
rename from src/capwap/wtpinfo_set_location.c
rename to src/cw/wtpinfo_set_location.c
diff --git a/src/mod/capwap/capwap_actions.h b/src/mod/capwap/capwap_actions.h
index 1c66d44e..7295066d 100644
--- a/src/mod/capwap/capwap_actions.h
+++ b/src/mod/capwap/capwap_actions.h
@@ -20,8 +20,8 @@
 #define __CAPWAP_ACTIONS_H
 
 
-#include "capwap/capwap.h"
-#include "capwap/capwap_items.h"
+#include "cw/capwap.h"
+#include "cw/capwap_items.h"
 
 
 #define CW_ACTION_IN_LOCATION_DATA 	\
diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c
index 7b6c1047..9b3657de 100644
--- a/src/mod/capwap/capwap_actions_ac.c
+++ b/src/mod/capwap/capwap_actions_ac.c
@@ -17,12 +17,12 @@
 */
 
 
-#include "capwap/capwap.h"
-#include "capwap/action.h"
-#include "capwap/capwap_items.h"
+#include "cw/capwap.h"
+#include "cw/action.h"
+#include "cw/capwap_items.h"
 #include "capwap_actions.h"
-#include "capwap/strheap.h"
-#include "capwap/radio.h"
+#include "cw/strheap.h"
+#include "cw/radio.h"
 
 #include "mod_capwap.h"
 
@@ -281,7 +281,7 @@ static cw_action_out_t actions_out[]={
 };
 
 
-#include "capwap/item.h"
+#include "cw/item.h"
 
 static struct cw_itemdef _capwap_itemdefs[] = {
 
diff --git a/src/mod/capwap/capwap_actions_wtp.c b/src/mod/capwap/capwap_actions_wtp.c
index 8a943593..ec252588 100644
--- a/src/mod/capwap/capwap_actions_wtp.c
+++ b/src/mod/capwap/capwap_actions_wtp.c
@@ -1,6 +1,6 @@
-#include "capwap/capwap.h"
-#include "capwap/action.h"
-#include "capwap/capwap_items.h"
+#include "cw/capwap.h"
+#include "cw/action.h"
+#include "cw/capwap_items.h"
 
 
 static cw_action_in_t actions_in[] = {
diff --git a/src/mod/capwap/capwap_in_wtp_board_data.c b/src/mod/capwap/capwap_in_wtp_board_data.c
index 3822a1e0..fc0dcb5f 100644
--- a/src/mod/capwap/capwap_in_wtp_board_data.c
+++ b/src/mod/capwap/capwap_in_wtp_board_data.c
@@ -22,13 +22,13 @@
 
 
 
-#include "capwap/capwap.h"
-#include "capwap/capwap_items.h"
+#include "cw/capwap.h"
+#include "cw/capwap_items.h"
 
-#include "capwap/mbag.h"
+#include "cw/mbag.h"
 
-#include "capwap/cw_util.h"
-#include "capwap/dbg.h"
+#include "cw/cw_util.h"
+#include "cw/dbg.h"
 
 
 
diff --git a/src/mod/capwap/capwap_in_wtp_descriptor.c b/src/mod/capwap/capwap_in_wtp_descriptor.c
index 5fdb7905..cf966122 100644
--- a/src/mod/capwap/capwap_in_wtp_descriptor.c
+++ b/src/mod/capwap/capwap_in_wtp_descriptor.c
@@ -18,8 +18,8 @@
 
 
 
-#include "capwap/sock.h"
-#include "capwap/cw.h"
+#include "cw/sock.h"
+#include "cw/cw.h"
 
 int capwap_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
 			 int len, struct sockaddr *from)
diff --git a/src/mod/capwap/mod_capwap_ac.c b/src/mod/capwap/mod_capwap_ac.c
index e12ccfc7..eaac5147 100644
--- a/src/mod/capwap/mod_capwap_ac.c
+++ b/src/mod/capwap/mod_capwap_ac.c
@@ -1,9 +1,9 @@
 
-#include "capwap/mod.h"
-#include "capwap/log.h"
-#include "capwap/dbg.h"
+#include "cw/mod.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
 
-#include "capwap/action.h"
+#include "cw/action.h"
 
 #include "mod_capwap.h"
 
diff --git a/src/mod/capwap/mod_capwap_wtp.c b/src/mod/capwap/mod_capwap_wtp.c
index eea86eaa..a4262167 100644
--- a/src/mod/capwap/mod_capwap_wtp.c
+++ b/src/mod/capwap/mod_capwap_wtp.c
@@ -1,9 +1,9 @@
 
-#include "capwap/mod.h"
-#include "capwap/log.h"
-#include "capwap/dbg.h"
+#include "cw/mod.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
 
-#include "capwap/action.h"
+#include "cw/action.h"
 
 #include "mod_capwap.h"
 
diff --git a/src/mod/cipwap/mod_cipwap_ac.c b/src/mod/cipwap/mod_cipwap_ac.c
index 315473b8..8caba57a 100644
--- a/src/mod/cipwap/mod_cipwap_ac.c
+++ b/src/mod/cipwap/mod_cipwap_ac.c
@@ -1,6 +1,6 @@
 
-#include "capwap/mod.h"
-#include "capwap/log.h"
+#include "cw/mod.h"
+#include "cw/log.h"
 
 #include "mod_cipwap.h"
 
diff --git a/src/mod/cisco/capwap_actions.h b/src/mod/cisco/capwap_actions.h
index 1c66d44e..7295066d 100644
--- a/src/mod/cisco/capwap_actions.h
+++ b/src/mod/cisco/capwap_actions.h
@@ -20,8 +20,8 @@
 #define __CAPWAP_ACTIONS_H
 
 
-#include "capwap/capwap.h"
-#include "capwap/capwap_items.h"
+#include "cw/capwap.h"
+#include "cw/capwap_items.h"
 
 
 #define CW_ACTION_IN_LOCATION_DATA 	\
diff --git a/src/mod/cisco/cisco.h b/src/mod/cisco/cisco.h
index 988ebfb3..cc03e067 100644
--- a/src/mod/cisco/cisco.h
+++ b/src/mod/cisco/cisco.h
@@ -1,8 +1,8 @@
 #ifndef __CISCO_H
 #define __CISCO_H
 
-#include "capwap/conn.h"
-#include "capwap/action.h"
+#include "cw/conn.h"
+#include "cw/action.h"
 
 extern int cisco_out_ap_timesync(struct conn *conn,struct cw_action_out * a,uint8_t *dst);
 extern int cisco_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c
index e0c070ef..17af559c 100644
--- a/src/mod/cisco/cisco_actions_ac.c
+++ b/src/mod/cisco/cisco_actions_ac.c
@@ -17,13 +17,13 @@
 */
 
 
-#include "capwap/capwap.h"
-#include "capwap/action.h"
-#include "capwap/capwap_items.h"
+#include "cw/capwap.h"
+#include "cw/action.h"
+#include "cw/capwap_items.h"
 #include "capwap_actions.h"
-#include "capwap/strheap.h"
-#include "capwap/radio.h"
-#include "capwap/capwap_cisco.h"
+#include "cw/strheap.h"
+#include "cw/radio.h"
+#include "cw/capwap_cisco.h"
 
 #include "mod_cisco.h"
 #include "cisco.h"
@@ -137,7 +137,7 @@ static cw_action_out_t actions_out[]={
 
 
 
-#include "capwap/item.h"
+#include "cw/item.h"
 
 static struct cw_itemdef _capwap_itemdefs[] = {
 
diff --git a/src/mod/cisco/cisco_in_wtp_descriptor.c b/src/mod/cisco/cisco_in_wtp_descriptor.c
index 4203b2bc..06e15915 100644
--- a/src/mod/cisco/cisco_in_wtp_descriptor.c
+++ b/src/mod/cisco/cisco_in_wtp_descriptor.c
@@ -17,7 +17,7 @@
 */
 
 
-#include "capwap/cw.h"
+#include "cw/cw.h"
 
 
 int cisco_in_wtp_descriptor(struct conn *conn, struct cw_action_in *a, uint8_t * data,
diff --git a/src/mod/cisco/cisco_out_ac_descriptor.c b/src/mod/cisco/cisco_out_ac_descriptor.c
index f6510167..5c912ab2 100644
--- a/src/mod/cisco/cisco_out_ac_descriptor.c
+++ b/src/mod/cisco/cisco_out_ac_descriptor.c
@@ -1,9 +1,9 @@
-#include "capwap/log.h"
-#include "capwap/conn.h"
+#include "cw/log.h"
+#include "cw/conn.h"
 
-#include "capwap/mbag.h"
-#include "capwap/capwap_items.h"
-#include "capwap/capwap.h"
+#include "cw/mbag.h"
+#include "cw/capwap_items.h"
+#include "cw/capwap.h"
 
 
 int cisco_out_ac_descriptor(struct conn *conn,struct cw_action_out * a,uint8_t *dst) 
diff --git a/src/mod/cisco/cisco_out_ap_timesync.c b/src/mod/cisco/cisco_out_ap_timesync.c
index fa4853d7..3ee4bd53 100644
--- a/src/mod/cisco/cisco_out_ap_timesync.c
+++ b/src/mod/cisco/cisco_out_ap_timesync.c
@@ -2,7 +2,7 @@
 #include <time.h>
 #include "cisco.h"
 
-#include "capwap/capwap_cisco.h"
+#include "cw/capwap_cisco.h"
 
 int cisco_out_ap_timesync(struct conn *conn,struct cw_action_out * a,uint8_t *dst)
 {
diff --git a/src/mod/cisco/mod_cisco_ac.c b/src/mod/cisco/mod_cisco_ac.c
index b3544298..d1c1141a 100644
--- a/src/mod/cisco/mod_cisco_ac.c
+++ b/src/mod/cisco/mod_cisco_ac.c
@@ -1,10 +1,10 @@
 
-#include "capwap/capwap.h"
-#include "capwap/mod.h"
-#include "capwap/log.h"
-#include "capwap/dbg.h"
+#include "cw/capwap.h"
+#include "cw/mod.h"
+#include "cw/log.h"
+#include "cw/dbg.h"
 
-#include "capwap/action.h"
+#include "cw/action.h"
 
 #include "mod_cisco.h"
 #include "../modload.h"
diff --git a/src/mod/modload.h b/src/mod/modload.h
index 73eea9ca..3ff0ab0a 100644
--- a/src/mod/modload.h
+++ b/src/mod/modload.h
@@ -1,5 +1,5 @@
 
-#include "capwap/mod.h"
+#include "cw/mod.h"
 
 struct mod_ac * modload_ac(const char *name);
 struct mod_wtp * modload_wtp(const char *name);
diff --git a/src/mod/modload_ac.c b/src/mod/modload_ac.c
index fd60c6c1..d196b3c7 100644
--- a/src/mod/modload_ac.c
+++ b/src/mod/modload_ac.c
@@ -1,4 +1,4 @@
-#include "../capwap/mod.h"
+#include "../cw/mod.h"
 
 
 #include "cipwap/mod_cipwap.h"
diff --git a/src/mod/modload_wtp.c b/src/mod/modload_wtp.c
index e81c6497..4e1de733 100644
--- a/src/mod/modload_wtp.c
+++ b/src/mod/modload_wtp.c
@@ -1,4 +1,4 @@
-#include "../capwap/mod.h"
+#include "../cw/mod.h"
 
 
 #include "cipwap/mod_cipwap.h"