diff --git a/conf/alsa.conf.xml b/conf/autoload_configs/alsa.conf.xml
similarity index 100%
rename from conf/alsa.conf.xml
rename to conf/autoload_configs/alsa.conf.xml
diff --git a/conf/cdr.conf.xml b/conf/autoload_configs/cdr.conf.xml
similarity index 100%
rename from conf/cdr.conf.xml
rename to conf/autoload_configs/cdr.conf.xml
diff --git a/conf/conference.conf.xml b/conf/autoload_configs/conference.conf.xml
similarity index 100%
rename from conf/conference.conf.xml
rename to conf/autoload_configs/conference.conf.xml
diff --git a/conf/console.conf.xml b/conf/autoload_configs/console.conf.xml
similarity index 100%
rename from conf/console.conf.xml
rename to conf/autoload_configs/console.conf.xml
diff --git a/conf/dialplan_directory.conf.xml b/conf/autoload_configs/dialplan_directory.conf.xml
similarity index 100%
rename from conf/dialplan_directory.conf.xml
rename to conf/autoload_configs/dialplan_directory.conf.xml
diff --git a/conf/dingaling.conf.xml b/conf/autoload_configs/dingaling.conf.xml
similarity index 100%
rename from conf/dingaling.conf.xml
rename to conf/autoload_configs/dingaling.conf.xml
diff --git a/conf/enum.conf.xml b/conf/autoload_configs/enum.conf.xml
similarity index 100%
rename from conf/enum.conf.xml
rename to conf/autoload_configs/enum.conf.xml
diff --git a/conf/event_multicast.conf.xml b/conf/autoload_configs/event_multicast.conf.xml
similarity index 100%
rename from conf/event_multicast.conf.xml
rename to conf/autoload_configs/event_multicast.conf.xml
diff --git a/conf/event_socket.conf.xml b/conf/autoload_configs/event_socket.conf.xml
similarity index 100%
rename from conf/event_socket.conf.xml
rename to conf/autoload_configs/event_socket.conf.xml
diff --git a/conf/iax.conf.xml b/conf/autoload_configs/iax.conf.xml
similarity index 100%
rename from conf/iax.conf.xml
rename to conf/autoload_configs/iax.conf.xml
diff --git a/conf/ivr.conf.xml b/conf/autoload_configs/ivr.conf.xml
similarity index 100%
rename from conf/ivr.conf.xml
rename to conf/autoload_configs/ivr.conf.xml
diff --git a/conf/java.conf.xml b/conf/autoload_configs/java.conf.xml
similarity index 100%
rename from conf/java.conf.xml
rename to conf/autoload_configs/java.conf.xml
diff --git a/conf/limit.conf.xml b/conf/autoload_configs/limit.conf.xml
similarity index 100%
rename from conf/limit.conf.xml
rename to conf/autoload_configs/limit.conf.xml
diff --git a/conf/local_stream.conf.xml b/conf/autoload_configs/local_stream.conf.xml
similarity index 100%
rename from conf/local_stream.conf.xml
rename to conf/autoload_configs/local_stream.conf.xml
diff --git a/conf/modules.conf.xml b/conf/autoload_configs/modules.conf.xml
similarity index 100%
rename from conf/modules.conf.xml
rename to conf/autoload_configs/modules.conf.xml
diff --git a/conf/openmrcp.conf.xml b/conf/autoload_configs/openmrcp.conf.xml
similarity index 100%
rename from conf/openmrcp.conf.xml
rename to conf/autoload_configs/openmrcp.conf.xml
diff --git a/conf/portaudio.conf.xml b/conf/autoload_configs/portaudio.conf.xml
similarity index 100%
rename from conf/portaudio.conf.xml
rename to conf/autoload_configs/portaudio.conf.xml
diff --git a/conf/rss.conf.xml b/conf/autoload_configs/rss.conf.xml
similarity index 100%
rename from conf/rss.conf.xml
rename to conf/autoload_configs/rss.conf.xml
diff --git a/conf/sofia.conf.xml b/conf/autoload_configs/sofia.conf.xml
similarity index 100%
rename from conf/sofia.conf.xml
rename to conf/autoload_configs/sofia.conf.xml
diff --git a/conf/spidermonkey.conf.xml b/conf/autoload_configs/spidermonkey.conf.xml
similarity index 100%
rename from conf/spidermonkey.conf.xml
rename to conf/autoload_configs/spidermonkey.conf.xml
diff --git a/conf/switch.conf.xml b/conf/autoload_configs/switch.conf.xml
similarity index 100%
rename from conf/switch.conf.xml
rename to conf/autoload_configs/switch.conf.xml
diff --git a/conf/syslog.conf.xml b/conf/autoload_configs/syslog.conf.xml
similarity index 100%
rename from conf/syslog.conf.xml
rename to conf/autoload_configs/syslog.conf.xml
diff --git a/conf/voicemail.conf.xml b/conf/autoload_configs/voicemail.conf.xml
similarity index 100%
rename from conf/voicemail.conf.xml
rename to conf/autoload_configs/voicemail.conf.xml
diff --git a/conf/wanpipe.conf.xml b/conf/autoload_configs/wanpipe.conf.xml
similarity index 100%
rename from conf/wanpipe.conf.xml
rename to conf/autoload_configs/wanpipe.conf.xml
diff --git a/conf/woomera.conf.xml b/conf/autoload_configs/woomera.conf.xml
similarity index 100%
rename from conf/woomera.conf.xml
rename to conf/autoload_configs/woomera.conf.xml
diff --git a/conf/xml_cdr.conf.xml b/conf/autoload_configs/xml_cdr.conf.xml
similarity index 100%
rename from conf/xml_cdr.conf.xml
rename to conf/autoload_configs/xml_cdr.conf.xml
diff --git a/conf/xml_curl.conf.xml b/conf/autoload_configs/xml_curl.conf.xml
similarity index 100%
rename from conf/xml_curl.conf.xml
rename to conf/autoload_configs/xml_curl.conf.xml
diff --git a/conf/xml_rpc.conf.xml b/conf/autoload_configs/xml_rpc.conf.xml
similarity index 100%
rename from conf/xml_rpc.conf.xml
rename to conf/autoload_configs/xml_rpc.conf.xml
diff --git a/conf/zeroconf.conf.xml b/conf/autoload_configs/zeroconf.conf.xml
similarity index 100%
rename from conf/zeroconf.conf.xml
rename to conf/autoload_configs/zeroconf.conf.xml
diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml
index 3937fb033f..07b44ac097 100644
--- a/conf/freeswitch.xml
+++ b/conf/freeswitch.xml
@@ -21,78 +21,7 @@
   <X-PRE-PROCESS cmd="include" data="vars.xml"/>
 
   <section name="configuration" description="Various Configuration">
