diff --git a/mods/cnc/music.yaml b/mods/cnc/audio/music.yaml
similarity index 100%
rename from mods/cnc/music.yaml
rename to mods/cnc/audio/music.yaml
diff --git a/mods/cnc/notifications.yaml b/mods/cnc/audio/notifications.yaml
similarity index 100%
rename from mods/cnc/notifications.yaml
rename to mods/cnc/audio/notifications.yaml
diff --git a/mods/cnc/voices.yaml b/mods/cnc/audio/voices.yaml
similarity index 100%
rename from mods/cnc/voices.yaml
rename to mods/cnc/audio/voices.yaml
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index e59c2b2587..73ed0758d4 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -61,6 +61,13 @@ Sequences:
 	./mods/cnc/sequences/civilian.yaml
 	./mods/cnc/sequences/campaign.yaml
 
+TileSets:
+	./mods/cnc/tilesets/desert.yaml
+	./mods/cnc/tilesets/winter.yaml
+	./mods/cnc/tilesets/snow.yaml
+	./mods/cnc/tilesets/temperat.yaml
+	./mods/cnc/tilesets/jungle.yaml
+
 Weapons:
 	./mods/cnc/weapons/explosions.yaml
 	./mods/cnc/weapons/largecaliber.yaml
@@ -117,25 +124,18 @@ ChromeLayout:
 Movies:
 	./mods/cnc/movies-gdi.yaml
 	./mods/cnc/movies-nod.yaml
-	
-Translations:
-	./mods/cnc/languages/english.yaml
 
 Voices:
-	./mods/cnc/voices.yaml
+	./mods/cnc/audio/voices.yaml
 
 Notifications:
-	./mods/cnc/notifications.yaml
+	./mods/cnc/audio/notifications.yaml
 
 Music:
-	./mods/cnc/music.yaml
+	./mods/cnc/audio/music.yaml
 
-TileSets:
-	./mods/cnc/tilesets/desert.yaml
-	./mods/cnc/tilesets/winter.yaml
-	./mods/cnc/tilesets/snow.yaml
-	./mods/cnc/tilesets/temperat.yaml
-	./mods/cnc/tilesets/jungle.yaml
+Translations:
+	./mods/cnc/languages/english.yaml
 
 LoadScreen: CncLoadScreen
 	Image: ./mods/cnc/uibits/chrome.png
diff --git a/mods/d2k/music.yaml b/mods/d2k/audio/music.yaml
similarity index 100%
rename from mods/d2k/music.yaml
rename to mods/d2k/audio/music.yaml
diff --git a/mods/d2k/notifications.yaml b/mods/d2k/audio/notifications.yaml
similarity index 100%
rename from mods/d2k/notifications.yaml
rename to mods/d2k/audio/notifications.yaml
diff --git a/mods/d2k/voices.yaml b/mods/d2k/audio/voices.yaml
similarity index 100%
rename from mods/d2k/voices.yaml
rename to mods/d2k/audio/voices.yaml
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 36e6a337b5..a5429cc922 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -46,6 +46,11 @@ Sequences:
 	./mods/d2k/sequences/structures.yaml
 	./mods/d2k/sequences/misc.yaml
 
+TileSets:
+	./mods/d2k/tilesets/arrakis.yaml
+
+TileSize: 32,32
+
 Cursors:
 	./mods/d2k/cursors.yaml
 
@@ -100,18 +105,13 @@ Weapons:
 	./mods/d2k/weapons.yaml
 
 Voices:
-	./mods/d2k/voices.yaml
+	./mods/d2k/audio/voices.yaml
 
 Notifications:
-	./mods/d2k/notifications.yaml
-
-TileSets:
-	./mods/d2k/tilesets/arrakis.yaml
-
-TileSize: 32,32
+	./mods/d2k/audio/notifications.yaml
 
 Music:
-	./mods/d2k/music.yaml
+	./mods/d2k/audio/music.yaml
 
 Translations:
 	./mods/d2k/languages/english.yaml
