From 5e1af58bbeaef4f0f053fe851ab4f02353d137fb Mon Sep 17 00:00:00 2001
From: penev92 <penev92@gmail.com>
Date: Fri, 2 Jan 2015 22:58:01 +0200
Subject: [PATCH 1/4] Move Gives/Gains Experience and Bounty to Mods.Common

---
 {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/Rank.cs      | 3 ++-
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                | 6 +++++-
 .../Traits}/GainsExperience.cs                              | 6 ++----
 .../Traits}/GivesBounty.cs                                  | 2 +-
 .../Traits}/GivesExperience.cs                              | 3 +--
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                        | 6 +-----
 OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs          | 1 +
 7 files changed, 13 insertions(+), 14 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Effects/Rank.cs (95%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/GainsExperience.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/GivesBounty.cs (98%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/GivesExperience.cs (96%)

diff --git a/OpenRA.Mods.RA/Effects/Rank.cs b/OpenRA.Mods.Common/Effects/Rank.cs
similarity index 95%
rename from OpenRA.Mods.RA/Effects/Rank.cs
rename to OpenRA.Mods.Common/Effects/Rank.cs
index eb4d52cd17..e004e7062d 100644
--- a/OpenRA.Mods.RA/Effects/Rank.cs
+++ b/OpenRA.Mods.Common/Effects/Rank.cs
@@ -11,8 +11,9 @@
 using System.Collections.Generic;
 using OpenRA.Effects;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
 
-namespace OpenRA.Mods.RA.Effects
+namespace OpenRA.Mods.Common.Effects
 {
 	class Rank : IEffect
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index c9b4327873..d462dd4a34 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Effects\PowerdownIndicator.cs" />
     <Compile Include="Effects\RallyPointIndicator.cs" />
+    <Compile Include="Effects\Rank.cs" />
     <Compile Include="Effects\Smoke.cs" />
     <Compile Include="Commands\ChatCommands.cs" />
     <Compile Include="Commands\DevCommands.cs" />
@@ -134,6 +135,9 @@
     <Compile Include="Traits\Buildings\RepairsUnits.cs" />
     <Compile Include="Traits\Buildings\FootprintUtils.cs" />
     <Compile Include="Traits\Burns.cs" />
+    <Compile Include="Traits\GainsExperience.cs" />
+    <Compile Include="Traits\GivesBounty.cs" />
+    <Compile Include="Traits\GivesExperience.cs" />
     <Compile Include="Traits\Huntable.cs" />
     <Compile Include="Traits\CustomBuildTimeValue.cs" />
     <Compile Include="Traits\CustomSellValue.cs" />
@@ -284,4 +288,4 @@ cd "$(SolutionDir)"</PostBuildEvent>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.Common/Traits/GainsExperience.cs
similarity index 96%
rename from OpenRA.Mods.RA/GainsExperience.cs
rename to OpenRA.Mods.Common/Traits/GainsExperience.cs
index 2393252601..a4cf300aaf 100644
--- a/OpenRA.Mods.RA/GainsExperience.cs
+++ b/OpenRA.Mods.Common/Traits/GainsExperience.cs
@@ -12,12 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Effects;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Effects;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This actor's experience increases when it has killed a GivesExperience actor.")]
 	public class GainsExperienceInfo : ITraitInfo, Requires<ValuedInfo>
@@ -125,7 +123,7 @@ namespace OpenRA.Mods.RA
 
 	class ExperienceInit : IActorInit<int>
 	{
-		[FieldFromYamlKey] public readonly int value = 0;
+		[FieldFromYamlKey] readonly int value;
 		public ExperienceInit() { }
 		public ExperienceInit(int init) { value = init; }
 		public int Value(World world) { return value; }
diff --git a/OpenRA.Mods.RA/GivesBounty.cs b/OpenRA.Mods.Common/Traits/GivesBounty.cs
similarity index 98%
rename from OpenRA.Mods.RA/GivesBounty.cs
rename to OpenRA.Mods.Common/Traits/GivesBounty.cs
index 447c506b2c..88b7117eb8 100644
--- a/OpenRA.Mods.RA/GivesBounty.cs
+++ b/OpenRA.Mods.Common/Traits/GivesBounty.cs
@@ -13,7 +13,7 @@ using OpenRA.Mods.Common.Effects;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("You get money for playing this actor.")]
 	class GivesBountyInfo : TraitInfo<GivesBounty>
diff --git a/OpenRA.Mods.RA/GivesExperience.cs b/OpenRA.Mods.Common/Traits/GivesExperience.cs
similarity index 96%
rename from OpenRA.Mods.RA/GivesExperience.cs
rename to OpenRA.Mods.Common/Traits/GivesExperience.cs
index d3cb6527ed..82047a6e8b 100644
--- a/OpenRA.Mods.RA/GivesExperience.cs
+++ b/OpenRA.Mods.Common/Traits/GivesExperience.cs
@@ -8,10 +8,9 @@
  */
 #endregion
 
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This actor gives experience to a GainsExperience actor when they are killed.")]
 	class GivesExperienceInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index dd600f772f..d204fefbed 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -127,12 +127,10 @@
     <Compile Include="Attack\AttackTurreted.cs" />
     <Compile Include="Crushable.cs" />
     <Compile Include="Effects\GpsSatellite.cs" />
-    <Compile Include="Effects\Rank.cs" />
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
     <Compile Include="Render\RenderUnitReload.cs" />
     <Compile Include="Graphics\TeslaZapRenderable.cs" />
-    <Compile Include="GainsExperience.cs" />
     <Compile Include="EjectOnDeath.cs" />
     <Compile Include="AI\RushFuzzy.cs" />
     <Compile Include="AI\StateMachine.cs" />
@@ -179,8 +177,6 @@
     <Compile Include="EmitInfantryOnSell.cs" />
     <Compile Include="EngineerRepair.cs" />
     <Compile Include="Explodes.cs" />
-    <Compile Include="GivesBounty.cs" />
-    <Compile Include="GivesExperience.cs" />
     <Compile Include="Guard.cs" />
     <Compile Include="Invulnerable.cs" />
     <Compile Include="Captures.cs" />
@@ -444,4 +440,4 @@ copy "FuzzyLogicLibrary.dll" "$(SolutionDir)"
 cd "$(SolutionDir)"</PostBuildEvent>
   </PropertyGroup>
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs
index d0b9760717..b9f26edf37 100644
--- a/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 
 namespace OpenRA.Mods.RA.Traits
 {

From 0e71580af64c1db61e6283272a0911c3a08cd333 Mon Sep 17 00:00:00 2001
From: penev92 <penev92@gmail.com>
Date: Sat, 3 Jan 2015 00:26:14 +0200
Subject: [PATCH 2/4] Move DetectCloaked to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                | 1 +
 .../Traits}/DetectCloaked.cs                                | 6 +++---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                        | 1 -
 OpenRA.Mods.RA/RenderDetectionCircle.cs                     | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/DetectCloaked.cs (82%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index d462dd4a34..d719454d01 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -135,6 +135,7 @@
     <Compile Include="Traits\Buildings\RepairsUnits.cs" />
     <Compile Include="Traits\Buildings\FootprintUtils.cs" />
     <Compile Include="Traits\Burns.cs" />
+    <Compile Include="Traits\DetectCloaked.cs" />
     <Compile Include="Traits\GainsExperience.cs" />
     <Compile Include="Traits\GivesBounty.cs" />
     <Compile Include="Traits\GivesExperience.cs" />
diff --git a/OpenRA.Mods.RA/DetectCloaked.cs b/OpenRA.Mods.Common/Traits/DetectCloaked.cs
similarity index 82%
rename from OpenRA.Mods.RA/DetectCloaked.cs
rename to OpenRA.Mods.Common/Traits/DetectCloaked.cs
index 48c83d5cd5..4fa703783c 100644
--- a/OpenRA.Mods.RA/DetectCloaked.cs
+++ b/OpenRA.Mods.Common/Traits/DetectCloaked.cs
@@ -10,10 +10,10 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Actor can reveal Cloak actors in a specified range.")]
-	class DetectCloakedInfo : TraitInfo<DetectCloaked>
+	public class DetectCloakedInfo : TraitInfo<DetectCloaked>
 	{
 		[Desc("Specific cloak classifications I can reveal.")]
 		public readonly string[] CloakTypes = { "Cloak" };
@@ -22,5 +22,5 @@ namespace OpenRA.Mods.RA
 		public readonly int Range = 5;
 	}
 
-	class DetectCloaked { }
+	public class DetectCloaked { }
 }
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index d204fefbed..cdadc5fb5b 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -170,7 +170,6 @@
     <Compile Include="Traits\Crates\RevealMapCrateAction.cs" />
     <Compile Include="Traits\Crates\SupportPowerCrateAction.cs" />
     <Compile Include="Traits\DemoTruck.cs" />
-    <Compile Include="DetectCloaked.cs" />
     <Compile Include="Effects\GpsDot.cs" />
     <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
diff --git a/OpenRA.Mods.RA/RenderDetectionCircle.cs b/OpenRA.Mods.RA/RenderDetectionCircle.cs
index a6a1ef07a9..d61bfb9317 100644
--- a/OpenRA.Mods.RA/RenderDetectionCircle.cs
+++ b/OpenRA.Mods.RA/RenderDetectionCircle.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits

From b1e2e5bea6dac96168ad6df3f33239d93115a9b6 Mon Sep 17 00:00:00 2001
From: penev92 <penev92@gmail.com>
Date: Sat, 3 Jan 2015 01:02:15 +0200
Subject: [PATCH 3/4] Move PlayerStatistics to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                  | 1 +
 .../Traits}/Player/PlayerStatistics.cs                        | 4 +---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                          | 3 +--
 OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs     | 4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Player/PlayerStatistics.cs (97%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index d719454d01..073e4b7614 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -163,6 +163,7 @@
     <Compile Include="Traits\Player\GlobalUpgradeManager.cs" />
     <Compile Include="Traits\Player\MissionObjectives.cs" />
     <Compile Include="Traits\Player\PlaceBeacon.cs" />
+    <Compile Include="Traits\Player\PlayerStatistics.cs" />
     <Compile Include="Traits\Player\ProvidesCustomPrerequisite.cs" />
     <Compile Include="Traits\Player\ProvidesTechPrerequisite.cs" />
     <Compile Include="Traits\Player\StrategicVictoryConditions.cs" />
diff --git a/OpenRA.Mods.RA/Player/PlayerStatistics.cs b/OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
similarity index 97%
rename from OpenRA.Mods.RA/Player/PlayerStatistics.cs
rename to OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
index 89a0c8da01..e4049c4a2a 100644
--- a/OpenRA.Mods.RA/Player/PlayerStatistics.cs
+++ b/OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
@@ -10,11 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the player actor to collect observer stats.")]
 	public class PlayerStatisticsInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index cdadc5fb5b..56f069ce47 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -97,6 +97,7 @@
     <Compile Include="AI\AttackOrFleeFuzzy.cs" />
     <Compile Include="AI\BaseBuilder.cs" />
     <Compile Include="AI\HackyAI.cs" />
+    <Compile Include="Player\AllyRepair.cs" />
     <Compile Include="Render\WithIdleOverlay.cs" />
     <Compile Include="Traits\AcceptsSupplies.cs" />
     <Compile Include="Activities\Attack.cs" />
@@ -197,8 +198,6 @@
     <Compile Include="Orders\RepairOrderGenerator.cs" />
     <Compile Include="ParaDrop.cs" />
     <Compile Include="Passenger.cs" />
-    <Compile Include="Player\PlayerStatistics.cs" />
-    <Compile Include="Player\AllyRepair.cs" />
     <Compile Include="Player\ClassicProductionQueue.cs" />
     <Compile Include="Player\PlaceBuilding.cs" />
     <Compile Include="Player\ProductionQueue.cs" />
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
index 857f5f1103..14b096dabd 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
@@ -8,11 +8,9 @@
  */
 #endregion
 
-using System;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.RA;
-using OpenRA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets.Logic

From 62601491ad928d943eef58fe2013aa5b0ad37f39 Mon Sep 17 00:00:00 2001
From: penev92 <penev92@gmail.com>
Date: Sat, 3 Jan 2015 03:44:54 +0200
Subject: [PATCH 4/4] Move Enter and Repair Building activities, EngineerRepair
 trait and ActorExts to Mods.Common and extract IgnoresDisguise trait to its
 own file

---
 .../Activities/Enter.cs                       |  4 +---
 .../Activities/RepairBuilding.cs              |  3 +--
 .../ActorExts.cs                              |  3 ++-
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj  |  5 +++++
 .../Traits}/EngineerRepair.cs                 |  4 ++--
 OpenRA.Mods.Common/Traits/IgnoresDisguise.cs  | 19 +++++++++++++++++++
 OpenRA.Mods.RA/Activities/CaptureActor.cs     |  2 +-
 OpenRA.Mods.RA/Activities/Demolish.cs         |  4 ++--
 OpenRA.Mods.RA/Activities/DonateSupplies.cs   |  2 +-
 OpenRA.Mods.RA/Activities/EnterTransport.cs   |  3 +--
 OpenRA.Mods.RA/Activities/Hunt.cs             |  1 +
 OpenRA.Mods.RA/Activities/Infiltrate.cs       |  2 +-
 OpenRA.Mods.RA/Activities/RepairBridge.cs     |  2 +-
 OpenRA.Mods.RA/Attack/AttackBase.cs           |  1 +
 OpenRA.Mods.RA/AutoHeal.cs                    |  1 +
 OpenRA.Mods.RA/AutoTarget.cs                  |  2 +-
 OpenRA.Mods.RA/C4Demolition.cs                |  1 +
 OpenRA.Mods.RA/Captures.cs                    |  1 +
 OpenRA.Mods.RA/Disguise.cs                    |  4 ----
 OpenRA.Mods.RA/ExternalCaptures.cs            |  1 +
 OpenRA.Mods.RA/Guard.cs                       |  1 +
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj          |  4 ----
 OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs |  1 +
 OpenRA.Mods.RA/Player/AllyRepair.cs           |  1 +
 OpenRA.Mods.RA/Traits/Air/Aircraft.cs         |  1 +
 .../Traits/Buildings/RepairableBuilding.cs    |  4 ++--
 OpenRA.Mods.RA/Traits/DemoTruck.cs            |  3 +--
 .../Traits/Infiltration/Infiltrates.cs        |  1 +
 OpenRA.Mods.RA/Traits/MadTank.cs              |  1 +
 OpenRA.Mods.RA/Traits/Mobile.cs               |  1 +
 OpenRA.Mods.RA/Traits/SupplyTruck.cs          |  1 +
 31 files changed, 55 insertions(+), 29 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Activities/Enter.cs (98%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Activities/RepairBuilding.cs (93%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/ActorExts.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/EngineerRepair.cs (97%)
 create mode 100644 OpenRA.Mods.Common/Traits/IgnoresDisguise.cs

diff --git a/OpenRA.Mods.RA/Activities/Enter.cs b/OpenRA.Mods.Common/Activities/Enter.cs
old mode 100755
new mode 100644
similarity index 98%
rename from OpenRA.Mods.RA/Activities/Enter.cs
rename to OpenRA.Mods.Common/Activities/Enter.cs
index dc536b626a..30187da88a
--- a/OpenRA.Mods.RA/Activities/Enter.cs
+++ b/OpenRA.Mods.Common/Activities/Enter.cs
@@ -9,13 +9,11 @@
 #endregion
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	public abstract class Enter : Activity
 	{
diff --git a/OpenRA.Mods.RA/Activities/RepairBuilding.cs b/OpenRA.Mods.Common/Activities/RepairBuilding.cs
similarity index 93%
rename from OpenRA.Mods.RA/Activities/RepairBuilding.cs
rename to OpenRA.Mods.Common/Activities/RepairBuilding.cs
index d544dc50b9..5eb3440164 100644
--- a/OpenRA.Mods.RA/Activities/RepairBuilding.cs
+++ b/OpenRA.Mods.Common/Activities/RepairBuilding.cs
@@ -8,10 +8,9 @@
  */
 #endregion
 
-using OpenRA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Activities
+namespace OpenRA.Mods.Common.Activities
 {
 	class RepairBuilding : Enter
 	{
diff --git a/OpenRA.Mods.RA/ActorExts.cs b/OpenRA.Mods.Common/ActorExts.cs
similarity index 97%
rename from OpenRA.Mods.RA/ActorExts.cs
rename to OpenRA.Mods.Common/ActorExts.cs
index 4a0dceb383..2cd0e293ce 100644
--- a/OpenRA.Mods.RA/ActorExts.cs
+++ b/OpenRA.Mods.Common/ActorExts.cs
@@ -9,9 +9,10 @@
 #endregion
 
 using System.Drawing;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common
 {
 	public static class ActorExts
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 073e4b7614..25a9d4f22c 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -56,11 +56,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Activities\Enter.cs" />
     <Compile Include="Activities\Move\Drag.cs" />
     <Compile Include="Activities\RemoveSelf.cs" />
+    <Compile Include="Activities\RepairBuilding.cs" />
     <Compile Include="Activities\SimpleTeleport.cs" />
     <Compile Include="Activities\Turn.cs" />
     <Compile Include="Activities\Wait.cs" />
+    <Compile Include="ActorExts.cs" />
     <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Effects\Bullet.cs" />
     <Compile Include="Effects\Contrail.cs" />
@@ -135,7 +138,9 @@
     <Compile Include="Traits\Buildings\RepairsUnits.cs" />
     <Compile Include="Traits\Buildings\FootprintUtils.cs" />
     <Compile Include="Traits\Burns.cs" />
+    <Compile Include="Traits\IgnoresDisguise.cs" />
     <Compile Include="Traits\DetectCloaked.cs" />
+    <Compile Include="Traits\EngineerRepair.cs" />
     <Compile Include="Traits\GainsExperience.cs" />
     <Compile Include="Traits\GivesBounty.cs" />
     <Compile Include="Traits\GivesExperience.cs" />
diff --git a/OpenRA.Mods.RA/EngineerRepair.cs b/OpenRA.Mods.Common/Traits/EngineerRepair.cs
similarity index 97%
rename from OpenRA.Mods.RA/EngineerRepair.cs
rename to OpenRA.Mods.Common/Traits/EngineerRepair.cs
index fbe030df76..120931d930 100644
--- a/OpenRA.Mods.RA/EngineerRepair.cs
+++ b/OpenRA.Mods.Common/Traits/EngineerRepair.cs
@@ -10,11 +10,11 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Can instantly repair other actors, but gets consumed afterwards.")]
 	class EngineerRepairInfo : TraitInfo<EngineerRepair> { }
diff --git a/OpenRA.Mods.Common/Traits/IgnoresDisguise.cs b/OpenRA.Mods.Common/Traits/IgnoresDisguise.cs
new file mode 100644
index 0000000000..cf936a1c6c
--- /dev/null
+++ b/OpenRA.Mods.Common/Traits/IgnoresDisguise.cs
@@ -0,0 +1,19 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+    [Desc("Allows automatic targeting of disguised actors.")]
+    class IgnoresDisguiseInfo : TraitInfo<IgnoresDisguise> { }
+
+    class IgnoresDisguise { }
+}
diff --git a/OpenRA.Mods.RA/Activities/CaptureActor.cs b/OpenRA.Mods.RA/Activities/CaptureActor.cs
index 8f220b15c6..283429d6f3 100644
--- a/OpenRA.Mods.RA/Activities/CaptureActor.cs
+++ b/OpenRA.Mods.RA/Activities/CaptureActor.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Demolish.cs b/OpenRA.Mods.RA/Activities/Demolish.cs
index 0c263ffb67..69b0b64063 100644
--- a/OpenRA.Mods.RA/Activities/Demolish.cs
+++ b/OpenRA.Mods.RA/Activities/Demolish.cs
@@ -10,10 +10,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Activities;
 using OpenRA.Effects;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Traits;
+using OpenRA.Mods.RA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/DonateSupplies.cs b/OpenRA.Mods.RA/Activities/DonateSupplies.cs
index 22444ed441..04801bcc64 100644
--- a/OpenRA.Mods.RA/Activities/DonateSupplies.cs
+++ b/OpenRA.Mods.RA/Activities/DonateSupplies.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/EnterTransport.cs b/OpenRA.Mods.RA/Activities/EnterTransport.cs
index b727e3548b..0f80aab23f 100644
--- a/OpenRA.Mods.RA/Activities/EnterTransport.cs
+++ b/OpenRA.Mods.RA/Activities/EnterTransport.cs
@@ -9,8 +9,7 @@
 #endregion
 
 using System;
-using System.Linq;
-using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/Hunt.cs b/OpenRA.Mods.RA/Activities/Hunt.cs
index dfc225067b..987de48011 100644
--- a/OpenRA.Mods.RA/Activities/Hunt.cs
+++ b/OpenRA.Mods.RA/Activities/Hunt.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.RA/Activities/Infiltrate.cs
index bd17ca10ca..6bb194297c 100644
--- a/OpenRA.Mods.RA/Activities/Infiltrate.cs
+++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/RepairBridge.cs b/OpenRA.Mods.RA/Activities/RepairBridge.cs
index 1c589b52ce..e916eee3f2 100644
--- a/OpenRA.Mods.RA/Activities/RepairBridge.cs
+++ b/OpenRA.Mods.RA/Activities/RepairBridge.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-using OpenRA.Activities;
+using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs
index e7453a8804..cc75ffbec3 100644
--- a/OpenRA.Mods.RA/Attack/AttackBase.cs
+++ b/OpenRA.Mods.RA/Attack/AttackBase.cs
@@ -14,6 +14,7 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
 using OpenRA.GameRules;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/AutoHeal.cs b/OpenRA.Mods.RA/AutoHeal.cs
index 29ed553211..8a2af9fa97 100644
--- a/OpenRA.Mods.RA/AutoHeal.cs
+++ b/OpenRA.Mods.RA/AutoHeal.cs
@@ -9,6 +9,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/AutoTarget.cs b/OpenRA.Mods.RA/AutoTarget.cs
index a5bb060112..ea57c8f494 100644
--- a/OpenRA.Mods.RA/AutoTarget.cs
+++ b/OpenRA.Mods.RA/AutoTarget.cs
@@ -10,7 +10,7 @@
 
 using System.Drawing;
 using System.Linq;
-using OpenRA.Activities;
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/C4Demolition.cs b/OpenRA.Mods.RA/C4Demolition.cs
index ec67887fe7..38836b8724 100644
--- a/OpenRA.Mods.RA/C4Demolition.cs
+++ b/OpenRA.Mods.RA/C4Demolition.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Captures.cs b/OpenRA.Mods.RA/Captures.cs
index c42d9d6874..1b752e2fe5 100644
--- a/OpenRA.Mods.RA/Captures.cs
+++ b/OpenRA.Mods.RA/Captures.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Disguise.cs b/OpenRA.Mods.RA/Disguise.cs
index 27034fc90e..cd319bf512 100644
--- a/OpenRA.Mods.RA/Disguise.cs
+++ b/OpenRA.Mods.RA/Disguise.cs
@@ -135,8 +135,4 @@ namespace OpenRA.Mods.RA.Traits
 
 		public void Attacking(Actor self, Target target, Armament a, Barrel barrel) { DisguiseAs(self, null); }
 	}
-
-	[Desc("Allows automatic targeting of disguised actors.")]
-	class IgnoresDisguiseInfo : TraitInfo<IgnoresDisguise> { }
-	class IgnoresDisguise { }
 }
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/ExternalCaptures.cs b/OpenRA.Mods.RA/ExternalCaptures.cs
index ea1d8be5c3..09a3401308 100644
--- a/OpenRA.Mods.RA/ExternalCaptures.cs
+++ b/OpenRA.Mods.RA/ExternalCaptures.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Guard.cs b/OpenRA.Mods.RA/Guard.cs
index 8a7a47b35f..e2efc38da0 100644
--- a/OpenRA.Mods.RA/Guard.cs
+++ b/OpenRA.Mods.RA/Guard.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 56f069ce47..06da5e6732 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -106,7 +106,6 @@
     <Compile Include="Activities\DeliverResources.cs" />
     <Compile Include="Activities\Demolish.cs" />
     <Compile Include="Activities\DonateSupplies.cs" />
-    <Compile Include="Activities\Enter.cs" />
     <Compile Include="Activities\EnterTransport.cs" />
     <Compile Include="Activities\FindResources.cs" />
     <Compile Include="Activities\Follow.cs" />
@@ -118,12 +117,10 @@
     <Compile Include="Activities\RAHarvesterDockSequence.cs" />
     <Compile Include="Activities\Rearm.cs" />
     <Compile Include="Activities\Repair.cs" />
-    <Compile Include="Activities\RepairBuilding.cs" />
     <Compile Include="Activities\Sell.cs" />
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="Activities\Transform.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
-    <Compile Include="ActorExts.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
     <Compile Include="Attack\AttackTurreted.cs" />
     <Compile Include="Crushable.cs" />
@@ -175,7 +172,6 @@
     <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="EmitInfantryOnSell.cs" />
-    <Compile Include="EngineerRepair.cs" />
     <Compile Include="Explodes.cs" />
     <Compile Include="Guard.cs" />
     <Compile Include="Invulnerable.cs" />
diff --git a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
index bf1e0bac08..ccb9a8d2c3 100644
--- a/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
+++ b/OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Player/AllyRepair.cs b/OpenRA.Mods.RA/Player/AllyRepair.cs
index a740e125ef..801ac91c71 100644
--- a/OpenRA.Mods.RA/Player/AllyRepair.cs
+++ b/OpenRA.Mods.RA/Player/AllyRepair.cs
@@ -8,6 +8,7 @@
  */
 #endregion
 
+using OpenRA.Mods.Common;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/Traits/Air/Aircraft.cs b/OpenRA.Mods.RA/Traits/Air/Aircraft.cs
index c6c83a397b..849a2312ce 100644
--- a/OpenRA.Mods.RA/Traits/Air/Aircraft.cs
+++ b/OpenRA.Mods.RA/Traits/Air/Aircraft.cs
@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
diff --git a/OpenRA.Mods.RA/Traits/Buildings/RepairableBuilding.cs b/OpenRA.Mods.RA/Traits/Buildings/RepairableBuilding.cs
index dbf0743f56..8dfcf9e710 100644
--- a/OpenRA.Mods.RA/Traits/Buildings/RepairableBuilding.cs
+++ b/OpenRA.Mods.RA/Traits/Buildings/RepairableBuilding.cs
@@ -9,11 +9,11 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/Traits/DemoTruck.cs b/OpenRA.Mods.RA/Traits/DemoTruck.cs
index 09bdf56501..ed132ff254 100644
--- a/OpenRA.Mods.RA/Traits/DemoTruck.cs
+++ b/OpenRA.Mods.RA/Traits/DemoTruck.cs
@@ -11,10 +11,9 @@
 using System.Collections.Generic;
 using System.Drawing;
 using OpenRA.Activities;
-using OpenRA.Mods.Common.Activities;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Orders;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs b/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs
index 0a01d6f7b5..a431a73813 100644
--- a/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs
+++ b/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Traits/MadTank.cs b/OpenRA.Mods.RA/Traits/MadTank.cs
index cf2d412c2e..9c582de44c 100644
--- a/OpenRA.Mods.RA/Traits/MadTank.cs
+++ b/OpenRA.Mods.RA/Traits/MadTank.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
diff --git a/OpenRA.Mods.RA/Traits/Mobile.cs b/OpenRA.Mods.RA/Traits/Mobile.cs
index 9012c2027a..a27af81fc9 100644
--- a/OpenRA.Mods.RA/Traits/Mobile.cs
+++ b/OpenRA.Mods.RA/Traits/Mobile.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
diff --git a/OpenRA.Mods.RA/Traits/SupplyTruck.cs b/OpenRA.Mods.RA/Traits/SupplyTruck.cs
index e63d24428b..ece823c04e 100644
--- a/OpenRA.Mods.RA/Traits/SupplyTruck.cs
+++ b/OpenRA.Mods.RA/Traits/SupplyTruck.cs
@@ -10,6 +10,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;