diff --git a/src/capwap/mod/capwap/Makefile b/src/mod/capwap/Makefile
similarity index 100%
rename from src/capwap/mod/capwap/Makefile
rename to src/mod/capwap/Makefile
diff --git a/src/capwap/mod/capwap/capwap.h b/src/mod/capwap/capwap.h
similarity index 100%
rename from src/capwap/mod/capwap/capwap.h
rename to src/mod/capwap/capwap.h
diff --git a/src/capwap/mod/capwap/capwap_actions.h b/src/mod/capwap/capwap_actions.h
similarity index 100%
rename from src/capwap/mod/capwap/capwap_actions.h
rename to src/mod/capwap/capwap_actions.h
diff --git a/src/capwap/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c
similarity index 100%
rename from src/capwap/mod/capwap/capwap_actions_ac.c
rename to src/mod/capwap/capwap_actions_ac.c
diff --git a/src/capwap/mod/capwap/capwap_in_wtp_board_data.c b/src/mod/capwap/capwap_in_wtp_board_data.c
similarity index 100%
rename from src/capwap/mod/capwap/capwap_in_wtp_board_data.c
rename to src/mod/capwap/capwap_in_wtp_board_data.c
diff --git a/src/capwap/mod/capwap/capwap_in_wtp_descriptor.c b/src/mod/capwap/capwap_in_wtp_descriptor.c
similarity index 100%
rename from src/capwap/mod/capwap/capwap_in_wtp_descriptor.c
rename to src/mod/capwap/capwap_in_wtp_descriptor.c
diff --git a/src/capwap/mod/capwap/mod_capwap.h b/src/mod/capwap/mod_capwap.h
similarity index 100%
rename from src/capwap/mod/capwap/mod_capwap.h
rename to src/mod/capwap/mod_capwap.h
diff --git a/src/capwap/mod/capwap/mod_capwap_ac.c b/src/mod/capwap/mod_capwap_ac.c
similarity index 100%
rename from src/capwap/mod/capwap/mod_capwap_ac.c
rename to src/mod/capwap/mod_capwap_ac.c
diff --git a/src/capwap/mod/cipwap/Makefile b/src/mod/cipwap/Makefile
similarity index 100%
rename from src/capwap/mod/cipwap/Makefile
rename to src/mod/cipwap/Makefile
diff --git a/src/capwap/mod/cipwap/mod_cipwap.h b/src/mod/cipwap/mod_cipwap.h
similarity index 100%
rename from src/capwap/mod/cipwap/mod_cipwap.h
rename to src/mod/cipwap/mod_cipwap.h
diff --git a/src/capwap/mod/cipwap/mod_cipwap_ac.c b/src/mod/cipwap/mod_cipwap_ac.c
similarity index 100%
rename from src/capwap/mod/cipwap/mod_cipwap_ac.c
rename to src/mod/cipwap/mod_cipwap_ac.c