diff --git a/bigcouch/.placeholder b/bigcouch/.placeholder
new file mode 100644
index 0000000..e69de29
diff --git a/autoload_configs/conference.conf.xml b/freeswitch/autoload_configs/conference.conf.xml
similarity index 100%
rename from autoload_configs/conference.conf.xml
rename to freeswitch/autoload_configs/conference.conf.xml
diff --git a/autoload_configs/console.conf.xml b/freeswitch/autoload_configs/console.conf.xml
similarity index 100%
rename from autoload_configs/console.conf.xml
rename to freeswitch/autoload_configs/console.conf.xml
diff --git a/autoload_configs/event_socket.conf.xml b/freeswitch/autoload_configs/event_socket.conf.xml
similarity index 100%
rename from autoload_configs/event_socket.conf.xml
rename to freeswitch/autoload_configs/event_socket.conf.xml
diff --git a/autoload_configs/http_cache.conf.xml b/freeswitch/autoload_configs/http_cache.conf.xml
similarity index 100%
rename from autoload_configs/http_cache.conf.xml
rename to freeswitch/autoload_configs/http_cache.conf.xml
diff --git a/autoload_configs/kazoo.conf.xml b/freeswitch/autoload_configs/kazoo.conf.xml
similarity index 100%
rename from autoload_configs/kazoo.conf.xml
rename to freeswitch/autoload_configs/kazoo.conf.xml
diff --git a/autoload_configs/local_stream.conf.xml b/freeswitch/autoload_configs/local_stream.conf.xml
similarity index 100%
rename from autoload_configs/local_stream.conf.xml
rename to freeswitch/autoload_configs/local_stream.conf.xml
diff --git a/autoload_configs/logfile.conf.xml b/freeswitch/autoload_configs/logfile.conf.xml
similarity index 100%
rename from autoload_configs/logfile.conf.xml
rename to freeswitch/autoload_configs/logfile.conf.xml
diff --git a/autoload_configs/modules.conf.xml b/freeswitch/autoload_configs/modules.conf.xml
similarity index 100%
rename from autoload_configs/modules.conf.xml
rename to freeswitch/autoload_configs/modules.conf.xml
diff --git a/autoload_configs/post_load_modules.conf.xml b/freeswitch/autoload_configs/post_load_modules.conf.xml
similarity index 100%
rename from autoload_configs/post_load_modules.conf.xml
rename to freeswitch/autoload_configs/post_load_modules.conf.xml
diff --git a/autoload_configs/shout.conf.xml b/freeswitch/autoload_configs/shout.conf.xml
similarity index 100%
rename from autoload_configs/shout.conf.xml
rename to freeswitch/autoload_configs/shout.conf.xml
diff --git a/autoload_configs/sofia.conf.xml b/freeswitch/autoload_configs/sofia.conf.xml
similarity index 100%
rename from autoload_configs/sofia.conf.xml
rename to freeswitch/autoload_configs/sofia.conf.xml
diff --git a/autoload_configs/spandsp.conf.xml b/freeswitch/autoload_configs/spandsp.conf.xml
similarity index 100%
rename from autoload_configs/spandsp.conf.xml
rename to freeswitch/autoload_configs/spandsp.conf.xml
diff --git a/autoload_configs/switch.conf.xml b/freeswitch/autoload_configs/switch.conf.xml
similarity index 100%
rename from autoload_configs/switch.conf.xml
rename to freeswitch/autoload_configs/switch.conf.xml
diff --git a/autoload_configs/syslog.conf.xml b/freeswitch/autoload_configs/syslog.conf.xml
similarity index 100%
rename from autoload_configs/syslog.conf.xml
rename to freeswitch/autoload_configs/syslog.conf.xml
diff --git a/autoload_configs/timezones.conf.xml b/freeswitch/autoload_configs/timezones.conf.xml
similarity index 100%
rename from autoload_configs/timezones.conf.xml
rename to freeswitch/autoload_configs/timezones.conf.xml
diff --git a/freeswitch.xml b/freeswitch/freeswitch.xml
similarity index 100%
rename from freeswitch.xml
rename to freeswitch/freeswitch.xml
diff --git a/lang/de/de.xml b/freeswitch/lang/de/de.xml
similarity index 100%
rename from lang/de/de.xml
rename to freeswitch/lang/de/de.xml
diff --git a/lang/de/demo/demo.xml b/freeswitch/lang/de/demo/demo.xml
similarity index 100%
rename from lang/de/demo/demo.xml
rename to freeswitch/lang/de/demo/demo.xml
diff --git a/lang/de/vm/sounds.xml b/freeswitch/lang/de/vm/sounds.xml
similarity index 100%
rename from lang/de/vm/sounds.xml
rename to freeswitch/lang/de/vm/sounds.xml
diff --git a/lang/de/vm/tts.xml b/freeswitch/lang/de/vm/tts.xml
similarity index 100%
rename from lang/de/vm/tts.xml
rename to freeswitch/lang/de/vm/tts.xml
diff --git a/lang/en/demo/demo-ivr.xml b/freeswitch/lang/en/demo/demo-ivr.xml
similarity index 100%
rename from lang/en/demo/demo-ivr.xml
rename to freeswitch/lang/en/demo/demo-ivr.xml
diff --git a/lang/en/demo/demo.xml b/freeswitch/lang/en/demo/demo.xml
similarity index 100%
rename from lang/en/demo/demo.xml
rename to freeswitch/lang/en/demo/demo.xml
diff --git a/lang/en/demo/funnies.xml b/freeswitch/lang/en/demo/funnies.xml
similarity index 100%
rename from lang/en/demo/funnies.xml
rename to freeswitch/lang/en/demo/funnies.xml
diff --git a/lang/en/demo/new-demo-ivr.xml b/freeswitch/lang/en/demo/new-demo-ivr.xml
similarity index 100%
rename from lang/en/demo/new-demo-ivr.xml
rename to freeswitch/lang/en/demo/new-demo-ivr.xml
diff --git a/lang/en/dir/sounds.xml b/freeswitch/lang/en/dir/sounds.xml
similarity index 100%
rename from lang/en/dir/sounds.xml
rename to freeswitch/lang/en/dir/sounds.xml
diff --git a/lang/en/dir/tts.xml b/freeswitch/lang/en/dir/tts.xml
similarity index 100%
rename from lang/en/dir/tts.xml
rename to freeswitch/lang/en/dir/tts.xml
diff --git a/lang/en/en.xml b/freeswitch/lang/en/en.xml
similarity index 100%
rename from lang/en/en.xml
rename to freeswitch/lang/en/en.xml
diff --git a/lang/en/ivr/sounds.xml b/freeswitch/lang/en/ivr/sounds.xml
similarity index 100%
rename from lang/en/ivr/sounds.xml
rename to freeswitch/lang/en/ivr/sounds.xml
diff --git a/lang/en/vm/sounds.xml b/freeswitch/lang/en/vm/sounds.xml
similarity index 100%
rename from lang/en/vm/sounds.xml
rename to freeswitch/lang/en/vm/sounds.xml
diff --git a/lang/en/vm/tts.xml b/freeswitch/lang/en/vm/tts.xml
similarity index 100%
rename from lang/en/vm/tts.xml
rename to freeswitch/lang/en/vm/tts.xml
diff --git a/lang/en/vm/voicemail_ivr.xml b/freeswitch/lang/en/vm/voicemail_ivr.xml
similarity index 100%
rename from lang/en/vm/voicemail_ivr.xml
rename to freeswitch/lang/en/vm/voicemail_ivr.xml
diff --git a/lang/es/demo/demo-es-ES.xml b/freeswitch/lang/es/demo/demo-es-ES.xml
similarity index 100%
rename from lang/es/demo/demo-es-ES.xml
rename to freeswitch/lang/es/demo/demo-es-ES.xml
diff --git a/lang/es/demo/demo-es-MX.xml b/freeswitch/lang/es/demo/demo-es-MX.xml
similarity index 100%
rename from lang/es/demo/demo-es-MX.xml
rename to freeswitch/lang/es/demo/demo-es-MX.xml
diff --git a/lang/es/demo/demo-ivr-es-ES.xml b/freeswitch/lang/es/demo/demo-ivr-es-ES.xml
similarity index 100%
rename from lang/es/demo/demo-ivr-es-ES.xml
rename to freeswitch/lang/es/demo/demo-ivr-es-ES.xml
diff --git a/lang/es/demo/demo-ivr-es-MX.xml b/freeswitch/lang/es/demo/demo-ivr-es-MX.xml
similarity index 100%
rename from lang/es/demo/demo-ivr-es-MX.xml
rename to freeswitch/lang/es/demo/demo-ivr-es-MX.xml
diff --git a/lang/es/dir/sounds-es-ES.xml b/freeswitch/lang/es/dir/sounds-es-ES.xml
similarity index 100%
rename from lang/es/dir/sounds-es-ES.xml
rename to freeswitch/lang/es/dir/sounds-es-ES.xml
diff --git a/lang/es/dir/sounds-es-MX.xml b/freeswitch/lang/es/dir/sounds-es-MX.xml
similarity index 100%
rename from lang/es/dir/sounds-es-MX.xml
rename to freeswitch/lang/es/dir/sounds-es-MX.xml
diff --git a/lang/es/dir/tts-es-ES.xml b/freeswitch/lang/es/dir/tts-es-ES.xml
similarity index 100%
rename from lang/es/dir/tts-es-ES.xml
rename to freeswitch/lang/es/dir/tts-es-ES.xml
diff --git a/lang/es/dir/tts-es-MX.xml b/freeswitch/lang/es/dir/tts-es-MX.xml
similarity index 100%
rename from lang/es/dir/tts-es-MX.xml
rename to freeswitch/lang/es/dir/tts-es-MX.xml
diff --git a/lang/es/es_ES.xml b/freeswitch/lang/es/es_ES.xml
similarity index 100%
rename from lang/es/es_ES.xml
rename to freeswitch/lang/es/es_ES.xml
diff --git a/lang/es/es_MX.xml b/freeswitch/lang/es/es_MX.xml
similarity index 100%
rename from lang/es/es_MX.xml
rename to freeswitch/lang/es/es_MX.xml
diff --git a/lang/es/vm/sounds-es-ES.xml b/freeswitch/lang/es/vm/sounds-es-ES.xml
similarity index 100%
rename from lang/es/vm/sounds-es-ES.xml
rename to freeswitch/lang/es/vm/sounds-es-ES.xml
diff --git a/lang/es/vm/sounds-es-MX.xml b/freeswitch/lang/es/vm/sounds-es-MX.xml
similarity index 100%
rename from lang/es/vm/sounds-es-MX.xml
rename to freeswitch/lang/es/vm/sounds-es-MX.xml
diff --git a/lang/es/vm/tts-es-ES.xml b/freeswitch/lang/es/vm/tts-es-ES.xml
similarity index 100%
rename from lang/es/vm/tts-es-ES.xml
rename to freeswitch/lang/es/vm/tts-es-ES.xml
diff --git a/lang/es/vm/tts-es-MX.xml b/freeswitch/lang/es/vm/tts-es-MX.xml
similarity index 100%
rename from lang/es/vm/tts-es-MX.xml
rename to freeswitch/lang/es/vm/tts-es-MX.xml
diff --git a/lang/fr/demo/demo.xml b/freeswitch/lang/fr/demo/demo.xml
similarity index 100%
rename from lang/fr/demo/demo.xml
rename to freeswitch/lang/fr/demo/demo.xml
diff --git a/lang/fr/dir/sounds.xml b/freeswitch/lang/fr/dir/sounds.xml
similarity index 100%
rename from lang/fr/dir/sounds.xml
rename to freeswitch/lang/fr/dir/sounds.xml
diff --git a/lang/fr/dir/tts.xml b/freeswitch/lang/fr/dir/tts.xml
similarity index 100%
rename from lang/fr/dir/tts.xml
rename to freeswitch/lang/fr/dir/tts.xml
diff --git a/lang/fr/fr.xml b/freeswitch/lang/fr/fr.xml
similarity index 100%
rename from lang/fr/fr.xml
rename to freeswitch/lang/fr/fr.xml
diff --git a/lang/fr/vm/sounds.xml b/freeswitch/lang/fr/vm/sounds.xml
similarity index 100%
rename from lang/fr/vm/sounds.xml
rename to freeswitch/lang/fr/vm/sounds.xml
diff --git a/lang/he/demo/demo-ivr.xml b/freeswitch/lang/he/demo/demo-ivr.xml
similarity index 100%
rename from lang/he/demo/demo-ivr.xml
rename to freeswitch/lang/he/demo/demo-ivr.xml
diff --git a/lang/he/demo/demo.xml b/freeswitch/lang/he/demo/demo.xml
similarity index 100%
rename from lang/he/demo/demo.xml
rename to freeswitch/lang/he/demo/demo.xml
diff --git a/lang/he/dir/sounds.xml b/freeswitch/lang/he/dir/sounds.xml
similarity index 100%
rename from lang/he/dir/sounds.xml
rename to freeswitch/lang/he/dir/sounds.xml
diff --git a/lang/he/he.xml b/freeswitch/lang/he/he.xml
similarity index 100%
rename from lang/he/he.xml
rename to freeswitch/lang/he/he.xml
diff --git a/lang/he/vm/sounds.xml b/freeswitch/lang/he/vm/sounds.xml
similarity index 100%
rename from lang/he/vm/sounds.xml
rename to freeswitch/lang/he/vm/sounds.xml
diff --git a/lang/pt/demo/demo-ivr-pt-BR.xml b/freeswitch/lang/pt/demo/demo-ivr-pt-BR.xml
similarity index 100%
rename from lang/pt/demo/demo-ivr-pt-BR.xml
rename to freeswitch/lang/pt/demo/demo-ivr-pt-BR.xml
diff --git a/lang/pt/demo/demo-ivr-pt-PT.xml b/freeswitch/lang/pt/demo/demo-ivr-pt-PT.xml
similarity index 100%
rename from lang/pt/demo/demo-ivr-pt-PT.xml
rename to freeswitch/lang/pt/demo/demo-ivr-pt-PT.xml
diff --git a/lang/pt/demo/demo-pt-BR.xml b/freeswitch/lang/pt/demo/demo-pt-BR.xml
similarity index 100%
rename from lang/pt/demo/demo-pt-BR.xml
rename to freeswitch/lang/pt/demo/demo-pt-BR.xml
diff --git a/lang/pt/demo/demo-pt-PT.xml b/freeswitch/lang/pt/demo/demo-pt-PT.xml
similarity index 100%
rename from lang/pt/demo/demo-pt-PT.xml
rename to freeswitch/lang/pt/demo/demo-pt-PT.xml
diff --git a/lang/pt/dir/sounds-pt-BR.xml b/freeswitch/lang/pt/dir/sounds-pt-BR.xml
similarity index 100%
rename from lang/pt/dir/sounds-pt-BR.xml
rename to freeswitch/lang/pt/dir/sounds-pt-BR.xml
diff --git a/lang/pt/dir/sounds-pt-PT.xml b/freeswitch/lang/pt/dir/sounds-pt-PT.xml
similarity index 100%
rename from lang/pt/dir/sounds-pt-PT.xml
rename to freeswitch/lang/pt/dir/sounds-pt-PT.xml
diff --git a/lang/pt/dir/tts-pt-BR.xml b/freeswitch/lang/pt/dir/tts-pt-BR.xml
similarity index 100%
rename from lang/pt/dir/tts-pt-BR.xml
rename to freeswitch/lang/pt/dir/tts-pt-BR.xml
diff --git a/lang/pt/dir/tts-pt-PT.xml b/freeswitch/lang/pt/dir/tts-pt-PT.xml
similarity index 100%
rename from lang/pt/dir/tts-pt-PT.xml
rename to freeswitch/lang/pt/dir/tts-pt-PT.xml
diff --git a/lang/pt/pt_BR.xml b/freeswitch/lang/pt/pt_BR.xml
similarity index 100%
rename from lang/pt/pt_BR.xml
rename to freeswitch/lang/pt/pt_BR.xml
diff --git a/lang/pt/pt_PT.xml b/freeswitch/lang/pt/pt_PT.xml
similarity index 100%
rename from lang/pt/pt_PT.xml
rename to freeswitch/lang/pt/pt_PT.xml
diff --git a/lang/pt/vm/sounds-pt-BR.xml b/freeswitch/lang/pt/vm/sounds-pt-BR.xml
similarity index 100%
rename from lang/pt/vm/sounds-pt-BR.xml
rename to freeswitch/lang/pt/vm/sounds-pt-BR.xml
diff --git a/lang/pt/vm/sounds-pt-PT.xml b/freeswitch/lang/pt/vm/sounds-pt-PT.xml
similarity index 100%
rename from lang/pt/vm/sounds-pt-PT.xml
rename to freeswitch/lang/pt/vm/sounds-pt-PT.xml
diff --git a/lang/pt/vm/tts-pt-BR.xml b/freeswitch/lang/pt/vm/tts-pt-BR.xml
similarity index 100%
rename from lang/pt/vm/tts-pt-BR.xml
rename to freeswitch/lang/pt/vm/tts-pt-BR.xml
diff --git a/lang/pt/vm/tts-pt-PT.xml b/freeswitch/lang/pt/vm/tts-pt-PT.xml
similarity index 100%
rename from lang/pt/vm/tts-pt-PT.xml
rename to freeswitch/lang/pt/vm/tts-pt-PT.xml
diff --git a/lang/ru/demo/demo-ivr.xml b/freeswitch/lang/ru/demo/demo-ivr.xml
similarity index 100%
rename from lang/ru/demo/demo-ivr.xml
rename to freeswitch/lang/ru/demo/demo-ivr.xml
diff --git a/lang/ru/demo/demo.xml b/freeswitch/lang/ru/demo/demo.xml
similarity index 100%
rename from lang/ru/demo/demo.xml
rename to freeswitch/lang/ru/demo/demo.xml
diff --git a/lang/ru/dir/sounds.xml b/freeswitch/lang/ru/dir/sounds.xml
similarity index 100%
rename from lang/ru/dir/sounds.xml
rename to freeswitch/lang/ru/dir/sounds.xml
diff --git a/lang/ru/dir/tts.xml b/freeswitch/lang/ru/dir/tts.xml
similarity index 100%
rename from lang/ru/dir/tts.xml
rename to freeswitch/lang/ru/dir/tts.xml
diff --git a/lang/ru/ru.xml b/freeswitch/lang/ru/ru.xml
similarity index 100%
rename from lang/ru/ru.xml
rename to freeswitch/lang/ru/ru.xml
diff --git a/lang/ru/vm/sounds.xml b/freeswitch/lang/ru/vm/sounds.xml
similarity index 100%
rename from lang/ru/vm/sounds.xml
rename to freeswitch/lang/ru/vm/sounds.xml
diff --git a/lang/ru/vm/tts.xml b/freeswitch/lang/ru/vm/tts.xml
similarity index 100%
rename from lang/ru/vm/tts.xml
rename to freeswitch/lang/ru/vm/tts.xml
diff --git a/mime.types b/freeswitch/mime.types
similarity index 100%
rename from mime.types
rename to freeswitch/mime.types
diff --git a/sip_profiles/sipinterface_1.xml b/freeswitch/sip_profiles/sipinterface_1.xml
similarity index 100%
rename from sip_profiles/sipinterface_1.xml
rename to freeswitch/sip_profiles/sipinterface_1.xml
diff --git a/freeswitch.limits.conf b/system/freeswitch.limits.conf
similarity index 100%
rename from freeswitch.limits.conf
rename to system/freeswitch.limits.conf