diff --git a/OpenRA.Mods.RA/Effects/NukeLaunch.cs b/OpenRA.Mods.Common/Effects/NukeLaunch.cs
old mode 100755
new mode 100644
similarity index 98%
rename from OpenRA.Mods.RA/Effects/NukeLaunch.cs
rename to OpenRA.Mods.Common/Effects/NukeLaunch.cs
index bf19626ebd..8c0eebc7ba
--- a/OpenRA.Mods.RA/Effects/NukeLaunch.cs
+++ b/OpenRA.Mods.Common/Effects/NukeLaunch.cs
@@ -15,7 +15,7 @@ using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	public class NukeLaunch : IEffect
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index e911ecaac2..5714130f15 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -61,6 +61,7 @@
     <Compile Include="Effects\GravityBomb.cs" />
     <Compile Include="Effects\LaserZap.cs" />
     <Compile Include="Effects\Missile.cs" />
+    <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Effects\PowerdownIndicator.cs" />
     <Compile Include="Effects\RallyPoint.cs" />
     <Compile Include="Effects\Smoke.cs" />
@@ -85,7 +86,11 @@
     <Compile Include="Orders\DeployOrderTargeter.cs" />
     <Compile Include="Orders\EnterAlliedActorTargeter.cs" />
     <Compile Include="Orders\UnitOrderTargeter.cs" />
-    <Compile Include="PaletteFromFile.cs" />
+    <Compile Include="PaletteEffects\CloakPaletteEffect.cs" />
+    <Compile Include="PaletteEffects\LightPaletteRotator.cs" />
+    <Compile Include="PaletteEffects\MenuPaletteEffect.cs" />
+    <Compile Include="PaletteEffects\NukePaletteEffect.cs" />
+    <Compile Include="PaletteEffects\WaterPaletteRotation.cs" />
     <Compile Include="RallyPoint.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
     <Compile Include="ServerTraits\LobbyCommands.cs" />
@@ -93,6 +98,7 @@
     <Compile Include="ServerTraits\MasterServerPinger.cs" />
     <Compile Include="ServerTraits\PlayerPinger.cs" />
     <Compile Include="Traits\BlocksBullets.cs" />
+    <Compile Include="Traits\Immobile.cs" />
     <Compile Include="Traits\JamsMissiles.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
     <Compile Include="Traits\Power\AffectedByPowerOutage.cs" />
@@ -145,6 +151,10 @@
     <Compile Include="World\CreateMPPlayers.cs" />
     <Compile Include="World\MPStartLocations.cs" />
     <Compile Include="World\MPStartUnits.cs" />
+    <Compile Include="World\PaletteFromCurrentTileset.cs" />
+    <Compile Include="World\PaletteFromFile.cs" />
+    <Compile Include="World\PaletteFromRGBA.cs" />
+    <Compile Include="World\PlayerPaletteFromCurrentTileset.cs" />
     <Compile Include="World\PlayMusicOnMapLoad.cs" />
     <Compile Include="World\RadarPings.cs" />
     <Compile Include="World\ResourceClaim.cs" />
diff --git a/OpenRA.Mods.RA/CloakPaletteEffect.cs b/OpenRA.Mods.Common/PaletteEffects/CloakPaletteEffect.cs
similarity index 97%
rename from OpenRA.Mods.RA/CloakPaletteEffect.cs
rename to OpenRA.Mods.Common/PaletteEffects/CloakPaletteEffect.cs
index 495299db73..fafa707da9 100644
--- a/OpenRA.Mods.RA/CloakPaletteEffect.cs
+++ b/OpenRA.Mods.Common/PaletteEffects/CloakPaletteEffect.cs
@@ -13,7 +13,7 @@ using System.Drawing;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class CloakPaletteEffectInfo : TraitInfo<CloakPaletteEffect> { }
 
diff --git a/OpenRA.Mods.RA/LightPaletteRotator.cs b/OpenRA.Mods.Common/PaletteEffects/LightPaletteRotator.cs
similarity index 97%
rename from OpenRA.Mods.RA/LightPaletteRotator.cs
rename to OpenRA.Mods.Common/PaletteEffects/LightPaletteRotator.cs
index daec06f975..4adc6c6833 100644
--- a/OpenRA.Mods.RA/LightPaletteRotator.cs
+++ b/OpenRA.Mods.Common/PaletteEffects/LightPaletteRotator.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Palette effect used for blinking \"animations\" on actors.")]
 	class LightPaletteRotatorInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/MenuPaletteEffect.cs b/OpenRA.Mods.Common/PaletteEffects/MenuPaletteEffect.cs
