diff --git a/reactos/dll/cpl/access/access.rc b/reactos/dll/cpl/access/access.rc
index d2b23d6edcb..8fc036b0580 100644
--- a/reactos/dll/cpl/access/access.rc
+++ b/reactos/dll/cpl/access/access.rc
@@ -12,15 +12,16 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_CPLACCESS ICON "resources/applet.ico"
 
 
-#include "Cz.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "Hu.rc"
-#include "Id.rc"
-#include "It.rc"
-#include "Ja.rc"
-#include "Nl.rc"
-#include "Pl.rc"
-#include "Ru.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/pl-PL.rc"
+#include "lang/ru-RU.rc"
+
diff --git a/reactos/dll/cpl/access/Cz.rc b/reactos/dll/cpl/access/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/access/Cz.rc
rename to reactos/dll/cpl/access/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/access/De.rc b/reactos/dll/cpl/access/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/access/De.rc
rename to reactos/dll/cpl/access/lang/de-DE.rc
diff --git a/reactos/dll/cpl/access/En.rc b/reactos/dll/cpl/access/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/access/En.rc
rename to reactos/dll/cpl/access/lang/en-US.rc
diff --git a/reactos/dll/cpl/access/Es.rc b/reactos/dll/cpl/access/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/access/Es.rc
rename to reactos/dll/cpl/access/lang/es-ES.rc
diff --git a/reactos/dll/cpl/access/Fr.rc b/reactos/dll/cpl/access/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/access/Fr.rc
rename to reactos/dll/cpl/access/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/access/Hu.rc b/reactos/dll/cpl/access/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/access/Hu.rc
rename to reactos/dll/cpl/access/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/access/Id.rc b/reactos/dll/cpl/access/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/access/Id.rc
rename to reactos/dll/cpl/access/lang/id-ID.rc
diff --git a/reactos/dll/cpl/access/It.rc b/reactos/dll/cpl/access/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/access/It.rc
rename to reactos/dll/cpl/access/lang/it-IT.rc
diff --git a/reactos/dll/cpl/access/Ja.rc b/reactos/dll/cpl/access/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/access/Ja.rc
rename to reactos/dll/cpl/access/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/access/Nl.rc b/reactos/dll/cpl/access/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/access/Nl.rc
rename to reactos/dll/cpl/access/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/access/Pl.rc b/reactos/dll/cpl/access/lang/pl-PL.rc
similarity index 100%
rename from reactos/dll/cpl/access/Pl.rc
rename to reactos/dll/cpl/access/lang/pl-PL.rc
diff --git a/reactos/dll/cpl/access/Ru.rc b/reactos/dll/cpl/access/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/access/Ru.rc
rename to reactos/dll/cpl/access/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/appwiz/appwiz.rc b/reactos/dll/cpl/appwiz/appwiz.rc
index 185b861ce46..54cefa99d4a 100644
--- a/reactos/dll/cpl/appwiz/appwiz.rc
+++ b/reactos/dll/cpl/appwiz/appwiz.rc
@@ -21,18 +21,18 @@ IDI_CPLSYSTEM ICON "resources/applet.ico"
  * a neutral version. This is to get localized bitmaps for example.
  */
 
