diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 601741d69e..ee9401be26 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -83,7 +83,6 @@
     <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\InvulnEffect.cs" />
     <Compile Include="Effects\MoveFlash.cs" />
-    <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\Smoke.cs" />
@@ -225,8 +224,6 @@
     <Compile Include="Traits\LightPaletteRotator.cs" />
     <Compile Include="Traits\LimitedAmmo.cs" />
     <Compile Include="Traits\NukePower.cs" />
-    <Compile Include="Traits\ParaDrop.cs" />
-    <Compile Include="Traits\ParatroopersPower.cs" />
     <Compile Include="Traits\Passenger.cs" />
     <Compile Include="Traits\PlaceBuilding.cs" />
     <Compile Include="Traits\SonarPulsePower.cs" />
diff --git a/OpenRa.Game/Traits/Activities/Fly.cs b/OpenRa.Game/Traits/Activities/Fly.cs
index 088c2f0f8a..f6f4e14414 100644
--- a/OpenRa.Game/Traits/Activities/Fly.cs
+++ b/OpenRa.Game/Traits/Activities/Fly.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OpenRa.Traits.Activities
 {
-	class Fly : IActivity
+	public class Fly : IActivity
 	{
 		readonly float2 Pos;
 		bool isCanceled;
diff --git a/OpenRa.Game/Traits/Activities/FlyAttack.cs b/OpenRa.Game/Traits/Activities/FlyAttack.cs
index 78333f2554..deff3d1ff3 100644
--- a/OpenRa.Game/Traits/Activities/FlyAttack.cs
+++ b/OpenRa.Game/Traits/Activities/FlyAttack.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace OpenRa.Traits.Activities
 {
-	class FlyAttack : IActivity
+	public class FlyAttack : IActivity
 	{
 		public IActivity NextActivity { get; set; }
 		Actor Target;
@@ -30,7 +30,7 @@ namespace OpenRa.Traits.Activities
 		public void Cancel(Actor self) { Target = null; NextActivity = null; }
 	}
 
-	class FlyCircle : IActivity
+	public class FlyCircle : IActivity
 	{
 		public IActivity NextActivity { get; set; }
 		int2 Target;
diff --git a/OpenRa.Game/Traits/Activities/RemoveSelf.cs b/OpenRa.Game/Traits/Activities/RemoveSelf.cs
index 06ea0983e5..0fd27fc5f8 100644
--- a/OpenRa.Game/Traits/Activities/RemoveSelf.cs
+++ b/OpenRa.Game/Traits/Activities/RemoveSelf.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace OpenRa.Traits.Activities
 {
-	class RemoveSelf : IActivity
+	public class RemoveSelf : IActivity
 	{
 		bool isCanceled;
 		public IActivity NextActivity { get; set; }
diff --git a/OpenRa.Game/Traits/Cargo.cs b/OpenRa.Game/Traits/Cargo.cs
index 4de9cd9099..23a2460884 100644
--- a/OpenRa.Game/Traits/Cargo.cs
+++ b/OpenRa.Game/Traits/Cargo.cs
@@ -3,7 +3,7 @@ using OpenRa.Traits.Activities;
 
 namespace OpenRa.Traits
 {
-	class CargoInfo : ITraitInfo
+	public class CargoInfo : ITraitInfo
 	{
 		public readonly int Passengers = 0;
 		public readonly UnitMovementType[] PassengerTypes = { };
@@ -12,7 +12,7 @@ namespace OpenRa.Traits
 		public object Create(Actor self) { return new Cargo(self); }
 	}
 
-	class Cargo : IPips, IIssueOrder, IResolveOrder
+	public class Cargo : IPips, IIssueOrder, IResolveOrder
 	{
 		List<Actor> cargo = new List<Actor>();
 
diff --git a/OpenRa.Game/Traits/Mobile.cs b/OpenRa.Game/Traits/Mobile.cs
index 0bc226d367..0685158677 100644
--- a/OpenRa.Game/Traits/Mobile.cs
+++ b/OpenRa.Game/Traits/Mobile.cs
@@ -1,18 +1,16 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using OpenRa.GameRules;
 
 namespace OpenRa.Traits
 {
-	class MobileInfo : ITraitInfo
+	public class MobileInfo : ITraitInfo
 	{
 		public readonly UnitMovementType MovementType = UnitMovementType.Wheel;
 
 		public object Create(Actor self) { return new Mobile(self); }
 	}
 
-	class Mobile : IIssueOrder, IResolveOrder, IOccupySpace, IMovement
+	public class Mobile : IIssueOrder, IResolveOrder, IOccupySpace, IMovement
 	{
 		readonly Actor self;
 
diff --git a/OpenRa.Game/Traits/Util.cs b/OpenRa.Game/Traits/Util.cs
index 069a7e09d9..bbc01df953 100755
--- a/OpenRa.Game/Traits/Util.cs
+++ b/OpenRa.Game/Traits/Util.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Linq;
-using OpenRa.GameRules;
 using OpenRa.Graphics;
 using OpenRa.Traits.Activities;
 
 namespace OpenRa.Traits
 {
-	static class Util
+	public static class Util
 	{
 		public static void TickFacing( ref int facing, int desiredFacing, int rot )
 		{
diff --git a/OpenRa.Game/WorldUtils.cs b/OpenRa.Game/WorldUtils.cs
index 8b198a323d..f66bc8469b 100755
--- a/OpenRa.Game/WorldUtils.cs
+++ b/OpenRa.Game/WorldUtils.cs
@@ -8,7 +8,7 @@ using OpenRa.FileFormats;
 
 namespace OpenRa
 {
-	static class WorldUtils
+	public static class WorldUtils
 	{
 		public static bool IsCellBuildable(this World world, int2 a, UnitMovementType umt)
 		{
diff --git a/OpenRa.Game/Effects/Parachute.cs b/OpenRa.Mods.RA/Effects/Parachute.cs
similarity index 89%
rename from OpenRa.Game/Effects/Parachute.cs
rename to OpenRa.Mods.RA/Effects/Parachute.cs
index a8ff4570ec..b263d0bb97 100644
--- a/OpenRa.Game/Effects/Parachute.cs
+++ b/OpenRa.Mods.RA/Effects/Parachute.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Traits;
+using System.Collections.Generic;
+using OpenRa.Effects;
 using OpenRa.Graphics;
+using OpenRa.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRa.Mods.RA.Effects
 {
 	class Parachute : IEffect
 	{
diff --git a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
index c4d53388a1..663892f2df 100644
--- a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
+++ b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
@@ -53,8 +53,11 @@
     <Compile Include="Activities\Steal.cs" />
     <Compile Include="C4Demolition.cs" />
     <Compile Include="Effects\CrateEffectSpeedUpgrade.cs" />
+    <Compile Include="Effects\Parachute.cs" />
     <Compile Include="EngineerCapture.cs" />
     <Compile Include="InfiltrateForSonarPulse.cs" />
+    <Compile Include="ParaDrop.cs" />
+    <Compile Include="ParatroopersPower.cs" />
     <Compile Include="RequiresPower.cs" />
     <Compile Include="Mine.cs" />
     <Compile Include="MineImmune.cs" />
diff --git a/OpenRa.Game/Traits/ParaDrop.cs b/OpenRa.Mods.RA/ParaDrop.cs
similarity index 86%
rename from OpenRa.Game/Traits/ParaDrop.cs
rename to OpenRa.Mods.RA/ParaDrop.cs
index 88afc17bb0..02c59e317a 100644
--- a/OpenRa.Game/Traits/ParaDrop.cs
+++ b/OpenRa.Mods.RA/ParaDrop.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
+using OpenRa.Mods.RA.Effects;
+using OpenRa.Traits;
 using OpenRa.Traits.Activities;
-using OpenRa.Effects;
 
-namespace OpenRa.Traits
+namespace OpenRa.Mods.RA
 {
 	class ParaDropInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/ParatroopersPower.cs b/OpenRa.Mods.RA/ParatroopersPower.cs
similarity index 90%
rename from OpenRa.Game/Traits/ParatroopersPower.cs
rename to OpenRa.Mods.RA/ParatroopersPower.cs
index 2505537515..32115b7651 100644
--- a/OpenRa.Game/Traits/ParatroopersPower.cs
+++ b/OpenRa.Mods.RA/ParatroopersPower.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
+using OpenRa.Traits;
 using OpenRa.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRa.Mods.RA
 {
 	class ParatroopersPowerInfo : SupportPowerInfo
 	{