similarity index 98%
rename from OpenRA.Mods.RA/MenuPaletteEffect.cs
rename to OpenRA.Mods.Common/PaletteEffects/MenuPaletteEffect.cs
index b206fff4fc..7469df6ca1 100644
--- a/OpenRA.Mods.RA/MenuPaletteEffect.cs
+++ b/OpenRA.Mods.Common/PaletteEffects/MenuPaletteEffect.cs
@@ -13,7 +13,7 @@ using System.Drawing;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Fades the world from/to black at the start/end of the game, and can (optionally) desaturate the world")]
 	public class MenuPaletteEffectInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/NukePaletteEffect.cs b/OpenRA.Mods.Common/PaletteEffects/NukePaletteEffect.cs
similarity index 97%
rename from OpenRA.Mods.RA/NukePaletteEffect.cs
rename to OpenRA.Mods.Common/PaletteEffects/NukePaletteEffect.cs
index f7819b328c..e11c49afca 100644
--- a/OpenRA.Mods.RA/NukePaletteEffect.cs
+++ b/OpenRA.Mods.Common/PaletteEffects/NukePaletteEffect.cs
@@ -13,7 +13,7 @@ using System.Drawing;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Apply palette full screen rotations during atom bomb explosions. Add this to the world actor.")]
 	class NukePaletteEffectInfo : TraitInfo<NukePaletteEffect> { }
diff --git a/OpenRA.Mods.RA/WaterPaletteRotation.cs b/OpenRA.Mods.Common/PaletteEffects/WaterPaletteRotation.cs
similarity index 98%
rename from OpenRA.Mods.RA/WaterPaletteRotation.cs
rename to OpenRA.Mods.Common/PaletteEffects/WaterPaletteRotation.cs
index a92765724a..31ca1ed226 100644
--- a/OpenRA.Mods.RA/WaterPaletteRotation.cs
+++ b/OpenRA.Mods.Common/PaletteEffects/WaterPaletteRotation.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Palette effect used for sprinkle \"animations\" on terrain tiles.")]
 	class WaterPaletteRotationInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Immobile.cs b/OpenRA.Mods.Common/Traits/Immobile.cs
