diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index fef6c3c853..4bb30b7387 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -425,7 +425,7 @@
       </condition>
     </extension>
 
-    <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="default/*.xml"/>
     <!--
     <extension name="refer">
       <condition field="${sip_refer_to}">
diff --git a/conf/dialplan/extensions/00_pizza_demo.xml b/conf/dialplan/default/00_pizza_demo.xml
similarity index 100%
rename from conf/dialplan/extensions/00_pizza_demo.xml
rename to conf/dialplan/default/00_pizza_demo.xml
diff --git a/conf/dialplan/extensions/99999_enum.xml b/conf/dialplan/default/99999_enum.xml
similarity index 100%
rename from conf/dialplan/extensions/99999_enum.xml
rename to conf/dialplan/default/99999_enum.xml
diff --git a/conf/dialplan/extensions/ideasip.com.noload b/conf/dialplan/default/ideasip.com.noload
similarity index 100%
rename from conf/dialplan/extensions/ideasip.com.noload
rename to conf/dialplan/default/ideasip.com.noload
diff --git a/conf/dialplan/extensions/pulver.com.noload b/conf/dialplan/default/pulver.com.noload
similarity index 100%
rename from conf/dialplan/extensions/pulver.com.noload
rename to conf/dialplan/default/pulver.com.noload
diff --git a/conf/dialplan/extensions/sipbroker.com.noload b/conf/dialplan/default/sipbroker.com.noload
similarity index 100%
rename from conf/dialplan/extensions/sipbroker.com.noload
rename to conf/dialplan/default/sipbroker.com.noload
diff --git a/conf/dialplan/extensions/sipphone.com.noload b/conf/dialplan/default/sipphone.com.noload
similarity index 100%
rename from conf/dialplan/extensions/sipphone.com.noload
rename to conf/dialplan/default/sipphone.com.noload
diff --git a/conf/dialplan/extensions/tollfreegateway.com.noload b/conf/dialplan/default/tollfreegateway.com.noload
similarity index 100%
rename from conf/dialplan/extensions/tollfreegateway.com.noload
rename to conf/dialplan/default/tollfreegateway.com.noload
diff --git a/conf/dialplan/public.xml b/conf/dialplan/public.xml
index d7e72740e6..08a218466b 100644
--- a/conf/dialplan/public.xml
+++ b/conf/dialplan/public.xml
@@ -15,11 +15,7 @@
       </condition>
     </extension>
 
-    <extension name="public_did">
-      <condition field="destination_number" expression="^(5551212)$">
-	<action application="transfer" data="$1 XML default"/>
-      </condition>
-    </extension>
+    <X-PRE-PROCESS cmd="include" data="public/*.xml"/>
 
   </context>
 </include>
diff --git a/conf/dialplan/public/00_inbound_did.xml b/conf/dialplan/public/00_inbound_did.xml
new file mode 100644
index 0000000000..ca8a423877
--- /dev/null
+++ b/conf/dialplan/public/00_inbound_did.xml
@@ -0,0 +1,8 @@
+<include>
+  <extension name="public_did">
+    <condition field="destination_number" expression="^(5551212)$">
+      <!-- This example maps the DID 5551212 to ring 1000 in the default context -->
+      <action application="transfer" data="1000 XML default"/>
+    </condition>
+  </extension>
+</include>