diff --git a/OpenRA.Mods.RA/RALoadScreen.cs b/OpenRA.Mods.RA/RALoadScreen.cs
index 2d48d12ca4..7dcfc31d71 100644
--- a/OpenRA.Mods.RA/RALoadScreen.cs
+++ b/OpenRA.Mods.RA/RALoadScreen.cs
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA
 			if (r == null) return;
 			Font = r.BoldFont;
 			
-			var s = new Sheet("mods/ra/loadscreen.png");
+			var s = new Sheet("mods/ra/uibits/loadscreen.png");
 			Logo = new Sprite(s, new Rectangle(0,0,256,256), TextureChannel.Alpha);
 			Stripe = new Sprite(s, new Rectangle(256,0,256,256), TextureChannel.Alpha);
 			StripeRect = new Rectangle(0, Renderer.Resolution.Height/2 - 128, Renderer.Resolution.Width, 256);
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 711025bd2c..308e876af2 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -2,23 +2,25 @@
 
 Folders:
 	.
-	mods/cnc/
-	mods/cnc/uibits/
+	mods/cnc
+	mods/cnc/bits
+	mods/cnc/uibits
+	mods/cnc/packages
 Packages:
-	mods/cnc/bits/snow.mix
-	mods/cnc/bits/overrides.mix
-	mods/cnc/packages/speech.mix
-	mods/cnc/packages/conquer.mix
-	mods/cnc/packages/sounds.mix
-	mods/cnc/packages/tempicnh.mix
-	mods/cnc/packages/updatec.mix
-	mods/cnc/packages/temperat.mix
-	mods/cnc/packages/winter.mix
-	mods/cnc/packages/desert.mix
-	~mods/cnc/packages/movies-gdi.mix
-	~mods/cnc/packages/movies-nod.mix
-	~mods/cnc/packages/movies.mix
-	~mods/cnc/packages/scores.mix
+	overrides.mix
+	snow.mix
+	speech.mix
+	conquer.mix
+	sounds.mix
+	tempicnh.mix
+	updatec.mix
+	temperat.mix
+	winter.mix
+	desert.mix
+	~movies-gdi.mix
+	~movies-nod.mix
+	~movies.mix
+	~scores.mix
 
 Rules:
 	mods/cnc/rules/defaults.yaml:		Basic stuff