diff --git a/mods/ra/music.yaml b/mods/ra/audio/music.yaml
similarity index 100%
rename from mods/ra/music.yaml
rename to mods/ra/audio/music.yaml
diff --git a/mods/ra/notifications.yaml b/mods/ra/audio/notifications.yaml
similarity index 100%
rename from mods/ra/notifications.yaml
rename to mods/ra/audio/notifications.yaml
diff --git a/mods/ra/voices.yaml b/mods/ra/audio/voices.yaml
similarity index 100%
rename from mods/ra/voices.yaml
rename to mods/ra/audio/voices.yaml
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 90a5cfa29a..81577c5d8d 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -58,6 +58,12 @@ Sequences:
 	./mods/ra/sequences/misc.yaml
 	./mods/ra/sequences/decorations.yaml
 
+TileSets:
+	./mods/ra/tilesets/snow.yaml
+	./mods/ra/tilesets/interior.yaml
+	./mods/ra/tilesets/temperat.yaml
+	./mods/ra/tilesets/desert.yaml
+
 Cursors:
 	./mods/ra/cursors.yaml
 
@@ -112,19 +118,13 @@ Weapons:
 	./mods/ra/weapons.yaml
 	
 Voices:
-	./mods/ra/voices.yaml
+	./mods/ra/audio/voices.yaml
 
 Notifications:
-	./mods/ra/notifications.yaml
-	
-TileSets:
-	./mods/ra/tilesets/snow.yaml
-	./mods/ra/tilesets/interior.yaml
-	./mods/ra/tilesets/temperat.yaml
-	./mods/ra/tilesets/desert.yaml
+	./mods/ra/audio/notifications.yaml
 
 Music:
-	./mods/ra/music.yaml
+	./mods/ra/audio/music.yaml
 
 Translations:
 	./mods/ra/languages/english.yaml
diff --git a/mods/ts/music.yaml b/mods/ts/audio/music.yaml
similarity index 100%
rename from mods/ts/music.yaml
rename to mods/ts/audio/music.yaml
diff --git a/mods/ts/notifications.yaml b/mods/ts/audio/notifications.yaml
similarity index 100%
rename from mods/ts/notifications.yaml
rename to mods/ts/audio/notifications.yaml
diff --git a/mods/ts/voices.yaml b/mods/ts/audio/voices.yaml
similarity index 100%
rename from mods/ts/voices.yaml
rename to mods/ts/audio/voices.yaml
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index 441fd3d07d..fadf21d7a0 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -60,8 +60,6 @@ Packages:
 	~e01vox02.mix:CRC32
 	~ecache01.mix:CRC32
 
-PackageContents:
-
 Rules:
 	./mods/ts/rules/misc.yaml
 	./mods/ts/rules/ai.yaml
@@ -87,6 +85,15 @@ Sequences:
 VoxelSequences:
 	./mods/ts/sequences/voxels.yaml
 
+TileSets:
+	./mods/ts/tilesets/temperat.yaml
+
+TileSize: 48,24
+TileShape: Diamond
+SubCells:
+	Offsets: 0,0,0, -256,128,0, 0,-128,0, 256,128,0
+	DefaultIndex: 2
+
 Cursors:
 	./mods/ts/cursors.yaml
 
@@ -142,22 +149,13 @@ Weapons:
 	./mods/ts/weapons.yaml
 
 Voices:
-	./mods/ts/voices.yaml
+	./mods/ts/audio/voices.yaml
 
 Notifications:
-	./mods/ts/notifications.yaml
-
-TileSets:
-	./mods/ts/tilesets/temperat.yaml
-
-TileSize: 48,24
-TileShape: Diamond
-SubCells:
-	Offsets: 0,0,0, -256,128,0, 0,-128,0, 256,128,0
-	DefaultIndex: 2
+	./mods/ts/audio/notifications.yaml
 
 Music:
-	./mods/ts/music.yaml
+	./mods/ts/audio/music.yaml
 
 Translations:
 	./mods/ts/languages/english.yaml