diff --git a/OpenRA.Game/FileSystem/FileSystem.cs b/OpenRA.Game/FileSystem/FileSystem.cs
index 35b59fbc40..517f5a4e63 100644
--- a/OpenRA.Game/FileSystem/FileSystem.cs
+++ b/OpenRA.Game/FileSystem/FileSystem.cs
@@ -128,9 +128,6 @@ namespace OpenRA.FileSystem
 		public void LoadFromManifest(Manifest manifest)
 		{
 			UnmountAll();
-			foreach (var dir in manifest.Folders)
-				Mount(dir);
-
 			foreach (var pkg in manifest.Packages)
 				Mount(pkg);
 		}
diff --git a/OpenRA.Game/Manifest.cs b/OpenRA.Game/Manifest.cs
index 4867766598..0342c92f84 100644
--- a/OpenRA.Game/Manifest.cs
+++ b/OpenRA.Game/Manifest.cs
@@ -36,7 +36,7 @@ namespace OpenRA
 
 		public readonly ModMetadata Mod;
 		public readonly string[]
-			Packages, Folders, Rules, ServerTraits,
+			Packages, Rules, ServerTraits,
 			Sequences, VoxelSequences, Cursors, Chrome, Assemblies, ChromeLayout,
 			Weapons, Voices, Notifications, Music, Translations, TileSets,
 			ChromeMetrics, MapCompatibility, Missions;
@@ -72,7 +72,6 @@ namespace OpenRA
 			Mod.Id = modId;
 
 			// TODO: Use fieldloader
-			Folders = YamlList(yaml, "Folders", true);
 			MapFolders = YamlDictionary(yaml, "MapFolders", true);
 			Packages = YamlList(yaml, "Packages", true);
 			Rules = YamlList(yaml, "Rules", true);
diff --git a/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs b/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs
index 181fe1523d..3a3286cde2 100644
--- a/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/GenerateMinimapCommand.cs
@@ -27,12 +27,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		public void Run(ModData modData, string[] args)
 		{
 			Game.ModData = modData;
+			modData.MountFiles();
+
 			var map = new Map(args[1]);
-
-			modData.ModFiles.UnmountAll();
-			foreach (var dir in Game.ModData.Manifest.Folders)
-				modData.ModFiles.Mount(dir);
-
 			var minimap = Minimap.RenderMapPreview(map.Rules.TileSets[map.Tileset], map, true);
 
 			var dest = Path.GetFileNameWithoutExtension(args[1]) + ".png";
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 0cc5dca850..28eb0efd39 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -7,21 +7,10 @@ Metadata:
 RequiresMods:
 	modchooser: {DEV_VERSION}
 
-Folders:
+Packages:
+	~^Content/cnc
 	.
 	./mods/cnc
-	./mods/cnc/bits
-	./mods/cnc/bits/jungle
-	./mods/cnc/bits/desert
-	./mods/cnc/bits/ss
-	./mods/cnc/uibits
-	~^Content/cnc
-
-MapFolders:
-	./mods/cnc/maps@System
-	~^maps/cnc@User
-
-Packages:
 	speech.mix
 	conquer.mix
 	sounds.mix
@@ -29,13 +18,22 @@ Packages:
 	temperat.mix
 	winter.mix
 	desert.mix
-	snow.mix
 	~movies-gdi.mix
 	~movies-nod.mix
 	~movies.mix
 	~scores.mix
 	~scores2.mix
 	~transit.mix
+	./mods/cnc/bits/snow.mix
+	./mods/cnc/bits
+	./mods/cnc/bits/jungle
+	./mods/cnc/bits/desert
+	./mods/cnc/bits/ss
+	./mods/cnc/uibits
+
+MapFolders:
+	./mods/cnc/maps@System
+	~^maps/cnc@User
 
 Rules:
 	./mods/cnc/rules/misc.yaml
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index ba2d98b399..71e61e6fb7 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -7,25 +7,23 @@ Metadata:
 RequiresMods:
 	modchooser: {DEV_VERSION}
 
-Folders:
-	.
-	d2k:
-	d2k:bits
-	d2k:bits/tex
-	d2k:bits/xmas
-	d2k:uibits
+Packages:
 	~^Content/d2k
 	~^Content/d2k/GAMESFX
 	~^Content/d2k/Movies
 	~^Content/d2k/Music
+	.
+	d2k:
+	SOUND.RS
+	d2k:bits
+	d2k:bits/tex
+	d2k:bits/xmas
+	d2k:uibits
 
 MapFolders:
 	d2k:maps@System
 	~^maps/d2k@User
 
-Packages:
-	SOUND.RS
-
 Rules:
 	d2k:rules/misc.yaml
 	d2k:rules/ai.yaml
diff --git a/mods/modchooser/mod.yaml b/mods/modchooser/mod.yaml
index 2b55eebe03..2b6dfa7b22 100644
--- a/mods/modchooser/mod.yaml
+++ b/mods/modchooser/mod.yaml
@@ -6,7 +6,7 @@ Metadata:
 
 RequiresMods:
 
-Folders:
+Packages:
 	.
 	./mods/modchooser
 
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 3c7d40232b..368f4995ce 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -7,19 +7,10 @@ Metadata:
 RequiresMods:
 	modchooser: {DEV_VERSION}
 
-Folders:
+Packages:
+	~^Content/ra
 	.
 	./mods/ra
-	./mods/ra/bits
-	./mods/ra/bits/desert
-	./mods/ra/uibits
-	~^Content/ra
-
-MapFolders:
-	./mods/ra/maps@System
-	~^maps/ra@User
-
-Packages:
 	~main.mix
 	redalert.mix
 	conquer.mix
@@ -35,6 +26,13 @@ Packages:
 	~scores.mix
 	~movies1.mix
 	~movies2.mix
+	./mods/ra/bits
+	./mods/ra/bits/desert
+	./mods/ra/uibits
+
+MapFolders:
+	./mods/ra/maps@System
+	~^maps/ra@User
 
 Rules:
 	./mods/ra/rules/misc.yaml
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index 42b0257bf3..b2782587f2 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -7,18 +7,10 @@ Metadata:
 RequiresMods:
 	modchooser: {DEV_VERSION}
 
-Folders:
+Packages:
+	~^Content/ts
 	.
 	./mods/ts
-	./mods/ts/bits
-	./mods/ts/uibits
-	~^Content/ts
-
-MapFolders:
-	./mods/ts/maps@System
-	~^maps/ts@User
-
-Packages:
 # Tiberian Sun
 	~scores.mix
 	~sidenc01.mix
@@ -58,6 +50,12 @@ Packages:
 	~e01vox01.mix
 	~e01vox02.mix
 	~ecache01.mix
+	./mods/ts/bits
+	./mods/ts/uibits
+
+MapFolders:
+	./mods/ts/maps@System
+	~^maps/ts@User
 
 Rules:
 	./mods/ts/rules/ai.yaml