diff --git a/mods/ra/extras/jburn1.aud b/mods/ra/bits/jburn1.aud
similarity index 100%
rename from mods/ra/extras/jburn1.aud
rename to mods/ra/bits/jburn1.aud
diff --git a/mods/ra/extras/jchrge1.aud b/mods/ra/bits/jchrge1.aud
similarity index 100%
rename from mods/ra/extras/jchrge1.aud
rename to mods/ra/bits/jchrge1.aud
diff --git a/mods/ra/extras/jcrisp1.aud b/mods/ra/bits/jcrisp1.aud
similarity index 100%
rename from mods/ra/extras/jcrisp1.aud
rename to mods/ra/bits/jcrisp1.aud
diff --git a/mods/ra/extras/jdance1.aud b/mods/ra/bits/jdance1.aud
similarity index 100%
rename from mods/ra/extras/jdance1.aud
rename to mods/ra/bits/jdance1.aud
diff --git a/mods/ra/extras/jjuice1.aud b/mods/ra/bits/jjuice1.aud
similarity index 100%
rename from mods/ra/extras/jjuice1.aud
rename to mods/ra/bits/jjuice1.aud
diff --git a/mods/ra/extras/jjump1.aud b/mods/ra/bits/jjump1.aud
similarity index 100%
rename from mods/ra/extras/jjump1.aud
rename to mods/ra/bits/jjump1.aud
diff --git a/mods/ra/extras/jlight1.aud b/mods/ra/bits/jlight1.aud
similarity index 100%
rename from mods/ra/extras/jlight1.aud
rename to mods/ra/bits/jlight1.aud
diff --git a/mods/ra/extras/jpower1.aud b/mods/ra/bits/jpower1.aud
similarity index 100%
rename from mods/ra/extras/jpower1.aud
rename to mods/ra/bits/jpower1.aud
diff --git a/mods/ra/extras/jshock1.aud b/mods/ra/bits/jshock1.aud
similarity index 100%
rename from mods/ra/extras/jshock1.aud
rename to mods/ra/bits/jshock1.aud
diff --git a/mods/ra/extras/jyes1.aud b/mods/ra/bits/jyes1.aud
similarity index 100%
rename from mods/ra/extras/jyes1.aud
rename to mods/ra/bits/jyes1.aud
diff --git a/mods/ra/levelup.shp b/mods/ra/bits/levelup.shp
similarity index 100%
rename from mods/ra/levelup.shp
rename to mods/ra/bits/levelup.shp
diff --git a/mods/ra/extras/msub.shp b/mods/ra/bits/msub.shp
similarity index 100%
rename from mods/ra/extras/msub.shp
rename to mods/ra/bits/msub.shp
diff --git a/mods/ra/extras/msubicon.shp b/mods/ra/bits/msubicon.shp
similarity index 100%
rename from mods/ra/extras/msubicon.shp
rename to mods/ra/bits/msubicon.shp
diff --git a/mods/ra/nopower.shp b/mods/ra/bits/nopower.shp
similarity index 100%
rename from mods/ra/nopower.shp
rename to mods/ra/bits/nopower.shp
diff --git a/mods/ra/playersmoke.shp b/mods/ra/bits/playersmoke.shp
similarity index 100%
rename from mods/ra/playersmoke.shp
rename to mods/ra/bits/playersmoke.shp
diff --git a/mods/ra/rank.shp b/mods/ra/bits/rank.shp
similarity index 100%
rename from mods/ra/rank.shp
rename to mods/ra/bits/rank.shp
diff --git a/mods/ra/extras/shok.shp b/mods/ra/bits/shok.shp
similarity index 100%
rename from mods/ra/extras/shok.shp
rename to mods/ra/bits/shok.shp
diff --git a/mods/ra/extras/shokicon.shp b/mods/ra/bits/shokicon.shp
similarity index 100%
rename from mods/ra/extras/shokicon.shp
rename to mods/ra/bits/shokicon.shp
diff --git a/mods/ra/tire.shp b/mods/ra/bits/tire.shp
similarity index 100%
rename from mods/ra/tire.shp
rename to mods/ra/bits/tire.shp
diff --git a/mods/ra/extras/ttnk.shp b/mods/ra/bits/ttnk.shp
similarity index 100%
rename from mods/ra/extras/ttnk.shp
rename to mods/ra/bits/ttnk.shp
diff --git a/mods/ra/extras/ttnkicon.shp b/mods/ra/bits/ttnkicon.shp
similarity index 100%
rename from mods/ra/extras/ttnkicon.shp
rename to mods/ra/bits/ttnkicon.shp
diff --git a/mods/ra/chrome.xml b/mods/ra/chrome.xml
index 1b74499780..0f4e28a6b8 100644
--- a/mods/ra/chrome.xml
+++ b/mods/ra/chrome.xml
@@ -148,7 +148,7 @@
 		<image name="corner-bl" x="640" y="82" width="1" height="1" />
 		<image name="corner-br" x="722" y="82" width="1" height="1" />
 	</collection>
-	<collection name="dialog4" src="dialog4.png">
+	<collection name="dialog4" src="dialog.png">
 		<image name="border-t" x="773" y="0" width="52" height="6" />
 		<image name="border-b" x="773" y="58" width="52" height="6" />
 		<image name="border-l" x="768" y="5" width="6" height="54" />
diff --git a/mods/ra/dialog2.png b/mods/ra/dialog2.png
deleted file mode 100644
index 0acbe00f7f..0000000000
Binary files a/mods/ra/dialog2.png and /dev/null differ
diff --git a/mods/ra/dialog3.png b/mods/ra/dialog3.png
deleted file mode 100644
index eb169d6a98..0000000000
Binary files a/mods/ra/dialog3.png and /dev/null differ
diff --git a/mods/ra/dialog4.png b/mods/ra/dialog4.png
deleted file mode 100644
index a2ac1416e3..0000000000
Binary files a/mods/ra/dialog4.png and /dev/null differ
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 90ca664e9f..41dc7ddc39 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -1,11 +1,11 @@
 # Classic Red Alert Mod -- Package Manifest
 
 Folders:
-	./mods/ra/packages
-	./mods/ra/extras
-	./mods/ra
-	./
-
+	.
+	mods/ra
+	mods/ra/bits
+	mods/ra/uibits
+	mods/ra/packages
 Packages:
 	~main.mix
 	redalert.mix
@@ -24,13 +24,13 @@ Packages:
 	~movies2.mix
 
 Rules:
-	mods/ra/defaults.yaml
-	mods/ra/system.yaml
-	mods/ra/vehicles.yaml
-	mods/ra/structures.yaml
-	mods/ra/infantry.yaml
-	mods/ra/civilian.yaml
-	mods/ra/trees.yaml
+	mods/ra/rules/defaults.yaml
+	mods/ra/rules/system.yaml
+	mods/ra/rules/vehicles.yaml
+	mods/ra/rules/structures.yaml
+	mods/ra/rules/infantry.yaml
+	mods/ra/rules/civilian.yaml
+	mods/ra/rules/trees.yaml
 
 Sequences:
 	mods/ra/sequences.yaml:	Original animation sequences
