diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml
index b732d2a2c0..4f256ef996 100644
--- a/conf/freeswitch.xml
+++ b/conf/freeswitch.xml
@@ -107,14 +107,7 @@
   <!-- phrases section (under development still) -->
   <section name="phrases" description="Speech Phrase Management">
     <macros>
-      <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="david">
-	<X-PRE-PROCESS cmd="include" data="lang_en.xml"/>
-	<!--voicemail_en_tts is purely implemented with tts, we need a files based implementation too -->
-	<X-PRE-PROCESS cmd="include" data="voicemail_en_tts.xml"/>
-      </language>
-      <language name="fr" sound_path="/var/sounds/lang/fr/jean" tts_engine="cepstral" tts_voice="jean-pierre">
-	<X-PRE-PROCESS cmd="include" data="lang_fr.xml"/>
-      </language>
+      <X-PRE-PROCESS cmd="include" data="lang/*/*.xml"/>
     </macros>
   </section>
 
diff --git a/conf/lang_en.xml b/conf/lang/en/demo/demo.xml
similarity index 100%
rename from conf/lang_en.xml
rename to conf/lang/en/demo/demo.xml
diff --git a/conf/lang/en/en.xml b/conf/lang/en/en.xml
new file mode 100644
index 0000000000..ea7597564b
--- /dev/null
+++ b/conf/lang/en/en.xml
@@ -0,0 +1,7 @@
+<include>
+  <language name="en" sound-path="/snds" tts-engine="cepstral" tts-voice="david">
+    <X-PRE-PROCESS cmd="include" data="demo/demo.xml"/>
+    <!--voicemail_en_tts is purely implemented with tts, we need a files based implementation too -->
+    <X-PRE-PROCESS cmd="include" data="vm/tts.xml"/>
+  </language>
+</include>
diff --git a/conf/voicemail_en.xml b/conf/lang/en/vm/sounds.xml
similarity index 100%
rename from conf/voicemail_en.xml
rename to conf/lang/en/vm/sounds.xml
diff --git a/conf/voicemail_en_tts.xml b/conf/lang/en/vm/tts.xml
similarity index 100%
rename from conf/voicemail_en_tts.xml
rename to conf/lang/en/vm/tts.xml