-#include "Cz.rc"
-#include "De.rc"
-#include "Dk.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "Gr.rc"
-#include "Hu.rc"
-#include "Id.rc"
-#include "It.rc"
-#include "Ja.rc"
-#include "Nl.rc"
-#include "Pl.rc"
-#include "Ru.rc"
-#include "Uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/da-DK.rc"
+#include "lang/de-DE.rc"
+#include "lang/el-GR.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/pl-PL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"
diff --git a/reactos/dll/cpl/appwiz/Cz.rc b/reactos/dll/cpl/appwiz/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Cz.rc
rename to reactos/dll/cpl/appwiz/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/appwiz/Dk.rc b/reactos/dll/cpl/appwiz/lang/da-DK.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Dk.rc
rename to reactos/dll/cpl/appwiz/lang/da-DK.rc
diff --git a/reactos/dll/cpl/appwiz/De.rc b/reactos/dll/cpl/appwiz/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/De.rc
rename to reactos/dll/cpl/appwiz/lang/de-DE.rc
diff --git a/reactos/dll/cpl/appwiz/Gr.rc b/reactos/dll/cpl/appwiz/lang/el-GR.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Gr.rc
rename to reactos/dll/cpl/appwiz/lang/el-GR.rc
diff --git a/reactos/dll/cpl/appwiz/En.rc b/reactos/dll/cpl/appwiz/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/En.rc
rename to reactos/dll/cpl/appwiz/lang/en-US.rc
diff --git a/reactos/dll/cpl/appwiz/Es.rc b/reactos/dll/cpl/appwiz/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Es.rc
rename to reactos/dll/cpl/appwiz/lang/es-ES.rc
diff --git a/reactos/dll/cpl/appwiz/Fr.rc b/reactos/dll/cpl/appwiz/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Fr.rc
rename to reactos/dll/cpl/appwiz/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/appwiz/Hu.rc b/reactos/dll/cpl/appwiz/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Hu.rc
rename to reactos/dll/cpl/appwiz/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/appwiz/Id.rc b/reactos/dll/cpl/appwiz/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Id.rc
rename to reactos/dll/cpl/appwiz/lang/id-ID.rc
diff --git a/reactos/dll/cpl/appwiz/It.rc b/reactos/dll/cpl/appwiz/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/It.rc
rename to reactos/dll/cpl/appwiz/lang/it-IT.rc
diff --git a/reactos/dll/cpl/appwiz/Ja.rc b/reactos/dll/cpl/appwiz/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Ja.rc
rename to reactos/dll/cpl/appwiz/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/appwiz/Nl.rc b/reactos/dll/cpl/appwiz/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Nl.rc
rename to reactos/dll/cpl/appwiz/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/appwiz/Pl.rc b/reactos/dll/cpl/appwiz/lang/pl-PL.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Pl.rc
rename to reactos/dll/cpl/appwiz/lang/pl-PL.rc
diff --git a/reactos/dll/cpl/appwiz/Ru.rc b/reactos/dll/cpl/appwiz/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Ru.rc
rename to reactos/dll/cpl/appwiz/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/appwiz/Uk.rc b/reactos/dll/cpl/appwiz/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/appwiz/Uk.rc
rename to reactos/dll/cpl/appwiz/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/desk/desk.rc b/reactos/dll/cpl/desk/desk.rc
index 3a29e23c954..ec1feeed849 100644
--- a/reactos/dll/cpl/desk/desk.rc
+++ b/reactos/dll/cpl/desk/desk.rc
@@ -14,18 +14,18 @@ IDC_DESK_ICON ICON "resources/applet.ico"
 IDC_DESK_ICON2 ICON "resources/applet.ico"
 IDC_MONITOR BITMAP "resources/monitor.bmp"
 
