From ee71daa1f66b458f868d7e3d36dcf8b3aaa056df Mon Sep 17 00:00:00 2001
From: Ken Rice <krice@tollfreegateway.com>
Date: Mon, 9 Jan 2012 15:13:57 -0500
Subject: [PATCH] conf: mv conf/* -> conf/vanilla/*

---
 Makefile.am                                       | 15 +++++++++------
 conf/{ => vanilla}/README_IMPORTANT.txt           |  0
 .../autoload_configs/abstraction.conf.xml         |  0
 conf/{ => vanilla}/autoload_configs/acl.conf.xml  |  0
 conf/{ => vanilla}/autoload_configs/alsa.conf.xml |  0
 .../autoload_configs/blacklist.conf.xml           |  0
 .../autoload_configs/callcenter.conf.xml          |  0
 .../autoload_configs/cdr_csv.conf.xml             |  0
 .../autoload_configs/cdr_mongodb.conf.xml         |  0
 .../autoload_configs/cdr_pg_csv.conf.xml          |  0
 .../autoload_configs/cdr_sqlite.conf.xml          |  0
 .../autoload_configs/cepstral.conf.xml            |  0
 .../autoload_configs/cidlookup.conf.xml           |  0
 .../autoload_configs/conference.conf.xml          |  0
 .../autoload_configs/console.conf.xml             |  0
 conf/{ => vanilla}/autoload_configs/db.conf.xml   |  0
 .../autoload_configs/dialplan_directory.conf.xml  |  0
 .../autoload_configs/dingaling.conf.xml           |  0
 .../autoload_configs/directory.conf.xml           |  0
 .../autoload_configs/distributor.conf.xml         |  0
 .../autoload_configs/easyroute.conf.xml           |  0
 conf/{ => vanilla}/autoload_configs/enum.conf.xml |  0
 .../autoload_configs/erlang_event.conf.xml        |  0
 .../autoload_configs/event_multicast.conf.xml     |  0
 .../autoload_configs/event_socket.conf.xml        |  0
 conf/{ => vanilla}/autoload_configs/fax.conf.xml  |  0
 conf/{ => vanilla}/autoload_configs/fifo.conf.xml |  0
 conf/{ => vanilla}/autoload_configs/hash.conf.xml |  0
 .../autoload_configs/httapi.conf.xml              |  0
 .../autoload_configs/http_cache.conf.xml          |  0
 conf/{ => vanilla}/autoload_configs/ivr.conf.xml  |  0
 conf/{ => vanilla}/autoload_configs/java.conf.xml |  0
 conf/{ => vanilla}/autoload_configs/lcr.conf.xml  |  0
 .../autoload_configs/local_stream.conf.xml        |  0
 .../autoload_configs/logfile.conf.xml             |  0
 conf/{ => vanilla}/autoload_configs/lua.conf.xml  |  0
 .../autoload_configs/memcache.conf.xml            |  0
 .../autoload_configs/modules.conf.xml             |  0
 .../{ => vanilla}/autoload_configs/mongo.conf.xml |  0
 .../autoload_configs/nibblebill.conf.xml          |  0
 conf/{ => vanilla}/autoload_configs/opal.conf.xml |  0
 conf/{ => vanilla}/autoload_configs/osp.conf.xml  |  0
 conf/{ => vanilla}/autoload_configs/perl.conf.xml |  0
 .../autoload_configs/pocketsphinx.conf.xml        |  0
 .../autoload_configs/portaudio.conf.xml           |  0
 .../autoload_configs/post_load_modules.conf.xml   |  0
 .../autoload_configs/presence_map.conf.xml        |  0
 .../autoload_configs/python.conf.xml              |  0
 .../{ => vanilla}/autoload_configs/redis.conf.xml |  0
 conf/{ => vanilla}/autoload_configs/rss.conf.xml  |  0
 conf/{ => vanilla}/autoload_configs/rtmp.conf.xml |  0
 .../autoload_configs/sangoma_codec.conf.xml       |  0
 .../{ => vanilla}/autoload_configs/shout.conf.xml |  0
 .../autoload_configs/skinny.conf.xml              |  0
 .../{ => vanilla}/autoload_configs/sofia.conf.xml |  0
 .../autoload_configs/spandsp.conf.xml             |  0
 .../autoload_configs/spidermonkey.conf.xml        |  0
 .../autoload_configs/switch.conf.xml              |  0
 .../autoload_configs/syslog.conf.xml              |  0
 .../autoload_configs/timezones.conf.xml           |  0
 .../autoload_configs/tts_commandline.conf.xml     |  0
 .../autoload_configs/unicall.conf.xml             |  0
 .../autoload_configs/unimrcp.conf.xml             |  0
 .../autoload_configs/voicemail.conf.xml           |  0
 .../autoload_configs/voicemail_ivr.conf.xml       |  0
 .../autoload_configs/xml_cdr.conf.xml             |  0
 .../autoload_configs/xml_curl.conf.xml            |  0
 .../autoload_configs/xml_rpc.conf.xml             |  0
 .../autoload_configs/zeroconf.conf.xml            |  0
 conf/{ => vanilla}/chatplan/default.xml           |  0
 conf/{ => vanilla}/config.FS0                     |  0
 conf/{ => vanilla}/dialplan/default.xml           |  0
 conf/{ => vanilla}/dialplan/default/00_ladspa.xml |  0
 .../dialplan/default/00_pizza_demo.xml            |  0
 .../dialplan/default/01_Talking_Clock.xml         |  0
 .../dialplan/default/01_example.com.xml           |  0
 .../dialplan/default/ideasip.com.noload           |  0
 .../dialplan/default/pulver.com.noload            |  0
 .../dialplan/default/sipbroker.com.noload         |  0
 .../dialplan/default/sipphone.com.noload          |  0
 .../dialplan/default/tollfreegateway.com.noload   |  0
 conf/{ => vanilla}/dialplan/features.xml          |  0
 conf/{ => vanilla}/dialplan/public.xml            |  0
 .../dialplan/public/00_inbound_did.xml            |  0
 conf/{ => vanilla}/dialplan/skinny-patterns.xml   |  0
 .../dialplan/skinny-patterns/20-Demo.xml          |  0
 .../skinny-patterns/20-Local_extension.xml        |  0
 .../dialplan/skinny-patterns/90-External.xml      |  0
 .../dialplan/skinny-patterns/99-Default_Drop.xml  |  0
 conf/{ => vanilla}/directory/default.xml          |  0
 conf/{ => vanilla}/directory/default/1000.xml     |  0
 conf/{ => vanilla}/directory/default/1001.xml     |  0
 conf/{ => vanilla}/directory/default/1002.xml     |  0
 conf/{ => vanilla}/directory/default/1003.xml     |  0
 conf/{ => vanilla}/directory/default/1004.xml     |  0
 conf/{ => vanilla}/directory/default/1005.xml     |  0
 conf/{ => vanilla}/directory/default/1006.xml     |  0
 conf/{ => vanilla}/directory/default/1007.xml     |  0
 conf/{ => vanilla}/directory/default/1008.xml     |  0
 conf/{ => vanilla}/directory/default/1009.xml     |  0
 conf/{ => vanilla}/directory/default/1010.xml     |  0
 conf/{ => vanilla}/directory/default/1011.xml     |  0
 conf/{ => vanilla}/directory/default/1012.xml     |  0
 conf/{ => vanilla}/directory/default/1013.xml     |  0
 conf/{ => vanilla}/directory/default/1014.xml     |  0
 conf/{ => vanilla}/directory/default/1015.xml     |  0
 conf/{ => vanilla}/directory/default/1016.xml     |  0
 conf/{ => vanilla}/directory/default/1017.xml     |  0
 conf/{ => vanilla}/directory/default/1018.xml     |  0
 conf/{ => vanilla}/directory/default/1019.xml     |  0
 conf/{ => vanilla}/directory/default/brian.xml    |  0
 conf/{ => vanilla}/directory/default/default.xml  |  0
 .../directory/default/example.com.xml             |  0
 .../directory/default/skinny-example.xml          |  0
 conf/{ => vanilla}/extensions.conf                |  0
 conf/{ => vanilla}/freeswitch.xml                 |  0
 conf/{ => vanilla}/fur_elise.ttml                 |  0
 conf/{ => vanilla}/ivr_menus/demo_ivr.xml         |  0
 conf/{ => vanilla}/jingle_profiles/client.xml     |  0
 conf/{ => vanilla}/jingle_profiles/server.xml     |  0
 conf/{ => vanilla}/lang/de/de.xml                 |  0
 conf/{ => vanilla}/lang/de/demo/demo.xml          |  0
 conf/{ => vanilla}/lang/de/vm/sounds.xml          |  0
 conf/{ => vanilla}/lang/de/vm/tts.xml             |  0
 conf/{ => vanilla}/lang/en/demo/demo-ivr.xml      |  0
 conf/{ => vanilla}/lang/en/demo/demo.xml          |  0
 conf/{ => vanilla}/lang/en/dir/sounds.xml         |  0
 conf/{ => vanilla}/lang/en/dir/tts.xml            |  0
 conf/{ => vanilla}/lang/en/en.xml                 |  0
 conf/{ => vanilla}/lang/en/ivr/sounds.xml         |  0
 conf/{ => vanilla}/lang/en/vm/sounds.xml          |  0
 conf/{ => vanilla}/lang/en/vm/tts.xml             |  0
 conf/{ => vanilla}/lang/en/vm/voicemail_ivr.xml   |  0
 conf/{ => vanilla}/lang/fr/demo/demo.xml          |  0
 conf/{ => vanilla}/lang/fr/dir/sounds.xml         |  0
 conf/{ => vanilla}/lang/fr/dir/tts.xml            |  0
 conf/{ => vanilla}/lang/fr/fr.xml                 |  0
 conf/{ => vanilla}/lang/fr/vm/sounds.xml          |  0
 conf/{ => vanilla}/lang/he/demo/demo-ivr.xml      |  0
 conf/{ => vanilla}/lang/he/demo/demo.xml          |  0
 conf/{ => vanilla}/lang/he/dir/sounds.xml         |  0
 conf/{ => vanilla}/lang/he/he.xml                 |  0
 conf/{ => vanilla}/lang/he/vm/sounds.xml          |  0
 conf/{ => vanilla}/lang/ru/demo/demo-ivr.xml      |  0
 conf/{ => vanilla}/lang/ru/demo/demo.xml          |  0
 conf/{ => vanilla}/lang/ru/dir/sounds.xml         |  0
 conf/{ => vanilla}/lang/ru/dir/tts.xml            |  0
 conf/{ => vanilla}/lang/ru/ru.xml                 |  0
 conf/{ => vanilla}/lang/ru/vm/sounds.xml          |  0
 conf/{ => vanilla}/lang/ru/vm/tts.xml             |  0
 conf/{ => vanilla}/mime.types                     |  0
 .../mrcp_profiles/loquendo-7-mrcp-v2.xml          |  0
 .../mrcp_profiles/nuance-1.0.0-mrcp-v1.xml        |  0
 .../mrcp_profiles/nuance-5.0-mrcp-v1.xml          |  0
 .../mrcp_profiles/nuance-5.0-mrcp-v2.xml          |  0
 .../mrcp_profiles/unimrcpserver-mrcp-v1.xml       |  0
 .../mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml  |  0
 conf/{ => vanilla}/notify-voicemail.tpl           |  0
 conf/{ => vanilla}/sip_profiles/external.xml      |  0
 .../sip_profiles/external/example.xml             |  0
 conf/{ => vanilla}/sip_profiles/internal-ipv6.xml |  0
 conf/{ => vanilla}/sip_profiles/internal.xml      |  0
 .../sip_profiles/internal/example.xml             |  0
 conf/{ => vanilla}/skinny_profiles/internal.xml   |  0
 conf/{ => vanilla}/tetris.ttml                    |  0
 conf/{ => vanilla}/vars.xml                       |  0
 conf/{ => vanilla}/voicemail.tpl                  |  0
 conf/{ => vanilla}/web-vm.tpl                     |  0
 conf/{ => vanilla}/yaml/extensions.yaml           |  0
 conf/{ => vanilla}/yaml/mod_yaml.yaml             |  0
 170 files changed, 9 insertions(+), 6 deletions(-)
 rename conf/{ => vanilla}/README_IMPORTANT.txt (100%)
 rename conf/{ => vanilla}/autoload_configs/abstraction.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/acl.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/alsa.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/blacklist.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/callcenter.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/cdr_csv.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/cdr_mongodb.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/cdr_pg_csv.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/cdr_sqlite.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/cepstral.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/cidlookup.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/conference.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/console.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/db.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/dialplan_directory.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/dingaling.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/directory.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/distributor.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/easyroute.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/enum.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/erlang_event.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/event_multicast.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/event_socket.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/fax.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/fifo.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/hash.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/httapi.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/http_cache.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/ivr.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/java.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/lcr.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/local_stream.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/logfile.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/lua.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/memcache.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/modules.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/mongo.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/nibblebill.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/opal.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/osp.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/perl.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/pocketsphinx.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/portaudio.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/post_load_modules.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/presence_map.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/python.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/redis.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/rss.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/rtmp.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/sangoma_codec.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/shout.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/skinny.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/sofia.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/spandsp.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/spidermonkey.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/switch.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/syslog.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/timezones.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/tts_commandline.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/unicall.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/unimrcp.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/voicemail.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/voicemail_ivr.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/xml_cdr.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/xml_curl.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/xml_rpc.conf.xml (100%)
 rename conf/{ => vanilla}/autoload_configs/zeroconf.conf.xml (100%)
 rename conf/{ => vanilla}/chatplan/default.xml (100%)
 rename conf/{ => vanilla}/config.FS0 (100%)
 rename conf/{ => vanilla}/dialplan/default.xml (100%)
 rename conf/{ => vanilla}/dialplan/default/00_ladspa.xml (100%)
 rename conf/{ => vanilla}/dialplan/default/00_pizza_demo.xml (100%)
 rename conf/{ => vanilla}/dialplan/default/01_Talking_Clock.xml (100%)
 rename conf/{ => vanilla}/dialplan/default/01_example.com.xml (100%)
 rename conf/{ => vanilla}/dialplan/default/ideasip.com.noload (100%)
 rename conf/{ => vanilla}/dialplan/default/pulver.com.noload (100%)
 rename conf/{ => vanilla}/dialplan/default/sipbroker.com.noload (100%)
 rename conf/{ => vanilla}/dialplan/default/sipphone.com.noload (100%)
 rename conf/{ => vanilla}/dialplan/default/tollfreegateway.com.noload (100%)
 rename conf/{ => vanilla}/dialplan/features.xml (100%)
 rename conf/{ => vanilla}/dialplan/public.xml (100%)
 rename conf/{ => vanilla}/dialplan/public/00_inbound_did.xml (100%)
 rename conf/{ => vanilla}/dialplan/skinny-patterns.xml (100%)
 rename conf/{ => vanilla}/dialplan/skinny-patterns/20-Demo.xml (100%)
 rename conf/{ => vanilla}/dialplan/skinny-patterns/20-Local_extension.xml (100%)
 rename conf/{ => vanilla}/dialplan/skinny-patterns/90-External.xml (100%)
 rename conf/{ => vanilla}/dialplan/skinny-patterns/99-Default_Drop.xml (100%)
 rename conf/{ => vanilla}/directory/default.xml (100%)
 rename conf/{ => vanilla}/directory/default/1000.xml (100%)
 rename conf/{ => vanilla}/directory/default/1001.xml (100%)
 rename conf/{ => vanilla}/directory/default/1002.xml (100%)
 rename conf/{ => vanilla}/directory/default/1003.xml (100%)
 rename conf/{ => vanilla}/directory/default/1004.xml (100%)
 rename conf/{ => vanilla}/directory/default/1005.xml (100%)
 rename conf/{ => vanilla}/directory/default/1006.xml (100%)
 rename conf/{ => vanilla}/directory/default/1007.xml (100%)
 rename conf/{ => vanilla}/directory/default/1008.xml (100%)
 rename conf/{ => vanilla}/directory/default/1009.xml (100%)
 rename conf/{ => vanilla}/directory/default/1010.xml (100%)
 rename conf/{ => vanilla}/directory/default/1011.xml (100%)
 rename conf/{ => vanilla}/directory/default/1012.xml (100%)
 rename conf/{ => vanilla}/directory/default/1013.xml (100%)
 rename conf/{ => vanilla}/directory/default/1014.xml (100%)
 rename conf/{ => vanilla}/directory/default/1015.xml (100%)
 rename conf/{ => vanilla}/directory/default/1016.xml (100%)
 rename conf/{ => vanilla}/directory/default/1017.xml (100%)
 rename conf/{ => vanilla}/directory/default/1018.xml (100%)
 rename conf/{ => vanilla}/directory/default/1019.xml (100%)
 rename conf/{ => vanilla}/directory/default/brian.xml (100%)
 rename conf/{ => vanilla}/directory/default/default.xml (100%)
 rename conf/{ => vanilla}/directory/default/example.com.xml (100%)
 rename conf/{ => vanilla}/directory/default/skinny-example.xml (100%)
 rename conf/{ => vanilla}/extensions.conf (100%)
 rename conf/{ => vanilla}/freeswitch.xml (100%)
 rename conf/{ => vanilla}/fur_elise.ttml (100%)
 rename conf/{ => vanilla}/ivr_menus/demo_ivr.xml (100%)
 rename conf/{ => vanilla}/jingle_profiles/client.xml (100%)
 rename conf/{ => vanilla}/jingle_profiles/server.xml (100%)
 rename conf/{ => vanilla}/lang/de/de.xml (100%)
 rename conf/{ => vanilla}/lang/de/demo/demo.xml (100%)
 rename conf/{ => vanilla}/lang/de/vm/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/de/vm/tts.xml (100%)
 rename conf/{ => vanilla}/lang/en/demo/demo-ivr.xml (100%)
 rename conf/{ => vanilla}/lang/en/demo/demo.xml (100%)
 rename conf/{ => vanilla}/lang/en/dir/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/en/dir/tts.xml (100%)
 rename conf/{ => vanilla}/lang/en/en.xml (100%)
 rename conf/{ => vanilla}/lang/en/ivr/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/en/vm/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/en/vm/tts.xml (100%)
 rename conf/{ => vanilla}/lang/en/vm/voicemail_ivr.xml (100%)
 rename conf/{ => vanilla}/lang/fr/demo/demo.xml (100%)
 rename conf/{ => vanilla}/lang/fr/dir/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/fr/dir/tts.xml (100%)
 rename conf/{ => vanilla}/lang/fr/fr.xml (100%)
 rename conf/{ => vanilla}/lang/fr/vm/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/he/demo/demo-ivr.xml (100%)
 rename conf/{ => vanilla}/lang/he/demo/demo.xml (100%)
 rename conf/{ => vanilla}/lang/he/dir/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/he/he.xml (100%)
 rename conf/{ => vanilla}/lang/he/vm/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/ru/demo/demo-ivr.xml (100%)
 rename conf/{ => vanilla}/lang/ru/demo/demo.xml (100%)
 rename conf/{ => vanilla}/lang/ru/dir/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/ru/dir/tts.xml (100%)
 rename conf/{ => vanilla}/lang/ru/ru.xml (100%)
 rename conf/{ => vanilla}/lang/ru/vm/sounds.xml (100%)
 rename conf/{ => vanilla}/lang/ru/vm/tts.xml (100%)
 rename conf/{ => vanilla}/mime.types (100%)
 rename conf/{ => vanilla}/mrcp_profiles/loquendo-7-mrcp-v2.xml (100%)
 rename conf/{ => vanilla}/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml (100%)
 rename conf/{ => vanilla}/mrcp_profiles/nuance-5.0-mrcp-v1.xml (100%)
 rename conf/{ => vanilla}/mrcp_profiles/nuance-5.0-mrcp-v2.xml (100%)
 rename conf/{ => vanilla}/mrcp_profiles/unimrcpserver-mrcp-v1.xml (100%)
 rename conf/{ => vanilla}/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml (100%)
 rename conf/{ => vanilla}/notify-voicemail.tpl (100%)
 rename conf/{ => vanilla}/sip_profiles/external.xml (100%)
 rename conf/{ => vanilla}/sip_profiles/external/example.xml (100%)
 rename conf/{ => vanilla}/sip_profiles/internal-ipv6.xml (100%)
 rename conf/{ => vanilla}/sip_profiles/internal.xml (100%)
 rename conf/{ => vanilla}/sip_profiles/internal/example.xml (100%)
 rename conf/{ => vanilla}/skinny_profiles/internal.xml (100%)
 rename conf/{ => vanilla}/tetris.ttml (100%)
 rename conf/{ => vanilla}/vars.xml (100%)
 rename conf/{ => vanilla}/voicemail.tpl (100%)
 rename conf/{ => vanilla}/web-vm.tpl (100%)
 rename conf/{ => vanilla}/yaml/extensions.yaml (100%)
 rename conf/{ => vanilla}/yaml/mod_yaml.yaml (100%)

diff --git a/Makefile.am b/Makefile.am
index 0261b709b0..dfe8197bb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -466,7 +466,7 @@ libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
 ##
 yaml-files:
 	@echo `mkdir $(DESTDIR)$(sysconfdir)/yaml 2>/dev/null`
-	$(INSTALL) -m 644 $(switch_srcdir)/conf/yaml/*.yaml $(DESTDIR)$(sysconfdir)/yaml
+	$(INSTALL) -m 644 $(switch_srcdir)/conf/default/yaml/*.yaml $(DESTDIR)$(sysconfdir)/yaml
 
 vm-sync:
 	test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -474,20 +474,22 @@ vm-sync:
 	test -d $(DESTDIR)$(sysconfdir)/lang/en || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en
 	test -d $(DESTDIR)$(sysconfdir)/lang/en/demo || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/demo
 	test -d $(DESTDIR)$(sysconfdir)/lang/en/vm || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/vm
-	$(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
-	$(INSTALL) -m 644 $(switch_srcdir)/conf/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
+	$(INSTALL) -m 644 $(switch_srcdir)/conf/default/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
+	$(INSTALL) -m 644 $(switch_srcdir)/conf/default/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
 
-samples-conf:
+config-%:
 	test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	for conffile in `cd $(switch_srcdir)/conf && find . -name \*.xml && find . -name \*.conf && find . -name \*.tpl  && find . -name \*.ttml && find . -name mime.types` ; do \
+	for conffile in `cd $(switch_srcdir)/conf/$* && find . -name \*.xml && find . -name \*.conf && find . -name \*.tpl  && find . -name \*.ttml && find . -name mime.types` ; do \
 		dir=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|/[^/]*$$||'`; \
 		filename=`echo $$conffile | sed -e 's|^\.||' | sed -e 's|^.*/||'`; \
 		test -d $(DESTDIR)$(sysconfdir)$$dir || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)$$dir ; \
 		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename || \
 		test -f $(DESTDIR)$(sysconfdir)$$dir/$$filename.noload || \
-			$(INSTALL) -m 644 $(switch_srcdir)/conf/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \
+			$(INSTALL) -m 644 $(switch_srcdir)/conf/$*/$$dir/$$filename $(DESTDIR)$(sysconfdir)$$dir; \
 	done
 
