diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 4abdddea0f..fb2815147f 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -115,6 +115,20 @@
     <Compile Include="Traits\Sound\AnnounceOnKill.cs" />
     <Compile Include="Traits\Sound\DeathSounds.cs" />
     <Compile Include="Traits\Sound\SoundOnDamageTransition.cs" />
+    <Compile Include="Traits\Valued.cs" />
+    <Compile Include="Traits\World\CreateMPPlayers.cs" />
+    <Compile Include="Traits\World\MPStartLocations.cs" />
+    <Compile Include="Traits\World\MPStartUnits.cs" />
+    <Compile Include="Traits\World\PlayMusicOnMapLoad.cs" />
+    <Compile Include="Traits\World\RadarPings.cs" />
+    <Compile Include="Traits\World\ResourceClaim.cs" />
+    <Compile Include="Traits\World\ResourceClaimLayer.cs" />
+    <Compile Include="Traits\World\ShroudPalette.cs" />
+    <Compile Include="Traits\World\ShroudRenderer.cs" />
+    <Compile Include="Traits\World\SmudgeLayer.cs" />
+    <Compile Include="Traits\World\SpawnMapActors.cs" />
+    <Compile Include="Traits\World\StartGameNotification.cs" />
+    <Compile Include="Traits\World\TerrainGeometryOverlay.cs" />
     <Compile Include="UtilityCommands\ConvertPngToShpCommand.cs" />
     <Compile Include="UtilityCommands\ConvertSpriteToPngCommand.cs" />
     <Compile Include="UtilityCommands\ExtractFilesCommand.cs" />
@@ -151,19 +165,10 @@
     <Compile Include="Widgets\MenuButtonWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
-    <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" />
-    <Compile Include="World\ResourceClaimLayer.cs" />
-    <Compile Include="World\SmudgeLayer.cs" />
-    <Compile Include="World\SpawnMapActors.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />
@@ -171,7 +176,6 @@
     <Compile Include="SpriteLoaders\ShpD2Loader.cs" />
     <Compile Include="Widgets\Logic\SettingsLogic.cs" />
     <Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
-    <Compile Include="World\TerrainGeometryOverlay.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/OpenRA.Mods.Common/World/CreateMPPlayers.cs b/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/CreateMPPlayers.cs
rename to OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs
diff --git a/OpenRA.Mods.Common/World/MPStartLocations.cs b/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/MPStartLocations.cs
rename to OpenRA.Mods.Common/Traits/World/MPStartLocations.cs
diff --git a/OpenRA.Mods.Common/World/MPStartUnits.cs b/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/MPStartUnits.cs
rename to OpenRA.Mods.Common/Traits/World/MPStartUnits.cs
diff --git a/OpenRA.Mods.Common/World/PlayMusicOnMapLoad.cs b/OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/PlayMusicOnMapLoad.cs
rename to OpenRA.Mods.Common/Traits/World/PlayMusicOnMapLoad.cs
diff --git a/OpenRA.Mods.Common/World/RadarPings.cs b/OpenRA.Mods.Common/Traits/World/RadarPings.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/RadarPings.cs
rename to OpenRA.Mods.Common/Traits/World/RadarPings.cs
diff --git a/OpenRA.Mods.Common/World/ResourceClaim.cs b/OpenRA.Mods.Common/Traits/World/ResourceClaim.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/ResourceClaim.cs
rename to OpenRA.Mods.Common/Traits/World/ResourceClaim.cs
diff --git a/OpenRA.Mods.Common/World/ResourceClaimLayer.cs b/OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/ResourceClaimLayer.cs
rename to OpenRA.Mods.Common/Traits/World/ResourceClaimLayer.cs
diff --git a/OpenRA.Mods.RA/ShroudPalette.cs b/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs
similarity index 98%
rename from OpenRA.Mods.RA/ShroudPalette.cs
rename to OpenRA.Mods.Common/Traits/World/ShroudPalette.cs
index d7613ad11c..ff51213d86 100644
--- a/OpenRA.Mods.RA/ShroudPalette.cs
+++ b/OpenRA.Mods.Common/Traits/World/ShroudPalette.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class ShroudPaletteInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/ShroudRenderer.cs b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
similarity index 99%
rename from OpenRA.Mods.RA/ShroudRenderer.cs
rename to OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
index fcc50315e3..1d7f288370 100644
--- a/OpenRA.Mods.RA/ShroudRenderer.cs
+++ b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs
@@ -12,7 +12,7 @@ using System;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public class ShroudRendererInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.Common/World/SmudgeLayer.cs b/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/SmudgeLayer.cs
rename to OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs
diff --git a/OpenRA.Mods.Common/World/SpawnMapActors.cs b/OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/SpawnMapActors.cs
rename to OpenRA.Mods.Common/Traits/World/SpawnMapActors.cs
diff --git a/OpenRA.Mods.RA/StartGameNotification.cs b/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs
similarity index 96%
rename from OpenRA.Mods.RA/StartGameNotification.cs
rename to OpenRA.Mods.Common/Traits/World/StartGameNotification.cs
index f8db63aaae..514968f466 100644
--- a/OpenRA.Mods.RA/StartGameNotification.cs
+++ b/OpenRA.Mods.Common/Traits/World/StartGameNotification.cs
@@ -11,7 +11,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	class StartGameNotificationInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.Common/World/TerrainGeometryOverlay.cs b/OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
similarity index 100%
rename from OpenRA.Mods.Common/World/TerrainGeometryOverlay.cs
rename to OpenRA.Mods.Common/Traits/World/TerrainGeometryOverlay.cs
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 28cce932cb..12cdb6dc8a 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -289,7 +289,6 @@
     <Compile Include="SeedsResource.cs" />
     <Compile Include="SelfHealing.cs" />
     <Compile Include="Sellable.cs" />
-    <Compile Include="ShroudPalette.cs" />
     <Compile Include="SmokeTrailWhenDamaged.cs" />
     <Compile Include="SpawnMPUnits.cs" />
     <Compile Include="Disguise.cs" />
@@ -385,7 +384,6 @@
     <Compile Include="CombatDebugOverlay.cs" />
     <Compile Include="World\PathfinderDebugOverlay.cs" />
     <Compile Include="AttackBomber.cs" />
-    <Compile Include="ShroudRenderer.cs" />
     <Compile Include="Render\WithCrateBody.cs" />
     <Compile Include="Activities\FlyFollow.cs" />
     <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
@@ -399,7 +397,6 @@
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Buildings\LineBuildNode.cs" />
     <Compile Include="Render\WithBuildingPlacedAnimation.cs" />
-    <Compile Include="StartGameNotification.cs" />
     <Compile Include="Scripting\LuaScript.cs" />
     <Compile Include="Scripting\CallLuaFunc.cs" />
     <Compile Include="Scripting\Global\ActorGlobal.cs" />