-#include "cz.rc"
-#include "de.rc"
-#include "en.rc"
-#include "es.rc"
-#include "Fr.rc"
-#include "gr.rc"
-#include "hu.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "Ja.rc"
-#include "nl.rc"
-#include "pl.rc"
-#include "ru-RU.rc"
-#include "sv.rc"
-#include "Uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/el-GR.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/pl-PL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
diff --git a/reactos/dll/cpl/desk/cz.rc b/reactos/dll/cpl/desk/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/desk/cz.rc
rename to reactos/dll/cpl/desk/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/desk/de.rc b/reactos/dll/cpl/desk/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/desk/de.rc
rename to reactos/dll/cpl/desk/lang/de-DE.rc
diff --git a/reactos/dll/cpl/desk/gr.rc b/reactos/dll/cpl/desk/lang/el-GR.rc
similarity index 100%
rename from reactos/dll/cpl/desk/gr.rc
rename to reactos/dll/cpl/desk/lang/el-GR.rc
diff --git a/reactos/dll/cpl/desk/en.rc b/reactos/dll/cpl/desk/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/desk/en.rc
rename to reactos/dll/cpl/desk/lang/en-US.rc
diff --git a/reactos/dll/cpl/desk/es.rc b/reactos/dll/cpl/desk/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/desk/es.rc
rename to reactos/dll/cpl/desk/lang/es-ES.rc
diff --git a/reactos/dll/cpl/desk/Fr.rc b/reactos/dll/cpl/desk/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/desk/Fr.rc
rename to reactos/dll/cpl/desk/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/desk/hu.rc b/reactos/dll/cpl/desk/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/desk/hu.rc
rename to reactos/dll/cpl/desk/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/desk/id-ID.rc b/reactos/dll/cpl/desk/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/desk/id-ID.rc
rename to reactos/dll/cpl/desk/lang/id-ID.rc
diff --git a/reactos/dll/cpl/desk/it-IT.rc b/reactos/dll/cpl/desk/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/desk/it-IT.rc
rename to reactos/dll/cpl/desk/lang/it-IT.rc
diff --git a/reactos/dll/cpl/desk/Ja.rc b/reactos/dll/cpl/desk/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/desk/Ja.rc
rename to reactos/dll/cpl/desk/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/desk/nl.rc b/reactos/dll/cpl/desk/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/desk/nl.rc
rename to reactos/dll/cpl/desk/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/desk/pl.rc b/reactos/dll/cpl/desk/lang/pl-PL.rc
similarity index 100%
rename from reactos/dll/cpl/desk/pl.rc
rename to reactos/dll/cpl/desk/lang/pl-PL.rc
diff --git a/reactos/dll/cpl/desk/ru-RU.rc b/reactos/dll/cpl/desk/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/desk/ru-RU.rc
rename to reactos/dll/cpl/desk/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/desk/sv.rc b/reactos/dll/cpl/desk/lang/sv-SE.rc
similarity index 100%
rename from reactos/dll/cpl/desk/sv.rc
rename to reactos/dll/cpl/desk/lang/sv-SE.rc
diff --git a/reactos/dll/cpl/desk/Uk.rc b/reactos/dll/cpl/desk/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/desk/Uk.rc
rename to reactos/dll/cpl/desk/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.rc b/reactos/dll/cpl/hdwwiz/hdwwiz.rc
index d99bd88854f..43ee47f2e0a 100644
--- a/reactos/dll/cpl/hdwwiz/hdwwiz.rc
+++ b/reactos/dll/cpl/hdwwiz/hdwwiz.rc
@@ -17,16 +17,16 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_CPLICON ICON "resources/applet.ico"
 
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "Gr.rc"
-#include "Hu.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "Ja.rc"
-#include "Nl.rc"
-#include "Ru.rc"
-#include "th-TH.rc"
-#include "Uk.rc"
+#include "lang/de-DE.rc"
+#include "lang/el-GR.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/th-TH.rc"
+#include "lang/uk-UA.rc"
diff --git a/reactos/dll/cpl/hdwwiz/De.rc b/reactos/dll/cpl/hdwwiz/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/De.rc
rename to reactos/dll/cpl/hdwwiz/lang/de-DE.rc
diff --git a/reactos/dll/cpl/hdwwiz/Gr.rc b/reactos/dll/cpl/hdwwiz/lang/el-GR.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Gr.rc
rename to reactos/dll/cpl/hdwwiz/lang/el-GR.rc
diff --git a/reactos/dll/cpl/hdwwiz/En.rc b/reactos/dll/cpl/hdwwiz/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/En.rc
rename to reactos/dll/cpl/hdwwiz/lang/en-US.rc
diff --git a/reactos/dll/cpl/hdwwiz/Es.rc b/reactos/dll/cpl/hdwwiz/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Es.rc
rename to reactos/dll/cpl/hdwwiz/lang/es-ES.rc
diff --git a/reactos/dll/cpl/hdwwiz/Fr.rc b/reactos/dll/cpl/hdwwiz/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Fr.rc
rename to reactos/dll/cpl/hdwwiz/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/hdwwiz/Hu.rc b/reactos/dll/cpl/hdwwiz/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Hu.rc
rename to reactos/dll/cpl/hdwwiz/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/hdwwiz/id-ID.rc b/reactos/dll/cpl/hdwwiz/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/id-ID.rc
rename to reactos/dll/cpl/hdwwiz/lang/id-ID.rc
diff --git a/reactos/dll/cpl/hdwwiz/it-IT.rc b/reactos/dll/cpl/hdwwiz/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/it-IT.rc
rename to reactos/dll/cpl/hdwwiz/lang/it-IT.rc
diff --git a/reactos/dll/cpl/hdwwiz/Ja.rc b/reactos/dll/cpl/hdwwiz/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Ja.rc
rename to reactos/dll/cpl/hdwwiz/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/hdwwiz/Nl.rc b/reactos/dll/cpl/hdwwiz/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Nl.rc
rename to reactos/dll/cpl/hdwwiz/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/hdwwiz/Ru.rc b/reactos/dll/cpl/hdwwiz/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Ru.rc
rename to reactos/dll/cpl/hdwwiz/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/hdwwiz/th-TH.rc b/reactos/dll/cpl/hdwwiz/lang/th-TH.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/th-TH.rc
rename to reactos/dll/cpl/hdwwiz/lang/th-TH.rc
diff --git a/reactos/dll/cpl/hdwwiz/Uk.rc b/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/hdwwiz/Uk.rc
rename to reactos/dll/cpl/hdwwiz/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/intl/intl.rc b/reactos/dll/cpl/intl/intl.rc
index 13469daceea..207b5508aed 100644
--- a/reactos/dll/cpl/intl/intl.rc
+++ b/reactos/dll/cpl/intl/intl.rc
@@ -21,16 +21,16 @@ IDC_FLAGS ICON "resources/flags.ico"
  * a neutral version. This is to get localized bitmaps for example.
  */
 