+samples-conf: config-vanilla
+
 samples-htdocs: 
 	test -d $(DESTDIR)$(htdocsdir) || $(mkinstalldirs) $(DESTDIR)$(htdocsdir)
 	for htdocsfile in `cd $(switch_srcdir)/htdocs && find . -type f -name \* | sed -e 's|^\.||'` ; do \
@@ -497,6 +499,7 @@ samples-htdocs:
 		test -f $(DESTDIR)$(htdocsdir)$$dir/$$filename || $(INSTALL) -m 644 $(switch_srcdir)/htdocs/$$dir/$$filename $(DESTDIR)$(htdocsdir)$$dir 2>/dev/null;  \
 	done
 
+
 samples: samples-conf samples-htdocs
 
 install-exec-local:
diff --git a/conf/README_IMPORTANT.txt b/conf/vanilla/README_IMPORTANT.txt
similarity index 100%
rename from conf/README_IMPORTANT.txt
rename to conf/vanilla/README_IMPORTANT.txt
diff --git a/conf/autoload_configs/abstraction.conf.xml b/conf/vanilla/autoload_configs/abstraction.conf.xml
similarity index 100%
rename from conf/autoload_configs/abstraction.conf.xml
rename to conf/vanilla/autoload_configs/abstraction.conf.xml
diff --git a/conf/autoload_configs/acl.conf.xml b/conf/vanilla/autoload_configs/acl.conf.xml
similarity index 100%
rename from conf/autoload_configs/acl.conf.xml
rename to conf/vanilla/autoload_configs/acl.conf.xml
diff --git a/conf/autoload_configs/alsa.conf.xml b/conf/vanilla/autoload_configs/alsa.conf.xml
similarity index 100%
rename from conf/autoload_configs/alsa.conf.xml
rename to conf/vanilla/autoload_configs/alsa.conf.xml
diff --git a/conf/autoload_configs/blacklist.conf.xml b/conf/vanilla/autoload_configs/blacklist.conf.xml
similarity index 100%
rename from conf/autoload_configs/blacklist.conf.xml
rename to conf/vanilla/autoload_configs/blacklist.conf.xml
diff --git a/conf/autoload_configs/callcenter.conf.xml b/conf/vanilla/autoload_configs/callcenter.conf.xml
similarity index 100%
rename from conf/autoload_configs/callcenter.conf.xml
rename to conf/vanilla/autoload_configs/callcenter.conf.xml
diff --git a/conf/autoload_configs/cdr_csv.conf.xml b/conf/vanilla/autoload_configs/cdr_csv.conf.xml
similarity index 100%
rename from conf/autoload_configs/cdr_csv.conf.xml
rename to conf/vanilla/autoload_configs/cdr_csv.conf.xml
diff --git a/conf/autoload_configs/cdr_mongodb.conf.xml b/conf/vanilla/autoload_configs/cdr_mongodb.conf.xml
similarity index 100%
rename from conf/autoload_configs/cdr_mongodb.conf.xml
rename to conf/vanilla/autoload_configs/cdr_mongodb.conf.xml
diff --git a/conf/autoload_configs/cdr_pg_csv.conf.xml b/conf/vanilla/autoload_configs/cdr_pg_csv.conf.xml
similarity index 100%
rename from conf/autoload_configs/cdr_pg_csv.conf.xml
rename to conf/vanilla/autoload_configs/cdr_pg_csv.conf.xml
diff --git a/conf/autoload_configs/cdr_sqlite.conf.xml b/conf/vanilla/autoload_configs/cdr_sqlite.conf.xml
similarity index 100%
rename from conf/autoload_configs/cdr_sqlite.conf.xml
rename to conf/vanilla/autoload_configs/cdr_sqlite.conf.xml
diff --git a/conf/autoload_configs/cepstral.conf.xml b/conf/vanilla/autoload_configs/cepstral.conf.xml
similarity index 100%
rename from conf/autoload_configs/cepstral.conf.xml
rename to conf/vanilla/autoload_configs/cepstral.conf.xml
diff --git a/conf/autoload_configs/cidlookup.conf.xml b/conf/vanilla/autoload_configs/cidlookup.conf.xml
similarity index 100%
rename from conf/autoload_configs/cidlookup.conf.xml
rename to conf/vanilla/autoload_configs/cidlookup.conf.xml
diff --git a/conf/autoload_configs/conference.conf.xml b/conf/vanilla/autoload_configs/conference.conf.xml
similarity index 100%
rename from conf/autoload_configs/conference.conf.xml
rename to conf/vanilla/autoload_configs/conference.conf.xml
diff --git a/conf/autoload_configs/console.conf.xml b/conf/vanilla/autoload_configs/console.conf.xml
similarity index 100%
rename from conf/autoload_configs/console.conf.xml
rename to conf/vanilla/autoload_configs/console.conf.xml
diff --git a/conf/autoload_configs/db.conf.xml b/conf/vanilla/autoload_configs/db.conf.xml
similarity index 100%
rename from conf/autoload_configs/db.conf.xml
rename to conf/vanilla/autoload_configs/db.conf.xml
diff --git a/conf/autoload_configs/dialplan_directory.conf.xml b/conf/vanilla/autoload_configs/dialplan_directory.conf.xml
similarity index 100%
rename from conf/autoload_configs/dialplan_directory.conf.xml
rename to conf/vanilla/autoload_configs/dialplan_directory.conf.xml
diff --git a/conf/autoload_configs/dingaling.conf.xml b/conf/vanilla/autoload_configs/dingaling.conf.xml
similarity index 100%
rename from conf/autoload_configs/dingaling.conf.xml
rename to conf/vanilla/autoload_configs/dingaling.conf.xml
diff --git a/conf/autoload_configs/directory.conf.xml b/conf/vanilla/autoload_configs/directory.conf.xml
similarity index 100%
rename from conf/autoload_configs/directory.conf.xml
rename to conf/vanilla/autoload_configs/directory.conf.xml
diff --git a/conf/autoload_configs/distributor.conf.xml b/conf/vanilla/autoload_configs/distributor.conf.xml
similarity index 100%
rename from conf/autoload_configs/distributor.conf.xml
rename to conf/vanilla/autoload_configs/distributor.conf.xml
diff --git a/conf/autoload_configs/easyroute.conf.xml b/conf/vanilla/autoload_configs/easyroute.conf.xml
similarity index 100%
rename from conf/autoload_configs/easyroute.conf.xml
rename to conf/vanilla/autoload_configs/easyroute.conf.xml
diff --git a/conf/autoload_configs/enum.conf.xml b/conf/vanilla/autoload_configs/enum.conf.xml
similarity index 100%
rename from conf/autoload_configs/enum.conf.xml
rename to conf/vanilla/autoload_configs/enum.conf.xml
diff --git a/conf/autoload_configs/erlang_event.conf.xml b/conf/vanilla/autoload_configs/erlang_event.conf.xml
similarity index 100%
rename from conf/autoload_configs/erlang_event.conf.xml
rename to conf/vanilla/autoload_configs/erlang_event.conf.xml
diff --git a/conf/autoload_configs/event_multicast.conf.xml b/conf/vanilla/autoload_configs/event_multicast.conf.xml
similarity index 100%
rename from conf/autoload_configs/event_multicast.conf.xml
rename to conf/vanilla/autoload_configs/event_multicast.conf.xml
diff --git a/conf/autoload_configs/event_socket.conf.xml b/conf/vanilla/autoload_configs/event_socket.conf.xml
similarity index 100%
rename from conf/autoload_configs/event_socket.conf.xml
rename to conf/vanilla/autoload_configs/event_socket.conf.xml
diff --git a/conf/autoload_configs/fax.conf.xml b/conf/vanilla/autoload_configs/fax.conf.xml
similarity index 100%
rename from conf/autoload_configs/fax.conf.xml
rename to conf/vanilla/autoload_configs/fax.conf.xml
diff --git a/conf/autoload_configs/fifo.conf.xml b/conf/vanilla/autoload_configs/fifo.conf.xml
similarity index 100%
rename from conf/autoload_configs/fifo.conf.xml
rename to conf/vanilla/autoload_configs/fifo.conf.xml
diff --git a/conf/autoload_configs/hash.conf.xml b/conf/vanilla/autoload_configs/hash.conf.xml
similarity index 100%
rename from conf/autoload_configs/hash.conf.xml
rename to conf/vanilla/autoload_configs/hash.conf.xml
diff --git a/conf/autoload_configs/httapi.conf.xml b/conf/vanilla/autoload_configs/httapi.conf.xml
similarity index 100%
rename from conf/autoload_configs/httapi.conf.xml
rename to conf/vanilla/autoload_configs/httapi.conf.xml
diff --git a/conf/autoload_configs/http_cache.conf.xml b/conf/vanilla/autoload_configs/http_cache.conf.xml
similarity index 100%
rename from conf/autoload_configs/http_cache.conf.xml
rename to conf/vanilla/autoload_configs/http_cache.conf.xml
diff --git a/conf/autoload_configs/ivr.conf.xml b/conf/vanilla/autoload_configs/ivr.conf.xml
similarity index 100%
rename from conf/autoload_configs/ivr.conf.xml
rename to conf/vanilla/autoload_configs/ivr.conf.xml
diff --git a/conf/autoload_configs/java.conf.xml b/conf/vanilla/autoload_configs/java.conf.xml
similarity index 100%
rename from conf/autoload_configs/java.conf.xml
rename to conf/vanilla/autoload_configs/java.conf.xml
diff --git a/conf/autoload_configs/lcr.conf.xml b/conf/vanilla/autoload_configs/lcr.conf.xml
similarity index 100%
rename from conf/autoload_configs/lcr.conf.xml
rename to conf/vanilla/autoload_configs/lcr.conf.xml
diff --git a/conf/autoload_configs/local_stream.conf.xml b/conf/vanilla/autoload_configs/local_stream.conf.xml
similarity index 100%
rename from conf/autoload_configs/local_stream.conf.xml
rename to conf/vanilla/autoload_configs/local_stream.conf.xml
diff --git a/conf/autoload_configs/logfile.conf.xml b/conf/vanilla/autoload_configs/logfile.conf.xml
similarity index 100%
rename from conf/autoload_configs/logfile.conf.xml
rename to conf/vanilla/autoload_configs/logfile.conf.xml
diff --git a/conf/autoload_configs/lua.conf.xml b/conf/vanilla/autoload_configs/lua.conf.xml
similarity index 100%
rename from conf/autoload_configs/lua.conf.xml
rename to conf/vanilla/autoload_configs/lua.conf.xml
diff --git a/conf/autoload_configs/memcache.conf.xml b/conf/vanilla/autoload_configs/memcache.conf.xml
similarity index 100%
rename from conf/autoload_configs/memcache.conf.xml
rename to conf/vanilla/autoload_configs/memcache.conf.xml
diff --git a/conf/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
similarity index 100%
rename from conf/autoload_configs/modules.conf.xml
rename to conf/vanilla/autoload_configs/modules.conf.xml
diff --git a/conf/autoload_configs/mongo.conf.xml b/conf/vanilla/autoload_configs/mongo.conf.xml
similarity index 100%
rename from conf/autoload_configs/mongo.conf.xml
rename to conf/vanilla/autoload_configs/mongo.conf.xml
diff --git a/conf/autoload_configs/nibblebill.conf.xml b/conf/vanilla/autoload_configs/nibblebill.conf.xml
similarity index 100%
rename from conf/autoload_configs/nibblebill.conf.xml
rename to conf/vanilla/autoload_configs/nibblebill.conf.xml
diff --git a/conf/autoload_configs/opal.conf.xml b/conf/vanilla/autoload_configs/opal.conf.xml
similarity index 100%
rename from conf/autoload_configs/opal.conf.xml
rename to conf/vanilla/autoload_configs/opal.conf.xml
diff --git a/conf/autoload_configs/osp.conf.xml b/conf/vanilla/autoload_configs/osp.conf.xml
similarity index 100%
rename from conf/autoload_configs/osp.conf.xml
rename to conf/vanilla/autoload_configs/osp.conf.xml
diff --git a/conf/autoload_configs/perl.conf.xml b/conf/vanilla/autoload_configs/perl.conf.xml
similarity index 100%
rename from conf/autoload_configs/perl.conf.xml
rename to conf/vanilla/autoload_configs/perl.conf.xml
diff --git a/conf/autoload_configs/pocketsphinx.conf.xml b/conf/vanilla/autoload_configs/pocketsphinx.conf.xml
similarity index 100%
rename from conf/autoload_configs/pocketsphinx.conf.xml
rename to conf/vanilla/autoload_configs/pocketsphinx.conf.xml
diff --git a/conf/autoload_configs/portaudio.conf.xml b/conf/vanilla/autoload_configs/portaudio.conf.xml
similarity index 100%
rename from conf/autoload_configs/portaudio.conf.xml
rename to conf/vanilla/autoload_configs/portaudio.conf.xml
diff --git a/conf/autoload_configs/post_load_modules.conf.xml b/conf/vanilla/autoload_configs/post_load_modules.conf.xml
similarity index 100%
rename from conf/autoload_configs/post_load_modules.conf.xml
rename to conf/vanilla/autoload_configs/post_load_modules.conf.xml
diff --git a/conf/autoload_configs/presence_map.conf.xml b/conf/vanilla/autoload_configs/presence_map.conf.xml
similarity index 100%
rename from conf/autoload_configs/presence_map.conf.xml
rename to conf/vanilla/autoload_configs/presence_map.conf.xml
diff --git a/conf/autoload_configs/python.conf.xml b/conf/vanilla/autoload_configs/python.conf.xml
similarity index 100%
rename from conf/autoload_configs/python.conf.xml
rename to conf/vanilla/autoload_configs/python.conf.xml
diff --git a/conf/autoload_configs/redis.conf.xml b/conf/vanilla/autoload_configs/redis.conf.xml
similarity index 100%
rename from conf/autoload_configs/redis.conf.xml
rename to conf/vanilla/autoload_configs/redis.conf.xml
diff --git a/conf/autoload_configs/rss.conf.xml b/conf/vanilla/autoload_configs/rss.conf.xml
similarity index 100%
rename from conf/autoload_configs/rss.conf.xml
rename to conf/vanilla/autoload_configs/rss.conf.xml
diff --git a/conf/autoload_configs/rtmp.conf.xml b/conf/vanilla/autoload_configs/rtmp.conf.xml
similarity index 100%
rename from conf/autoload_configs/rtmp.conf.xml
rename to conf/vanilla/autoload_configs/rtmp.conf.xml
diff --git a/conf/autoload_configs/sangoma_codec.conf.xml b/conf/vanilla/autoload_configs/sangoma_codec.conf.xml
similarity index 100%
rename from conf/autoload_configs/sangoma_codec.conf.xml
rename to conf/vanilla/autoload_configs/sangoma_codec.conf.xml
diff --git a/conf/autoload_configs/shout.conf.xml b/conf/vanilla/autoload_configs/shout.conf.xml
similarity index 100%
rename from conf/autoload_configs/shout.conf.xml
rename to conf/vanilla/autoload_configs/shout.conf.xml
diff --git a/conf/autoload_configs/skinny.conf.xml b/conf/vanilla/autoload_configs/skinny.conf.xml
similarity index 100%
rename from conf/autoload_configs/skinny.conf.xml
rename to conf/vanilla/autoload_configs/skinny.conf.xml
diff --git a/conf/autoload_configs/sofia.conf.xml b/conf/vanilla/autoload_configs/sofia.conf.xml
similarity index 100%
rename from conf/autoload_configs/sofia.conf.xml
rename to conf/vanilla/autoload_configs/sofia.conf.xml
diff --git a/conf/autoload_configs/spandsp.conf.xml b/conf/vanilla/autoload_configs/spandsp.conf.xml
similarity index 100%
rename from conf/autoload_configs/spandsp.conf.xml
rename to conf/vanilla/autoload_configs/spandsp.conf.xml
diff --git a/conf/autoload_configs/spidermonkey.conf.xml b/conf/vanilla/autoload_configs/spidermonkey.conf.xml
similarity index 100%
rename from conf/autoload_configs/spidermonkey.conf.xml
rename to conf/vanilla/autoload_configs/spidermonkey.conf.xml
diff --git a/conf/autoload_configs/switch.conf.xml b/conf/vanilla/autoload_configs/switch.conf.xml
similarity index 100%
rename from conf/autoload_configs/switch.conf.xml
rename to conf/vanilla/autoload_configs/switch.conf.xml
diff --git a/conf/autoload_configs/syslog.conf.xml b/conf/vanilla/autoload_configs/syslog.conf.xml
similarity index 100%
rename from conf/autoload_configs/syslog.conf.xml
rename to conf/vanilla/autoload_configs/syslog.conf.xml
diff --git a/conf/autoload_configs/timezones.conf.xml b/conf/vanilla/autoload_configs/timezones.conf.xml
similarity index 100%
rename from conf/autoload_configs/timezones.conf.xml
rename to conf/vanilla/autoload_configs/timezones.conf.xml
diff --git a/conf/autoload_configs/tts_commandline.conf.xml b/conf/vanilla/autoload_configs/tts_commandline.conf.xml
similarity index 100%
rename from conf/autoload_configs/tts_commandline.conf.xml
rename to conf/vanilla/autoload_configs/tts_commandline.conf.xml
diff --git a/conf/autoload_configs/unicall.conf.xml b/conf/vanilla/autoload_configs/unicall.conf.xml
similarity index 100%
rename from conf/autoload_configs/unicall.conf.xml
rename to conf/vanilla/autoload_configs/unicall.conf.xml
diff --git a/conf/autoload_configs/unimrcp.conf.xml b/conf/vanilla/autoload_configs/unimrcp.conf.xml
similarity index 100%
rename from conf/autoload_configs/unimrcp.conf.xml
rename to conf/vanilla/autoload_configs/unimrcp.conf.xml
diff --git a/conf/autoload_configs/voicemail.conf.xml b/conf/vanilla/autoload_configs/voicemail.conf.xml
similarity index 100%
rename from conf/autoload_configs/voicemail.conf.xml
rename to conf/vanilla/autoload_configs/voicemail.conf.xml
diff --git a/conf/autoload_configs/voicemail_ivr.conf.xml b/conf/vanilla/autoload_configs/voicemail_ivr.conf.xml
similarity index 100%
rename from conf/autoload_configs/voicemail_ivr.conf.xml
rename to conf/vanilla/autoload_configs/voicemail_ivr.conf.xml
diff --git a/conf/autoload_configs/xml_cdr.conf.xml b/conf/vanilla/autoload_configs/xml_cdr.conf.xml
similarity index 100%
rename from conf/autoload_configs/xml_cdr.conf.xml
rename to conf/vanilla/autoload_configs/xml_cdr.conf.xml
diff --git a/conf/autoload_configs/xml_curl.conf.xml b/conf/vanilla/autoload_configs/xml_curl.conf.xml
similarity index 100%
rename from conf/autoload_configs/xml_curl.conf.xml
rename to conf/vanilla/autoload_configs/xml_curl.conf.xml
diff --git a/conf/autoload_configs/xml_rpc.conf.xml b/conf/vanilla/autoload_configs/xml_rpc.conf.xml
similarity index 100%
rename from conf/autoload_configs/xml_rpc.conf.xml
rename to conf/vanilla/autoload_configs/xml_rpc.conf.xml
diff --git a/conf/autoload_configs/zeroconf.conf.xml b/conf/vanilla/autoload_configs/zeroconf.conf.xml
similarity index 100%
rename from conf/autoload_configs/zeroconf.conf.xml
rename to conf/vanilla/autoload_configs/zeroconf.conf.xml
diff --git a/conf/chatplan/default.xml b/conf/vanilla/chatplan/default.xml
similarity index 100%
rename from conf/chatplan/default.xml
rename to conf/vanilla/chatplan/default.xml
diff --git a/conf/config.FS0 b/conf/vanilla/config.FS0
similarity index 100%
rename from conf/config.FS0
rename to conf/vanilla/config.FS0
diff --git a/conf/dialplan/default.xml b/conf/vanilla/dialplan/default.xml
similarity index 100%
rename from conf/dialplan/default.xml
rename to conf/vanilla/dialplan/default.xml
diff --git a/conf/dialplan/default/00_ladspa.xml b/conf/vanilla/dialplan/default/00_ladspa.xml
similarity index 100%
rename from conf/dialplan/default/00_ladspa.xml
rename to conf/vanilla/dialplan/default/00_ladspa.xml
diff --git a/conf/dialplan/default/00_pizza_demo.xml b/conf/vanilla/dialplan/default/00_pizza_demo.xml
similarity index 100%
rename from conf/dialplan/default/00_pizza_demo.xml
rename to conf/vanilla/dialplan/default/00_pizza_demo.xml
diff --git a/conf/dialplan/default/01_Talking_Clock.xml b/conf/vanilla/dialplan/default/01_Talking_Clock.xml
similarity index 100%
rename from conf/dialplan/default/01_Talking_Clock.xml
rename to conf/vanilla/dialplan/default/01_Talking_Clock.xml
diff --git a/conf/dialplan/default/01_example.com.xml b/conf/vanilla/dialplan/default/01_example.com.xml
similarity index 100%
rename from conf/dialplan/default/01_example.com.xml
rename to conf/vanilla/dialplan/default/01_example.com.xml
diff --git a/conf/dialplan/default/ideasip.com.noload b/conf/vanilla/dialplan/default/ideasip.com.noload
similarity index 100%
rename from conf/dialplan/default/ideasip.com.noload
rename to conf/vanilla/dialplan/default/ideasip.com.noload
diff --git a/conf/dialplan/default/pulver.com.noload b/conf/vanilla/dialplan/default/pulver.com.noload
similarity index 100%
rename from conf/dialplan/default/pulver.com.noload
rename to conf/vanilla/dialplan/default/pulver.com.noload
diff --git a/conf/dialplan/default/sipbroker.com.noload b/conf/vanilla/dialplan/default/sipbroker.com.noload
similarity index 100%
rename from conf/dialplan/default/sipbroker.com.noload
rename to conf/vanilla/dialplan/default/sipbroker.com.noload
diff --git a/conf/dialplan/default/sipphone.com.noload b/conf/vanilla/dialplan/default/sipphone.com.noload
similarity index 100%
rename from conf/dialplan/default/sipphone.com.noload
rename to conf/vanilla/dialplan/default/sipphone.com.noload
diff --git a/conf/dialplan/default/tollfreegateway.com.noload b/conf/vanilla/dialplan/default/tollfreegateway.com.noload
similarity index 100%
rename from conf/dialplan/default/tollfreegateway.com.noload
rename to conf/vanilla/dialplan/default/tollfreegateway.com.noload
diff --git a/conf/dialplan/features.xml b/conf/vanilla/dialplan/features.xml
similarity index 100%
rename from conf/dialplan/features.xml
rename to conf/vanilla/dialplan/features.xml
diff --git a/conf/dialplan/public.xml b/conf/vanilla/dialplan/public.xml
similarity index 100%
rename from conf/dialplan/public.xml
rename to conf/vanilla/dialplan/public.xml
diff --git a/conf/dialplan/public/00_inbound_did.xml b/conf/vanilla/dialplan/public/00_inbound_did.xml
similarity index 100%
rename from conf/dialplan/public/00_inbound_did.xml
rename to conf/vanilla/dialplan/public/00_inbound_did.xml
diff --git a/conf/dialplan/skinny-patterns.xml b/conf/vanilla/dialplan/skinny-patterns.xml
similarity index 100%
rename from conf/dialplan/skinny-patterns.xml
rename to conf/vanilla/dialplan/skinny-patterns.xml
diff --git a/conf/dialplan/skinny-patterns/20-Demo.xml b/conf/vanilla/dialplan/skinny-patterns/20-Demo.xml
similarity index 100%
rename from conf/dialplan/skinny-patterns/20-Demo.xml
rename to conf/vanilla/dialplan/skinny-patterns/20-Demo.xml
diff --git a/conf/dialplan/skinny-patterns/20-Local_extension.xml b/conf/vanilla/dialplan/skinny-patterns/20-Local_extension.xml
similarity index 100%
rename from conf/dialplan/skinny-patterns/20-Local_extension.xml
rename to conf/vanilla/dialplan/skinny-patterns/20-Local_extension.xml
diff --git a/conf/dialplan/skinny-patterns/90-External.xml b/conf/vanilla/dialplan/skinny-patterns/90-External.xml
similarity index 100%
rename from conf/dialplan/skinny-patterns/90-External.xml
rename to conf/vanilla/dialplan/skinny-patterns/90-External.xml
diff --git a/conf/dialplan/skinny-patterns/99-Default_Drop.xml b/conf/vanilla/dialplan/skinny-patterns/99-Default_Drop.xml
similarity index 100%
rename from conf/dialplan/skinny-patterns/99-Default_Drop.xml
rename to conf/vanilla/dialplan/skinny-patterns/99-Default_Drop.xml
diff --git a/conf/directory/default.xml b/conf/vanilla/directory/default.xml
similarity index 100%
rename from conf/directory/default.xml
rename to conf/vanilla/directory/default.xml
diff --git a/conf/directory/default/1000.xml b/conf/vanilla/directory/default/1000.xml
similarity index 100%
rename from conf/directory/default/1000.xml
rename to conf/vanilla/directory/default/1000.xml
diff --git a/conf/directory/default/1001.xml b/conf/vanilla/directory/default/1001.xml
similarity index 100%
rename from conf/directory/default/1001.xml
rename to conf/vanilla/directory/default/1001.xml
diff --git a/conf/directory/default/1002.xml b/conf/vanilla/directory/default/1002.xml
similarity index 100%
rename from conf/directory/default/1002.xml
rename to conf/vanilla/directory/default/1002.xml
diff --git a/conf/directory/default/1003.xml b/conf/vanilla/directory/default/1003.xml
similarity index 100%
rename from conf/directory/default/1003.xml
rename to conf/vanilla/directory/default/1003.xml
diff --git a/conf/directory/default/1004.xml b/conf/vanilla/directory/default/1004.xml
similarity index 100%
rename from conf/directory/default/1004.xml
rename to conf/vanilla/directory/default/1004.xml
diff --git a/conf/directory/default/1005.xml b/conf/vanilla/directory/default/1005.xml
similarity index 100%
rename from conf/directory/default/1005.xml
rename to conf/vanilla/directory/default/1005.xml
diff --git a/conf/directory/default/1006.xml b/conf/vanilla/directory/default/1006.xml
similarity index 100%
rename from conf/directory/default/1006.xml
rename to conf/vanilla/directory/default/1006.xml
diff --git a/conf/directory/default/1007.xml b/conf/vanilla/directory/default/1007.xml
similarity index 100%
rename from conf/directory/default/1007.xml
rename to conf/vanilla/directory/default/1007.xml
diff --git a/conf/directory/default/1008.xml b/conf/vanilla/directory/default/1008.xml
similarity index 100%
rename from conf/directory/default/1008.xml
rename to conf/vanilla/directory/default/1008.xml
diff --git a/conf/directory/default/1009.xml b/conf/vanilla/directory/default/1009.xml
similarity index 100%
rename from conf/directory/default/1009.xml
rename to conf/vanilla/directory/default/1009.xml
diff --git a/conf/directory/default/1010.xml b/conf/vanilla/directory/default/1010.xml
similarity index 100%
rename from conf/directory/default/1010.xml
rename to conf/vanilla/directory/default/1010.xml
diff --git a/conf/directory/default/1011.xml b/conf/vanilla/directory/default/1011.xml
similarity index 100%
rename from conf/directory/default/1011.xml
rename to conf/vanilla/directory/default/1011.xml
diff --git a/conf/directory/default/1012.xml b/conf/vanilla/directory/default/1012.xml
similarity index 100%
rename from conf/directory/default/1012.xml
rename to conf/vanilla/directory/default/1012.xml
diff --git a/conf/directory/default/1013.xml b/conf/vanilla/directory/default/1013.xml
similarity index 100%
rename from conf/directory/default/1013.xml
rename to conf/vanilla/directory/default/1013.xml
diff --git a/conf/directory/default/1014.xml b/conf/vanilla/directory/default/1014.xml
similarity index 100%
rename from conf/directory/default/1014.xml
rename to conf/vanilla/directory/default/1014.xml
diff --git a/conf/directory/default/1015.xml b/conf/vanilla/directory/default/1015.xml
similarity index 100%
rename from conf/directory/default/1015.xml
rename to conf/vanilla/directory/default/1015.xml
diff --git a/conf/directory/default/1016.xml b/conf/vanilla/directory/default/1016.xml
similarity index 100%
rename from conf/directory/default/1016.xml
rename to conf/vanilla/directory/default/1016.xml
diff --git a/conf/directory/default/1017.xml b/conf/vanilla/directory/default/1017.xml
similarity index 100%
rename from conf/directory/default/1017.xml
rename to conf/vanilla/directory/default/1017.xml
diff --git a/conf/directory/default/1018.xml b/conf/vanilla/directory/default/1018.xml
similarity index 100%
rename from conf/directory/default/1018.xml
rename to conf/vanilla/directory/default/1018.xml
diff --git a/conf/directory/default/1019.xml b/conf/vanilla/directory/default/1019.xml
similarity index 100%
rename from conf/directory/default/1019.xml
rename to conf/vanilla/directory/default/1019.xml
diff --git a/conf/directory/default/brian.xml b/conf/vanilla/directory/default/brian.xml
similarity index 100%
rename from conf/directory/default/brian.xml
rename to conf/vanilla/directory/default/brian.xml
diff --git a/conf/directory/default/default.xml b/conf/vanilla/directory/default/default.xml
similarity index 100%
rename from conf/directory/default/default.xml
rename to conf/vanilla/directory/default/default.xml
diff --git a/conf/directory/default/example.com.xml b/conf/vanilla/directory/default/example.com.xml
similarity index 100%
rename from conf/directory/default/example.com.xml
rename to conf/vanilla/directory/default/example.com.xml
diff --git a/conf/directory/default/skinny-example.xml b/conf/vanilla/directory/default/skinny-example.xml
similarity index 100%
rename from conf/directory/default/skinny-example.xml
rename to conf/vanilla/directory/default/skinny-example.xml
diff --git a/conf/extensions.conf b/conf/vanilla/extensions.conf
similarity index 100%
rename from conf/extensions.conf
rename to conf/vanilla/extensions.conf
diff --git a/conf/freeswitch.xml b/conf/vanilla/freeswitch.xml
similarity index 100%
rename from conf/freeswitch.xml
rename to conf/vanilla/freeswitch.xml
diff --git a/conf/fur_elise.ttml b/conf/vanilla/fur_elise.ttml
similarity index 100%
rename from conf/fur_elise.ttml
rename to conf/vanilla/fur_elise.ttml
diff --git a/conf/ivr_menus/demo_ivr.xml b/conf/vanilla/ivr_menus/demo_ivr.xml
similarity index 100%
rename from conf/ivr_menus/demo_ivr.xml
rename to conf/vanilla/ivr_menus/demo_ivr.xml
diff --git a/conf/jingle_profiles/client.xml b/conf/vanilla/jingle_profiles/client.xml
similarity index 100%
rename from conf/jingle_profiles/client.xml
rename to conf/vanilla/jingle_profiles/client.xml
diff --git a/conf/jingle_profiles/server.xml b/conf/vanilla/jingle_profiles/server.xml
similarity index 100%
rename from conf/jingle_profiles/server.xml
rename to conf/vanilla/jingle_profiles/server.xml
diff --git a/conf/lang/de/de.xml b/conf/vanilla/lang/de/de.xml
similarity index 100%
rename from conf/lang/de/de.xml
rename to conf/vanilla/lang/de/de.xml
diff --git a/conf/lang/de/demo/demo.xml b/conf/vanilla/lang/de/demo/demo.xml
similarity index 100%
rename from conf/lang/de/demo/demo.xml
rename to conf/vanilla/lang/de/demo/demo.xml
diff --git a/conf/lang/de/vm/sounds.xml b/conf/vanilla/lang/de/vm/sounds.xml
similarity index 100%
rename from conf/lang/de/vm/sounds.xml
rename to conf/vanilla/lang/de/vm/sounds.xml
diff --git a/conf/lang/de/vm/tts.xml b/conf/vanilla/lang/de/vm/tts.xml
similarity index 100%
rename from conf/lang/de/vm/tts.xml
rename to conf/vanilla/lang/de/vm/tts.xml
diff --git a/conf/lang/en/demo/demo-ivr.xml b/conf/vanilla/lang/en/demo/demo-ivr.xml
similarity index 100%
rename from conf/lang/en/demo/demo-ivr.xml
rename to conf/vanilla/lang/en/demo/demo-ivr.xml
diff --git a/conf/lang/en/demo/demo.xml b/conf/vanilla/lang/en/demo/demo.xml
similarity index 100%
rename from conf/lang/en/demo/demo.xml
rename to conf/vanilla/lang/en/demo/demo.xml
diff --git a/conf/lang/en/dir/sounds.xml b/conf/vanilla/lang/en/dir/sounds.xml
similarity index 100%
rename from conf/lang/en/dir/sounds.xml
rename to conf/vanilla/lang/en/dir/sounds.xml
diff --git a/conf/lang/en/dir/tts.xml b/conf/vanilla/lang/en/dir/tts.xml
similarity index 100%
rename from conf/lang/en/dir/tts.xml
rename to conf/vanilla/lang/en/dir/tts.xml
diff --git a/conf/lang/en/en.xml b/conf/vanilla/lang/en/en.xml
similarity index 100%
rename from conf/lang/en/en.xml
rename to conf/vanilla/lang/en/en.xml
diff --git a/conf/lang/en/ivr/sounds.xml b/conf/vanilla/lang/en/ivr/sounds.xml
similarity index 100%
rename from conf/lang/en/ivr/sounds.xml
rename to conf/vanilla/lang/en/ivr/sounds.xml
diff --git a/conf/lang/en/vm/sounds.xml b/conf/vanilla/lang/en/vm/sounds.xml
similarity index 100%
rename from conf/lang/en/vm/sounds.xml
rename to conf/vanilla/lang/en/vm/sounds.xml
diff --git a/conf/lang/en/vm/tts.xml b/conf/vanilla/lang/en/vm/tts.xml
similarity index 100%
rename from conf/lang/en/vm/tts.xml
rename to conf/vanilla/lang/en/vm/tts.xml
diff --git a/conf/lang/en/vm/voicemail_ivr.xml b/conf/vanilla/lang/en/vm/voicemail_ivr.xml
similarity index 100%
rename from conf/lang/en/vm/voicemail_ivr.xml
rename to conf/vanilla/lang/en/vm/voicemail_ivr.xml
diff --git a/conf/lang/fr/demo/demo.xml b/conf/vanilla/lang/fr/demo/demo.xml
similarity index 100%
rename from conf/lang/fr/demo/demo.xml
rename to conf/vanilla/lang/fr/demo/demo.xml
diff --git a/conf/lang/fr/dir/sounds.xml b/conf/vanilla/lang/fr/dir/sounds.xml
similarity index 100%
rename from conf/lang/fr/dir/sounds.xml
rename to conf/vanilla/lang/fr/dir/sounds.xml
diff --git a/conf/lang/fr/dir/tts.xml b/conf/vanilla/lang/fr/dir/tts.xml
similarity index 100%
rename from conf/lang/fr/dir/tts.xml
rename to conf/vanilla/lang/fr/dir/tts.xml
diff --git a/conf/lang/fr/fr.xml b/conf/vanilla/lang/fr/fr.xml
similarity index 100%
rename from conf/lang/fr/fr.xml
rename to conf/vanilla/lang/fr/fr.xml
diff --git a/conf/lang/fr/vm/sounds.xml b/conf/vanilla/lang/fr/vm/sounds.xml
similarity index 100%
rename from conf/lang/fr/vm/sounds.xml
rename to conf/vanilla/lang/fr/vm/sounds.xml
diff --git a/conf/lang/he/demo/demo-ivr.xml b/conf/vanilla/lang/he/demo/demo-ivr.xml
similarity index 100%
rename from conf/lang/he/demo/demo-ivr.xml
rename to conf/vanilla/lang/he/demo/demo-ivr.xml
diff --git a/conf/lang/he/demo/demo.xml b/conf/vanilla/lang/he/demo/demo.xml
similarity index 100%
rename from conf/lang/he/demo/demo.xml
rename to conf/vanilla/lang/he/demo/demo.xml
diff --git a/conf/lang/he/dir/sounds.xml b/conf/vanilla/lang/he/dir/sounds.xml
similarity index 100%
rename from conf/lang/he/dir/sounds.xml
rename to conf/vanilla/lang/he/dir/sounds.xml
diff --git a/conf/lang/he/he.xml b/conf/vanilla/lang/he/he.xml
similarity index 100%
rename from conf/lang/he/he.xml
rename to conf/vanilla/lang/he/he.xml
diff --git a/conf/lang/he/vm/sounds.xml b/conf/vanilla/lang/he/vm/sounds.xml
similarity index 100%
rename from conf/lang/he/vm/sounds.xml
rename to conf/vanilla/lang/he/vm/sounds.xml
diff --git a/conf/lang/ru/demo/demo-ivr.xml b/conf/vanilla/lang/ru/demo/demo-ivr.xml
similarity index 100%
rename from conf/lang/ru/demo/demo-ivr.xml
rename to conf/vanilla/lang/ru/demo/demo-ivr.xml
diff --git a/conf/lang/ru/demo/demo.xml b/conf/vanilla/lang/ru/demo/demo.xml
similarity index 100%
rename from conf/lang/ru/demo/demo.xml
rename to conf/vanilla/lang/ru/demo/demo.xml
diff --git a/conf/lang/ru/dir/sounds.xml b/conf/vanilla/lang/ru/dir/sounds.xml
similarity index 100%
rename from conf/lang/ru/dir/sounds.xml
rename to conf/vanilla/lang/ru/dir/sounds.xml
diff --git a/conf/lang/ru/dir/tts.xml b/conf/vanilla/lang/ru/dir/tts.xml
similarity index 100%
rename from conf/lang/ru/dir/tts.xml
rename to conf/vanilla/lang/ru/dir/tts.xml
diff --git a/conf/lang/ru/ru.xml b/conf/vanilla/lang/ru/ru.xml
similarity index 100%
rename from conf/lang/ru/ru.xml
rename to conf/vanilla/lang/ru/ru.xml
diff --git a/conf/lang/ru/vm/sounds.xml b/conf/vanilla/lang/ru/vm/sounds.xml
similarity index 100%
rename from conf/lang/ru/vm/sounds.xml
rename to conf/vanilla/lang/ru/vm/sounds.xml
diff --git a/conf/lang/ru/vm/tts.xml b/conf/vanilla/lang/ru/vm/tts.xml
similarity index 100%
rename from conf/lang/ru/vm/tts.xml
rename to conf/vanilla/lang/ru/vm/tts.xml
diff --git a/conf/mime.types b/conf/vanilla/mime.types
similarity index 100%
rename from conf/mime.types
rename to conf/vanilla/mime.types
diff --git a/conf/mrcp_profiles/loquendo-7-mrcp-v2.xml b/conf/vanilla/mrcp_profiles/loquendo-7-mrcp-v2.xml
similarity index 100%
rename from conf/mrcp_profiles/loquendo-7-mrcp-v2.xml
rename to conf/vanilla/mrcp_profiles/loquendo-7-mrcp-v2.xml
diff --git a/conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml b/conf/vanilla/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
similarity index 100%
rename from conf/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
rename to conf/vanilla/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml
diff --git a/conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml b/conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v1.xml
similarity index 100%
rename from conf/mrcp_profiles/nuance-5.0-mrcp-v1.xml
rename to conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v1.xml
diff --git a/conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml b/conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v2.xml
similarity index 100%
rename from conf/mrcp_profiles/nuance-5.0-mrcp-v2.xml
rename to conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v2.xml
diff --git a/conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml b/conf/vanilla/mrcp_profiles/unimrcpserver-mrcp-v1.xml
similarity index 100%
rename from conf/mrcp_profiles/unimrcpserver-mrcp-v1.xml
rename to conf/vanilla/mrcp_profiles/unimrcpserver-mrcp-v1.xml
diff --git a/conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml b/conf/vanilla/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
similarity index 100%
rename from conf/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
rename to conf/vanilla/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml
diff --git a/conf/notify-voicemail.tpl b/conf/vanilla/notify-voicemail.tpl
similarity index 100%
rename from conf/notify-voicemail.tpl
rename to conf/vanilla/notify-voicemail.tpl
diff --git a/conf/sip_profiles/external.xml b/conf/vanilla/sip_profiles/external.xml
similarity index 100%
rename from conf/sip_profiles/external.xml
rename to conf/vanilla/sip_profiles/external.xml
diff --git a/conf/sip_profiles/external/example.xml b/conf/vanilla/sip_profiles/external/example.xml
similarity index 100%
rename from conf/sip_profiles/external/example.xml
rename to conf/vanilla/sip_profiles/external/example.xml
diff --git a/conf/sip_profiles/internal-ipv6.xml b/conf/vanilla/sip_profiles/internal-ipv6.xml
similarity index 100%
rename from conf/sip_profiles/internal-ipv6.xml
rename to conf/vanilla/sip_profiles/internal-ipv6.xml
diff --git a/conf/sip_profiles/internal.xml b/conf/vanilla/sip_profiles/internal.xml
similarity index 100%
rename from conf/sip_profiles/internal.xml
rename to conf/vanilla/sip_profiles/internal.xml
diff --git a/conf/sip_profiles/internal/example.xml b/conf/vanilla/sip_profiles/internal/example.xml
similarity index 100%
rename from conf/sip_profiles/internal/example.xml
rename to conf/vanilla/sip_profiles/internal/example.xml
diff --git a/conf/skinny_profiles/internal.xml b/conf/vanilla/skinny_profiles/internal.xml
similarity index 100%
rename from conf/skinny_profiles/internal.xml
rename to conf/vanilla/skinny_profiles/internal.xml
diff --git a/conf/tetris.ttml b/conf/vanilla/tetris.ttml
similarity index 100%
rename from conf/tetris.ttml
rename to conf/vanilla/tetris.ttml
diff --git a/conf/vars.xml b/conf/vanilla/vars.xml
similarity index 100%
rename from conf/vars.xml
rename to conf/vanilla/vars.xml
diff --git a/conf/voicemail.tpl b/conf/vanilla/voicemail.tpl
similarity index 100%
rename from conf/voicemail.tpl
rename to conf/vanilla/voicemail.tpl
diff --git a/conf/web-vm.tpl b/conf/vanilla/web-vm.tpl
similarity index 100%
rename from conf/web-vm.tpl
rename to conf/vanilla/web-vm.tpl
diff --git a/conf/yaml/extensions.yaml b/conf/vanilla/yaml/extensions.yaml
similarity index 100%
rename from conf/yaml/extensions.yaml
rename to conf/vanilla/yaml/extensions.yaml
diff --git a/conf/yaml/mod_yaml.yaml b/conf/vanilla/yaml/mod_yaml.yaml
similarity index 100%
rename from conf/yaml/mod_yaml.yaml
rename to conf/vanilla/yaml/mod_yaml.yaml