diff --git a/resources/templates/conf/autoload_configs/.htaccess b/app/switch/resources/conf/autoload_configs/.htaccess
similarity index 100%
rename from resources/templates/conf/autoload_configs/.htaccess
rename to app/switch/resources/conf/autoload_configs/.htaccess
diff --git a/resources/templates/conf/autoload_configs/abstraction.conf.xml b/app/switch/resources/conf/autoload_configs/abstraction.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/abstraction.conf.xml
rename to app/switch/resources/conf/autoload_configs/abstraction.conf.xml
diff --git a/resources/templates/conf/autoload_configs/alsa.conf.xml b/app/switch/resources/conf/autoload_configs/alsa.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/alsa.conf.xml
rename to app/switch/resources/conf/autoload_configs/alsa.conf.xml
diff --git a/resources/templates/conf/autoload_configs/blacklist.conf.xml b/app/switch/resources/conf/autoload_configs/blacklist.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/blacklist.conf.xml
rename to app/switch/resources/conf/autoload_configs/blacklist.conf.xml
diff --git a/resources/templates/conf/autoload_configs/callcenter.conf.xml b/app/switch/resources/conf/autoload_configs/callcenter.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/callcenter.conf.xml
rename to app/switch/resources/conf/autoload_configs/callcenter.conf.xml
diff --git a/resources/templates/conf/autoload_configs/cdr_mongodb.conf.xml b/app/switch/resources/conf/autoload_configs/cdr_mongodb.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/cdr_mongodb.conf.xml
rename to app/switch/resources/conf/autoload_configs/cdr_mongodb.conf.xml
diff --git a/resources/templates/conf/autoload_configs/cdr_pg_csv.conf.xml b/app/switch/resources/conf/autoload_configs/cdr_pg_csv.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/cdr_pg_csv.conf.xml
rename to app/switch/resources/conf/autoload_configs/cdr_pg_csv.conf.xml
diff --git a/resources/templates/conf/autoload_configs/cdr_sqlite.conf.xml b/app/switch/resources/conf/autoload_configs/cdr_sqlite.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/cdr_sqlite.conf.xml
rename to app/switch/resources/conf/autoload_configs/cdr_sqlite.conf.xml
diff --git a/resources/templates/conf/autoload_configs/cepstral.conf.xml b/app/switch/resources/conf/autoload_configs/cepstral.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/cepstral.conf.xml
rename to app/switch/resources/conf/autoload_configs/cepstral.conf.xml
diff --git a/resources/templates/conf/autoload_configs/cidlookup.conf.xml b/app/switch/resources/conf/autoload_configs/cidlookup.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/cidlookup.conf.xml
rename to app/switch/resources/conf/autoload_configs/cidlookup.conf.xml
diff --git a/resources/templates/conf/autoload_configs/conference.conf b/app/switch/resources/conf/autoload_configs/conference.conf
similarity index 100%
rename from resources/templates/conf/autoload_configs/conference.conf
rename to app/switch/resources/conf/autoload_configs/conference.conf
diff --git a/resources/templates/conf/autoload_configs/conference_layouts.conf.xml b/app/switch/resources/conf/autoload_configs/conference_layouts.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/conference_layouts.conf.xml
rename to app/switch/resources/conf/autoload_configs/conference_layouts.conf.xml
diff --git a/resources/templates/conf/autoload_configs/console.conf.xml b/app/switch/resources/conf/autoload_configs/console.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/console.conf.xml
rename to app/switch/resources/conf/autoload_configs/console.conf.xml
diff --git a/resources/templates/conf/autoload_configs/curl.conf.xml b/app/switch/resources/conf/autoload_configs/curl.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/curl.conf.xml
rename to app/switch/resources/conf/autoload_configs/curl.conf.xml
diff --git a/resources/templates/conf/autoload_configs/db.conf.xml b/app/switch/resources/conf/autoload_configs/db.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/db.conf.xml
rename to app/switch/resources/conf/autoload_configs/db.conf.xml
diff --git a/resources/templates/conf/autoload_configs/dialplan_directory.conf.xml b/app/switch/resources/conf/autoload_configs/dialplan_directory.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/dialplan_directory.conf.xml
rename to app/switch/resources/conf/autoload_configs/dialplan_directory.conf.xml
diff --git a/resources/templates/conf/autoload_configs/dingaling.conf.xml b/app/switch/resources/conf/autoload_configs/dingaling.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/dingaling.conf.xml
rename to app/switch/resources/conf/autoload_configs/dingaling.conf.xml
diff --git a/resources/templates/conf/autoload_configs/directory.conf.xml b/app/switch/resources/conf/autoload_configs/directory.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/directory.conf.xml
rename to app/switch/resources/conf/autoload_configs/directory.conf.xml
diff --git a/resources/templates/conf/autoload_configs/distributor.conf.xml b/app/switch/resources/conf/autoload_configs/distributor.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/distributor.conf.xml
rename to app/switch/resources/conf/autoload_configs/distributor.conf.xml
diff --git a/resources/templates/conf/autoload_configs/easyroute.conf.xml b/app/switch/resources/conf/autoload_configs/easyroute.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/easyroute.conf.xml
rename to app/switch/resources/conf/autoload_configs/easyroute.conf.xml
diff --git a/resources/templates/conf/autoload_configs/enum.conf.xml b/app/switch/resources/conf/autoload_configs/enum.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/enum.conf.xml
rename to app/switch/resources/conf/autoload_configs/enum.conf.xml
diff --git a/resources/templates/conf/autoload_configs/erlang_event.conf.xml b/app/switch/resources/conf/autoload_configs/erlang_event.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/erlang_event.conf.xml
rename to app/switch/resources/conf/autoload_configs/erlang_event.conf.xml
diff --git a/resources/templates/conf/autoload_configs/event_multicast.conf.xml b/app/switch/resources/conf/autoload_configs/event_multicast.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/event_multicast.conf.xml
rename to app/switch/resources/conf/autoload_configs/event_multicast.conf.xml
diff --git a/resources/templates/conf/autoload_configs/event_socket.conf.xml b/app/switch/resources/conf/autoload_configs/event_socket.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/event_socket.conf.xml
rename to app/switch/resources/conf/autoload_configs/event_socket.conf.xml
diff --git a/resources/templates/conf/autoload_configs/fax.conf.xml b/app/switch/resources/conf/autoload_configs/fax.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/fax.conf.xml
rename to app/switch/resources/conf/autoload_configs/fax.conf.xml
diff --git a/resources/templates/conf/autoload_configs/fifo.conf.xml b/app/switch/resources/conf/autoload_configs/fifo.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/fifo.conf.xml
rename to app/switch/resources/conf/autoload_configs/fifo.conf.xml
diff --git a/resources/templates/conf/autoload_configs/freetdm.conf.xml b/app/switch/resources/conf/autoload_configs/freetdm.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/freetdm.conf.xml
rename to app/switch/resources/conf/autoload_configs/freetdm.conf.xml
diff --git a/resources/templates/conf/autoload_configs/hash.conf.xml b/app/switch/resources/conf/autoload_configs/hash.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/hash.conf.xml
rename to app/switch/resources/conf/autoload_configs/hash.conf.xml
diff --git a/resources/templates/conf/autoload_configs/httapi.conf.xml b/app/switch/resources/conf/autoload_configs/httapi.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/httapi.conf.xml
rename to app/switch/resources/conf/autoload_configs/httapi.conf.xml
diff --git a/resources/templates/conf/autoload_configs/http_cache.conf.xml b/app/switch/resources/conf/autoload_configs/http_cache.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/http_cache.conf.xml
rename to app/switch/resources/conf/autoload_configs/http_cache.conf.xml
diff --git a/resources/templates/conf/autoload_configs/ivr.conf.xml b/app/switch/resources/conf/autoload_configs/ivr.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/ivr.conf.xml
rename to app/switch/resources/conf/autoload_configs/ivr.conf.xml
diff --git a/resources/templates/conf/autoload_configs/java.conf.xml b/app/switch/resources/conf/autoload_configs/java.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/java.conf.xml
rename to app/switch/resources/conf/autoload_configs/java.conf.xml
diff --git a/resources/templates/conf/autoload_configs/json_cdr.conf.xml b/app/switch/resources/conf/autoload_configs/json_cdr.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/json_cdr.conf.xml
rename to app/switch/resources/conf/autoload_configs/json_cdr.conf.xml
diff --git a/resources/templates/conf/autoload_configs/lcr.conf.xml b/app/switch/resources/conf/autoload_configs/lcr.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/lcr.conf.xml
rename to app/switch/resources/conf/autoload_configs/lcr.conf.xml
diff --git a/resources/templates/conf/autoload_configs/local_stream.conf b/app/switch/resources/conf/autoload_configs/local_stream.conf
similarity index 100%
rename from resources/templates/conf/autoload_configs/local_stream.conf
rename to app/switch/resources/conf/autoload_configs/local_stream.conf
diff --git a/resources/templates/conf/autoload_configs/logfile.conf.xml b/app/switch/resources/conf/autoload_configs/logfile.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/logfile.conf.xml
rename to app/switch/resources/conf/autoload_configs/logfile.conf.xml
diff --git a/resources/templates/conf/autoload_configs/lua.conf.xml b/app/switch/resources/conf/autoload_configs/lua.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/lua.conf.xml
rename to app/switch/resources/conf/autoload_configs/lua.conf.xml
diff --git a/resources/templates/conf/autoload_configs/memcache.conf.xml b/app/switch/resources/conf/autoload_configs/memcache.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/memcache.conf.xml
rename to app/switch/resources/conf/autoload_configs/memcache.conf.xml
diff --git a/resources/templates/conf/autoload_configs/modules.conf.xml b/app/switch/resources/conf/autoload_configs/modules.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/modules.conf.xml
rename to app/switch/resources/conf/autoload_configs/modules.conf.xml
diff --git a/resources/templates/conf/autoload_configs/mongo.conf.xml b/app/switch/resources/conf/autoload_configs/mongo.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/mongo.conf.xml
rename to app/switch/resources/conf/autoload_configs/mongo.conf.xml
diff --git a/resources/templates/conf/autoload_configs/nibblebill.conf.xml b/app/switch/resources/conf/autoload_configs/nibblebill.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/nibblebill.conf.xml
rename to app/switch/resources/conf/autoload_configs/nibblebill.conf.xml
diff --git a/resources/templates/conf/autoload_configs/opal.conf.xml b/app/switch/resources/conf/autoload_configs/opal.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/opal.conf.xml
rename to app/switch/resources/conf/autoload_configs/opal.conf.xml
diff --git a/resources/templates/conf/autoload_configs/opus.conf.xml b/app/switch/resources/conf/autoload_configs/opus.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/opus.conf.xml
rename to app/switch/resources/conf/autoload_configs/opus.conf.xml
diff --git a/resources/templates/conf/autoload_configs/osp.conf.xml b/app/switch/resources/conf/autoload_configs/osp.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/osp.conf.xml
rename to app/switch/resources/conf/autoload_configs/osp.conf.xml
diff --git a/resources/templates/conf/autoload_configs/perl.conf.xml b/app/switch/resources/conf/autoload_configs/perl.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/perl.conf.xml
rename to app/switch/resources/conf/autoload_configs/perl.conf.xml
diff --git a/resources/templates/conf/autoload_configs/pocketsphinx.conf.xml b/app/switch/resources/conf/autoload_configs/pocketsphinx.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/pocketsphinx.conf.xml
rename to app/switch/resources/conf/autoload_configs/pocketsphinx.conf.xml
diff --git a/resources/templates/conf/autoload_configs/portaudio.conf.xml b/app/switch/resources/conf/autoload_configs/portaudio.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/portaudio.conf.xml
rename to app/switch/resources/conf/autoload_configs/portaudio.conf.xml
diff --git a/resources/templates/conf/autoload_configs/post_load_modules.conf.xml b/app/switch/resources/conf/autoload_configs/post_load_modules.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/post_load_modules.conf.xml
rename to app/switch/resources/conf/autoload_configs/post_load_modules.conf.xml
diff --git a/resources/templates/conf/autoload_configs/post_load_switch.conf.xml b/app/switch/resources/conf/autoload_configs/post_load_switch.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/post_load_switch.conf.xml
rename to app/switch/resources/conf/autoload_configs/post_load_switch.conf.xml
diff --git a/resources/templates/conf/autoload_configs/pre_load_modules.conf.xml b/app/switch/resources/conf/autoload_configs/pre_load_modules.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/pre_load_modules.conf.xml
rename to app/switch/resources/conf/autoload_configs/pre_load_modules.conf.xml
diff --git a/resources/templates/conf/autoload_configs/presence_map.conf.xml b/app/switch/resources/conf/autoload_configs/presence_map.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/presence_map.conf.xml
rename to app/switch/resources/conf/autoload_configs/presence_map.conf.xml
diff --git a/resources/templates/conf/autoload_configs/python.conf.xml b/app/switch/resources/conf/autoload_configs/python.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/python.conf.xml
rename to app/switch/resources/conf/autoload_configs/python.conf.xml
diff --git a/resources/templates/conf/autoload_configs/redis.conf.xml b/app/switch/resources/conf/autoload_configs/redis.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/redis.conf.xml
rename to app/switch/resources/conf/autoload_configs/redis.conf.xml
diff --git a/resources/templates/conf/autoload_configs/rss.conf.xml b/app/switch/resources/conf/autoload_configs/rss.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/rss.conf.xml
rename to app/switch/resources/conf/autoload_configs/rss.conf.xml
diff --git a/resources/templates/conf/autoload_configs/rtmp.conf.xml b/app/switch/resources/conf/autoload_configs/rtmp.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/rtmp.conf.xml
rename to app/switch/resources/conf/autoload_configs/rtmp.conf.xml
diff --git a/resources/templates/conf/autoload_configs/sangoma_codec.conf.xml b/app/switch/resources/conf/autoload_configs/sangoma_codec.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/sangoma_codec.conf.xml
rename to app/switch/resources/conf/autoload_configs/sangoma_codec.conf.xml
diff --git a/resources/templates/conf/autoload_configs/shout.conf.xml b/app/switch/resources/conf/autoload_configs/shout.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/shout.conf.xml
rename to app/switch/resources/conf/autoload_configs/shout.conf.xml
diff --git a/resources/templates/conf/autoload_configs/skinny.conf.xml b/app/switch/resources/conf/autoload_configs/skinny.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/skinny.conf.xml
rename to app/switch/resources/conf/autoload_configs/skinny.conf.xml
diff --git a/resources/templates/conf/autoload_configs/smpp.conf.xml b/app/switch/resources/conf/autoload_configs/smpp.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/smpp.conf.xml
rename to app/switch/resources/conf/autoload_configs/smpp.conf.xml
diff --git a/resources/templates/conf/autoload_configs/sofia.conf.xml b/app/switch/resources/conf/autoload_configs/sofia.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/sofia.conf.xml
rename to app/switch/resources/conf/autoload_configs/sofia.conf.xml
diff --git a/resources/templates/conf/autoload_configs/spandsp.conf.xml b/app/switch/resources/conf/autoload_configs/spandsp.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/spandsp.conf.xml
rename to app/switch/resources/conf/autoload_configs/spandsp.conf.xml
diff --git a/resources/templates/conf/autoload_configs/spidermonkey.conf.xml b/app/switch/resources/conf/autoload_configs/spidermonkey.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/spidermonkey.conf.xml
rename to app/switch/resources/conf/autoload_configs/spidermonkey.conf.xml
diff --git a/resources/templates/conf/autoload_configs/switch.conf.xml b/app/switch/resources/conf/autoload_configs/switch.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/switch.conf.xml
rename to app/switch/resources/conf/autoload_configs/switch.conf.xml
diff --git a/resources/templates/conf/autoload_configs/syslog.conf.xml b/app/switch/resources/conf/autoload_configs/syslog.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/syslog.conf.xml
rename to app/switch/resources/conf/autoload_configs/syslog.conf.xml
diff --git a/resources/templates/conf/autoload_configs/timezones.conf.xml b/app/switch/resources/conf/autoload_configs/timezones.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/timezones.conf.xml
rename to app/switch/resources/conf/autoload_configs/timezones.conf.xml
diff --git a/resources/templates/conf/autoload_configs/tts_commandline.conf.xml b/app/switch/resources/conf/autoload_configs/tts_commandline.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/tts_commandline.conf.xml
rename to app/switch/resources/conf/autoload_configs/tts_commandline.conf.xml
diff --git a/resources/templates/conf/autoload_configs/unicall.conf.xml b/app/switch/resources/conf/autoload_configs/unicall.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/unicall.conf.xml
rename to app/switch/resources/conf/autoload_configs/unicall.conf.xml
diff --git a/resources/templates/conf/autoload_configs/unimrcp.conf.xml b/app/switch/resources/conf/autoload_configs/unimrcp.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/unimrcp.conf.xml
rename to app/switch/resources/conf/autoload_configs/unimrcp.conf.xml
diff --git a/resources/templates/conf/autoload_configs/v8.conf.xml b/app/switch/resources/conf/autoload_configs/v8.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/v8.conf.xml
rename to app/switch/resources/conf/autoload_configs/v8.conf.xml
diff --git a/resources/templates/conf/autoload_configs/verto.conf.xml b/app/switch/resources/conf/autoload_configs/verto.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/verto.conf.xml
rename to app/switch/resources/conf/autoload_configs/verto.conf.xml
diff --git a/resources/templates/conf/autoload_configs/voicemail.conf.xml b/app/switch/resources/conf/autoload_configs/voicemail.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/voicemail.conf.xml
rename to app/switch/resources/conf/autoload_configs/voicemail.conf.xml
diff --git a/resources/templates/conf/autoload_configs/voicemail_ivr.conf.xml b/app/switch/resources/conf/autoload_configs/voicemail_ivr.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/voicemail_ivr.conf.xml
rename to app/switch/resources/conf/autoload_configs/voicemail_ivr.conf.xml
diff --git a/resources/templates/conf/autoload_configs/xml_cdr.conf.xml b/app/switch/resources/conf/autoload_configs/xml_cdr.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/xml_cdr.conf.xml
rename to app/switch/resources/conf/autoload_configs/xml_cdr.conf.xml
diff --git a/resources/templates/conf/autoload_configs/xml_curl.conf.xml b/app/switch/resources/conf/autoload_configs/xml_curl.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/xml_curl.conf.xml
rename to app/switch/resources/conf/autoload_configs/xml_curl.conf.xml
diff --git a/resources/templates/conf/autoload_configs/xml_rpc.conf.xml b/app/switch/resources/conf/autoload_configs/xml_rpc.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/xml_rpc.conf.xml
rename to app/switch/resources/conf/autoload_configs/xml_rpc.conf.xml
diff --git a/resources/templates/conf/autoload_configs/zeroconf.conf.xml b/app/switch/resources/conf/autoload_configs/zeroconf.conf.xml
similarity index 100%
rename from resources/templates/conf/autoload_configs/zeroconf.conf.xml
rename to app/switch/resources/conf/autoload_configs/zeroconf.conf.xml
diff --git a/resources/templates/conf/chatplan/default.xml b/app/switch/resources/conf/chatplan/default.xml
similarity index 100%
rename from resources/templates/conf/chatplan/default.xml
rename to app/switch/resources/conf/chatplan/default.xml
diff --git a/resources/templates/conf/dialplan/empty.xml b/app/switch/resources/conf/dialplan/empty.xml
similarity index 100%
rename from resources/templates/conf/dialplan/empty.xml
rename to app/switch/resources/conf/dialplan/empty.xml
diff --git a/resources/templates/conf/directory/empty.xml b/app/switch/resources/conf/directory/empty.xml
similarity index 100%
rename from resources/templates/conf/directory/empty.xml
rename to app/switch/resources/conf/directory/empty.xml
diff --git a/resources/templates/conf/extensions.conf b/app/switch/resources/conf/extensions.conf
similarity index 100%
rename from resources/templates/conf/extensions.conf
rename to app/switch/resources/conf/extensions.conf
diff --git a/resources/templates/conf/freeswitch.xml b/app/switch/resources/conf/freeswitch.xml
similarity index 100%
rename from resources/templates/conf/freeswitch.xml
rename to app/switch/resources/conf/freeswitch.xml
diff --git a/resources/templates/conf/freetdm.conf b/app/switch/resources/conf/freetdm.conf
similarity index 100%
rename from resources/templates/conf/freetdm.conf
rename to app/switch/resources/conf/freetdm.conf
diff --git a/resources/templates/conf/fur_elise.ttml b/app/switch/resources/conf/fur_elise.ttml
similarity index 100%
rename from resources/templates/conf/fur_elise.ttml
rename to app/switch/resources/conf/fur_elise.ttml
diff --git a/resources/templates/conf/ivr_menus/demo_ivr.xml b/app/switch/resources/conf/ivr_menus/demo_ivr.xml
similarity index 100%
rename from resources/templates/conf/ivr_menus/demo_ivr.xml
rename to app/switch/resources/conf/ivr_menus/demo_ivr.xml
diff --git a/resources/templates/conf/jingle_profiles/client.xml b/app/switch/resources/conf/jingle_profiles/client.xml
similarity index 100%
rename from resources/templates/conf/jingle_profiles/client.xml
rename to app/switch/resources/conf/jingle_profiles/client.xml
diff --git a/resources/templates/conf/jingle_profiles/server.xml b/app/switch/resources/conf/jingle_profiles/server.xml
similarity index 100%
rename from resources/templates/conf/jingle_profiles/server.xml
rename to app/switch/resources/conf/jingle_profiles/server.xml
diff --git a/resources/templates/conf/languages/ar/ar.xml b/app/switch/resources/conf/languages/ar/ar.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/ar.xml
rename to app/switch/resources/conf/languages/ar/ar.xml
diff --git a/resources/templates/conf/languages/ar/demo/demo-ivr.xml b/app/switch/resources/conf/languages/ar/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/ar/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/ar/demo/demo.xml b/app/switch/resources/conf/languages/ar/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/demo/demo.xml
rename to app/switch/resources/conf/languages/ar/demo/demo.xml
diff --git a/resources/templates/conf/languages/ar/dir/sounds.xml b/app/switch/resources/conf/languages/ar/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/dir/sounds.xml
rename to app/switch/resources/conf/languages/ar/dir/sounds.xml
diff --git a/resources/templates/conf/languages/ar/dir/tts.xml b/app/switch/resources/conf/languages/ar/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/dir/tts.xml
rename to app/switch/resources/conf/languages/ar/dir/tts.xml
diff --git a/resources/templates/conf/languages/ar/ivr/pin_number.xml b/app/switch/resources/conf/languages/ar/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/ar/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/ar/ivr/sounds.xml b/app/switch/resources/conf/languages/ar/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/ivr/sounds.xml
rename to app/switch/resources/conf/languages/ar/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/ar/ivr/wakeup.xml b/app/switch/resources/conf/languages/ar/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/ar/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/ar/vm/sounds.xml b/app/switch/resources/conf/languages/ar/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/vm/sounds.xml
rename to app/switch/resources/conf/languages/ar/vm/sounds.xml
diff --git a/resources/templates/conf/languages/ar/vm/tts.xml b/app/switch/resources/conf/languages/ar/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/vm/tts.xml
rename to app/switch/resources/conf/languages/ar/vm/tts.xml
diff --git a/resources/templates/conf/languages/ar/vm/voicemail.xml b/app/switch/resources/conf/languages/ar/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/vm/voicemail.xml
rename to app/switch/resources/conf/languages/ar/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/ar/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/ar/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/ar/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/ar/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/de/de.xml b/app/switch/resources/conf/languages/de/de.xml
similarity index 100%
rename from resources/templates/conf/languages/de/de.xml
rename to app/switch/resources/conf/languages/de/de.xml
diff --git a/resources/templates/conf/languages/de/demo/demo-ivr.xml b/app/switch/resources/conf/languages/de/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/de/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/de/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/de/demo/demo.xml b/app/switch/resources/conf/languages/de/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/de/demo/demo.xml
rename to app/switch/resources/conf/languages/de/demo/demo.xml
diff --git a/resources/templates/conf/languages/de/dir/sounds.xml b/app/switch/resources/conf/languages/de/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/de/dir/sounds.xml
rename to app/switch/resources/conf/languages/de/dir/sounds.xml
diff --git a/resources/templates/conf/languages/de/dir/tts.xml b/app/switch/resources/conf/languages/de/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/de/dir/tts.xml
rename to app/switch/resources/conf/languages/de/dir/tts.xml
diff --git a/resources/templates/conf/languages/de/ivr/pin_number.xml b/app/switch/resources/conf/languages/de/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/de/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/de/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/de/ivr/sounds.xml b/app/switch/resources/conf/languages/de/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/de/ivr/sounds.xml
rename to app/switch/resources/conf/languages/de/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/de/ivr/wakeup.xml b/app/switch/resources/conf/languages/de/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/de/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/de/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/de/vm/sounds.xml b/app/switch/resources/conf/languages/de/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/de/vm/sounds.xml
rename to app/switch/resources/conf/languages/de/vm/sounds.xml
diff --git a/resources/templates/conf/languages/de/vm/tts.xml b/app/switch/resources/conf/languages/de/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/de/vm/tts.xml
rename to app/switch/resources/conf/languages/de/vm/tts.xml
diff --git a/resources/templates/conf/languages/de/vm/voicemail.xml b/app/switch/resources/conf/languages/de/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/de/vm/voicemail.xml
rename to app/switch/resources/conf/languages/de/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/de/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/de/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/de/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/de/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/en/demo/demo-ivr.xml b/app/switch/resources/conf/languages/en/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/en/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/en/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/en/demo/demo.xml b/app/switch/resources/conf/languages/en/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/en/demo/demo.xml
rename to app/switch/resources/conf/languages/en/demo/demo.xml
diff --git a/resources/templates/conf/languages/en/dir/sounds.xml b/app/switch/resources/conf/languages/en/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/en/dir/sounds.xml
rename to app/switch/resources/conf/languages/en/dir/sounds.xml
diff --git a/resources/templates/conf/languages/en/dir/tts.xml b/app/switch/resources/conf/languages/en/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/en/dir/tts.xml
rename to app/switch/resources/conf/languages/en/dir/tts.xml
diff --git a/resources/templates/conf/languages/en/en.xml b/app/switch/resources/conf/languages/en/en.xml
similarity index 100%
rename from resources/templates/conf/languages/en/en.xml
rename to app/switch/resources/conf/languages/en/en.xml
diff --git a/resources/templates/conf/languages/en/ivr/pin_number.xml b/app/switch/resources/conf/languages/en/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/en/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/en/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/en/ivr/sounds.xml b/app/switch/resources/conf/languages/en/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/en/ivr/sounds.xml
rename to app/switch/resources/conf/languages/en/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/en/ivr/wakeup.xml b/app/switch/resources/conf/languages/en/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/en/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/en/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/en/vm/sounds.xml b/app/switch/resources/conf/languages/en/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/en/vm/sounds.xml
rename to app/switch/resources/conf/languages/en/vm/sounds.xml
diff --git a/resources/templates/conf/languages/en/vm/tts.xml b/app/switch/resources/conf/languages/en/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/en/vm/tts.xml
rename to app/switch/resources/conf/languages/en/vm/tts.xml
diff --git a/resources/templates/conf/languages/en/vm/voicemail.xml b/app/switch/resources/conf/languages/en/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/en/vm/voicemail.xml
rename to app/switch/resources/conf/languages/en/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/en/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/en/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/en/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/en/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/es/demo/demo-ivr.xml b/app/switch/resources/conf/languages/es/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/es/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/es/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/es/demo/demo.xml b/app/switch/resources/conf/languages/es/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/es/demo/demo.xml
rename to app/switch/resources/conf/languages/es/demo/demo.xml
diff --git a/resources/templates/conf/languages/es/dir/sounds.xml b/app/switch/resources/conf/languages/es/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/es/dir/sounds.xml
rename to app/switch/resources/conf/languages/es/dir/sounds.xml
diff --git a/resources/templates/conf/languages/es/dir/tts.xml b/app/switch/resources/conf/languages/es/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/es/dir/tts.xml
rename to app/switch/resources/conf/languages/es/dir/tts.xml
diff --git a/resources/templates/conf/languages/es/es.xml b/app/switch/resources/conf/languages/es/es.xml
similarity index 100%
rename from resources/templates/conf/languages/es/es.xml
rename to app/switch/resources/conf/languages/es/es.xml
diff --git a/resources/templates/conf/languages/es/ivr/pin_number.xml b/app/switch/resources/conf/languages/es/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/es/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/es/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/es/ivr/sounds.xml b/app/switch/resources/conf/languages/es/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/es/ivr/sounds.xml
rename to app/switch/resources/conf/languages/es/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/es/ivr/wakeup.xml b/app/switch/resources/conf/languages/es/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/es/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/es/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/es/vm/sounds.xml b/app/switch/resources/conf/languages/es/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/es/vm/sounds.xml
rename to app/switch/resources/conf/languages/es/vm/sounds.xml
diff --git a/resources/templates/conf/languages/es/vm/tts.xml b/app/switch/resources/conf/languages/es/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/es/vm/tts.xml
rename to app/switch/resources/conf/languages/es/vm/tts.xml
diff --git a/resources/templates/conf/languages/es/vm/voicemail.xml b/app/switch/resources/conf/languages/es/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/es/vm/voicemail.xml
rename to app/switch/resources/conf/languages/es/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/es/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/es/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/es/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/es/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/fr/demo/demo-ivr.xml b/app/switch/resources/conf/languages/fr/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/fr/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/fr/demo/demo.xml b/app/switch/resources/conf/languages/fr/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/demo/demo.xml
rename to app/switch/resources/conf/languages/fr/demo/demo.xml
diff --git a/resources/templates/conf/languages/fr/dir/sounds.xml b/app/switch/resources/conf/languages/fr/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/dir/sounds.xml
rename to app/switch/resources/conf/languages/fr/dir/sounds.xml
diff --git a/resources/templates/conf/languages/fr/dir/tts.xml b/app/switch/resources/conf/languages/fr/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/dir/tts.xml
rename to app/switch/resources/conf/languages/fr/dir/tts.xml
diff --git a/resources/templates/conf/languages/fr/fr.xml b/app/switch/resources/conf/languages/fr/fr.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/fr.xml
rename to app/switch/resources/conf/languages/fr/fr.xml
diff --git a/resources/templates/conf/languages/fr/ivr/pin_number.xml b/app/switch/resources/conf/languages/fr/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/fr/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/fr/ivr/sounds.xml b/app/switch/resources/conf/languages/fr/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/ivr/sounds.xml
rename to app/switch/resources/conf/languages/fr/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/fr/ivr/wakeup.xml b/app/switch/resources/conf/languages/fr/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/fr/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/fr/vm/sounds.xml b/app/switch/resources/conf/languages/fr/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/vm/sounds.xml
rename to app/switch/resources/conf/languages/fr/vm/sounds.xml
diff --git a/resources/templates/conf/languages/fr/vm/tts.xml b/app/switch/resources/conf/languages/fr/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/vm/tts.xml
rename to app/switch/resources/conf/languages/fr/vm/tts.xml
diff --git a/resources/templates/conf/languages/fr/vm/voicemail.xml b/app/switch/resources/conf/languages/fr/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/vm/voicemail.xml
rename to app/switch/resources/conf/languages/fr/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/fr/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/fr/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/fr/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/fr/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/he/demo/demo-ivr.xml b/app/switch/resources/conf/languages/he/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/he/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/he/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/he/demo/demo.xml b/app/switch/resources/conf/languages/he/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/he/demo/demo.xml
rename to app/switch/resources/conf/languages/he/demo/demo.xml
diff --git a/resources/templates/conf/languages/he/dir/sounds.xml b/app/switch/resources/conf/languages/he/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/he/dir/sounds.xml
rename to app/switch/resources/conf/languages/he/dir/sounds.xml
diff --git a/resources/templates/conf/languages/he/dir/tts.xml b/app/switch/resources/conf/languages/he/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/he/dir/tts.xml
rename to app/switch/resources/conf/languages/he/dir/tts.xml
diff --git a/resources/templates/conf/languages/he/he.xml b/app/switch/resources/conf/languages/he/he.xml
similarity index 100%
rename from resources/templates/conf/languages/he/he.xml
rename to app/switch/resources/conf/languages/he/he.xml
diff --git a/resources/templates/conf/languages/he/ivr/pin_number.xml b/app/switch/resources/conf/languages/he/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/he/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/he/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/he/ivr/sounds.xml b/app/switch/resources/conf/languages/he/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/he/ivr/sounds.xml
rename to app/switch/resources/conf/languages/he/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/he/ivr/wakeup.xml b/app/switch/resources/conf/languages/he/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/he/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/he/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/he/vm/sounds.xml b/app/switch/resources/conf/languages/he/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/he/vm/sounds.xml
rename to app/switch/resources/conf/languages/he/vm/sounds.xml
diff --git a/resources/templates/conf/languages/he/vm/tts.xml b/app/switch/resources/conf/languages/he/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/he/vm/tts.xml
rename to app/switch/resources/conf/languages/he/vm/tts.xml
diff --git a/resources/templates/conf/languages/he/vm/voicemail.xml b/app/switch/resources/conf/languages/he/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/he/vm/voicemail.xml
rename to app/switch/resources/conf/languages/he/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/he/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/he/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/he/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/he/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/it/demo/demo-ivr.xml b/app/switch/resources/conf/languages/it/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/it/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/it/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/it/demo/demo.xml b/app/switch/resources/conf/languages/it/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/it/demo/demo.xml
rename to app/switch/resources/conf/languages/it/demo/demo.xml
diff --git a/resources/templates/conf/languages/it/dir/sounds.xml b/app/switch/resources/conf/languages/it/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/it/dir/sounds.xml
rename to app/switch/resources/conf/languages/it/dir/sounds.xml
diff --git a/resources/templates/conf/languages/it/dir/tts.xml b/app/switch/resources/conf/languages/it/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/it/dir/tts.xml
rename to app/switch/resources/conf/languages/it/dir/tts.xml
diff --git a/resources/templates/conf/languages/it/it.xml b/app/switch/resources/conf/languages/it/it.xml
similarity index 100%
rename from resources/templates/conf/languages/it/it.xml
rename to app/switch/resources/conf/languages/it/it.xml
diff --git a/resources/templates/conf/languages/it/ivr/pin_number.xml b/app/switch/resources/conf/languages/it/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/it/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/it/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/it/ivr/sounds.xml b/app/switch/resources/conf/languages/it/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/it/ivr/sounds.xml
rename to app/switch/resources/conf/languages/it/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/it/ivr/wakeup.xml b/app/switch/resources/conf/languages/it/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/it/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/it/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/it/vm/sounds.xml b/app/switch/resources/conf/languages/it/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/it/vm/sounds.xml
rename to app/switch/resources/conf/languages/it/vm/sounds.xml
diff --git a/resources/templates/conf/languages/it/vm/tts.xml b/app/switch/resources/conf/languages/it/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/it/vm/tts.xml
rename to app/switch/resources/conf/languages/it/vm/tts.xml
diff --git a/resources/templates/conf/languages/it/vm/voicemail.xml b/app/switch/resources/conf/languages/it/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/it/vm/voicemail.xml
rename to app/switch/resources/conf/languages/it/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/it/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/it/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/it/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/it/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/nl/demo/demo-ivr.xml b/app/switch/resources/conf/languages/nl/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/nl/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/nl/demo/demo.xml b/app/switch/resources/conf/languages/nl/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/demo/demo.xml
rename to app/switch/resources/conf/languages/nl/demo/demo.xml
diff --git a/resources/templates/conf/languages/nl/dir/sounds.xml b/app/switch/resources/conf/languages/nl/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/dir/sounds.xml
rename to app/switch/resources/conf/languages/nl/dir/sounds.xml
diff --git a/resources/templates/conf/languages/nl/dir/tts.xml b/app/switch/resources/conf/languages/nl/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/dir/tts.xml
rename to app/switch/resources/conf/languages/nl/dir/tts.xml
diff --git a/resources/templates/conf/languages/nl/en/demo/demo-ivr.xml b/app/switch/resources/conf/languages/nl/en/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/nl/en/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/nl/en/demo/demo.xml b/app/switch/resources/conf/languages/nl/en/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/demo/demo.xml
rename to app/switch/resources/conf/languages/nl/en/demo/demo.xml
diff --git a/resources/templates/conf/languages/nl/en/dir/sounds.xml b/app/switch/resources/conf/languages/nl/en/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/dir/sounds.xml
rename to app/switch/resources/conf/languages/nl/en/dir/sounds.xml
diff --git a/resources/templates/conf/languages/nl/en/dir/tts.xml b/app/switch/resources/conf/languages/nl/en/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/dir/tts.xml
rename to app/switch/resources/conf/languages/nl/en/dir/tts.xml
diff --git a/resources/templates/conf/languages/nl/en/en.xml b/app/switch/resources/conf/languages/nl/en/en.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/en.xml
rename to app/switch/resources/conf/languages/nl/en/en.xml
diff --git a/resources/templates/conf/languages/nl/en/ivr/pin_number.xml b/app/switch/resources/conf/languages/nl/en/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/nl/en/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/nl/en/ivr/sounds.xml b/app/switch/resources/conf/languages/nl/en/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/ivr/sounds.xml
rename to app/switch/resources/conf/languages/nl/en/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/nl/en/ivr/wakeup.xml b/app/switch/resources/conf/languages/nl/en/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/nl/en/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/nl/en/vm/sounds.xml b/app/switch/resources/conf/languages/nl/en/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/vm/sounds.xml
rename to app/switch/resources/conf/languages/nl/en/vm/sounds.xml
diff --git a/resources/templates/conf/languages/nl/en/vm/tts.xml b/app/switch/resources/conf/languages/nl/en/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/vm/tts.xml
rename to app/switch/resources/conf/languages/nl/en/vm/tts.xml
diff --git a/resources/templates/conf/languages/nl/en/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/nl/en/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/en/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/nl/en/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/nl/ivr/pin_number.xml b/app/switch/resources/conf/languages/nl/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/nl/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/nl/ivr/sounds.xml b/app/switch/resources/conf/languages/nl/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/ivr/sounds.xml
rename to app/switch/resources/conf/languages/nl/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/nl/ivr/wakeup.xml b/app/switch/resources/conf/languages/nl/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/nl/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/nl/nl.xml b/app/switch/resources/conf/languages/nl/nl.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/nl.xml
rename to app/switch/resources/conf/languages/nl/nl.xml
diff --git a/resources/templates/conf/languages/nl/vm/sounds.xml b/app/switch/resources/conf/languages/nl/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/vm/sounds.xml
rename to app/switch/resources/conf/languages/nl/vm/sounds.xml
diff --git a/resources/templates/conf/languages/nl/vm/tts.xml b/app/switch/resources/conf/languages/nl/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/vm/tts.xml
rename to app/switch/resources/conf/languages/nl/vm/tts.xml
diff --git a/resources/templates/conf/languages/nl/vm/voicemail.xml b/app/switch/resources/conf/languages/nl/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/vm/voicemail.xml
rename to app/switch/resources/conf/languages/nl/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/nl/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/nl/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/nl/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/nl/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/pt/demo/demo-ivr.xml b/app/switch/resources/conf/languages/pt/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/pt/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/pt/demo/demo.xml b/app/switch/resources/conf/languages/pt/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/demo/demo.xml
rename to app/switch/resources/conf/languages/pt/demo/demo.xml
diff --git a/resources/templates/conf/languages/pt/dir/sounds.xml b/app/switch/resources/conf/languages/pt/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/dir/sounds.xml
rename to app/switch/resources/conf/languages/pt/dir/sounds.xml
diff --git a/resources/templates/conf/languages/pt/dir/tts.xml b/app/switch/resources/conf/languages/pt/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/dir/tts.xml
rename to app/switch/resources/conf/languages/pt/dir/tts.xml
diff --git a/resources/templates/conf/languages/pt/ivr/pin_number.xml b/app/switch/resources/conf/languages/pt/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/pt/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/pt/ivr/sounds.xml b/app/switch/resources/conf/languages/pt/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/ivr/sounds.xml
rename to app/switch/resources/conf/languages/pt/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/pt/ivr/wakeup.xml b/app/switch/resources/conf/languages/pt/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/pt/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/pt/pt.xml b/app/switch/resources/conf/languages/pt/pt.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/pt.xml
rename to app/switch/resources/conf/languages/pt/pt.xml
diff --git a/resources/templates/conf/languages/pt/vm/sounds.xml b/app/switch/resources/conf/languages/pt/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/vm/sounds.xml
rename to app/switch/resources/conf/languages/pt/vm/sounds.xml
diff --git a/resources/templates/conf/languages/pt/vm/tts.xml b/app/switch/resources/conf/languages/pt/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/vm/tts.xml
rename to app/switch/resources/conf/languages/pt/vm/tts.xml
diff --git a/resources/templates/conf/languages/pt/vm/voicemail.xml b/app/switch/resources/conf/languages/pt/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/vm/voicemail.xml
rename to app/switch/resources/conf/languages/pt/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/pt/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/pt/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/pt/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/pt/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/ro/demo/demo-ivr.xml b/app/switch/resources/conf/languages/ro/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/ro/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/ro/demo/demo.xml b/app/switch/resources/conf/languages/ro/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/demo/demo.xml
rename to app/switch/resources/conf/languages/ro/demo/demo.xml
diff --git a/resources/templates/conf/languages/ro/dir/sounds.xml b/app/switch/resources/conf/languages/ro/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/dir/sounds.xml
rename to app/switch/resources/conf/languages/ro/dir/sounds.xml
diff --git a/resources/templates/conf/languages/ro/dir/tts.xml b/app/switch/resources/conf/languages/ro/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/dir/tts.xml
rename to app/switch/resources/conf/languages/ro/dir/tts.xml
diff --git a/resources/templates/conf/languages/ro/ivr/pin_number.xml b/app/switch/resources/conf/languages/ro/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/ro/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/ro/ivr/sounds.xml b/app/switch/resources/conf/languages/ro/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/ivr/sounds.xml
rename to app/switch/resources/conf/languages/ro/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/ro/ivr/wakeup.xml b/app/switch/resources/conf/languages/ro/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/ro/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/ro/ro.xml b/app/switch/resources/conf/languages/ro/ro.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/ro.xml
rename to app/switch/resources/conf/languages/ro/ro.xml
diff --git a/resources/templates/conf/languages/ro/vm/sounds.xml b/app/switch/resources/conf/languages/ro/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/vm/sounds.xml
rename to app/switch/resources/conf/languages/ro/vm/sounds.xml
diff --git a/resources/templates/conf/languages/ro/vm/tts.xml b/app/switch/resources/conf/languages/ro/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/vm/tts.xml
rename to app/switch/resources/conf/languages/ro/vm/tts.xml
diff --git a/resources/templates/conf/languages/ro/vm/voicemail.xml b/app/switch/resources/conf/languages/ro/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/vm/voicemail.xml
rename to app/switch/resources/conf/languages/ro/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/ro/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/ro/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/ro/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/ro/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/ru/demo/demo-ivr.xml b/app/switch/resources/conf/languages/ru/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/ru/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/ru/demo/demo.xml b/app/switch/resources/conf/languages/ru/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/demo/demo.xml
rename to app/switch/resources/conf/languages/ru/demo/demo.xml
diff --git a/resources/templates/conf/languages/ru/dir/sounds.xml b/app/switch/resources/conf/languages/ru/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/dir/sounds.xml
rename to app/switch/resources/conf/languages/ru/dir/sounds.xml
diff --git a/resources/templates/conf/languages/ru/dir/tts.xml b/app/switch/resources/conf/languages/ru/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/dir/tts.xml
rename to app/switch/resources/conf/languages/ru/dir/tts.xml
diff --git a/resources/templates/conf/languages/ru/ivr/pin_number.xml b/app/switch/resources/conf/languages/ru/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/ru/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/ru/ivr/sounds.xml b/app/switch/resources/conf/languages/ru/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/ivr/sounds.xml
rename to app/switch/resources/conf/languages/ru/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/ru/ivr/wakeup.xml b/app/switch/resources/conf/languages/ru/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/ru/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/ru/ru.xml b/app/switch/resources/conf/languages/ru/ru.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/ru.xml
rename to app/switch/resources/conf/languages/ru/ru.xml
diff --git a/resources/templates/conf/languages/ru/vm/sounds.xml b/app/switch/resources/conf/languages/ru/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/vm/sounds.xml
rename to app/switch/resources/conf/languages/ru/vm/sounds.xml
diff --git a/resources/templates/conf/languages/ru/vm/tts.xml b/app/switch/resources/conf/languages/ru/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/vm/tts.xml
rename to app/switch/resources/conf/languages/ru/vm/tts.xml
diff --git a/resources/templates/conf/languages/ru/vm/voicemail.xml b/app/switch/resources/conf/languages/ru/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/vm/voicemail.xml
rename to app/switch/resources/conf/languages/ru/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/ru/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/ru/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/ru/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/ru/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/sv/demo/demo-ivr.xml b/app/switch/resources/conf/languages/sv/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/sv/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/sv/demo/demo.xml b/app/switch/resources/conf/languages/sv/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/demo/demo.xml
rename to app/switch/resources/conf/languages/sv/demo/demo.xml
diff --git a/resources/templates/conf/languages/sv/dir/sounds.xml b/app/switch/resources/conf/languages/sv/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/dir/sounds.xml
rename to app/switch/resources/conf/languages/sv/dir/sounds.xml
diff --git a/resources/templates/conf/languages/sv/dir/tts.xml b/app/switch/resources/conf/languages/sv/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/dir/tts.xml
rename to app/switch/resources/conf/languages/sv/dir/tts.xml
diff --git a/resources/templates/conf/languages/sv/ivr/pin_number.xml b/app/switch/resources/conf/languages/sv/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/sv/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/sv/ivr/sounds.xml b/app/switch/resources/conf/languages/sv/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/ivr/sounds.xml
rename to app/switch/resources/conf/languages/sv/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/sv/ivr/wakeup.xml b/app/switch/resources/conf/languages/sv/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/sv/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/sv/sv.xml b/app/switch/resources/conf/languages/sv/sv.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/sv.xml
rename to app/switch/resources/conf/languages/sv/sv.xml
diff --git a/resources/templates/conf/languages/sv/vm/sounds.xml b/app/switch/resources/conf/languages/sv/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/vm/sounds.xml
rename to app/switch/resources/conf/languages/sv/vm/sounds.xml
diff --git a/resources/templates/conf/languages/sv/vm/tts.xml b/app/switch/resources/conf/languages/sv/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/vm/tts.xml
rename to app/switch/resources/conf/languages/sv/vm/tts.xml
diff --git a/resources/templates/conf/languages/sv/vm/voicemail.xml b/app/switch/resources/conf/languages/sv/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/vm/voicemail.xml
rename to app/switch/resources/conf/languages/sv/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/sv/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/sv/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/sv/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/sv/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/tr/demo/demo-ivr.xml b/app/switch/resources/conf/languages/tr/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/tr/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/tr/demo/demo.xml b/app/switch/resources/conf/languages/tr/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/demo/demo.xml
rename to app/switch/resources/conf/languages/tr/demo/demo.xml
diff --git a/resources/templates/conf/languages/tr/dir/sounds.xml b/app/switch/resources/conf/languages/tr/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/dir/sounds.xml
rename to app/switch/resources/conf/languages/tr/dir/sounds.xml
diff --git a/resources/templates/conf/languages/tr/dir/tts.xml b/app/switch/resources/conf/languages/tr/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/dir/tts.xml
rename to app/switch/resources/conf/languages/tr/dir/tts.xml
diff --git a/resources/templates/conf/languages/tr/ivr/pin_number.xml b/app/switch/resources/conf/languages/tr/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/tr/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/tr/ivr/sounds.xml b/app/switch/resources/conf/languages/tr/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/ivr/sounds.xml
rename to app/switch/resources/conf/languages/tr/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/tr/ivr/wakeup.xml b/app/switch/resources/conf/languages/tr/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/tr/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/tr/tr.xml b/app/switch/resources/conf/languages/tr/tr.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/tr.xml
rename to app/switch/resources/conf/languages/tr/tr.xml
diff --git a/resources/templates/conf/languages/tr/vm/sounds.xml b/app/switch/resources/conf/languages/tr/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/vm/sounds.xml
rename to app/switch/resources/conf/languages/tr/vm/sounds.xml
diff --git a/resources/templates/conf/languages/tr/vm/tts.xml b/app/switch/resources/conf/languages/tr/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/vm/tts.xml
rename to app/switch/resources/conf/languages/tr/vm/tts.xml
diff --git a/resources/templates/conf/languages/tr/vm/voicemail.xml b/app/switch/resources/conf/languages/tr/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/vm/voicemail.xml
rename to app/switch/resources/conf/languages/tr/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/tr/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/tr/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/tr/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/tr/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/languages/uk/demo/demo-ivr.xml b/app/switch/resources/conf/languages/uk/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/demo/demo-ivr.xml
rename to app/switch/resources/conf/languages/uk/demo/demo-ivr.xml
diff --git a/resources/templates/conf/languages/uk/demo/demo.xml b/app/switch/resources/conf/languages/uk/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/demo/demo.xml
rename to app/switch/resources/conf/languages/uk/demo/demo.xml
diff --git a/resources/templates/conf/languages/uk/dir/sounds.xml b/app/switch/resources/conf/languages/uk/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/dir/sounds.xml
rename to app/switch/resources/conf/languages/uk/dir/sounds.xml
diff --git a/resources/templates/conf/languages/uk/dir/tts.xml b/app/switch/resources/conf/languages/uk/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/dir/tts.xml
rename to app/switch/resources/conf/languages/uk/dir/tts.xml
diff --git a/resources/templates/conf/languages/uk/ivr/pin_number.xml b/app/switch/resources/conf/languages/uk/ivr/pin_number.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/ivr/pin_number.xml
rename to app/switch/resources/conf/languages/uk/ivr/pin_number.xml
diff --git a/resources/templates/conf/languages/uk/ivr/sounds.xml b/app/switch/resources/conf/languages/uk/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/ivr/sounds.xml
rename to app/switch/resources/conf/languages/uk/ivr/sounds.xml
diff --git a/resources/templates/conf/languages/uk/ivr/wakeup.xml b/app/switch/resources/conf/languages/uk/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/ivr/wakeup.xml
rename to app/switch/resources/conf/languages/uk/ivr/wakeup.xml
diff --git a/resources/templates/conf/languages/uk/uk.xml b/app/switch/resources/conf/languages/uk/uk.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/uk.xml
rename to app/switch/resources/conf/languages/uk/uk.xml
diff --git a/resources/templates/conf/languages/uk/vm/sounds.xml b/app/switch/resources/conf/languages/uk/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/vm/sounds.xml
rename to app/switch/resources/conf/languages/uk/vm/sounds.xml
diff --git a/resources/templates/conf/languages/uk/vm/tts.xml b/app/switch/resources/conf/languages/uk/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/vm/tts.xml
rename to app/switch/resources/conf/languages/uk/vm/tts.xml
diff --git a/resources/templates/conf/languages/uk/vm/voicemail.xml b/app/switch/resources/conf/languages/uk/vm/voicemail.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/vm/voicemail.xml
rename to app/switch/resources/conf/languages/uk/vm/voicemail.xml
diff --git a/resources/templates/conf/languages/uk/vm/voicemail_ivr.xml b/app/switch/resources/conf/languages/uk/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/languages/uk/vm/voicemail_ivr.xml
rename to app/switch/resources/conf/languages/uk/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/mime.types b/app/switch/resources/conf/mime.types
similarity index 100%
rename from resources/templates/conf/mime.types
rename to app/switch/resources/conf/mime.types
diff --git a/resources/templates/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml b/app/switch/resources/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml
similarity index 100%
rename from resources/templates/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml
rename to app/switch/resources/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml
diff --git a/resources/templates/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml b/app/switch/resources/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
similarity index 100%
rename from resources/templates/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
rename to app/switch/resources/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
diff --git a/resources/templates/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml b/app/switch/resources/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml
similarity index 100%
rename from resources/templates/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml
rename to app/switch/resources/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml
diff --git a/resources/templates/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml b/app/switch/resources/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml
similarity index 100%
rename from resources/templates/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml
rename to app/switch/resources/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml
diff --git a/resources/templates/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml b/app/switch/resources/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml
similarity index 100%
rename from resources/templates/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml
rename to app/switch/resources/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml
diff --git a/resources/templates/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml b/app/switch/resources/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
similarity index 100%
rename from resources/templates/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
rename to app/switch/resources/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
diff --git a/resources/templates/conf/notify-voicemail.tpl b/app/switch/resources/conf/notify-voicemail.tpl
similarity index 100%
rename from resources/templates/conf/notify-voicemail.tpl
rename to app/switch/resources/conf/notify-voicemail.tpl
diff --git a/resources/templates/conf/sip_profiles/empty.xml b/app/switch/resources/conf/sip_profiles/empty.xml
similarity index 100%
rename from resources/templates/conf/sip_profiles/empty.xml
rename to app/switch/resources/conf/sip_profiles/empty.xml
diff --git a/resources/templates/conf/sip_profiles/external-ipv6.xml.noload b/app/switch/resources/conf/sip_profiles/external-ipv6.xml.noload
similarity index 100%
rename from resources/templates/conf/sip_profiles/external-ipv6.xml.noload
rename to app/switch/resources/conf/sip_profiles/external-ipv6.xml.noload
diff --git a/resources/templates/conf/sip_profiles/external.xml.noload b/app/switch/resources/conf/sip_profiles/external.xml.noload
similarity index 100%
rename from resources/templates/conf/sip_profiles/external.xml.noload
rename to app/switch/resources/conf/sip_profiles/external.xml.noload
diff --git a/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload b/app/switch/resources/conf/sip_profiles/internal-ipv6.xml.noload
similarity index 100%
rename from resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
rename to app/switch/resources/conf/sip_profiles/internal-ipv6.xml.noload
diff --git a/resources/templates/conf/sip_profiles/internal.xml.noload b/app/switch/resources/conf/sip_profiles/internal.xml.noload
similarity index 100%
rename from resources/templates/conf/sip_profiles/internal.xml.noload
rename to app/switch/resources/conf/sip_profiles/internal.xml.noload
diff --git a/resources/templates/conf/skinny_profiles/internal.xml b/app/switch/resources/conf/skinny_profiles/internal.xml
similarity index 100%
rename from resources/templates/conf/skinny_profiles/internal.xml
rename to app/switch/resources/conf/skinny_profiles/internal.xml
diff --git a/resources/templates/conf/tetris.ttml b/app/switch/resources/conf/tetris.ttml
similarity index 100%
rename from resources/templates/conf/tetris.ttml
rename to app/switch/resources/conf/tetris.ttml
diff --git a/resources/templates/conf/vars.xml b/app/switch/resources/conf/vars.xml
similarity index 100%
rename from resources/templates/conf/vars.xml
rename to app/switch/resources/conf/vars.xml
diff --git a/resources/templates/conf/voicemail.tpl b/app/switch/resources/conf/voicemail.tpl
similarity index 100%
rename from resources/templates/conf/voicemail.tpl
rename to app/switch/resources/conf/voicemail.tpl
diff --git a/resources/templates/conf/web-vm.tpl b/app/switch/resources/conf/web-vm.tpl
similarity index 100%
rename from resources/templates/conf/web-vm.tpl
rename to app/switch/resources/conf/web-vm.tpl