-#include "cz.rc"
-#include "de.rc"
-#include "en.rc"
-#include "es.rc"
-#include "Fr.rc"
-#include "hu.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "Ja.rc"
-#include "nl.rc"
-#include "ru-RU.rc"
-#include "sv.rc"
-#include "uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
diff --git a/reactos/dll/cpl/intl/cz.rc b/reactos/dll/cpl/intl/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/intl/cz.rc
rename to reactos/dll/cpl/intl/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/intl/de.rc b/reactos/dll/cpl/intl/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/intl/de.rc
rename to reactos/dll/cpl/intl/lang/de-DE.rc
diff --git a/reactos/dll/cpl/intl/en.rc b/reactos/dll/cpl/intl/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/intl/en.rc
rename to reactos/dll/cpl/intl/lang/en-US.rc
diff --git a/reactos/dll/cpl/intl/es.rc b/reactos/dll/cpl/intl/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/intl/es.rc
rename to reactos/dll/cpl/intl/lang/es-ES.rc
diff --git a/reactos/dll/cpl/intl/Fr.rc b/reactos/dll/cpl/intl/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/intl/Fr.rc
rename to reactos/dll/cpl/intl/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/intl/hu.rc b/reactos/dll/cpl/intl/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/intl/hu.rc
rename to reactos/dll/cpl/intl/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/intl/id-ID.rc b/reactos/dll/cpl/intl/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/intl/id-ID.rc
rename to reactos/dll/cpl/intl/lang/id-ID.rc
diff --git a/reactos/dll/cpl/intl/it-IT.rc b/reactos/dll/cpl/intl/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/intl/it-IT.rc
rename to reactos/dll/cpl/intl/lang/it-IT.rc
diff --git a/reactos/dll/cpl/intl/Ja.rc b/reactos/dll/cpl/intl/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/intl/Ja.rc
rename to reactos/dll/cpl/intl/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/intl/nl.rc b/reactos/dll/cpl/intl/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/intl/nl.rc
rename to reactos/dll/cpl/intl/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/intl/ru-RU.rc b/reactos/dll/cpl/intl/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/intl/ru-RU.rc
rename to reactos/dll/cpl/intl/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/intl/sv.rc b/reactos/dll/cpl/intl/lang/sv-SE.rc
similarity index 100%
rename from reactos/dll/cpl/intl/sv.rc
rename to reactos/dll/cpl/intl/lang/sv-SE.rc
diff --git a/reactos/dll/cpl/intl/uk.rc b/reactos/dll/cpl/intl/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/intl/uk.rc
rename to reactos/dll/cpl/intl/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/intl_new/intl.rc b/reactos/dll/cpl/intl_new/intl.rc
index 0d6dc3b2b4c..6445e02b6b9 100644
--- a/reactos/dll/cpl/intl_new/intl.rc
+++ b/reactos/dll/cpl/intl_new/intl.rc
@@ -17,8 +17,8 @@ IDC_FLAGS ICON "resources/flags.ico"
  * a neutral version. This is to get localized bitmaps for example.
 */
 
-#include "En.rc"
-#include "Fr.rc"
-#include "Id.rc"
-#include "It.rc"
+#include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
 
diff --git a/reactos/dll/cpl/intl_new/En.rc b/reactos/dll/cpl/intl_new/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/intl_new/En.rc
rename to reactos/dll/cpl/intl_new/lang/en-US.rc
diff --git a/reactos/dll/cpl/intl_new/Fr.rc b/reactos/dll/cpl/intl_new/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/intl_new/Fr.rc
rename to reactos/dll/cpl/intl_new/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/intl_new/Id.rc b/reactos/dll/cpl/intl_new/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/intl_new/Id.rc
rename to reactos/dll/cpl/intl_new/lang/id-ID.rc
diff --git a/reactos/dll/cpl/intl_new/It.rc b/reactos/dll/cpl/intl_new/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/intl_new/It.rc
rename to reactos/dll/cpl/intl_new/lang/it-IT.rc
diff --git a/reactos/dll/cpl/liccpa/De.rc b/reactos/dll/cpl/liccpa/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/liccpa/De.rc
rename to reactos/dll/cpl/liccpa/lang/de-DE.rc
diff --git a/reactos/dll/cpl/liccpa/En.rc b/reactos/dll/cpl/liccpa/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/liccpa/En.rc
rename to reactos/dll/cpl/liccpa/lang/en-US.rc
diff --git a/reactos/dll/cpl/liccpa/Es.rc b/reactos/dll/cpl/liccpa/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/liccpa/Es.rc
rename to reactos/dll/cpl/liccpa/lang/es-ES.rc
diff --git a/reactos/dll/cpl/liccpa/Id.rc b/reactos/dll/cpl/liccpa/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/liccpa/Id.rc
rename to reactos/dll/cpl/liccpa/lang/id-ID.rc
diff --git a/reactos/dll/cpl/liccpa/It.rc b/reactos/dll/cpl/liccpa/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/liccpa/It.rc
rename to reactos/dll/cpl/liccpa/lang/it-IT.rc
diff --git a/reactos/dll/cpl/liccpa/Ja.rc b/reactos/dll/cpl/liccpa/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/liccpa/Ja.rc
rename to reactos/dll/cpl/liccpa/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/liccpa/Ru.rc b/reactos/dll/cpl/liccpa/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/liccpa/Ru.rc
rename to reactos/dll/cpl/liccpa/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/liccpa/liccpa.rc b/reactos/dll/cpl/liccpa/liccpa.rc
index 47e62d7edbf..419e065d88a 100644
--- a/reactos/dll/cpl/liccpa/liccpa.rc
+++ b/reactos/dll/cpl/liccpa/liccpa.rc
@@ -12,10 +12,10 @@
 
 IDC_CPLICON_1 ICON "resources/cpl_icon1.ico"
 
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Id.rc"
-#include "It.rc"
-#include "Ja.rc"
-#include "Ru.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/ru-RU.rc"
diff --git a/reactos/dll/cpl/main/Cz.rc b/reactos/dll/cpl/main/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/main/Cz.rc
rename to reactos/dll/cpl/main/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/main/De.rc b/reactos/dll/cpl/main/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/main/De.rc
rename to reactos/dll/cpl/main/lang/de-DE.rc
diff --git a/reactos/dll/cpl/main/En.rc b/reactos/dll/cpl/main/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/main/En.rc
rename to reactos/dll/cpl/main/lang/en-US.rc
diff --git a/reactos/dll/cpl/main/Es.rc b/reactos/dll/cpl/main/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/main/Es.rc
rename to reactos/dll/cpl/main/lang/es-ES.rc
diff --git a/reactos/dll/cpl/main/Fr.rc b/reactos/dll/cpl/main/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/main/Fr.rc
rename to reactos/dll/cpl/main/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/main/Hu.rc b/reactos/dll/cpl/main/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/main/Hu.rc
rename to reactos/dll/cpl/main/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/main/Id.rc b/reactos/dll/cpl/main/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/main/Id.rc
rename to reactos/dll/cpl/main/lang/id-ID.rc
diff --git a/reactos/dll/cpl/main/it-IT.rc b/reactos/dll/cpl/main/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/main/it-IT.rc
rename to reactos/dll/cpl/main/lang/it-IT.rc
diff --git a/reactos/dll/cpl/main/Ja.rc b/reactos/dll/cpl/main/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/main/Ja.rc
rename to reactos/dll/cpl/main/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/main/Nl.rc b/reactos/dll/cpl/main/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/main/Nl.rc
rename to reactos/dll/cpl/main/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/main/ru-RU.rc b/reactos/dll/cpl/main/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/main/ru-RU.rc
rename to reactos/dll/cpl/main/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/main/Uk.rc b/reactos/dll/cpl/main/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/main/Uk.rc
rename to reactos/dll/cpl/main/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/main/rsrc.rc b/reactos/dll/cpl/main/rsrc.rc
index 175288b6149..02d3904a18d 100644
--- a/reactos/dll/cpl/main/rsrc.rc
+++ b/reactos/dll/cpl/main/rsrc.rc
@@ -10,15 +10,15 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* include localised resources */
 
