diff --git a/resources/templates/conf/freeswitch.xml b/resources/templates/conf/freeswitch.xml
index 3988ea09be..d42cb6c6f3 100644
--- a/resources/templates/conf/freeswitch.xml
+++ b/resources/templates/conf/freeswitch.xml
@@ -58,10 +58,10 @@
 
   <!-- languages section -->
   <section name="languages" description="Language Management">
-    <!--<X-PRE-PROCESS cmd="include" data="lang/de/*.xml"/>-->
-    <X-PRE-PROCESS cmd="include" data="lang/en/*.xml"/>
-    <!--<X-PRE-PROCESS cmd="include" data="lang/fr/*.xml"/>-->
-    <!--<X-PRE-PROCESS cmd="include" data="lang/ru/*.xml"/>-->
-    <!--<X-PRE-PROCESS cmd="include" data="lang/he/*.xml"/>-->
+    <X-PRE-PROCESS cmd="include" data="languages/de/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="languages/en/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="languages/fr/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="languages/ru/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="languages/he/*.xml"/>
   </section>
 </document>
diff --git a/resources/templates/conf/lang/de/de.xml b/resources/templates/conf/languages/de/de.xml
similarity index 100%
rename from resources/templates/conf/lang/de/de.xml
rename to resources/templates/conf/languages/de/de.xml
diff --git a/resources/templates/conf/lang/de/demo/demo.xml b/resources/templates/conf/languages/de/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/lang/de/demo/demo.xml
rename to resources/templates/conf/languages/de/demo/demo.xml
diff --git a/resources/templates/conf/lang/de/vm/sounds.xml b/resources/templates/conf/languages/de/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/de/vm/sounds.xml
rename to resources/templates/conf/languages/de/vm/sounds.xml
diff --git a/resources/templates/conf/lang/de/vm/tts.xml b/resources/templates/conf/languages/de/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/lang/de/vm/tts.xml
rename to resources/templates/conf/languages/de/vm/tts.xml
diff --git a/resources/templates/conf/lang/en/demo/demo-ivr.xml b/resources/templates/conf/languages/en/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/lang/en/demo/demo-ivr.xml
rename to resources/templates/conf/languages/en/demo/demo-ivr.xml
diff --git a/resources/templates/conf/lang/en/demo/demo.xml b/resources/templates/conf/languages/en/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/lang/en/demo/demo.xml
rename to resources/templates/conf/languages/en/demo/demo.xml
diff --git a/resources/templates/conf/lang/en/dir/sounds.xml b/resources/templates/conf/languages/en/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/en/dir/sounds.xml
rename to resources/templates/conf/languages/en/dir/sounds.xml
diff --git a/resources/templates/conf/lang/en/dir/tts.xml b/resources/templates/conf/languages/en/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/lang/en/dir/tts.xml
rename to resources/templates/conf/languages/en/dir/tts.xml
diff --git a/resources/templates/conf/lang/en/en.xml b/resources/templates/conf/languages/en/en.xml
similarity index 100%
rename from resources/templates/conf/lang/en/en.xml
rename to resources/templates/conf/languages/en/en.xml
diff --git a/resources/templates/conf/lang/en/ivr/sounds.xml b/resources/templates/conf/languages/en/ivr/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/en/ivr/sounds.xml
rename to resources/templates/conf/languages/en/ivr/sounds.xml
diff --git a/resources/templates/conf/lang/en/ivr/wakeup.xml b/resources/templates/conf/languages/en/ivr/wakeup.xml
similarity index 100%
rename from resources/templates/conf/lang/en/ivr/wakeup.xml
rename to resources/templates/conf/languages/en/ivr/wakeup.xml
diff --git a/resources/templates/conf/lang/en/vm/sounds.xml b/resources/templates/conf/languages/en/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/en/vm/sounds.xml
rename to resources/templates/conf/languages/en/vm/sounds.xml
diff --git a/resources/templates/conf/lang/en/vm/tts.xml b/resources/templates/conf/languages/en/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/lang/en/vm/tts.xml
rename to resources/templates/conf/languages/en/vm/tts.xml
diff --git a/resources/templates/conf/lang/en/vm/voicemail_ivr.xml b/resources/templates/conf/languages/en/vm/voicemail_ivr.xml
similarity index 100%
rename from resources/templates/conf/lang/en/vm/voicemail_ivr.xml
rename to resources/templates/conf/languages/en/vm/voicemail_ivr.xml
diff --git a/resources/templates/conf/lang/en/wakeup/sounds.xml b/resources/templates/conf/languages/en/wakeup/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/en/wakeup/sounds.xml
rename to resources/templates/conf/languages/en/wakeup/sounds.xml
diff --git a/resources/templates/conf/lang/fr/demo/demo.xml b/resources/templates/conf/languages/fr/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/lang/fr/demo/demo.xml
rename to resources/templates/conf/languages/fr/demo/demo.xml
diff --git a/resources/templates/conf/lang/fr/dir/sounds.xml b/resources/templates/conf/languages/fr/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/fr/dir/sounds.xml
rename to resources/templates/conf/languages/fr/dir/sounds.xml
diff --git a/resources/templates/conf/lang/fr/dir/tts.xml b/resources/templates/conf/languages/fr/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/lang/fr/dir/tts.xml
rename to resources/templates/conf/languages/fr/dir/tts.xml
diff --git a/resources/templates/conf/lang/fr/fr.xml b/resources/templates/conf/languages/fr/fr.xml
similarity index 100%
rename from resources/templates/conf/lang/fr/fr.xml
rename to resources/templates/conf/languages/fr/fr.xml
diff --git a/resources/templates/conf/lang/fr/vm/sounds.xml b/resources/templates/conf/languages/fr/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/fr/vm/sounds.xml
rename to resources/templates/conf/languages/fr/vm/sounds.xml
diff --git a/resources/templates/conf/lang/he/demo/demo-ivr.xml b/resources/templates/conf/languages/he/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/lang/he/demo/demo-ivr.xml
rename to resources/templates/conf/languages/he/demo/demo-ivr.xml
diff --git a/resources/templates/conf/lang/he/demo/demo.xml b/resources/templates/conf/languages/he/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/lang/he/demo/demo.xml
rename to resources/templates/conf/languages/he/demo/demo.xml
diff --git a/resources/templates/conf/lang/he/dir/sounds.xml b/resources/templates/conf/languages/he/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/he/dir/sounds.xml
rename to resources/templates/conf/languages/he/dir/sounds.xml
diff --git a/resources/templates/conf/lang/he/he.xml b/resources/templates/conf/languages/he/he.xml
similarity index 100%
rename from resources/templates/conf/lang/he/he.xml
rename to resources/templates/conf/languages/he/he.xml
diff --git a/resources/templates/conf/lang/he/vm/sounds.xml b/resources/templates/conf/languages/he/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/he/vm/sounds.xml
rename to resources/templates/conf/languages/he/vm/sounds.xml
diff --git a/resources/templates/conf/lang/ru/demo/demo-ivr.xml b/resources/templates/conf/languages/ru/demo/demo-ivr.xml
similarity index 100%
rename from resources/templates/conf/lang/ru/demo/demo-ivr.xml
rename to resources/templates/conf/languages/ru/demo/demo-ivr.xml
diff --git a/resources/templates/conf/lang/ru/demo/demo.xml b/resources/templates/conf/languages/ru/demo/demo.xml
similarity index 100%
rename from resources/templates/conf/lang/ru/demo/demo.xml
rename to resources/templates/conf/languages/ru/demo/demo.xml
diff --git a/resources/templates/conf/lang/ru/dir/sounds.xml b/resources/templates/conf/languages/ru/dir/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/ru/dir/sounds.xml
rename to resources/templates/conf/languages/ru/dir/sounds.xml
diff --git a/resources/templates/conf/lang/ru/dir/tts.xml b/resources/templates/conf/languages/ru/dir/tts.xml
similarity index 100%
rename from resources/templates/conf/lang/ru/dir/tts.xml
rename to resources/templates/conf/languages/ru/dir/tts.xml
diff --git a/resources/templates/conf/lang/ru/ru.xml b/resources/templates/conf/languages/ru/ru.xml
similarity index 100%
rename from resources/templates/conf/lang/ru/ru.xml
rename to resources/templates/conf/languages/ru/ru.xml
diff --git a/resources/templates/conf/lang/ru/vm/sounds.xml b/resources/templates/conf/languages/ru/vm/sounds.xml
similarity index 100%
rename from resources/templates/conf/lang/ru/vm/sounds.xml
rename to resources/templates/conf/languages/ru/vm/sounds.xml
diff --git a/resources/templates/conf/lang/ru/vm/tts.xml b/resources/templates/conf/languages/ru/vm/tts.xml
similarity index 100%
rename from resources/templates/conf/lang/ru/vm/tts.xml
rename to resources/templates/conf/languages/ru/vm/tts.xml