@@ -59,9 +59,9 @@ Voices:
 	mods/ra/voices.yaml
 	
 TileSets:
-	mods/ra/tileset-sno.yaml: Snow
-	mods/ra/tileset-int.yaml: Interior
-	mods/ra/tileset-tem.yaml: Temperate
+	mods/ra/tilesets/snow.yaml: Snow
+	mods/ra/tilesets/interior.yaml: Interior
+	mods/ra/tilesets/temperat.yaml: Temperate
 
 Music:
 	mods/ra/music.yaml
diff --git a/mods/ra/civilian.yaml b/mods/ra/rules/civilian.yaml
similarity index 100%
rename from mods/ra/civilian.yaml
rename to mods/ra/rules/civilian.yaml
diff --git a/mods/ra/defaults.yaml b/mods/ra/rules/defaults.yaml
similarity index 100%
rename from mods/ra/defaults.yaml
rename to mods/ra/rules/defaults.yaml
diff --git a/mods/ra/infantry.yaml b/mods/ra/rules/infantry.yaml
similarity index 100%
rename from mods/ra/infantry.yaml
rename to mods/ra/rules/infantry.yaml
diff --git a/mods/ra/structures.yaml b/mods/ra/rules/structures.yaml
similarity index 100%
rename from mods/ra/structures.yaml
rename to mods/ra/rules/structures.yaml
diff --git a/mods/ra/system.yaml b/mods/ra/rules/system.yaml
similarity index 100%
rename from mods/ra/system.yaml
rename to mods/ra/rules/system.yaml
diff --git a/mods/ra/trees.yaml b/mods/ra/rules/trees.yaml
similarity index 100%
rename from mods/ra/trees.yaml
rename to mods/ra/rules/trees.yaml
diff --git a/mods/ra/vehicles.yaml b/mods/ra/rules/vehicles.yaml
similarity index 100%
rename from mods/ra/vehicles.yaml
rename to mods/ra/rules/vehicles.yaml
diff --git a/mods/ra/tileset-int.yaml b/mods/ra/tilesets/interior.yaml
similarity index 100%
rename from mods/ra/tileset-int.yaml
rename to mods/ra/tilesets/interior.yaml
diff --git a/mods/ra/tileset-sno.yaml b/mods/ra/tilesets/snow.yaml
similarity index 100%
rename from mods/ra/tileset-sno.yaml
rename to mods/ra/tilesets/snow.yaml
diff --git a/mods/ra/tileset-tem.yaml b/mods/ra/tilesets/temperat.yaml
similarity index 100%
rename from mods/ra/tileset-tem.yaml
rename to mods/ra/tilesets/temperat.yaml
diff --git a/mods/ra/buttons.png b/mods/ra/uibits/buttons.png
similarity index 100%
rename from mods/ra/buttons.png
rename to mods/ra/uibits/buttons.png
diff --git a/mods/ra/chrome-allies.png b/mods/ra/uibits/chrome-allies.png
similarity index 100%
rename from mods/ra/chrome-allies.png
rename to mods/ra/uibits/chrome-allies.png
diff --git a/mods/ra/chrome-soviet.png b/mods/ra/uibits/chrome-soviet.png
similarity index 100%
rename from mods/ra/chrome-soviet.png
rename to mods/ra/uibits/chrome-soviet.png
diff --git a/mods/ra/dialog.png b/mods/ra/uibits/dialog.png
similarity index 100%
rename from mods/ra/dialog.png
rename to mods/ra/uibits/dialog.png
diff --git a/mods/ra/loadscreen.png b/mods/ra/uibits/loadscreen.png
similarity index 100%
rename from mods/ra/loadscreen.png
rename to mods/ra/uibits/loadscreen.png
diff --git a/mods/ra/musicplayer.png b/mods/ra/uibits/musicplayer.png
similarity index 100%
rename from mods/ra/musicplayer.png
rename to mods/ra/uibits/musicplayer.png
diff --git a/mods/ra/spawnpoints.png b/mods/ra/uibits/spawnpoints.png
similarity index 100%
rename from mods/ra/spawnpoints.png
rename to mods/ra/uibits/spawnpoints.png
diff --git a/mods/ra/tabs.png b/mods/ra/uibits/tabs.png
similarity index 100%
rename from mods/ra/tabs.png
rename to mods/ra/uibits/tabs.png
diff --git a/mods/ra/widget-panel.png b/mods/ra/widget-panel.png
deleted file mode 100644
index 54f90b04d2..0000000000
Binary files a/mods/ra/widget-panel.png and /dev/null differ