-#include "Cz.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "Hu.rc"
-#include "Id.rc"
-#include "it-IT.rc"
-#include "Ja.rc"
-#include "Nl.rc"
-#include "ru-RU.rc"
-#include "Uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"
diff --git a/reactos/dll/cpl/mmsys/cs-CZ.rc b/reactos/dll/cpl/mmsys/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/cs-CZ.rc
rename to reactos/dll/cpl/mmsys/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/mmsys/de-DE.rc b/reactos/dll/cpl/mmsys/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/de-DE.rc
rename to reactos/dll/cpl/mmsys/lang/de-DE.rc
diff --git a/reactos/dll/cpl/mmsys/el-GR.rc b/reactos/dll/cpl/mmsys/lang/el-GR.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/el-GR.rc
rename to reactos/dll/cpl/mmsys/lang/el-GR.rc
diff --git a/reactos/dll/cpl/mmsys/en-US.rc b/reactos/dll/cpl/mmsys/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/en-US.rc
rename to reactos/dll/cpl/mmsys/lang/en-US.rc
diff --git a/reactos/dll/cpl/mmsys/es-ES.rc b/reactos/dll/cpl/mmsys/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/es-ES.rc
rename to reactos/dll/cpl/mmsys/lang/es-ES.rc
diff --git a/reactos/dll/cpl/mmsys/fr-FR.rc b/reactos/dll/cpl/mmsys/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/fr-FR.rc
rename to reactos/dll/cpl/mmsys/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/mmsys/id-ID.rc b/reactos/dll/cpl/mmsys/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/id-ID.rc
rename to reactos/dll/cpl/mmsys/lang/id-ID.rc
diff --git a/reactos/dll/cpl/mmsys/it-IT.rc b/reactos/dll/cpl/mmsys/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/it-IT.rc
rename to reactos/dll/cpl/mmsys/lang/it-IT.rc
diff --git a/reactos/dll/cpl/mmsys/nl-NL.rc b/reactos/dll/cpl/mmsys/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/nl-NL.rc
rename to reactos/dll/cpl/mmsys/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/mmsys/ru-RU.rc b/reactos/dll/cpl/mmsys/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/ru-RU.rc
rename to reactos/dll/cpl/mmsys/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/mmsys/uk-UK.rc b/reactos/dll/cpl/mmsys/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/mmsys/uk-UK.rc
rename to reactos/dll/cpl/mmsys/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/mmsys/mmsys.rc b/reactos/dll/cpl/mmsys/mmsys.rc
index 511a21cd30a..5a7f4ef328d 100644
--- a/reactos/dll/cpl/mmsys/mmsys.rc
+++ b/reactos/dll/cpl/mmsys/mmsys.rc
@@ -10,14 +10,14 @@
 
 IDI_CPLICON ICON "resources/mmsys.ico"
 