-    <!-- drop in configs -->
     <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>
-
-    <X-PRE-PROCESS cmd="include" data="switch.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="modules.conf.xml"/>
-
-    <!-- Order doesn't matter, but for clarity these are in same order as modules.conf.xml. 
-         If they aren't loaded by modules.conf.xml, then they are ignored.
-    --> 
-    <!-- Loggers -->
-    <X-PRE-PROCESS cmd="include" data="console.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="syslog.conf.xml"/>
-
-    <!-- Multi-Faceted -->
-    <X-PRE-PROCESS cmd="include" data="enum.conf.xml"/>
-
-    <!-- XML Interfaces --> 
-    <X-PRE-PROCESS cmd="include" data="xml_rpc.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="xml_cdr.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="xml_curl.conf.xml"/>
-    <!-- none for mod_xml_cdr -->
-
-    <!-- Event Handlers -->
-    <XX-PRE-PROCESS cmd="include" data="cdr.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/>
-
-    <!-- Directory Interfaces -->
-    <!-- none for mod_ldap; dialplan_directory.conf.xml has ldap connection info -->
-
-    <!-- Endpoints -->
-    <X-PRE-PROCESS cmd="include" data="dingaling.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="iax.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="portaudio.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="alsa.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="sofia.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="wanpipe.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="woomera.conf.xml"/>
-
-    <!-- Applications -->
-    <!-- none for mod_bridgecall, mod_commands, mod_echo, mod_park, mod_playback --> 
-    <X-PRE-PROCESS cmd="include" data="conference.conf.xml"/>
-    <!-- ivr.conf is used by mod_dptools -->
-    <X-PRE-PROCESS cmd="include" data="ivr.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="voicemail.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="limit.conf.xml"/>
-
-    <!-- Dialplan Interfaces -->
-    <X-PRE-PROCESS cmd="include" data="dialplan_directory.conf.xml"/>
-    <!-- mod_dialplan_xml is configured in the separate "dialplan" section. -->
-
-    <!-- Codec Interfaces -->
-    <!-- no configuration needed -->
-    <!-- File Format Interfaces -->
-    <!-- no configuration needed -->
-    <!-- Timers -->
-    <!-- no configuration needed -->
-
-    <!-- Languages -->
-    <X-PRE-PROCESS cmd="include" data="spidermonkey.conf.xml"/>
-    <!-- none for mod_perl -->
-    <X-PRE-PROCESS cmd="include" data="java.conf.xml"/>
-
-    <!-- ASR /TTS -->
-    <!-- none for mod_cepstral -->
-    <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/>
-    <X-PRE-PROCESS cmd="include" data="openmrcp.conf.xml"/>
-
-    <!-- Say -->
-    <!-- none for mod_say_en -->
-    <X-PRE-PROCESS cmd="include" data="local_stream.conf.xml"/>
   </section>
   
   <section name="dialplan" description="Regex/XML Dialplan">