diff --git a/Utils/CMakeLists.txt b/Utils/CMakeLists.txt
index 688f9555..ebf13645 100644
--- a/Utils/CMakeLists.txt
+++ b/Utils/CMakeLists.txt
@@ -7,7 +7,6 @@ set(UtilsSrc
 "${CMAKE_CURRENT_SOURCE_DIR}/dsutil.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Encrypted File.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Event Pump.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/ExportStrings.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Font Control.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/ImportStrings.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/INIReader.cpp"
@@ -37,20 +36,4 @@ set(UtilsSrc
 "${CMAKE_CURRENT_SOURCE_DIR}/XML_Items.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/XML_Language.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/XML_SenderNameList.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_ChineseText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_DutchText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_EnglishText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_FrenchText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_GermanText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_ItalianText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25ChineseText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25DutchText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25EnglishText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25FrenchText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25GermanText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25ItalianText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25PolishText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25RussianText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_PolishText.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/_RussianText.cpp"
 PARENT_SCOPE)
diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
index 6c40cf61..8f36adea 100644
--- a/i18n/CMakeLists.txt
+++ b/i18n/CMakeLists.txt
@@ -1,5 +1,22 @@
 set(i18nSrc
 "${CMAKE_CURRENT_SOURCE_DIR}/language.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Ja2 Libs.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/ExportStrings.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_ChineseText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_DutchText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_EnglishText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_FrenchText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_GermanText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_ItalianText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25ChineseText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25DutchText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25EnglishText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25FrenchText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25GermanText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25ItalianText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25PolishText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_Ja25RussianText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_PolishText.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/_RussianText.cpp"
 PARENT_SCOPE
 )
diff --git a/Utils/ExportStrings.cpp b/i18n/ExportStrings.cpp
similarity index 100%
rename from Utils/ExportStrings.cpp
rename to i18n/ExportStrings.cpp
diff --git a/Utils/_ChineseText.cpp b/i18n/_ChineseText.cpp
similarity index 100%
rename from Utils/_ChineseText.cpp
rename to i18n/_ChineseText.cpp
diff --git a/Utils/_DutchText.cpp b/i18n/_DutchText.cpp
similarity index 100%
rename from Utils/_DutchText.cpp
rename to i18n/_DutchText.cpp
diff --git a/Utils/_EnglishText.cpp b/i18n/_EnglishText.cpp
similarity index 100%
rename from Utils/_EnglishText.cpp
rename to i18n/_EnglishText.cpp
diff --git a/Utils/_FrenchText.cpp b/i18n/_FrenchText.cpp
similarity index 100%
rename from Utils/_FrenchText.cpp
rename to i18n/_FrenchText.cpp
diff --git a/Utils/_GermanText.cpp b/i18n/_GermanText.cpp
similarity index 100%
rename from Utils/_GermanText.cpp
rename to i18n/_GermanText.cpp
diff --git a/Utils/_ItalianText.cpp b/i18n/_ItalianText.cpp
similarity index 100%
rename from Utils/_ItalianText.cpp
rename to i18n/_ItalianText.cpp
diff --git a/Utils/_Ja25ChineseText.cpp b/i18n/_Ja25ChineseText.cpp
similarity index 100%
rename from Utils/_Ja25ChineseText.cpp
rename to i18n/_Ja25ChineseText.cpp
diff --git a/Utils/_Ja25DutchText.cpp b/i18n/_Ja25DutchText.cpp
similarity index 100%
rename from Utils/_Ja25DutchText.cpp
rename to i18n/_Ja25DutchText.cpp
diff --git a/Utils/_Ja25EnglishText.cpp b/i18n/_Ja25EnglishText.cpp
similarity index 100%
rename from Utils/_Ja25EnglishText.cpp
rename to i18n/_Ja25EnglishText.cpp
diff --git a/Utils/_Ja25FrenchText.cpp b/i18n/_Ja25FrenchText.cpp
similarity index 100%
rename from Utils/_Ja25FrenchText.cpp
rename to i18n/_Ja25FrenchText.cpp
diff --git a/Utils/_Ja25GermanText.cpp b/i18n/_Ja25GermanText.cpp
similarity index 100%
rename from Utils/_Ja25GermanText.cpp
rename to i18n/_Ja25GermanText.cpp
diff --git a/Utils/_Ja25ItalianText.cpp b/i18n/_Ja25ItalianText.cpp
similarity index 100%
rename from Utils/_Ja25ItalianText.cpp
rename to i18n/_Ja25ItalianText.cpp
diff --git a/Utils/_Ja25PolishText.cpp b/i18n/_Ja25PolishText.cpp
similarity index 100%
rename from Utils/_Ja25PolishText.cpp
rename to i18n/_Ja25PolishText.cpp
diff --git a/Utils/_Ja25RussianText.cpp b/i18n/_Ja25RussianText.cpp
similarity index 100%
rename from Utils/_Ja25RussianText.cpp
rename to i18n/_Ja25RussianText.cpp
diff --git a/Utils/_PolishText.cpp b/i18n/_PolishText.cpp
similarity index 100%
rename from Utils/_PolishText.cpp
rename to i18n/_PolishText.cpp
diff --git a/Utils/_RussianText.cpp b/i18n/_RussianText.cpp
similarity index 100%
rename from Utils/_RussianText.cpp
rename to i18n/_RussianText.cpp
diff --git a/Utils/ExportStrings.h b/i18n/include/ExportStrings.h
similarity index 100%
rename from Utils/ExportStrings.h
rename to i18n/include/ExportStrings.h
diff --git a/Utils/_Ja25DutchText.h b/i18n/include/_Ja25DutchText.h
similarity index 100%
rename from Utils/_Ja25DutchText.h
rename to i18n/include/_Ja25DutchText.h
diff --git a/Utils/_Ja25EnglishText.h b/i18n/include/_Ja25EnglishText.h
similarity index 100%
rename from Utils/_Ja25EnglishText.h
rename to i18n/include/_Ja25EnglishText.h
diff --git a/Utils/_Ja25FrenchText.h b/i18n/include/_Ja25FrenchText.h
similarity index 100%
rename from Utils/_Ja25FrenchText.h
rename to i18n/include/_Ja25FrenchText.h
diff --git a/Utils/_Ja25GermanText.h b/i18n/include/_Ja25GermanText.h
similarity index 100%
rename from Utils/_Ja25GermanText.h
rename to i18n/include/_Ja25GermanText.h
diff --git a/Utils/_Ja25ItalianText.h b/i18n/include/_Ja25ItalianText.h
similarity index 100%
rename from Utils/_Ja25ItalianText.h
rename to i18n/include/_Ja25ItalianText.h
diff --git a/Utils/_Ja25PolishText.h b/i18n/include/_Ja25PolishText.h
similarity index 100%
rename from Utils/_Ja25PolishText.h
rename to i18n/include/_Ja25PolishText.h
diff --git a/Utils/_Ja25RussianText.h b/i18n/include/_Ja25RussianText.h
similarity index 100%
rename from Utils/_Ja25RussianText.h
rename to i18n/include/_Ja25RussianText.h