-#include "cs-CZ.rc"
-#include "de-DE.rc"
-#include "el-GR.rc"
-#include "en-US.rc"
-#include "es-ES.rc"
-#include "fr-FR.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "nl-NL.rc"
-#include "ru-RU.rc"
-#include "uk-UK.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/el-GR.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/nl-NL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/uk-UA.rc"
diff --git a/reactos/dll/cpl/ncpa/cz.rc b/reactos/dll/cpl/ncpa/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/cz.rc
rename to reactos/dll/cpl/ncpa/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/ncpa/dk.rc b/reactos/dll/cpl/ncpa/lang/da-DK.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/dk.rc
rename to reactos/dll/cpl/ncpa/lang/da-DK.rc
diff --git a/reactos/dll/cpl/ncpa/de.rc b/reactos/dll/cpl/ncpa/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/de.rc
rename to reactos/dll/cpl/ncpa/lang/de-DE.rc
diff --git a/reactos/dll/cpl/ncpa/en.rc b/reactos/dll/cpl/ncpa/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/en.rc
rename to reactos/dll/cpl/ncpa/lang/en-US.rc
diff --git a/reactos/dll/cpl/ncpa/es.rc b/reactos/dll/cpl/ncpa/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/es.rc
rename to reactos/dll/cpl/ncpa/lang/es-ES.rc
diff --git a/reactos/dll/cpl/ncpa/fr.rc b/reactos/dll/cpl/ncpa/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/fr.rc
rename to reactos/dll/cpl/ncpa/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/ncpa/hu.rc b/reactos/dll/cpl/ncpa/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/hu.rc
rename to reactos/dll/cpl/ncpa/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/ncpa/id-ID.rc b/reactos/dll/cpl/ncpa/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/id-ID.rc
rename to reactos/dll/cpl/ncpa/lang/id-ID.rc
diff --git a/reactos/dll/cpl/ncpa/it-IT.rc b/reactos/dll/cpl/ncpa/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/it-IT.rc
rename to reactos/dll/cpl/ncpa/lang/it-IT.rc
diff --git a/reactos/dll/cpl/ncpa/Ja.rc b/reactos/dll/cpl/ncpa/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/Ja.rc
rename to reactos/dll/cpl/ncpa/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/ncpa/nl.rc b/reactos/dll/cpl/ncpa/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/nl.rc
rename to reactos/dll/cpl/ncpa/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/ncpa/ru-RU.rc b/reactos/dll/cpl/ncpa/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/ru-RU.rc
rename to reactos/dll/cpl/ncpa/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/ncpa/sv.rc b/reactos/dll/cpl/ncpa/lang/sv-SE.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/sv.rc
rename to reactos/dll/cpl/ncpa/lang/sv-SE.rc
diff --git a/reactos/dll/cpl/ncpa/uk.rc b/reactos/dll/cpl/ncpa/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/ncpa/uk.rc
rename to reactos/dll/cpl/ncpa/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/ncpa/ncpa.rc b/reactos/dll/cpl/ncpa/ncpa.rc
index 0169985df7c..23c1b9ef766 100644
--- a/reactos/dll/cpl/ncpa/ncpa.rc
+++ b/reactos/dll/cpl/ncpa/ncpa.rc
@@ -14,17 +14,17 @@ IDI_HORIZONTAL ICON "resources/HORIZ.ICO"
 IDI_VERTICAL ICON "resources/VERTIC.ICO"
 IDI_NETSTAT ICON "resources/NETCONN.ICO"
 
-#include "cz.rc"
-#include "de.rc"
-#include "dk.rc"
-#include "en.rc"
-#include "es.rc"
-#include "fr.rc"
-#include "hu.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "Ja.rc"
-#include "nl.rc"
-#include "ru-RU.rc"
-#include "sv.rc"
-#include "uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/da-DK.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
diff --git a/reactos/dll/cpl/powercfg/cz.rc b/reactos/dll/cpl/powercfg/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/powercfg/cz.rc
rename to reactos/dll/cpl/powercfg/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/powercfg/de.rc b/reactos/dll/cpl/powercfg/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/powercfg/de.rc
rename to reactos/dll/cpl/powercfg/lang/de-DE.rc
diff --git a/reactos/dll/cpl/powercfg/en.rc b/reactos/dll/cpl/powercfg/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/powercfg/en.rc
rename to reactos/dll/cpl/powercfg/lang/en-US.rc
diff --git a/reactos/dll/cpl/powercfg/fr.rc b/reactos/dll/cpl/powercfg/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/powercfg/fr.rc
rename to reactos/dll/cpl/powercfg/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/powercfg/id.rc b/reactos/dll/cpl/powercfg/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/powercfg/id.rc
rename to reactos/dll/cpl/powercfg/lang/id-ID.rc
diff --git a/reactos/dll/cpl/powercfg/it-IT.rc b/reactos/dll/cpl/powercfg/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/powercfg/it-IT.rc
rename to reactos/dll/cpl/powercfg/lang/it-IT.rc
diff --git a/reactos/dll/cpl/powercfg/ru.rc b/reactos/dll/cpl/powercfg/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/powercfg/ru.rc
rename to reactos/dll/cpl/powercfg/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/powercfg/powercfg.rc b/reactos/dll/cpl/powercfg/powercfg.rc
index 9d086777ec4..528f6e8abdb 100644
--- a/reactos/dll/cpl/powercfg/powercfg.rc
+++ b/reactos/dll/cpl/powercfg/powercfg.rc
@@ -14,11 +14,11 @@ IDI_ACDC ICON "resources/acdc.ico"
 IDI_DC ICON "resources/dc.ico"
 IDI_SCREEN ICON "resources/screen.ico"
 
