diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractChromeStrings.cs b/OpenRA.Mods.Common/UtilityCommands/ExtractChromeStrings.cs
index 3811fcbd38..de7397dbe8 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractChromeStrings.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/ExtractChromeStrings.cs
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			{
 				var fluentFolder = layout.Key + "|languages";
 				var fluentPackage = modData.ModFiles.OpenPackage(fluentFolder);
-				var fluentPath = Path.Combine(fluentPackage.Name, "chrome/en.ftl");
+				var fluentPath = Path.Combine(fluentPackage.Name, "chrome.ftl");
 
 				var unsortedCandidates = new List<ExtractionCandidate>();
 				var groupedCandidates = new Dictionary<HashSet<string>, List<ExtractionCandidate>>();
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractYamlStrings.cs b/OpenRA.Mods.Common/UtilityCommands/ExtractYamlStrings.cs
index 10015cfc93..ab432636f0 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractYamlStrings.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/ExtractYamlStrings.cs
@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 			}
 
 			var fluentPackage = modData.ModFiles.OpenPackage(modData.Manifest.Id + "|languages");
-			ExtractFromFile(Path.Combine(fluentPackage.Name, "rules/en.ftl"), modRules, traitInfos);
+			ExtractFromFile(Path.Combine(fluentPackage.Name, "rules.ftl"), modRules, traitInfos);
 			modRules.Save();
 
 			// Extract from maps.
@@ -83,18 +83,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					if (mapRulesNode != null)
 						mapRules.AddRange(UpdateUtils.LoadInternalMapYaml(modData, package, mapRulesNode.Value, new HashSet<string>()));
 