similarity index 98%
rename from OpenRA.Mods.RA/Immobile.cs
rename to OpenRA.Mods.Common/Traits/Immobile.cs
index 63570e95a8..cdcd55aaf4 100644
--- a/OpenRA.Mods.RA/Immobile.cs
+++ b/OpenRA.Mods.Common/Traits/Immobile.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	class ImmobileInfo : ITraitInfo, IOccupySpaceInfo
 	{
diff --git a/OpenRA.Mods.RA/PaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/World/PaletteFromCurrentTileset.cs
similarity index 97%
rename from OpenRA.Mods.RA/PaletteFromCurrentTileset.cs
rename to OpenRA.Mods.Common/World/PaletteFromCurrentTileset.cs
index c33a939bae..3d523abbd6 100644
--- a/OpenRA.Mods.RA/PaletteFromCurrentTileset.cs
+++ b/OpenRA.Mods.Common/World/PaletteFromCurrentTileset.cs
@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Loads the palette specified in the tileset definition")]
 	class PaletteFromCurrentTilesetInfo : ITraitInfo
diff --git a/OpenRA.Mods.Common/PaletteFromFile.cs b/OpenRA.Mods.Common/World/PaletteFromFile.cs
similarity index 100%
rename from OpenRA.Mods.Common/PaletteFromFile.cs
rename to OpenRA.Mods.Common/World/PaletteFromFile.cs
diff --git a/OpenRA.Mods.RA/PaletteFromRGBA.cs b/OpenRA.Mods.Common/World/PaletteFromRGBA.cs
similarity index 98%
rename from OpenRA.Mods.RA/PaletteFromRGBA.cs
rename to OpenRA.Mods.Common/World/PaletteFromRGBA.cs
index da17d9e72f..d194ce8215 100644
--- a/OpenRA.Mods.RA/PaletteFromRGBA.cs
+++ b/OpenRA.Mods.Common/World/PaletteFromRGBA.cs
@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Creates a single color palette without any base palette file.")]
 	class PaletteFromRGBAInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/PlayerPaletteFromCurrentTileset.cs b/OpenRA.Mods.Common/World/PlayerPaletteFromCurrentTileset.cs
similarity index 97%
rename from OpenRA.Mods.RA/PlayerPaletteFromCurrentTileset.cs
rename to OpenRA.Mods.Common/World/PlayerPaletteFromCurrentTileset.cs
index 76a6c9b033..ad42eb7dcc 100644
--- a/OpenRA.Mods.RA/PlayerPaletteFromCurrentTileset.cs
+++ b/OpenRA.Mods.Common/World/PlayerPaletteFromCurrentTileset.cs
@@ -12,7 +12,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	class PlayerPaletteFromCurrentTilesetInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index f645279052..2e2eb8e960 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -125,7 +125,6 @@
     <Compile Include="GainsExperience.cs" />
     <Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
     <Compile Include="Player\PlaceBeacon.cs" />
-    <Compile Include="MenuPaletteEffect.cs" />
     <Compile Include="EjectOnDeath.cs" />
     <Compile Include="Air\FallsToEarth.cs" />
     <Compile Include="Air\Fly.cs" />
@@ -202,7 +201,6 @@
     <Compile Include="DemoTruck.cs" />
     <Compile Include="DetectCloaked.cs" />
     <Compile Include="Effects\GpsDot.cs" />
-    <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="EmitInfantryOnSell.cs" />
@@ -220,7 +218,6 @@
     <Compile Include="Invulnerable.cs" />
     <Compile Include="LeavesHusk.cs" />
     <Compile Include="Captures.cs" />
-    <Compile Include="LightPaletteRotator.cs" />
     <Compile Include="LimitedAmmo.cs" />
     <Compile Include="Lint\CheckActorReferences.cs" />
     <Compile Include="Lint\CheckSyncAnnotations.cs" />
@@ -235,14 +232,10 @@
     <Compile Include="Move\Move.cs" />
     <Compile Include="Move\PathFinder.cs" />
     <Compile Include="Move\PathSearch.cs" />
-    <Compile Include="NukePaletteEffect.cs" />
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Orders\PowerDownOrderGenerator.cs" />
     <Compile Include="Orders\RepairOrderGenerator.cs" />
     <Compile Include="OreRefinery.cs" />
-    <Compile Include="PlayerPaletteFromCurrentTileset.cs" />
-    <Compile Include="PaletteFromCurrentTileset.cs" />
-    <Compile Include="PaletteFromRGBA.cs" />
     <Compile Include="ParaDrop.cs" />
     <Compile Include="Passenger.cs" />
     <Compile Include="Player\PlayerStatistics.cs" />
@@ -324,7 +317,6 @@
     <Compile Include="Transforms.cs" />
     <Compile Include="Turreted.cs" />
     <Compile Include="Valued.cs" />
-    <Compile Include="WaterPaletteRotation.cs" />
     <Compile Include="Widgets\Logic\KickSpectatorsLogic.cs" />
     <Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\IngameMenuLogic.cs" />
@@ -360,7 +352,6 @@
     <Compile Include="Infiltration\InfiltrateForExploration.cs" />
     <Compile Include="Infiltration\InfiltrateForCash.cs" />
     <Compile Include="RenderShroudCircle.cs" />
-    <Compile Include="CloakPaletteEffect.cs" />
     <Compile Include="Infiltration\Infiltrates.cs" />
     <Compile Include="Armament.cs" />
     <Compile Include="Buildings\BaseProvider.cs" />
@@ -401,7 +392,6 @@
     <Compile Include="Buildings\Demolishable.cs" />
     <Compile Include="Activities\FlyFollow.cs" />
     <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
-    <Compile Include="Immobile.cs" />
     <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
     <Compile Include="World\BuildableTerrainLayer.cs" />
     <Compile Include="Buildings\LaysTerrain.cs" />
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
index f0c08a1161..1e23af0af3 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Scripting;
 using OpenRA.Network;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
index 48251b8ef5..7b0286c4c6 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
@@ -10,6 +10,7 @@
 
 using System;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;