diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs
index 7120e5ea93..3057ff749f 100644
--- a/OpenRA.Game/Graphics/WorldRenderer.cs
+++ b/OpenRA.Game/Graphics/WorldRenderer.cs
@@ -21,7 +21,7 @@ namespace OpenRA.Graphics
 	{
 		readonly World world;
 		internal readonly TerrainRenderer terrainRenderer;
-		internal readonly UiOverlay uiOverlay;
+		public readonly UiOverlay uiOverlay;
 		internal readonly HardwarePalette palette;
 
 		internal WorldRenderer(World world)
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 7164e71fec..55dd4ebe72 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -75,7 +75,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="GameRules\WeaponInfo.cs" />
     <Compile Include="Group.cs" />
     <Compile Include="Orders\GenericSelectTarget.cs" />
@@ -135,7 +134,6 @@
     <Compile Include="Traits\Activities\RemoveSelf.cs" />
     <Compile Include="Traits\Activities\Sell.cs" />
     <Compile Include="Orders\IOrderGenerator.cs" />
-    <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Player.cs" />
     <Compile Include="Graphics\Sheet.cs" />
     <Compile Include="PathFinder.cs" />
@@ -158,17 +156,13 @@
     <Compile Include="Traits\Buildable.cs" />
     <Compile Include="Traits\Building.cs" />
     <Compile Include="Traits\World\BuildingInfluence.cs" />
-    <Compile Include="Traits\Player\PlaceBuilding.cs" />
     <Compile Include="Traits\World\PlayerColorPalette.cs" />
     <Compile Include="Traits\World\ResourceLayer.cs" />
     <Compile Include="Traits\World\ResourceType.cs" />
     <Compile Include="Traits\SupportPower.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
     <Compile Include="Traits\Selectable.cs" />
-    <Compile Include="Traits\Player\ProductionQueue.cs" />
     <Compile Include="Traits\Mobile.cs" />
-    <Compile Include="Traits\Production.cs" />
-    <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />
     <Compile Include="Traits\Turreted.cs" />
@@ -215,7 +209,6 @@
     <Compile Include="Traits\RevealsShroud.cs" />
     <Compile Include="Traits\Targetable.cs" />
     <Compile Include="Traits\Health.cs" />
-    <Compile Include="Traits\RepairableBuilding.cs" />
     <Compile Include="Traits\Activities\Drag.cs" />
     <Compile Include="Widgets\VqaPlayerWidget.cs" />
     <Compile Include="Widgets\Delegates\VideoPlayerDelegate.cs" />
@@ -226,7 +219,6 @@
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Graphics\CursorProvider.cs" />
     <Compile Include="Traits\Player\TechTree.cs" />
-    <Compile Include="Traits\Player\ClassicProductionQueue.cs" />
     <Compile Include="Traits\Player\PowerManager.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -242,7 +234,6 @@
     <Compile Include="ObjectCreator.cs" />
     <Compile Include="Network\SyncReport.cs" />
     <Compile Include="TraitDictionary.cs" />
-    <Compile Include="Traits\PrimaryBuilding.cs" />
     <Compile Include="Widgets\Delegates\DeveloperModeDelegate.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/OpenRA.Game/Traits/Player/PlayerResources.cs b/OpenRA.Game/Traits/Player/PlayerResources.cs
index 030deda103..46127cc632 100644
--- a/OpenRA.Game/Traits/Player/PlayerResources.cs
+++ b/OpenRA.Game/Traits/Player/PlayerResources.cs
@@ -13,7 +13,7 @@ using System.Linq;
 
 namespace OpenRA.Traits
 {
-	class PlayerResourcesInfo : ITraitInfo
+	public class PlayerResourcesInfo : ITraitInfo
 	{
 		public readonly int InitialCash = 10000;
 		public readonly int InitialOre = 0;
diff --git a/OpenRA.Game/UiOverlay.cs b/OpenRA.Game/UiOverlay.cs
index 2fd3074a9c..147bf8cd49 100644
--- a/OpenRA.Game/UiOverlay.cs
+++ b/OpenRA.Game/UiOverlay.cs
@@ -18,7 +18,7 @@ using OpenRA.Widgets;
 
 namespace OpenRA
 {
-	class UiOverlay
+	public class UiOverlay
 	{
 		Sprite buildOk, buildBlocked, unitDebug;
 
@@ -79,7 +79,7 @@ namespace OpenRA
 		}
 	}
 
-	static class LineBuildUtils
+	public static class LineBuildUtils
 	{
 		public static IEnumerable<int2> GetLineBuildCells(World world, int2 location, string name, BuildingInfo bi)
 		{
diff --git a/OpenRA.Game/Effects/RepairIndicator.cs b/OpenRA.Mods.RA/Effects/RepairIndicator.cs
similarity index 91%
rename from OpenRA.Game/Effects/RepairIndicator.cs
rename to OpenRA.Mods.RA/Effects/RepairIndicator.cs
index 961f3a2d0f..596ac708bb 100755
--- a/OpenRA.Game/Effects/RepairIndicator.cs
+++ b/OpenRA.Mods.RA/Effects/RepairIndicator.cs
@@ -9,10 +9,11 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Effects;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Effects
+namespace OpenRA.Mods.RA.Effects
 {
 	class RepairIndicator : IEffect
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 63c1d90faa..1d4132a672 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -87,17 +87,26 @@
     <Compile Include="Effects\GravityBomb.cs" />
     <Compile Include="Effects\LaserZap.cs" />
     <Compile Include="Effects\Missile.cs" />
+    <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="Effects\Smoke.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
     <Compile Include="LimitedAmmo.cs" />
+    <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Player\ActorGroupProxy.cs" />
     <Compile Include="Aircraft.cs" />
+    <Compile Include="Player\ClassicProductionQueue.cs" />
+    <Compile Include="Player\PlaceBuilding.cs" />
+    <Compile Include="Player\ProductionQueue.cs" />
+    <Compile Include="PrimaryBuilding.cs" />
+    <Compile Include="Production.cs" />
+    <Compile Include="RallyPoint.cs" />
     <Compile Include="RenderDetectionCircle.cs" />
     <Compile Include="RenderRangeCircle.cs" />
     <Compile Include="Render\RenderBuilding.cs" />
     <Compile Include="Render\RenderBuildingTurreted.cs" />
     <Compile Include="Render\RenderUnit.cs" />
     <Compile Include="Render\RenderUnitTurreted.cs" />
+    <Compile Include="RepairableBuilding.cs" />
     <Compile Include="ReservableProduction.cs" />
     <Compile Include="SupportPowers\AirstrikePower.cs" />
     <Compile Include="AttackFrontal.cs" />
diff --git a/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
old mode 100644
new mode 100755
similarity index 95%
rename from OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs
rename to OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
index 96904be7e7..876584aed0
--- a/OpenRA.Game/Orders/PlaceBuildingOrderGenerator.cs
+++ b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Orders
+namespace OpenRA.Mods.RA.Orders
 {
 	public class PlaceBuildingOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRA.Game/Traits/Player/ClassicProductionQueue.cs b/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
old mode 100644
new mode 100755
similarity index 96%
rename from OpenRA.Game/Traits/Player/ClassicProductionQueue.cs
rename to OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
index 7492c72698..e7853c1e14
--- a/OpenRA.Game/Traits/Player/ClassicProductionQueue.cs
+++ b/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
@@ -6,14 +6,13 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
-
-using System;
+#endregion
+
 using System.Collections.Generic;
-using System.Linq;
-using OpenRA.FileFormats;
+using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	public class ClassicProductionQueueInfo : ProductionQueueInfo, ITraitPrerequisite<TechTreeInfo>, ITraitPrerequisite<PowerManagerInfo>, ITraitPrerequisite<PlayerResourcesInfo>
 	{
diff --git a/OpenRA.Game/Traits/Player/PlaceBuilding.cs b/OpenRA.Mods.RA/Player/PlaceBuilding.cs
old mode 100644
new mode 100755
similarity index 95%
rename from OpenRA.Game/Traits/Player/PlaceBuilding.cs
rename to OpenRA.Mods.RA/Player/PlaceBuilding.cs
index bcb34ca7c9..8086f7e229
--- a/OpenRA.Game/Traits/Player/PlaceBuilding.cs
+++ b/OpenRA.Mods.RA/Player/PlaceBuilding.cs
@@ -10,10 +10,10 @@
 
 using System.Linq;
 using OpenRA.Effects;
-using OpenRA.GameRules;
 using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class PlaceBuildingInfo : TraitInfo<PlaceBuilding> {}
 
diff --git a/OpenRA.Game/Traits/Player/ProductionQueue.cs b/OpenRA.Mods.RA/Player/ProductionQueue.cs
old mode 100644
new mode 100755
similarity index 96%
rename from OpenRA.Game/Traits/Player/ProductionQueue.cs
rename to OpenRA.Mods.RA/Player/ProductionQueue.cs
index 9c6906688b..0d0e6536c3
--- a/OpenRA.Game/Traits/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.RA/Player/ProductionQueue.cs
@@ -11,8 +11,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	public class ProductionQueueInfo : ITraitInfo
 	{
diff --git a/OpenRA.Game/Traits/PrimaryBuilding.cs b/OpenRA.Mods.RA/PrimaryBuilding.cs
old mode 100644
new mode 100755
similarity index 94%
rename from OpenRA.Game/Traits/PrimaryBuilding.cs
rename to OpenRA.Mods.RA/PrimaryBuilding.cs
index 06a3c4d8f7..57fdee7276
--- a/OpenRA.Game/Traits/PrimaryBuilding.cs
+++ b/OpenRA.Mods.RA/PrimaryBuilding.cs
@@ -10,8 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class PrimaryBuildingInfo : TraitInfo<PrimaryBuilding> { }
 
diff --git a/OpenRA.Game/Traits/Production.cs b/OpenRA.Mods.RA/Production.cs
similarity index 91%
rename from OpenRA.Game/Traits/Production.cs
rename to OpenRA.Mods.RA/Production.cs
index fa1be97228..f09b4fef07 100755
--- a/OpenRA.Game/Traits/Production.cs
+++ b/OpenRA.Mods.RA/Production.cs
@@ -8,11 +8,11 @@
  */
 #endregion
 
-using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	public class ProductionInfo : ITraitInfo
 	{
@@ -61,7 +61,7 @@ namespace OpenRA.Traits
 			// Animate the spawn -> exit transition
 			var speed = move.MovementSpeedForCell(self, exit);
 			var length = speed > 0 ? (int)( ( to - spawn ).Length*3 / speed ) : 0;
-			newUnit.QueueActivity(new Activities.Drag(spawn, to, length));
+			newUnit.QueueActivity(new Traits.Activities.Drag(spawn, to, length));
 
 //			Log.Write("debug", "length={0} facing={1} exit={2} spawn={3}", length, facing.Facing, exit, spawn);
 			
@@ -72,7 +72,7 @@ namespace OpenRA.Traits
 			{
 				target = rp.rallyPoint;
 				// Todo: Move implies unit has Mobile
-				newUnit.QueueActivity(new Activities.Move(target, 1));
+				newUnit.QueueActivity(new Traits.Activities.Move(target, 1));
 			}
 			
 			if (newUnit.Owner == self.World.LocalPlayer)
diff --git a/OpenRA.Game/Traits/RallyPoint.cs b/OpenRA.Mods.RA/RallyPoint.cs
old mode 100644
new mode 100755
similarity index 88%
rename from OpenRA.Game/Traits/RallyPoint.cs
rename to OpenRA.Mods.RA/RallyPoint.cs
index 6969dd5614..033b6cbd50
--- a/OpenRA.Game/Traits/RallyPoint.cs
+++ b/OpenRA.Mods.RA/RallyPoint.cs
@@ -11,8 +11,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class RallyPointInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
 	{
@@ -38,8 +39,8 @@ namespace OpenRA.Traits
 		public IEnumerable<Renderable> Render(Actor self)
 		{
 			if (self.Owner == self.World.LocalPlayer && self.World.Selection.Actors.Contains(self))
-				yield return Util.Centered(self,
-					anim.Image, Util.CenterOfCell(rallyPoint));
+				yield return Traits.Util.Centered(self,
+					anim.Image, Traits.Util.CenterOfCell(rallyPoint));
 		}
 
 		public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
diff --git a/OpenRA.Game/Traits/RepairableBuilding.cs b/OpenRA.Mods.RA/RepairableBuilding.cs
old mode 100644
new mode 100755
similarity index 92%
rename from OpenRA.Game/Traits/RepairableBuilding.cs
rename to OpenRA.Mods.RA/RepairableBuilding.cs
index ec87dc444c..3c13fe0d6d
--- a/OpenRA.Game/Traits/RepairableBuilding.cs
+++ b/OpenRA.Mods.RA/RepairableBuilding.cs
@@ -6,17 +6,13 @@
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
+#endregion
+
+using System;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using OpenRA.Effects;
-using OpenRA.GameRules;
-using OpenRA.Traits.Activities;
-
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	public class RepairableBuildingInfo : ITraitInfo, ITraitPrerequisite<HealthInfo>
 	{
diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
index 4c58b6270d..f5a0b1c9f3 100755
--- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
@@ -14,7 +14,7 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
-using OpenRA.Orders;
+using OpenRA.Mods.RA.Orders;
 using OpenRA.Traits;
 using OpenRA.Widgets;