-					const string Enftl = "en.ftl";
-					ExtractFromFile(Path.Combine(package.Name, Enftl), mapRules, traitInfos, () =>
+					const string Mapftl = "map.ftl";
+					ExtractFromFile(Path.Combine(package.Name, Mapftl), mapRules, traitInfos, () =>
 					{
 						var node = yaml.NodeWithKeyOrDefault("FluentMessages");
 						if (node != null)
 						{
 							var value = node.NodeValue<string[]>();
-							if (!value.Contains(Enftl))
-								node.Value.Value = string.Join(", ", value.Concat(new string[] { Enftl }).ToArray());
+							if (!value.Contains(Mapftl))
+								node.Value.Value = string.Join(", ", value.Concat(new string[] { Mapftl }).ToArray());
 						}
 						else
-							yaml.Nodes.Add(new MiniYamlNodeBuilder("FluentMessages", Enftl));
+							yaml.Nodes.Add(new MiniYamlNodeBuilder("FluentMessages", Mapftl));
 					});
 
 					mapRules.Save();
diff --git a/mods/cnc-content/languages/chrome/en.ftl b/mods/cnc-content/fluent/chrome.ftl
similarity index 100%
rename from mods/cnc-content/languages/chrome/en.ftl
rename to mods/cnc-content/fluent/chrome.ftl
diff --git a/mods/cnc-content/mod.yaml b/mods/cnc-content/mod.yaml
index 897a474028..720d7eafec 100644
--- a/mods/cnc-content/mod.yaml
+++ b/mods/cnc-content/mod.yaml
@@ -37,10 +37,10 @@ ChromeMetrics:
 	content|metrics.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	content|languages/en.ftl
-	content|languages/chrome/en.ftl
-	cnccontent|languages/chrome/en.ftl
+	common|fluent/common.ftl
+	content|fluent/content.ftl
+	content|fluent/chrome.ftl
+	cnccontent|fluent/chrome.ftl
 
 Fonts:
 	Tiny:
diff --git a/mods/cnc/languages/campaign/en.ftl b/mods/cnc/fluent/campaign.ftl
similarity index 100%
rename from mods/cnc/languages/campaign/en.ftl
rename to mods/cnc/fluent/campaign.ftl
diff --git a/mods/cnc/languages/chrome/en.ftl b/mods/cnc/fluent/chrome.ftl
similarity index 100%
rename from mods/cnc/languages/chrome/en.ftl
rename to mods/cnc/fluent/chrome.ftl
diff --git a/mods/cnc/languages/en.ftl b/mods/cnc/fluent/cnc.ftl
similarity index 100%
rename from mods/cnc/languages/en.ftl
rename to mods/cnc/fluent/cnc.ftl
diff --git a/mods/cnc/languages/hotkeys/en.ftl b/mods/cnc/fluent/hotkeys.ftl
similarity index 100%
rename from mods/cnc/languages/hotkeys/en.ftl
rename to mods/cnc/fluent/hotkeys.ftl
diff --git a/mods/cnc/languages/lua/en.ftl b/mods/cnc/fluent/lua.ftl
similarity index 100%
rename from mods/cnc/languages/lua/en.ftl
rename to mods/cnc/fluent/lua.ftl
diff --git a/mods/cnc/languages/rules/en.ftl b/mods/cnc/fluent/rules.ftl
similarity index 100%
rename from mods/cnc/languages/rules/en.ftl
rename to mods/cnc/fluent/rules.ftl
diff --git a/mods/cnc/maps/cnc64gdi01/map.yaml b/mods/cnc/maps/cnc64gdi01/map.yaml
index 10b887ff0c..469c32161c 100644
--- a/mods/cnc/maps/cnc64gdi01/map.yaml
+++ b/mods/cnc/maps/cnc64gdi01/map.yaml
@@ -715,4 +715,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/eviction-notice/map.yaml b/mods/cnc/maps/eviction-notice/map.yaml
index dd015941b3..3d0c77d884 100644
--- a/mods/cnc/maps/eviction-notice/map.yaml
+++ b/mods/cnc/maps/eviction-notice/map.yaml
@@ -646,4 +646,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml
index 779f7faf64..3f6d21ecd7 100644
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -414,4 +414,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
index f37dc5d467..49ce93de9b 100644
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -237,4 +237,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml
index 0b00cc4ba8..0792a369ad 100644
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -626,4 +626,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml
index a2b5ea5084..7bd68c20e9 100644
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -700,4 +700,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml
index 979fc46236..10bea3bd26 100644
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -452,4 +452,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml
index 1f2b12f57d..8d8f74f518 100644
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -529,4 +529,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml
index 44b187e316..d94d14e60d 100644
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -746,4 +746,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi05a/map.yaml b/mods/cnc/maps/gdi05a/map.yaml
index 0eae0b8f05..ba857d3bf5 100644
--- a/mods/cnc/maps/gdi05a/map.yaml
+++ b/mods/cnc/maps/gdi05a/map.yaml
@@ -758,4 +758,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi05b/map.yaml b/mods/cnc/maps/gdi05b/map.yaml
index 1c7b1d29d8..4aaabcdb7c 100644
--- a/mods/cnc/maps/gdi05b/map.yaml
+++ b/mods/cnc/maps/gdi05b/map.yaml
@@ -613,4 +613,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi05c/map.yaml b/mods/cnc/maps/gdi05c/map.yaml
index 4e7290f075..4fc9f88852 100644
--- a/mods/cnc/maps/gdi05c/map.yaml
+++ b/mods/cnc/maps/gdi05c/map.yaml
@@ -770,4 +770,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi06/map.yaml b/mods/cnc/maps/gdi06/map.yaml
index 440a6c1944..aeec65f4a5 100644
--- a/mods/cnc/maps/gdi06/map.yaml
+++ b/mods/cnc/maps/gdi06/map.yaml
@@ -1021,4 +1021,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Music: music.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi07/map.yaml b/mods/cnc/maps/gdi07/map.yaml
index f77aa08d83..cf4372f347 100644
--- a/mods/cnc/maps/gdi07/map.yaml
+++ b/mods/cnc/maps/gdi07/map.yaml
@@ -1029,4 +1029,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi08a/map.yaml b/mods/cnc/maps/gdi08a/map.yaml
index a90225d82b..d497fe8e3e 100644
--- a/mods/cnc/maps/gdi08a/map.yaml
+++ b/mods/cnc/maps/gdi08a/map.yaml
@@ -888,4 +888,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi08b/map.yaml b/mods/cnc/maps/gdi08b/map.yaml
index a6c0fc5e4c..197061a8ba 100644
--- a/mods/cnc/maps/gdi08b/map.yaml
+++ b/mods/cnc/maps/gdi08b/map.yaml
@@ -1063,4 +1063,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/gdi09/map.yaml b/mods/cnc/maps/gdi09/map.yaml
index 749b82a34d..aff025db0a 100644
--- a/mods/cnc/maps/gdi09/map.yaml
+++ b/mods/cnc/maps/gdi09/map.yaml
@@ -784,4 +784,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
index fdb96f085f..588cb8a175 100644
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -233,4 +233,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml
index bc13b4b959..cc1121ce85 100644
--- a/mods/cnc/maps/nod02a/map.yaml
+++ b/mods/cnc/maps/nod02a/map.yaml
@@ -236,4 +236,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml
index a5f9be62ab..67bc0585c3 100644
--- a/mods/cnc/maps/nod02b/map.yaml
+++ b/mods/cnc/maps/nod02b/map.yaml
@@ -197,4 +197,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml
index 76d594f07a..b150468fdc 100644
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -436,4 +436,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml
index e406478397..38f2d73dc9 100644
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -477,4 +477,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml
index ff88e94558..61190deba4 100644
--- a/mods/cnc/maps/nod04a/map.yaml
+++ b/mods/cnc/maps/nod04a/map.yaml
@@ -479,4 +479,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml
index 0a3a31066f..0ad85947f8 100644
--- a/mods/cnc/maps/nod04b/map.yaml
+++ b/mods/cnc/maps/nod04b/map.yaml
@@ -538,4 +538,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml
index b612857a03..d937c86ac2 100644
--- a/mods/cnc/maps/nod05/map.yaml
+++ b/mods/cnc/maps/nod05/map.yaml
@@ -377,4 +377,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod06a/languages/en.ftl b/mods/cnc/maps/nod06a/map.ftl
similarity index 100%
rename from mods/cnc/maps/nod06a/languages/en.ftl
rename to mods/cnc/maps/nod06a/map.ftl
diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml
index 7a811d8b63..f0eea32cdb 100644
--- a/mods/cnc/maps/nod06a/map.yaml
+++ b/mods/cnc/maps/nod06a/map.yaml
@@ -669,4 +669,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl, map.ftl
diff --git a/mods/cnc/maps/nod06b/languages/en.ftl b/mods/cnc/maps/nod06b/map.ftl
similarity index 100%
rename from mods/cnc/maps/nod06b/languages/en.ftl
rename to mods/cnc/maps/nod06b/map.ftl
diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml
index f3c43141cd..6fb9ef685f 100644
--- a/mods/cnc/maps/nod06b/map.yaml
+++ b/mods/cnc/maps/nod06b/map.yaml
@@ -599,4 +599,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl, languages/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl, map.ftl
diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml
index f852466eec..013b82776d 100644
--- a/mods/cnc/maps/nod06c/map.yaml
+++ b/mods/cnc/maps/nod06c/map.yaml
@@ -467,4 +467,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod07a/map.yaml b/mods/cnc/maps/nod07a/map.yaml
index b512216b74..e294a42e9c 100644
--- a/mods/cnc/maps/nod07a/map.yaml
+++ b/mods/cnc/maps/nod07a/map.yaml
@@ -600,4 +600,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod07b/map.yaml b/mods/cnc/maps/nod07b/map.yaml
index 8aefa63986..bd11226c34 100644
--- a/mods/cnc/maps/nod07b/map.yaml
+++ b/mods/cnc/maps/nod07b/map.yaml
@@ -957,4 +957,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod07c/map.yaml b/mods/cnc/maps/nod07c/map.yaml
index 5b63ac999d..ed37b0b350 100644
--- a/mods/cnc/maps/nod07c/map.yaml
+++ b/mods/cnc/maps/nod07c/map.yaml
@@ -772,4 +772,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod08a/map.yaml b/mods/cnc/maps/nod08a/map.yaml
index 7dc149664a..5d206627d8 100644
--- a/mods/cnc/maps/nod08a/map.yaml
+++ b/mods/cnc/maps/nod08a/map.yaml
@@ -614,4 +614,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod08b/map.yaml b/mods/cnc/maps/nod08b/map.yaml
index c209f5fc3f..0f4cd22b95 100644
--- a/mods/cnc/maps/nod08b/map.yaml
+++ b/mods/cnc/maps/nod08b/map.yaml
@@ -773,4 +773,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod09/map.yaml b/mods/cnc/maps/nod09/map.yaml
index 6c03cca658..1dfc57c97a 100644
--- a/mods/cnc/maps/nod09/map.yaml
+++ b/mods/cnc/maps/nod09/map.yaml
@@ -886,4 +886,4 @@ Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|r
 
 Weapons: weapons.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod10a/map.yaml b/mods/cnc/maps/nod10a/map.yaml
index 10e63a39fa..6b1fd3be82 100644
--- a/mods/cnc/maps/nod10a/map.yaml
+++ b/mods/cnc/maps/nod10a/map.yaml
@@ -1345,4 +1345,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/nod10b/map.yaml b/mods/cnc/maps/nod10b/map.yaml
index 05a10d80ac..7e22eedb80 100644
--- a/mods/cnc/maps/nod10b/map.yaml
+++ b/mods/cnc/maps/nod10b/map.yaml
@@ -726,4 +726,4 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
diff --git a/mods/cnc/maps/twist-of-fate/map.yaml b/mods/cnc/maps/twist-of-fate/map.yaml
index 006ea97677..b8a049460f 100644
--- a/mods/cnc/maps/twist-of-fate/map.yaml
+++ b/mods/cnc/maps/twist-of-fate/map.yaml
@@ -1142,6 +1142,6 @@ Actors:
 
 Rules: cnc|rules/campaign-maprules.yaml, cnc|rules/campaign-tooltips.yaml, cnc|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: cnc|languages/lua/en.ftl, cnc|languages/campaign/en.ftl
+FluentMessages: cnc|fluent/lua.ftl, cnc|fluent/campaign.ftl
 
 Weapons: weapons.yaml
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 717b2c640d..78e741e4dc 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -145,13 +145,13 @@ ChromeLayout:
 	common|chrome/text-notifications.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	common|languages/hotkeys/en.ftl
-	common|languages/rules/en.ftl
-	cnc|languages/en.ftl
-	cnc|languages/chrome/en.ftl
-	cnc|languages/hotkeys/en.ftl
-	cnc|languages/rules/en.ftl
+	common|fluent/common.ftl
+	common|fluent/hotkeys.ftl
+	common|fluent/rules.ftl
+	cnc|fluent/cnc.ftl
+	cnc|fluent/chrome.ftl
+	cnc|fluent/hotkeys.ftl
+	cnc|fluent/rules.ftl
 
 AllowUnusedFluentMessagesInExternalPackages: false
 
diff --git a/mods/common-content/languages/chrome/en.ftl b/mods/common-content/fluent/chrome.ftl
similarity index 100%
rename from mods/common-content/languages/chrome/en.ftl
rename to mods/common-content/fluent/chrome.ftl
diff --git a/mods/common-content/languages/en.ftl b/mods/common-content/fluent/content.ftl
similarity index 100%
rename from mods/common-content/languages/en.ftl
rename to mods/common-content/fluent/content.ftl
diff --git a/mods/common/languages/chrome/en.ftl b/mods/common/fluent/chrome.ftl
similarity index 100%
rename from mods/common/languages/chrome/en.ftl
rename to mods/common/fluent/chrome.ftl
diff --git a/mods/common/languages/en.ftl b/mods/common/fluent/common.ftl
similarity index 100%
rename from mods/common/languages/en.ftl
rename to mods/common/fluent/common.ftl
diff --git a/mods/common/languages/hotkeys/en.ftl b/mods/common/fluent/hotkeys.ftl
similarity index 100%
rename from mods/common/languages/hotkeys/en.ftl
rename to mods/common/fluent/hotkeys.ftl
diff --git a/mods/common/languages/rules/en.ftl b/mods/common/fluent/rules.ftl
similarity index 100%
rename from mods/common/languages/rules/en.ftl
rename to mods/common/fluent/rules.ftl
diff --git a/mods/d2k-content/languages/chrome/en.ftl b/mods/d2k-content/fluent/chrome.ftl
similarity index 100%
rename from mods/d2k-content/languages/chrome/en.ftl
rename to mods/d2k-content/fluent/chrome.ftl
diff --git a/mods/d2k-content/mod.yaml b/mods/d2k-content/mod.yaml
index 1fecd92af5..c33aac5f5d 100644
--- a/mods/d2k-content/mod.yaml
+++ b/mods/d2k-content/mod.yaml
@@ -37,10 +37,10 @@ ChromeMetrics:
 	content|metrics.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	content|languages/en.ftl
-	content|languages/chrome/en.ftl
-	d2kcontent|languages/chrome/en.ftl
+	common|fluent/common.ftl
+	content|fluent/content.ftl
+	content|fluent/chrome.ftl
+	d2kcontent|fluent/chrome.ftl
 
 Fonts:
 	Tiny:
diff --git a/mods/d2k/languages/campaign/en.ftl b/mods/d2k/fluent/campaign.ftl
similarity index 100%
rename from mods/d2k/languages/campaign/en.ftl
rename to mods/d2k/fluent/campaign.ftl
diff --git a/mods/d2k/languages/chrome/en.ftl b/mods/d2k/fluent/chrome.ftl
similarity index 100%
rename from mods/d2k/languages/chrome/en.ftl
rename to mods/d2k/fluent/chrome.ftl
diff --git a/mods/d2k/languages/en.ftl b/mods/d2k/fluent/d2k.ftl
similarity index 100%
rename from mods/d2k/languages/en.ftl
rename to mods/d2k/fluent/d2k.ftl
diff --git a/mods/d2k/languages/hotkeys/en.ftl b/mods/d2k/fluent/hotkeys.ftl
similarity index 100%
rename from mods/d2k/languages/hotkeys/en.ftl
rename to mods/d2k/fluent/hotkeys.ftl
diff --git a/mods/d2k/languages/lua/en.ftl b/mods/d2k/fluent/lua.ftl
similarity index 100%
rename from mods/d2k/languages/lua/en.ftl
rename to mods/d2k/fluent/lua.ftl
diff --git a/mods/d2k/languages/rules/en.ftl b/mods/d2k/fluent/rules.ftl
similarity index 100%
rename from mods/d2k/languages/rules/en.ftl
rename to mods/d2k/fluent/rules.ftl
diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml
index 9c0842f629..08ee9cbce8 100644
--- a/mods/d2k/maps/atreides-01a/map.yaml
+++ b/mods/d2k/maps/atreides-01a/map.yaml
@@ -114,4 +114,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml
index af9c573a1f..e67e3bcaa6 100644
--- a/mods/d2k/maps/atreides-01b/map.yaml
+++ b/mods/d2k/maps/atreides-01b/map.yaml
@@ -113,4 +113,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/atreides-02a/map.yaml b/mods/d2k/maps/atreides-02a/map.yaml
index 3ebd9f7abd..607f257c6e 100644
--- a/mods/d2k/maps/atreides-02a/map.yaml
+++ b/mods/d2k/maps/atreides-02a/map.yaml
@@ -171,4 +171,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/atreides-02b/map.yaml b/mods/d2k/maps/atreides-02b/map.yaml
index 3f7f6f2f30..8909d1b8e7 100644
--- a/mods/d2k/maps/atreides-02b/map.yaml
+++ b/mods/d2k/maps/atreides-02b/map.yaml
@@ -141,4 +141,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/atreides-03a/map.yaml b/mods/d2k/maps/atreides-03a/map.yaml
index d765106d73..6892b3f9de 100644
--- a/mods/d2k/maps/atreides-03a/map.yaml
+++ b/mods/d2k/maps/atreides-03a/map.yaml
@@ -138,4 +138,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/atreides-03b/map.yaml b/mods/d2k/maps/atreides-03b/map.yaml
index 6a8e706e05..0ab7c10382 100644
--- a/mods/d2k/maps/atreides-03b/map.yaml
+++ b/mods/d2k/maps/atreides-03b/map.yaml
@@ -135,4 +135,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/atreides-04/map.yaml b/mods/d2k/maps/atreides-04/map.yaml
index 1933c6d7c3..fccc7bfe23 100644
--- a/mods/d2k/maps/atreides-04/map.yaml
+++ b/mods/d2k/maps/atreides-04/map.yaml
@@ -419,4 +419,4 @@ Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rule
 
 Sequences: sequences.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/atreides-05/map.yaml b/mods/d2k/maps/atreides-05/map.yaml
index 1c344c1519..03472e8c38 100644
--- a/mods/d2k/maps/atreides-05/map.yaml
+++ b/mods/d2k/maps/atreides-05/map.yaml
@@ -368,4 +368,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-01a/map.yaml b/mods/d2k/maps/harkonnen-01a/map.yaml
index e4ab862645..a4caf6b2d4 100644
--- a/mods/d2k/maps/harkonnen-01a/map.yaml
+++ b/mods/d2k/maps/harkonnen-01a/map.yaml
@@ -109,4 +109,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-01b/map.yaml b/mods/d2k/maps/harkonnen-01b/map.yaml
index b9329061b4..91d8635da3 100644
--- a/mods/d2k/maps/harkonnen-01b/map.yaml
+++ b/mods/d2k/maps/harkonnen-01b/map.yaml
@@ -109,4 +109,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-02a/map.yaml b/mods/d2k/maps/harkonnen-02a/map.yaml
index 7d5a6a3638..bbd1900a8d 100644
--- a/mods/d2k/maps/harkonnen-02a/map.yaml
+++ b/mods/d2k/maps/harkonnen-02a/map.yaml
@@ -165,4 +165,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-02b/map.yaml b/mods/d2k/maps/harkonnen-02b/map.yaml
index 60163ba487..e75e8c0cd8 100644
--- a/mods/d2k/maps/harkonnen-02b/map.yaml
+++ b/mods/d2k/maps/harkonnen-02b/map.yaml
@@ -147,4 +147,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-03a/map.yaml b/mods/d2k/maps/harkonnen-03a/map.yaml
index ea0d7c24ca..d289e232c7 100644
--- a/mods/d2k/maps/harkonnen-03a/map.yaml
+++ b/mods/d2k/maps/harkonnen-03a/map.yaml
@@ -180,4 +180,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-03b/map.yaml b/mods/d2k/maps/harkonnen-03b/map.yaml
index 07d08ac0e0..c4e3c1c578 100644
--- a/mods/d2k/maps/harkonnen-03b/map.yaml
+++ b/mods/d2k/maps/harkonnen-03b/map.yaml
@@ -210,4 +210,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-04/map.yaml b/mods/d2k/maps/harkonnen-04/map.yaml
index bd5e94158a..347ab46c7c 100644
--- a/mods/d2k/maps/harkonnen-04/map.yaml
+++ b/mods/d2k/maps/harkonnen-04/map.yaml
@@ -379,4 +379,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-05/map.yaml b/mods/d2k/maps/harkonnen-05/map.yaml
index c56161fa98..c10ebf19e0 100644
--- a/mods/d2k/maps/harkonnen-05/map.yaml
+++ b/mods/d2k/maps/harkonnen-05/map.yaml
@@ -517,4 +517,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-06a/map.yaml b/mods/d2k/maps/harkonnen-06a/map.yaml
index ee214b14c1..067edcdbe5 100644
--- a/mods/d2k/maps/harkonnen-06a/map.yaml
+++ b/mods/d2k/maps/harkonnen-06a/map.yaml
@@ -718,4 +718,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-06b/map.yaml b/mods/d2k/maps/harkonnen-06b/map.yaml
index 9421c7f5da..734781bb3e 100644
--- a/mods/d2k/maps/harkonnen-06b/map.yaml
+++ b/mods/d2k/maps/harkonnen-06b/map.yaml
@@ -655,4 +655,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-07/map.yaml b/mods/d2k/maps/harkonnen-07/map.yaml
index 536e50844c..26acb12417 100644
--- a/mods/d2k/maps/harkonnen-07/map.yaml
+++ b/mods/d2k/maps/harkonnen-07/map.yaml
@@ -772,4 +772,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-08/map.yaml b/mods/d2k/maps/harkonnen-08/map.yaml
index 4541e9de73..f2f6a3fb29 100644
--- a/mods/d2k/maps/harkonnen-08/map.yaml
+++ b/mods/d2k/maps/harkonnen-08/map.yaml
@@ -655,4 +655,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-09a/map.yaml b/mods/d2k/maps/harkonnen-09a/map.yaml
index 871f304242..f7e17fa0c5 100644
--- a/mods/d2k/maps/harkonnen-09a/map.yaml
+++ b/mods/d2k/maps/harkonnen-09a/map.yaml
@@ -1045,4 +1045,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/harkonnen-09b/map.yaml b/mods/d2k/maps/harkonnen-09b/map.yaml
index c47132ff45..63492128d9 100644
--- a/mods/d2k/maps/harkonnen-09b/map.yaml
+++ b/mods/d2k/maps/harkonnen-09b/map.yaml
@@ -1008,4 +1008,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-01a/map.yaml b/mods/d2k/maps/ordos-01a/map.yaml
index da9f6495db..a181372692 100644
--- a/mods/d2k/maps/ordos-01a/map.yaml
+++ b/mods/d2k/maps/ordos-01a/map.yaml
@@ -104,4 +104,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-01b/map.yaml b/mods/d2k/maps/ordos-01b/map.yaml
index 42b5068925..e6f59389e1 100644
--- a/mods/d2k/maps/ordos-01b/map.yaml
+++ b/mods/d2k/maps/ordos-01b/map.yaml
@@ -104,4 +104,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-02a/map.yaml b/mods/d2k/maps/ordos-02a/map.yaml
index 57f875d8a5..0e971a606d 100644
--- a/mods/d2k/maps/ordos-02a/map.yaml
+++ b/mods/d2k/maps/ordos-02a/map.yaml
@@ -155,4 +155,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-02b/map.yaml b/mods/d2k/maps/ordos-02b/map.yaml
index 7c350fe55c..15fc26b9d5 100644
--- a/mods/d2k/maps/ordos-02b/map.yaml
+++ b/mods/d2k/maps/ordos-02b/map.yaml
@@ -140,4 +140,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-03a/map.yaml b/mods/d2k/maps/ordos-03a/map.yaml
index 845682389f..dde0e0480d 100644
--- a/mods/d2k/maps/ordos-03a/map.yaml
+++ b/mods/d2k/maps/ordos-03a/map.yaml
@@ -146,4 +146,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-03b/map.yaml b/mods/d2k/maps/ordos-03b/map.yaml
index 727f613268..cf4aff4141 100644
--- a/mods/d2k/maps/ordos-03b/map.yaml
+++ b/mods/d2k/maps/ordos-03b/map.yaml
@@ -257,4 +257,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-04/map.yaml b/mods/d2k/maps/ordos-04/map.yaml
index 69dec4fcb1..abf589960c 100644
--- a/mods/d2k/maps/ordos-04/map.yaml
+++ b/mods/d2k/maps/ordos-04/map.yaml
@@ -519,4 +519,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-05/map.yaml b/mods/d2k/maps/ordos-05/map.yaml
index a584e667a3..05abeb61f3 100644
--- a/mods/d2k/maps/ordos-05/map.yaml
+++ b/mods/d2k/maps/ordos-05/map.yaml
@@ -573,4 +573,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/maps/ordos-06a/map.yaml b/mods/d2k/maps/ordos-06a/map.yaml
index 667473b86a..b53cd7ff02 100644
--- a/mods/d2k/maps/ordos-06a/map.yaml
+++ b/mods/d2k/maps/ordos-06a/map.yaml
@@ -577,4 +577,4 @@ Actors:
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: d2k|languages/lua/en.ftl, d2k|languages/campaign/en.ftl
+FluentMessages: d2k|fluent/lua.ftl, d2k|fluent/campaign.ftl
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index db24642a5f..970bcabc7b 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -130,14 +130,14 @@ ChromeLayout:
 	d2k|chrome/encyclopedia.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	common|languages/chrome/en.ftl
-	common|languages/hotkeys/en.ftl
-	common|languages/rules/en.ftl
-	d2k|languages/en.ftl
-	d2k|languages/chrome/en.ftl
-	d2k|languages/hotkeys/en.ftl
-	d2k|languages/rules/en.ftl
+	common|fluent/common.ftl
+	common|fluent/chrome.ftl
+	common|fluent/hotkeys.ftl
+	common|fluent/rules.ftl
+	d2k|fluent/d2k.ftl
+	d2k|fluent/chrome.ftl
+	d2k|fluent/hotkeys.ftl
+	d2k|fluent/rules.ftl
 
 AllowUnusedFluentMessagesInExternalPackages: false
 
diff --git a/mods/ra-content/languages/chrome/en.ftl b/mods/ra-content/fluent/chrome.ftl
similarity index 100%
rename from mods/ra-content/languages/chrome/en.ftl
rename to mods/ra-content/fluent/chrome.ftl
diff --git a/mods/ra-content/mod.yaml b/mods/ra-content/mod.yaml
index cbec222782..4da956260d 100644
--- a/mods/ra-content/mod.yaml
+++ b/mods/ra-content/mod.yaml
@@ -37,10 +37,10 @@ ChromeMetrics:
 	content|metrics.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	content|languages/en.ftl
-	content|languages/chrome/en.ftl
-	racontent|languages/chrome/en.ftl
+	common|fluent/en.ftl
+	content|fluent/content.ftl
+	content|fluent/chrome.ftl
+	racontent|fluent/chrome.ftl
 
 Fonts:
 	Tiny:
diff --git a/mods/ra/languages/campaign/en.ftl b/mods/ra/fluent/campaign.ftl
similarity index 100%
rename from mods/ra/languages/campaign/en.ftl
rename to mods/ra/fluent/campaign.ftl
diff --git a/mods/ra/languages/chrome/en.ftl b/mods/ra/fluent/chrome.ftl
similarity index 100%
rename from mods/ra/languages/chrome/en.ftl
rename to mods/ra/fluent/chrome.ftl
diff --git a/mods/ra/languages/hotkeys/en.ftl b/mods/ra/fluent/hotkeys.ftl
similarity index 100%
rename from mods/ra/languages/hotkeys/en.ftl
rename to mods/ra/fluent/hotkeys.ftl
diff --git a/mods/ra/languages/lua/en.ftl b/mods/ra/fluent/lua.ftl
similarity index 100%
rename from mods/ra/languages/lua/en.ftl
rename to mods/ra/fluent/lua.ftl
diff --git a/mods/ra/languages/en.ftl b/mods/ra/fluent/ra.ftl
similarity index 100%
rename from mods/ra/languages/en.ftl
rename to mods/ra/fluent/ra.ftl
diff --git a/mods/ra/languages/rules/en.ftl b/mods/ra/fluent/rules.ftl
similarity index 100%
rename from mods/ra/languages/rules/en.ftl
rename to mods/ra/fluent/rules.ftl
diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml
index 7cc8c819d8..a167ec8ada 100644
--- a/mods/ra/maps/allies-01/map.yaml
+++ b/mods/ra/maps/allies-01/map.yaml
@@ -449,4 +449,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-02/languages/en.ftl b/mods/ra/maps/allies-02/map.ftl
similarity index 100%
rename from mods/ra/maps/allies-02/languages/en.ftl
rename to mods/ra/maps/allies-02/map.ftl
diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml
index a6372523b9..08e6449f41 100644
--- a/mods/ra/maps/allies-02/map.yaml
+++ b/mods/ra/maps/allies-02/map.yaml
@@ -658,4 +658,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl, map.ftl
diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml
index 2e407e518c..b416694481 100644
--- a/mods/ra/maps/allies-03a/map.yaml
+++ b/mods/ra/maps/allies-03a/map.yaml
@@ -1312,4 +1312,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-03b/map.yaml b/mods/ra/maps/allies-03b/map.yaml
index 321a58bf7d..3132e3b0a2 100644
--- a/mods/ra/maps/allies-03b/map.yaml
+++ b/mods/ra/maps/allies-03b/map.yaml
@@ -1212,4 +1212,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-04/languages/en.ftl b/mods/ra/maps/allies-04/map.ftl
similarity index 100%
rename from mods/ra/maps/allies-04/languages/en.ftl
rename to mods/ra/maps/allies-04/map.ftl
diff --git a/mods/ra/maps/allies-04/map.yaml b/mods/ra/maps/allies-04/map.yaml
index 8a4092d8b3..f5113a2383 100644
--- a/mods/ra/maps/allies-04/map.yaml
+++ b/mods/ra/maps/allies-04/map.yaml
@@ -535,4 +535,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl, map.ftl
diff --git a/mods/ra/maps/allies-05a/languages/en.ftl b/mods/ra/maps/allies-05a/map.ftl
similarity index 100%
rename from mods/ra/maps/allies-05a/languages/en.ftl
rename to mods/ra/maps/allies-05a/map.ftl
diff --git a/mods/ra/maps/allies-05a/map.yaml b/mods/ra/maps/allies-05a/map.yaml
index a36cc884d1..502c10b961 100644
--- a/mods/ra/maps/allies-05a/map.yaml
+++ b/mods/ra/maps/allies-05a/map.yaml
@@ -1571,4 +1571,4 @@ Weapons: weapons.yaml
 
 Notifications: notifications.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, languages/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl, map.ftl
diff --git a/mods/ra/maps/allies-05b/map.yaml b/mods/ra/maps/allies-05b/map.yaml
index f33e831350..49fa2408a0 100644
--- a/mods/ra/maps/allies-05b/map.yaml
+++ b/mods/ra/maps/allies-05b/map.yaml
@@ -1276,4 +1276,4 @@ Weapons: weapons.yaml
 
 Notifications: notifications.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-05c/map.yaml b/mods/ra/maps/allies-05c/map.yaml
index d13305e0be..3eb05e562f 100644
--- a/mods/ra/maps/allies-05c/map.yaml
+++ b/mods/ra/maps/allies-05c/map.yaml
@@ -1129,4 +1129,4 @@ Weapons: weapons.yaml
 
 Notifications: notifications.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-06a/map.yaml b/mods/ra/maps/allies-06a/map.yaml
index fa8d8221b6..ba77b3eb63 100644
--- a/mods/ra/maps/allies-06a/map.yaml
+++ b/mods/ra/maps/allies-06a/map.yaml
@@ -826,4 +826,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-06b/map.yaml b/mods/ra/maps/allies-06b/map.yaml
index 0e71549bb2..5637d7346a 100644
--- a/mods/ra/maps/allies-06b/map.yaml
+++ b/mods/ra/maps/allies-06b/map.yaml
@@ -845,4 +845,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-07/map.yaml b/mods/ra/maps/allies-07/map.yaml
index 8daa9d9fc6..85da02b2b6 100644
--- a/mods/ra/maps/allies-07/map.yaml
+++ b/mods/ra/maps/allies-07/map.yaml
@@ -878,4 +878,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-08a/map.yaml b/mods/ra/maps/allies-08a/map.yaml
index 6722f7ceda..b67729062d 100644
--- a/mods/ra/maps/allies-08a/map.yaml
+++ b/mods/ra/maps/allies-08a/map.yaml
@@ -989,4 +989,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-08b/map.yaml b/mods/ra/maps/allies-08b/map.yaml
index b4ee578e3f..9035fe9ccc 100644
--- a/mods/ra/maps/allies-08b/map.yaml
+++ b/mods/ra/maps/allies-08b/map.yaml
@@ -828,4 +828,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-09a/map.yaml b/mods/ra/maps/allies-09a/map.yaml
index 02771eefed..9590d45cf4 100644
--- a/mods/ra/maps/allies-09a/map.yaml
+++ b/mods/ra/maps/allies-09a/map.yaml
@@ -974,4 +974,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-10a/map.yaml b/mods/ra/maps/allies-10a/map.yaml
index a38f233d85..42de33f348 100644
--- a/mods/ra/maps/allies-10a/map.yaml
+++ b/mods/ra/maps/allies-10a/map.yaml
@@ -1626,4 +1626,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-10b/map.yaml b/mods/ra/maps/allies-10b/map.yaml
index ddc8eba15b..9409e86d7f 100644
--- a/mods/ra/maps/allies-10b/map.yaml
+++ b/mods/ra/maps/allies-10b/map.yaml
@@ -938,4 +938,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Notifications: notifications.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/allies-13/map.yaml b/mods/ra/maps/allies-13/map.yaml
index b0700614a7..8991c01d18 100644
--- a/mods/ra/maps/allies-13/map.yaml
+++ b/mods/ra/maps/allies-13/map.yaml
@@ -1209,6 +1209,6 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
 
 Weapons: weapons.yaml
diff --git a/mods/ra/maps/ant-01/map.yaml b/mods/ra/maps/ant-01/map.yaml
index b67aa4429b..852f9ad58e 100644
--- a/mods/ra/maps/ant-01/map.yaml
+++ b/mods/ra/maps/ant-01/map.yaml
@@ -597,4 +597,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml, ra|rules/campaign-palettes.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/ant-03/map.yaml b/mods/ra/maps/ant-03/map.yaml
index 866162fd72..e7736e0991 100644
--- a/mods/ra/maps/ant-03/map.yaml
+++ b/mods/ra/maps/ant-03/map.yaml
@@ -670,4 +670,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/bomber-john/en.ftl b/mods/ra/maps/bomber-john/map.ftl
similarity index 100%
rename from mods/ra/maps/bomber-john/en.ftl
rename to mods/ra/maps/bomber-john/map.ftl
diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml
index 3a2f5eee96..2f1fe87717 100644
--- a/mods/ra/maps/bomber-john/map.yaml
+++ b/mods/ra/maps/bomber-john/map.yaml
@@ -756,4 +756,4 @@ Rules: rules.yaml
 
 Sequences: sequences.yaml
 
-FluentMessages: en.ftl
+FluentMessages: map.ftl
diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/en.ftl b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.ftl
similarity index 100%
rename from mods/ra/maps/drop-zone-battle-of-tikiaki/en.ftl
rename to mods/ra/maps/drop-zone-battle-of-tikiaki/map.ftl
diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
index 521d9e5580..75635ec362 100644
--- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
+++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
@@ -266,4 +266,4 @@ Rules: rules.yaml
 
 Weapons: weapons.yaml
 
-FluentMessages: en.ftl
+FluentMessages: map.ftl
diff --git a/mods/ra/maps/drop-zone-w/en.ftl b/mods/ra/maps/drop-zone-w/map.ftl
similarity index 100%
rename from mods/ra/maps/drop-zone-w/en.ftl
rename to mods/ra/maps/drop-zone-w/map.ftl
diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml
index 228d97d1c9..4e016335b7 100644
--- a/mods/ra/maps/drop-zone-w/map.yaml
+++ b/mods/ra/maps/drop-zone-w/map.yaml
@@ -185,4 +185,4 @@ Sequences: sequences.yaml
 
 Weapons: weapons.yaml
 
-FluentMessages: en.ftl
+FluentMessages: map.ftl
diff --git a/mods/ra/maps/drop-zone/en.ftl b/mods/ra/maps/drop-zone/map.ftl
similarity index 100%
rename from mods/ra/maps/drop-zone/en.ftl
rename to mods/ra/maps/drop-zone/map.ftl
diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml
index 0a96224913..eb678df395 100644
--- a/mods/ra/maps/drop-zone/map.yaml
+++ b/mods/ra/maps/drop-zone/map.yaml
@@ -161,4 +161,4 @@ Rules: rules.yaml
 
 Weapons: weapons.yaml
 
-FluentMessages: en.ftl
+FluentMessages: map.ftl
diff --git a/mods/ra/maps/evacuation/map.yaml b/mods/ra/maps/evacuation/map.yaml
index 108a381e26..25a112a0c8 100644
--- a/mods/ra/maps/evacuation/map.yaml
+++ b/mods/ra/maps/evacuation/map.yaml
@@ -1757,4 +1757,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, ra|rules/coop-missions-rules.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/exodus/map.yaml b/mods/ra/maps/exodus/map.yaml
index d852709843..a788c1581c 100644
--- a/mods/ra/maps/exodus/map.yaml
+++ b/mods/ra/maps/exodus/map.yaml
@@ -1384,4 +1384,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, ra|rules/coop-missions-rules.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml b/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml
index 8404a10647..13c0585a2e 100644
--- a/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml
+++ b/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml
@@ -1327,4 +1327,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml b/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml
index 0254768886..5cbc3b27cf 100644
--- a/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml
+++ b/mods/ra/maps/fall-of-greece-2-evacuation/map.yaml
@@ -1081,4 +1081,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/fort-lonestar/languages/en.ftl b/mods/ra/maps/fort-lonestar/languages/en.ftl
deleted file mode 100644
index 6b12e701a9..0000000000
--- a/mods/ra/maps/fort-lonestar/languages/en.ftl
+++ /dev/null
@@ -1,11 +0,0 @@
-dropdown-difficulty =
-    .label = Difficulty
-    .description = The difficulty of the mission
-
-options-difficulty =
-    .hard4p = Hard (4P)
-    .normal3p = Normal (3P)
-    .easy2p = Easy (2P)
-    .veryeasy1p = Very Easy (1P)
-    .endless = Endless mode
-    .tough = Real tough guy
diff --git a/mods/ra/maps/fort-lonestar/en.ftl b/mods/ra/maps/fort-lonestar/map.ftl
similarity index 55%
rename from mods/ra/maps/fort-lonestar/en.ftl
rename to mods/ra/maps/fort-lonestar/map.ftl
index 2b2fb4ccd7..276a5c0ce1 100644
--- a/mods/ra/maps/fort-lonestar/en.ftl
+++ b/mods/ra/maps/fort-lonestar/map.ftl
@@ -1,3 +1,15 @@
+dropdown-difficulty =
+    .label = Difficulty
+    .description = The difficulty of the mission
+
+options-difficulty =
+    .hard4p = Hard (4P)
+    .normal3p = Normal (3P)
+    .easy2p = Easy (2P)
+    .veryeasy1p = Very Easy (1P)
+    .endless = Endless mode
+    .tough = Real tough guy
+
 actor-mobiletent-name = Mobile Tent
 
 actor-sniper =
@@ -11,3 +23,4 @@ actor-mig-bomber-name = MiG Bomber
 
 ## rules.yaml
 actor-powerproxy-parabombs-description = A MiG bomber drops a load of parachuted bombs on your target.
+
diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml
index 679a067710..e02a483bde 100644
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -469,4 +469,4 @@ Sequences: sequences.yaml
 
 Music: music.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, languages/en.ftl, en.ftl
+FluentMessages: ra|fluent/lua.ftl, map.ftl
diff --git a/mods/ra/maps/in-the-nick-of-time/map.yaml b/mods/ra/maps/in-the-nick-of-time/map.yaml
index 5f47b6a70d..4ab3ae676d 100644
--- a/mods/ra/maps/in-the-nick-of-time/map.yaml
+++ b/mods/ra/maps/in-the-nick-of-time/map.yaml
@@ -956,4 +956,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/infiltration/map.yaml b/mods/ra/maps/infiltration/map.yaml
index efdaae4181..b385505281 100644
--- a/mods/ra/maps/infiltration/map.yaml
+++ b/mods/ra/maps/infiltration/map.yaml
@@ -1791,4 +1791,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, ra|rules/coop-missions-rules.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml
index 1e9a942368..bc1e4af078 100644
--- a/mods/ra/maps/intervention/map.yaml
+++ b/mods/ra/maps/intervention/map.yaml
@@ -2207,4 +2207,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml
index 01ea83ce1c..be97812770 100644
--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -2099,4 +2099,4 @@ Weapons: weapons.yaml
 
 Voices: voices.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/mousetrap/map.yaml b/mods/ra/maps/mousetrap/map.yaml
index d7d5c132a1..8f81f4649a 100644
--- a/mods/ra/maps/mousetrap/map.yaml
+++ b/mods/ra/maps/mousetrap/map.yaml
@@ -751,4 +751,4 @@ Notifications: notifications.yaml
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/negotiations/map.yaml b/mods/ra/maps/negotiations/map.yaml
index debc96f358..40dce720b7 100644
--- a/mods/ra/maps/negotiations/map.yaml
+++ b/mods/ra/maps/negotiations/map.yaml
@@ -1339,7 +1339,7 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-palettes.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
 
 Weapons: weapons.yaml
 
diff --git a/mods/ra/maps/oil-spill/en.ftl b/mods/ra/maps/oil-spill/map.ftl
similarity index 100%
rename from mods/ra/maps/oil-spill/en.ftl
rename to mods/ra/maps/oil-spill/map.ftl
diff --git a/mods/ra/maps/oil-spill/map.yaml b/mods/ra/maps/oil-spill/map.yaml
index 13ea0f95c9..e8b6771a7c 100644
--- a/mods/ra/maps/oil-spill/map.yaml
+++ b/mods/ra/maps/oil-spill/map.yaml
@@ -308,4 +308,4 @@ Rules: rules.yaml
 
 Sequences: sequences.yaml
 
-FluentMessages: en.ftl
+FluentMessages: map.ftl
diff --git a/mods/ra/maps/production-disruption/map.yaml b/mods/ra/maps/production-disruption/map.yaml
index 545204b581..9f4f4279af 100644
--- a/mods/ra/maps/production-disruption/map.yaml
+++ b/mods/ra/maps/production-disruption/map.yaml
@@ -660,4 +660,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/sarin-gas-1-crackdown/map.yaml b/mods/ra/maps/sarin-gas-1-crackdown/map.yaml
index 13b8dc4778..a45a96ba09 100644
--- a/mods/ra/maps/sarin-gas-1-crackdown/map.yaml
+++ b/mods/ra/maps/sarin-gas-1-crackdown/map.yaml
@@ -1011,4 +1011,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/sarin-gas-2-down-under/map.yaml b/mods/ra/maps/sarin-gas-2-down-under/map.yaml
index 6259ebd2a9..006e0c1dba 100644
--- a/mods/ra/maps/sarin-gas-2-down-under/map.yaml
+++ b/mods/ra/maps/sarin-gas-2-down-under/map.yaml
@@ -1367,4 +1367,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml b/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml
index 932c4a5c8e..7bbccfcbcd 100644
--- a/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml
+++ b/mods/ra/maps/sarin-gas-3-controlled-burn/map.yaml
@@ -1243,4 +1243,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/shock-therapy/map.yaml b/mods/ra/maps/shock-therapy/map.yaml
index 08e47b9230..ca3cfdd585 100644
--- a/mods/ra/maps/shock-therapy/map.yaml
+++ b/mods/ra/maps/shock-therapy/map.yaml
@@ -997,4 +997,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml b/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml
index e78c5b3227..abb7de7622 100644
--- a/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml
+++ b/mods/ra/maps/siberian-conflict-1-fresh-tracks/map.yaml
@@ -671,4 +671,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml b/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml
index d77a708ef9..c6f76508ac 100644
--- a/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml
+++ b/mods/ra/maps/siberian-conflict-3-wasteland/map.yaml
@@ -1053,4 +1053,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/situation-critical/map.yaml b/mods/ra/maps/situation-critical/map.yaml
index 51c687c0dc..21f6cbb263 100644
--- a/mods/ra/maps/situation-critical/map.yaml
+++ b/mods/ra/maps/situation-critical/map.yaml
@@ -566,4 +566,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml
index e3a9edea54..8c20e7e565 100644
--- a/mods/ra/maps/soviet-01/map.yaml
+++ b/mods/ra/maps/soviet-01/map.yaml
@@ -661,4 +661,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-02a/map.yaml b/mods/ra/maps/soviet-02a/map.yaml
index 299a03be90..888b1a3f68 100644
--- a/mods/ra/maps/soviet-02a/map.yaml
+++ b/mods/ra/maps/soviet-02a/map.yaml
@@ -513,4 +513,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-02b/map.yaml b/mods/ra/maps/soviet-02b/map.yaml
index abdbbad541..7bad123ee3 100644
--- a/mods/ra/maps/soviet-02b/map.yaml
+++ b/mods/ra/maps/soviet-02b/map.yaml
@@ -492,4 +492,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml
index cb3739f392..c25821bee8 100644
--- a/mods/ra/maps/soviet-03/map.yaml
+++ b/mods/ra/maps/soviet-03/map.yaml
@@ -1054,4 +1054,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Notifications: notifications.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-04a/map.yaml b/mods/ra/maps/soviet-04a/map.yaml
index 910ff6e0e6..18f14b9dee 100644
--- a/mods/ra/maps/soviet-04a/map.yaml
+++ b/mods/ra/maps/soviet-04a/map.yaml
@@ -600,4 +600,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-04b/map.yaml b/mods/ra/maps/soviet-04b/map.yaml
index d7a962e79a..6217fb6c52 100644
--- a/mods/ra/maps/soviet-04b/map.yaml
+++ b/mods/ra/maps/soviet-04b/map.yaml
@@ -649,4 +649,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-05/map.yaml b/mods/ra/maps/soviet-05/map.yaml
index 6afdf57b4e..c48561a643 100644
--- a/mods/ra/maps/soviet-05/map.yaml
+++ b/mods/ra/maps/soviet-05/map.yaml
@@ -591,4 +591,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-06a/map.yaml b/mods/ra/maps/soviet-06a/map.yaml
index 6a8cf2d1ea..9f9b4751b6 100644
--- a/mods/ra/maps/soviet-06a/map.yaml
+++ b/mods/ra/maps/soviet-06a/map.yaml
@@ -849,4 +849,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-06b/map.yaml b/mods/ra/maps/soviet-06b/map.yaml
index 8630cbbf22..ecdb950ac5 100644
--- a/mods/ra/maps/soviet-06b/map.yaml
+++ b/mods/ra/maps/soviet-06b/map.yaml
@@ -509,4 +509,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml
index 32698d3309..e9350562ce 100644
--- a/mods/ra/maps/soviet-07/map.yaml
+++ b/mods/ra/maps/soviet-07/map.yaml
@@ -795,4 +795,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-08a/map.yaml b/mods/ra/maps/soviet-08a/map.yaml
index 17063ebb74..229c5d9d10 100644
--- a/mods/ra/maps/soviet-08a/map.yaml
+++ b/mods/ra/maps/soviet-08a/map.yaml
@@ -1069,4 +1069,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-08b/map.yaml b/mods/ra/maps/soviet-08b/map.yaml
index 2871362e97..a800fb3829 100644
--- a/mods/ra/maps/soviet-08b/map.yaml
+++ b/mods/ra/maps/soviet-08b/map.yaml
@@ -891,4 +891,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-09/map.yaml b/mods/ra/maps/soviet-09/map.yaml
index bd661a4e35..21507776fd 100644
--- a/mods/ra/maps/soviet-09/map.yaml
+++ b/mods/ra/maps/soviet-09/map.yaml
@@ -1599,4 +1599,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-10/map.yaml b/mods/ra/maps/soviet-10/map.yaml
index d76ea0b656..300e1514b7 100644
--- a/mods/ra/maps/soviet-10/map.yaml
+++ b/mods/ra/maps/soviet-10/map.yaml
@@ -1145,4 +1145,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-11a/map.yaml b/mods/ra/maps/soviet-11a/map.yaml
index 0c27c454ae..0400d91f6e 100644
--- a/mods/ra/maps/soviet-11a/map.yaml
+++ b/mods/ra/maps/soviet-11a/map.yaml
@@ -912,4 +912,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-11b/map.yaml b/mods/ra/maps/soviet-11b/map.yaml
index 3b0d8079e9..7efb21fb31 100644
--- a/mods/ra/maps/soviet-11b/map.yaml
+++ b/mods/ra/maps/soviet-11b/map.yaml
@@ -839,4 +839,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-13a/map.yaml b/mods/ra/maps/soviet-13a/map.yaml
index faa95c1701..e963ef7544 100644
--- a/mods/ra/maps/soviet-13a/map.yaml
+++ b/mods/ra/maps/soviet-13a/map.yaml
@@ -937,4 +937,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-13b/map.yaml b/mods/ra/maps/soviet-13b/map.yaml
index cef96b658c..df780400ec 100644
--- a/mods/ra/maps/soviet-13b/map.yaml
+++ b/mods/ra/maps/soviet-13b/map.yaml
@@ -954,4 +954,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml
index 5057d41895..eda982b718 100644
--- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml
+++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml
@@ -1319,4 +1319,4 @@ Weapons: weapons.yaml
 
 Notifications: notifications.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml
index 19cc2f0960..665d00b335 100644
--- a/mods/ra/maps/survival01/map.yaml
+++ b/mods/ra/maps/survival01/map.yaml
@@ -1196,4 +1196,4 @@ Actors:
 
 Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml
index cc8e884f71..87f67dc968 100644
--- a/mods/ra/maps/survival02/map.yaml
+++ b/mods/ra/maps/survival02/map.yaml
@@ -1011,4 +1011,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl
diff --git a/mods/ra/maps/top-o-the-world/en.ftl b/mods/ra/maps/top-o-the-world/map.ftl
similarity index 100%
rename from mods/ra/maps/top-o-the-world/en.ftl
rename to mods/ra/maps/top-o-the-world/map.ftl
diff --git a/mods/ra/maps/top-o-the-world/map.yaml b/mods/ra/maps/top-o-the-world/map.yaml
index 205625fde3..c5bd1a5e7d 100644
--- a/mods/ra/maps/top-o-the-world/map.yaml
+++ b/mods/ra/maps/top-o-the-world/map.yaml
@@ -897,4 +897,4 @@ Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/c
 
 Weapons: weapons.yaml
 
-FluentMessages: ra|languages/lua/en.ftl, ra|languages/campaign/en.ftl, en.ftl
+FluentMessages: ra|fluent/lua.ftl, ra|fluent/campaign.ftl, map.ftl
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 5fb0928c1b..b0b583e794 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -165,14 +165,14 @@ ChromeLayout:
 	common|chrome/text-notifications.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	common|languages/chrome/en.ftl
-	common|languages/hotkeys/en.ftl
-	common|languages/rules/en.ftl
-	ra|languages/en.ftl
-	ra|languages/chrome/en.ftl
-	ra|languages/hotkeys/en.ftl
-	ra|languages/rules/en.ftl
+	common|fluent/common.ftl
+	common|fluent/chrome.ftl
+	common|fluent/hotkeys.ftl
+	common|fluent/rules.ftl
+	ra|fluent/ra.ftl
+	ra|fluent/chrome.ftl
+	ra|fluent/hotkeys.ftl
+	ra|fluent/rules.ftl
 
 AllowUnusedFluentMessagesInExternalPackages: false
 
diff --git a/mods/ts-content/languages/chrome/en.ftl b/mods/ts-content/fluent/chrome.ftl
similarity index 100%
rename from mods/ts-content/languages/chrome/en.ftl
rename to mods/ts-content/fluent/chrome.ftl
diff --git a/mods/ts-content/mod.yaml b/mods/ts-content/mod.yaml
index 537959646d..607e542299 100644
--- a/mods/ts-content/mod.yaml
+++ b/mods/ts-content/mod.yaml
@@ -37,10 +37,10 @@ ChromeMetrics:
 	content|metrics.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	content|languages/en.ftl
-	content|languages/chrome/en.ftl
-	tscontent|languages/chrome/en.ftl
+	common|fluent/common.ftl
+	content|fluent/content.ftl
+	content|fluent/chrome.ftl
+	tscontent|fluent/chrome.ftl
 
 Fonts:
 	Tiny:
diff --git a/mods/ts/languages/chrome/en.ftl b/mods/ts/fluent/chrome.ftl
similarity index 100%
rename from mods/ts/languages/chrome/en.ftl
rename to mods/ts/fluent/chrome.ftl
diff --git a/mods/ts/languages/hotkeys/en.ftl b/mods/ts/fluent/hotkeys.ftl
similarity index 100%
rename from mods/ts/languages/hotkeys/en.ftl
rename to mods/ts/fluent/hotkeys.ftl
diff --git a/mods/ts/languages/rules/en.ftl b/mods/ts/fluent/rules.ftl
similarity index 100%
rename from mods/ts/languages/rules/en.ftl
rename to mods/ts/fluent/rules.ftl
diff --git a/mods/ts/languages/en.ftl b/mods/ts/fluent/ts.ftl
similarity index 100%
rename from mods/ts/languages/en.ftl
rename to mods/ts/fluent/ts.ftl
diff --git a/mods/ts/maps/sunstroke/en.ftl b/mods/ts/maps/sunstroke/map.ftl
similarity index 100%
rename from mods/ts/maps/sunstroke/en.ftl
rename to mods/ts/maps/sunstroke/map.ftl
diff --git a/mods/ts/maps/sunstroke/map.yaml b/mods/ts/maps/sunstroke/map.yaml
index 9a849618c4..444051db6f 100644
--- a/mods/ts/maps/sunstroke/map.yaml
+++ b/mods/ts/maps/sunstroke/map.yaml
@@ -2630,4 +2630,4 @@ Actors:
 Rules: rules.yaml
 
 Sequences: sequences.yaml
-FluentMessages: en.ftl
+FluentMessages: map.ftl
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index 6b2cf639f4..c66c8f45e6 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -174,14 +174,14 @@ ChromeLayout:
 	common|chrome/text-notifications.yaml
 
 FluentMessages:
-	common|languages/en.ftl
-	common|languages/chrome/en.ftl
-	common|languages/hotkeys/en.ftl
-	common|languages/rules/en.ftl
-	ts|languages/en.ftl
-	ts|languages/chrome/en.ftl
-	ts|languages/hotkeys/en.ftl
-	ts|languages/rules/en.ftl
+	common|fluent/common.ftl
+	common|fluent/chrome.ftl
+	common|fluent/hotkeys.ftl
+	common|fluent/rules.ftl
+	ts|fluent/ts.ftl
+	ts|fluent/chrome.ftl
+	ts|fluent/hotkeys.ftl
+	ts|fluent/rules.ftl
 
 AllowUnusedFluentMessagesInExternalPackages: false