diff --git a/freeswitch/src/include/config.h.in b/src/include/config.h.in
similarity index 100%
rename from freeswitch/src/include/config.h.in
rename to src/include/config.h.in
diff --git a/freeswitch/src/include/switch.h b/src/include/switch.h
similarity index 100%
rename from freeswitch/src/include/switch.h
rename to src/include/switch.h
diff --git a/freeswitch/src/include/switch_buffer.h b/src/include/switch_buffer.h
similarity index 100%
rename from freeswitch/src/include/switch_buffer.h
rename to src/include/switch_buffer.h
diff --git a/freeswitch/src/include/switch_caller.h b/src/include/switch_caller.h
similarity index 100%
rename from freeswitch/src/include/switch_caller.h
rename to src/include/switch_caller.h
diff --git a/freeswitch/src/include/switch_channel.h b/src/include/switch_channel.h
similarity index 100%
rename from freeswitch/src/include/switch_channel.h
rename to src/include/switch_channel.h
diff --git a/freeswitch/src/include/switch_config.h b/src/include/switch_config.h
similarity index 100%
rename from freeswitch/src/include/switch_config.h
rename to src/include/switch_config.h
diff --git a/freeswitch/src/include/switch_console.h b/src/include/switch_console.h
similarity index 100%
rename from freeswitch/src/include/switch_console.h
rename to src/include/switch_console.h
diff --git a/freeswitch/src/include/switch_core.h b/src/include/switch_core.h
similarity index 100%
rename from freeswitch/src/include/switch_core.h
rename to src/include/switch_core.h
diff --git a/freeswitch/src/include/switch_frame.h b/src/include/switch_frame.h
similarity index 100%
rename from freeswitch/src/include/switch_frame.h
rename to src/include/switch_frame.h
diff --git a/freeswitch/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h
similarity index 100%
rename from freeswitch/src/include/switch_loadable_module.h
rename to src/include/switch_loadable_module.h
diff --git a/freeswitch/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
similarity index 100%
rename from freeswitch/src/include/switch_module_interfaces.h
rename to src/include/switch_module_interfaces.h
diff --git a/freeswitch/src/include/switch_mutex.h b/src/include/switch_mutex.h
similarity index 100%
rename from freeswitch/src/include/switch_mutex.h
rename to src/include/switch_mutex.h
diff --git a/freeswitch/src/include/switch_types.h b/src/include/switch_types.h
similarity index 100%
rename from freeswitch/src/include/switch_types.h
rename to src/include/switch_types.h
diff --git a/freeswitch/src/include/switch_utils.h b/src/include/switch_utils.h
similarity index 100%
rename from freeswitch/src/include/switch_utils.h
rename to src/include/switch_utils.h
diff --git a/freeswitch/src/mod/mod_bridgecall/mod_bridgecall.c b/src/mod/mod_bridgecall/mod_bridgecall.c
similarity index 100%
rename from freeswitch/src/mod/mod_bridgecall/mod_bridgecall.c
rename to src/mod/mod_bridgecall/mod_bridgecall.c
diff --git a/freeswitch/src/mod/mod_dialplan_demo/mod_dialplan_demo.c b/src/mod/mod_dialplan_demo/mod_dialplan_demo.c
similarity index 100%
rename from freeswitch/src/mod/mod_dialplan_demo/mod_dialplan_demo.c
rename to src/mod/mod_dialplan_demo/mod_dialplan_demo.c
diff --git a/freeswitch/src/mod/mod_exosip/Makefile b/src/mod/mod_exosip/Makefile
similarity index 100%
rename from freeswitch/src/mod/mod_exosip/Makefile
rename to src/mod/mod_exosip/Makefile
diff --git a/freeswitch/src/mod/mod_exosip/mod_exosip.c b/src/mod/mod_exosip/mod_exosip.c
similarity index 100%
rename from freeswitch/src/mod/mod_exosip/mod_exosip.c
rename to src/mod/mod_exosip/mod_exosip.c
diff --git a/freeswitch/src/mod/mod_exosip/mod_exosip_ccrtp.c b/src/mod/mod_exosip/mod_exosip_ccrtp.c
similarity index 100%
rename from freeswitch/src/mod/mod_exosip/mod_exosip_ccrtp.c
rename to src/mod/mod_exosip/mod_exosip_ccrtp.c
diff --git a/freeswitch/src/mod/mod_exosip/mod_exosip_ucl.c b/src/mod/mod_exosip/mod_exosip_ucl.c
similarity index 100%
rename from freeswitch/src/mod/mod_exosip/mod_exosip_ucl.c
rename to src/mod/mod_exosip/mod_exosip_ucl.c
diff --git a/freeswitch/src/mod/mod_g711codec/Makefile b/src/mod/mod_g711codec/Makefile
similarity index 100%
rename from freeswitch/src/mod/mod_g711codec/Makefile
rename to src/mod/mod_g711codec/Makefile
diff --git a/freeswitch/src/mod/mod_g711codec/g711.c b/src/mod/mod_g711codec/g711.c
similarity index 100%
rename from freeswitch/src/mod/mod_g711codec/g711.c
rename to src/mod/mod_g711codec/g711.c
diff --git a/freeswitch/src/mod/mod_g711codec/g711.h b/src/mod/mod_g711codec/g711.h
similarity index 100%
rename from freeswitch/src/mod/mod_g711codec/g711.h
rename to src/mod/mod_g711codec/g711.h
diff --git a/freeswitch/src/mod/mod_g711codec/mod_g711codec.c b/src/mod/mod_g711codec/mod_g711codec.c
similarity index 100%
rename from freeswitch/src/mod/mod_g711codec/mod_g711codec.c
rename to src/mod/mod_g711codec/mod_g711codec.c
diff --git a/freeswitch/src/mod/mod_playback/mod_playback.c b/src/mod/mod_playback/mod_playback.c
similarity index 100%
rename from freeswitch/src/mod/mod_playback/mod_playback.c
rename to src/mod/mod_playback/mod_playback.c
diff --git a/freeswitch/src/mod/mod_rawaudio/mod_rawaudio.c b/src/mod/mod_rawaudio/mod_rawaudio.c
similarity index 100%
rename from freeswitch/src/mod/mod_rawaudio/mod_rawaudio.c
rename to src/mod/mod_rawaudio/mod_rawaudio.c
diff --git a/freeswitch/src/mod/mod_skel/mod_skel.c b/src/mod/mod_skel/mod_skel.c
similarity index 100%
rename from freeswitch/src/mod/mod_skel/mod_skel.c
rename to src/mod/mod_skel/mod_skel.c
diff --git a/freeswitch/src/mod/mod_softtimer/mod_softtimer.c b/src/mod/mod_softtimer/mod_softtimer.c
similarity index 100%
rename from freeswitch/src/mod/mod_softtimer/mod_softtimer.c
rename to src/mod/mod_softtimer/mod_softtimer.c
diff --git a/freeswitch/src/mod/mod_speexcodec/Makefile b/src/mod/mod_speexcodec/Makefile
similarity index 100%
rename from freeswitch/src/mod/mod_speexcodec/Makefile
rename to src/mod/mod_speexcodec/Makefile
diff --git a/freeswitch/src/mod/mod_speexcodec/mod_speexcodec.c b/src/mod/mod_speexcodec/mod_speexcodec.c
similarity index 100%
rename from freeswitch/src/mod/mod_speexcodec/mod_speexcodec.c
rename to src/mod/mod_speexcodec/mod_speexcodec.c
diff --git a/freeswitch/src/mod/mod_wanchan/mod_wanchan.c b/src/mod/mod_wanchan/mod_wanchan.c
similarity index 100%
rename from freeswitch/src/mod/mod_wanchan/mod_wanchan.c
rename to src/mod/mod_wanchan/mod_wanchan.c
diff --git a/freeswitch/src/mod/mod_woomerachan/mod_woomerachan.c b/src/mod/mod_woomerachan/mod_woomerachan.c
similarity index 100%
rename from freeswitch/src/mod/mod_woomerachan/mod_woomerachan.c
rename to src/mod/mod_woomerachan/mod_woomerachan.c
diff --git a/freeswitch/src/switch.c b/src/switch.c
similarity index 100%
rename from freeswitch/src/switch.c
rename to src/switch.c
diff --git a/freeswitch/src/switch_buffer.c b/src/switch_buffer.c
similarity index 100%
rename from freeswitch/src/switch_buffer.c
rename to src/switch_buffer.c
diff --git a/freeswitch/src/switch_caller.c b/src/switch_caller.c
similarity index 100%
rename from freeswitch/src/switch_caller.c
rename to src/switch_caller.c
diff --git a/freeswitch/src/switch_channel.c b/src/switch_channel.c
similarity index 100%
rename from freeswitch/src/switch_channel.c
rename to src/switch_channel.c
diff --git a/freeswitch/src/switch_config.c b/src/switch_config.c
similarity index 100%
rename from freeswitch/src/switch_config.c
rename to src/switch_config.c
diff --git a/freeswitch/src/switch_console.c b/src/switch_console.c
similarity index 100%
rename from freeswitch/src/switch_console.c
rename to src/switch_console.c
diff --git a/freeswitch/src/switch_core.c b/src/switch_core.c
similarity index 100%
rename from freeswitch/src/switch_core.c
rename to src/switch_core.c
diff --git a/freeswitch/src/switch_loadable_module.c b/src/switch_loadable_module.c
similarity index 100%
rename from freeswitch/src/switch_loadable_module.c
rename to src/switch_loadable_module.c
diff --git a/freeswitch/src/switch_mutex.c b/src/switch_mutex.c
similarity index 100%
rename from freeswitch/src/switch_mutex.c
rename to src/switch_mutex.c
diff --git a/freeswitch/src/switch_utils.c b/src/switch_utils.c
similarity index 100%
rename from freeswitch/src/switch_utils.c
rename to src/switch_utils.c