-#include "cz.rc"
-#include "de.rc"
-#include "en.rc"
-#include "fr.rc"
-#include "id.rc"
-#include "it-IT.rc"
-#include "ru.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ru-RU.rc"
 
diff --git a/reactos/dll/cpl/sysdm/cz.rc b/reactos/dll/cpl/sysdm/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/cz.rc
rename to reactos/dll/cpl/sysdm/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/sysdm/dk.rc b/reactos/dll/cpl/sysdm/lang/da-DK.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/dk.rc
rename to reactos/dll/cpl/sysdm/lang/da-DK.rc
diff --git a/reactos/dll/cpl/sysdm/de.rc b/reactos/dll/cpl/sysdm/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/de.rc
rename to reactos/dll/cpl/sysdm/lang/de-DE.rc
diff --git a/reactos/dll/cpl/sysdm/en.rc b/reactos/dll/cpl/sysdm/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/en.rc
rename to reactos/dll/cpl/sysdm/lang/en-US.rc
diff --git a/reactos/dll/cpl/sysdm/es.rc b/reactos/dll/cpl/sysdm/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/es.rc
rename to reactos/dll/cpl/sysdm/lang/es-ES.rc
diff --git a/reactos/dll/cpl/sysdm/fr.rc b/reactos/dll/cpl/sysdm/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/fr.rc
rename to reactos/dll/cpl/sysdm/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/sysdm/hu.rc b/reactos/dll/cpl/sysdm/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/hu.rc
rename to reactos/dll/cpl/sysdm/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/sysdm/id-ID.rc b/reactos/dll/cpl/sysdm/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/id-ID.rc
rename to reactos/dll/cpl/sysdm/lang/id-ID.rc
diff --git a/reactos/dll/cpl/sysdm/it-IT.rc b/reactos/dll/cpl/sysdm/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/it-IT.rc
rename to reactos/dll/cpl/sysdm/lang/it-IT.rc
diff --git a/reactos/dll/cpl/sysdm/Ja.rc b/reactos/dll/cpl/sysdm/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/Ja.rc
rename to reactos/dll/cpl/sysdm/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/sysdm/nl.rc b/reactos/dll/cpl/sysdm/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/nl.rc
rename to reactos/dll/cpl/sysdm/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/sysdm/ru-RU.rc b/reactos/dll/cpl/sysdm/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/ru-RU.rc
rename to reactos/dll/cpl/sysdm/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/sysdm/sv.rc b/reactos/dll/cpl/sysdm/lang/sv-SE.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/sv.rc
rename to reactos/dll/cpl/sysdm/lang/sv-SE.rc
diff --git a/reactos/dll/cpl/sysdm/uk.rc b/reactos/dll/cpl/sysdm/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/sysdm/uk.rc
rename to reactos/dll/cpl/sysdm/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/sysdm/sysdm.rc b/reactos/dll/cpl/sysdm/sysdm.rc
index 41a339a26f5..3a45b83f236 100644
--- a/reactos/dll/cpl/sysdm/sysdm.rc
+++ b/reactos/dll/cpl/sysdm/sysdm.rc
@@ -5,9 +5,9 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS System Applet\0"
-#define REACTOS_STR_INTERNAL_NAME	  "sysdm\0"
-#define REACTOS_STR_ORIGINAL_FILENAME "sysdm.cpl\0"
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS System Applet\0"
+#define REACTOS_STR_INTERNAL_NAME	"sysdm\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"sysdm.cpl\0"
 #include <reactos/version.rc>
 
 123 24 DISCARDABLE "manifest.xml"
@@ -22,20 +22,20 @@ IDB_ROSBMP      BITMAP "resources/rosbitmap.bmp"
 
 RC_LICENSE RTDATA "resources/gpl.txt"
 
-#include "de.rc"
-#include "en.rc"
-#include "fr.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "ru-RU.rc"
+#include "lang/de-DE.rc"
+#include "lang/en-US.rc"
+#include "lang/fr-FR.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ru-RU.rc"
 
 /*
-#include "cz.rc"
-#include "dk.rc"
-#include "es.rc"
-#include "hu.rc"
-#include "Ja.rc"
-#include "nl.rc"
-#include "sv.rc"
-#include "uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/da-DK.rc"
+#include "lang/es-ES.rc"
+#include "lang/hu-HU.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/sv-SE.rc"
+#include "lang/uk-UA.rc"
 */
