diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index e103aad82c..d052f151c0 100644
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -1,117 +1,6 @@
-<!--the domain or ip (the right hand side of the @ in the addr-->
-<domain name="$${domain}">
-  <!--the user id (the left hand side of the @ in the addr-->
-  <user id="default"> <!--if id is numeric mailbox param is not necessary-->
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <!-- set these to take advantage of a dialplan localized to this user -->
-      <variable name="numbering_plan" value="US"/>
-      <!-- <variable name="default_area_code" value="434"/> -->
-    </variables>
-  </user>
-
-  <user id="brian" mailbox="1000"> <!--if id is numeric mailbox param is not necessary-->
-    <!-- Outbound Registrations Related to this user -->
-    <gateways>
-      <!--<gateway name="asterlink.com">-->
-      <!--/// account username *required* ///-->
-      <!--<param name="username" value="cluecon"/>-->
-      <!--/// auth realm: *optional* same as gateway name, if blank ///-->
-      <!--<param name="realm" value="asterlink.com"/>-->
-      <!--/// username to use in from: *optional* same as  username, if blank ///-->
-      <!--<param name="from-user" value="cluecon"/>-->
-      <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
-      <!--<param name="from-domain" value="asterlink.com"/>-->
-      <!--/// account password *required* ///-->
-      <!--<param name="password" value="2007"/>--> 
-      <!--/// replace the INVITE from user with the channel's caller-id ///-->
-      <!--<param name="caller-id-in-from" value="false"/>-->
-      <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
-      <!--<param name="extension" value="cluecon"/>-->
-      <!--/// proxy host: *optional* same as realm, if blank ///-->
-      <!--<param name="proxy" value="asterlink.com"/>-->
-      <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
-      <!--<param name="register-proxy" value="mysbc.com"/>-->
-      <!--/// expire in seconds: *optional* 3600, if blank ///-->
-      <!--<param name="expire-seconds" value="60"/>-->
-      <!--/// do not register ///-->
-      <!--<param name="register" value="false"/>-->
-      <!-- which transport to use for register -->
-      <!--<param name="register-transport" value="udp"/>-->
-      <!--How many seconds before a retry when a failure or timeout occurs -->
-      <!--<param name="retry_seconds" value="30"/>-->
-      <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
-      <!--<param name="caller-id-in-from" value="false"/>-->
-      <!--extra sip params to send in the contact-->
-      <!--<param name="contact-params" value="tport=tcp"/>-->
-      <!--</gateway>-->
-    </gateways>
-    <params>
-      <!-- omit password for authless registration -->
-      <param name="password" value="1234"/>
-      <param name="vm-password" value="1234"/><!--if vm-password is omitted password param is used-->
-      <!--<param name="email-addr" value="me@mydomain.com"/>-->
-      <!--<param name="vm-delete-file" value="true"/>-->
-      <!--<param name="vm-attach-file" value="true"/>-->
-      <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
-      <!--<param name="vm-email-all-messages" value="true"/>-->
-      <!-- optionally use this instead if you want to store the hash of user:domain:pass-->
-      <!--<param name="a1-hash" value="c6440e5de50b403206989679159de89a"/>-->
-    </params>
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <variable name="testing" value="this"/>
-
-      <!-- limit the max number of outgoing calls for this user -->
-      <!--<variable name="max_calls" value="2"/>-->
-
-      <!-- send presence information if FS is configured to do so -->
-      <!--<variable name="presence_id" value="1000@$${domain}"/>-->
-
-      <!-- set these to take advantage of a dialplan localized to this user -->
-      <!--<variable name="numbering_plan" value="US"/>-->
-      <!--<variable name="default_area_code" value="434"/>-->
-      <!--<variable name="default_gateway" value="asterlink.com"/>-->
-
-      <!--<variable name="sip-force-contact" value="nat-connectile-dysfunction"/>-->
-      <!--<variable name="sip-force-expires" value="10"/>-->
-      <!--<variable name="sip-register-gateway" value="cluecon.com"/>-->
-    </variables>
-
-    <vcard>
-      <!-- insert optional compliant vcard xml here-->
-    </vcard>
-  </user>
-
-  <!-- this is an example of a user with auth and various settings -->
-  <user id="1000" mailbox="1000">
-    <params>
-      <param name="password" value="mypass"/>
-      <param name="vm-password" value="1234"/>
-      <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
-      <!--<param name="vm-email-all-messages" value="true"/>-->
-      <param name="dial-string" value="sofia/${use_profile}/888@conference.freeswitch.org"/>
-    </params>
-  </user>
-
-  <!-- authless users and mailboxes -->
-  <user id="1001"/>
-  <user id="1002"/>
-  <user id="1003"/>
-  <user id="1004"/>
-  <user id="1005"/>
-  <user id="1006"/>
-  <user id="1007"/>
-  <user id="1008"/>
-  <user id="1009"/>
-  <user id="1010"/>
-  <user id="1011"/>
-  <user id="1012"/>
-  <user id="1013"/>
-  <user id="1014"/>
-  <user id="1015"/>
-  <user id="1016"/>
-  <user id="1017"/>
-  <user id="1018"/>
-  <user id="1019"/>
-</domain>
+<include>
+  <!--the domain or ip (the right hand side of the @ in the addr-->
+  <domain name="$${domain}">
+    <X-PRE-PROCESS cmd="include" data="*/*.xml"/>
+  </domain>
+</include>
diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
new file mode 100644
index 0000000000..dbe87d40af
--- /dev/null
+++ b/conf/directory/default/1000.xml
@@ -0,0 +1,11 @@
+<include>
+  <user id="1000" mailbox="1000">
+    <params>
+      <param name="password" value="mypass"/>
+      <param name="vm-password" value="1234"/>
+      <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
+      <!--<param name="vm-email-all-messages" value="true"/>-->
+      <param name="dial-string" value="sofia/${use_profile}/888@conference.freeswitch.org"/>
+    </params>
+  </user>
+</include>
diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
new file mode 100644
index 0000000000..0eb0e2f936
--- /dev/null
+++ b/conf/directory/default/1001.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1001"/>
+</include>
diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
new file mode 100644
index 0000000000..dfaa712d7a
--- /dev/null
+++ b/conf/directory/default/1002.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1002"/>
+</include>
diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
new file mode 100644
index 0000000000..62d3d2b8f4
--- /dev/null
+++ b/conf/directory/default/1003.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1003"/>
+</include>
diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
new file mode 100644
index 0000000000..de0db09690
--- /dev/null
+++ b/conf/directory/default/1004.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1004"/>
+</include>
diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
new file mode 100644
index 0000000000..e63f630d9b
--- /dev/null
+++ b/conf/directory/default/1005.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1005"/>
+</include>
diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
new file mode 100644
index 0000000000..860fca4093
--- /dev/null
+++ b/conf/directory/default/1006.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1006"/>
+</include>
diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
new file mode 100644
index 0000000000..7b0baedfe8
--- /dev/null
+++ b/conf/directory/default/1007.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1007"/>
+</include>
diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
new file mode 100644
index 0000000000..d9167fa65d
--- /dev/null
+++ b/conf/directory/default/1008.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1008"/>
+</include>
diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
new file mode 100644
index 0000000000..cf8d7a890a
--- /dev/null
+++ b/conf/directory/default/1009.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1009"/>
+</include>
diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
new file mode 100644
index 0000000000..6108ea47ca
--- /dev/null
+++ b/conf/directory/default/1010.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1010"/>
+</include>
diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
new file mode 100644
index 0000000000..0e46facfda
--- /dev/null
+++ b/conf/directory/default/1011.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1011"/>
+</include>
diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
new file mode 100644
index 0000000000..5264e3d1cd
--- /dev/null
+++ b/conf/directory/default/1012.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1012"/>
+</include>
diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
new file mode 100644
index 0000000000..f1c7c87d3e
--- /dev/null
+++ b/conf/directory/default/1013.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1013"/>
+</include>
diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
new file mode 100644
index 0000000000..b596545166
--- /dev/null
+++ b/conf/directory/default/1014.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1014"/>
+</include>
diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
new file mode 100644
index 0000000000..2045720e99
--- /dev/null
+++ b/conf/directory/default/1015.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1015"/>
+</include>
diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
new file mode 100644
index 0000000000..a7221a94bb
--- /dev/null
+++ b/conf/directory/default/1016.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1016"/>
+</include>
diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
new file mode 100644
index 0000000000..9ce4e7c5eb
--- /dev/null
+++ b/conf/directory/default/1017.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1017"/>
+</include>
diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
new file mode 100644
index 0000000000..b9dc231269
--- /dev/null
+++ b/conf/directory/default/1018.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1018"/>
+</include>
diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
new file mode 100644
index 0000000000..2c97b0c345
--- /dev/null
+++ b/conf/directory/default/1019.xml
@@ -0,0 +1,3 @@
+<include>
+	<user id="1019"/>
+</include>
diff --git a/conf/directory/default/brian.xml b/conf/directory/default/brian.xml
new file mode 100644
index 0000000000..8af847858b
--- /dev/null
+++ b/conf/directory/default/brian.xml
@@ -0,0 +1,74 @@
+<include>
+  <user id="brian" mailbox="9999"> <!--if id is numeric mailbox param is not necessary-->
+    <!-- Outbound Registrations Related to this user -->
+    <gateways>
+      <!--<gateway name="asterlink.com">-->
+      <!--/// account username *required* ///-->
+      <!--<param name="username" value="cluecon"/>-->
+      <!--/// auth realm: *optional* same as gateway name, if blank ///-->
+      <!--<param name="realm" value="asterlink.com"/>-->
+      <!--/// username to use in from: *optional* same as  username, if blank ///-->
+      <!--<param name="from-user" value="cluecon"/>-->
+      <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
+      <!--<param name="from-domain" value="asterlink.com"/>-->
+      <!--/// account password *required* ///-->
+      <!--<param name="password" value="2007"/>--> 
+      <!--/// replace the INVITE from user with the channel's caller-id ///-->
+      <!--<param name="caller-id-in-from" value="false"/>-->
+      <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
+      <!--<param name="extension" value="cluecon"/>-->
+      <!--/// proxy host: *optional* same as realm, if blank ///-->
+      <!--<param name="proxy" value="asterlink.com"/>-->
+      <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
+      <!--<param name="register-proxy" value="mysbc.com"/>-->
+      <!--/// expire in seconds: *optional* 3600, if blank ///-->
+      <!--<param name="expire-seconds" value="60"/>-->
+      <!--/// do not register ///-->
+      <!--<param name="register" value="false"/>-->
+      <!-- which transport to use for register -->
+      <!--<param name="register-transport" value="udp"/>-->
+      <!--How many seconds before a retry when a failure or timeout occurs -->
+      <!--<param name="retry_seconds" value="30"/>-->
+      <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
+      <!--<param name="caller-id-in-from" value="false"/>-->
+      <!--extra sip params to send in the contact-->
+      <!--<param name="contact-params" value="tport=tcp"/>-->
+      <!--</gateway>-->
+    </gateways>
+    <params>
+      <!-- omit password for authless registration -->
+      <param name="password" value="1234"/>
+      <param name="vm-password" value="1234"/><!--if vm-password is omitted password param is used-->
+      <!--<param name="email-addr" value="me@mydomain.com"/>-->
+      <!--<param name="vm-delete-file" value="true"/>-->
+      <!--<param name="vm-attach-file" value="true"/>-->
+      <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
+      <!--<param name="vm-email-all-messages" value="true"/>-->
+      <!-- optionally use this instead if you want to store the hash of user:domain:pass-->
+      <!--<param name="a1-hash" value="c6440e5de50b403206989679159de89a"/>-->
+    </params>
+    <variables>
+      <!--all variables here will be set on all inbound calls that originate from this user -->
+      <variable name="testing" value="this"/>
+
+      <!-- limit the max number of outgoing calls for this user -->
+      <!--<variable name="max_calls" value="2"/>-->
+
+      <!-- send presence information if FS is configured to do so -->
+      <!--<variable name="presence_id" value="1000@$${domain}"/>-->
+
+      <!-- set these to take advantage of a dialplan localized to this user -->
+      <!--<variable name="numbering_plan" value="US"/>-->
+      <!--<variable name="default_area_code" value="434"/>-->
+      <!--<variable name="default_gateway" value="asterlink.com"/>-->
+
+      <!--<variable name="sip-force-contact" value="nat-connectile-dysfunction"/>-->
+      <!--<variable name="sip-force-expires" value="10"/>-->
+      <!--<variable name="sip-register-gateway" value="cluecon.com"/>-->
+    </variables>
+
+    <vcard>
+      <!-- insert optional compliant vcard xml here-->
+    </vcard>
+  </user>
+</include>
diff --git a/conf/directory/default/default.xml b/conf/directory/default/default.xml
new file mode 100644
index 0000000000..b06d2e9700
--- /dev/null
+++ b/conf/directory/default/default.xml
@@ -0,0 +1,10 @@
+<include>
+  <user id="default"> <!--if id is numeric mailbox param is not necessary-->
+    <variables>
+      <!--all variables here will be set on all inbound calls that originate from this user -->
+      <!-- set these to take advantage of a dialplan localized to this user -->
+      <variable name="numbering_plan" value="US"/>
+      <!-- <variable name="default_area_code" value="434"/> -->
+    </variables>
+  </user>
+</include>