diff --git a/reactos/dll/cpl/timedate/Cz.rc b/reactos/dll/cpl/timedate/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Cz.rc
rename to reactos/dll/cpl/timedate/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/timedate/Dk.rc b/reactos/dll/cpl/timedate/lang/da-DK.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Dk.rc
rename to reactos/dll/cpl/timedate/lang/da-DK.rc
diff --git a/reactos/dll/cpl/timedate/De.rc b/reactos/dll/cpl/timedate/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/De.rc
rename to reactos/dll/cpl/timedate/lang/de-DE.rc
diff --git a/reactos/dll/cpl/timedate/Gr.rc b/reactos/dll/cpl/timedate/lang/el-GR.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Gr.rc
rename to reactos/dll/cpl/timedate/lang/el-GR.rc
diff --git a/reactos/dll/cpl/timedate/En.rc b/reactos/dll/cpl/timedate/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/En.rc
rename to reactos/dll/cpl/timedate/lang/en-US.rc
diff --git a/reactos/dll/cpl/timedate/Es.rc b/reactos/dll/cpl/timedate/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Es.rc
rename to reactos/dll/cpl/timedate/lang/es-ES.rc
diff --git a/reactos/dll/cpl/timedate/Fr.rc b/reactos/dll/cpl/timedate/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Fr.rc
rename to reactos/dll/cpl/timedate/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/timedate/Hu.rc b/reactos/dll/cpl/timedate/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Hu.rc
rename to reactos/dll/cpl/timedate/lang/hu-HU.rc
diff --git a/reactos/dll/cpl/timedate/id-ID.rc b/reactos/dll/cpl/timedate/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/id-ID.rc
rename to reactos/dll/cpl/timedate/lang/id-ID.rc
diff --git a/reactos/dll/cpl/timedate/it-IT.rc b/reactos/dll/cpl/timedate/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/it-IT.rc
rename to reactos/dll/cpl/timedate/lang/it-IT.rc
diff --git a/reactos/dll/cpl/timedate/Ja.rc b/reactos/dll/cpl/timedate/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Ja.rc
rename to reactos/dll/cpl/timedate/lang/ja-JP.rc
diff --git a/reactos/dll/cpl/timedate/Nl.rc b/reactos/dll/cpl/timedate/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Nl.rc
rename to reactos/dll/cpl/timedate/lang/nl-NL.rc
diff --git a/reactos/dll/cpl/timedate/Pl.rc b/reactos/dll/cpl/timedate/lang/pl-PL.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Pl.rc
rename to reactos/dll/cpl/timedate/lang/pl-PL.rc
diff --git a/reactos/dll/cpl/timedate/ru-RU.rc b/reactos/dll/cpl/timedate/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/ru-RU.rc
rename to reactos/dll/cpl/timedate/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/timedate/Sv.rc b/reactos/dll/cpl/timedate/lang/sv-SE.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Sv.rc
rename to reactos/dll/cpl/timedate/lang/sv-SE.rc
diff --git a/reactos/dll/cpl/timedate/th-TH.rc b/reactos/dll/cpl/timedate/lang/th-TH.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/th-TH.rc
rename to reactos/dll/cpl/timedate/lang/th-TH.rc
diff --git a/reactos/dll/cpl/timedate/Uk.rc b/reactos/dll/cpl/timedate/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/timedate/Uk.rc
rename to reactos/dll/cpl/timedate/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/timedate/timedate.rc b/reactos/dll/cpl/timedate/timedate.rc
index cf3aed06556..baf6c651ba2 100644
--- a/reactos/dll/cpl/timedate/timedate.rc
+++ b/reactos/dll/cpl/timedate/timedate.rc
@@ -16,20 +16,20 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDC_CPLICON ICON "resources/applet.ico"
 IDC_WORLD BITMAP "resources/world.bmp"
 
-#include "Cz.rc"
-#include "De.rc"
-#include "Dk.rc"
-#include "En.rc"
-#include "Es.rc"
-#include "Fr.rc"
-#include "Gr.rc"
-#include "Hu.rc"
-#include "id-ID.rc"
-#include "it-IT.rc"
-#include "Ja.rc"
-#include "Nl.rc"
-#include "Pl.rc"
-#include "ru-RU.rc"
-#include "Sv.rc"
-#include "th-TH.rc"
-#include "Uk.rc"
+#include "lang/cs-CZ.rc"
+#include "lang/da-DK.rc"
+#include "lang/de-DE.rc"
+#include "lang/el-GR.rc"
+#include "lang/en-US.rc"
+#include "lang/es-ES.rc"
+#include "lang/fr-FR.rc"
+#include "lang/hu-HU.rc"
+#include "lang/id-ID.rc"
+#include "lang/it-IT.rc"
+#include "lang/ja-JP.rc"
+#include "lang/nl-NL.rc"
+#include "lang/pl-PL.rc"
+#include "lang/ru-RU.rc"
+#include "lang/sv-SE.rc"
+#include "lang/th-TH.rc"
+#include "lang/uk-UA.rc"