diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 808acb6966..3e4f0e805e 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -144,7 +144,6 @@
     <Compile Include="Traits\Activities\HeliFly.cs" />
     <Compile Include="Traits\Activities\HeliLand.cs" />
     <Compile Include="Traits\Activities\HeliReturn.cs" />
-    <Compile Include="Traits\Activities\DeliverOre.cs" />
     <Compile Include="Traits\Activities\TransformIntoActor.cs" />
     <Compile Include="Actor.cs" />
     <Compile Include="Effects\Bullet.cs" />
@@ -188,7 +187,6 @@
     <Compile Include="Graphics\SpriteSheetBuilder.cs" />
     <Compile Include="GameRules\TerrainCost.cs" />
     <Compile Include="Graphics\TerrainRenderer.cs" />
-    <Compile Include="Traits\Activities\Harvest.cs" />
     <Compile Include="Traits\Activities\Move.cs" />
     <Compile Include="Traits\Activities\Follow.cs" />
     <Compile Include="Traits\Activities\Turn.cs" />
@@ -213,7 +211,6 @@
     <Compile Include="Traits\Explodes.cs" />
     <Compile Include="Traits\Fake.cs" />
     <Compile Include="Traits\GeneratesGap.cs" />
-    <Compile Include="Traits\Harvester.cs" />
     <Compile Include="Traits\Helicopter.cs" />
     <Compile Include="Traits\Modifiers\InvisibleToOthers.cs" />
     <Compile Include="Traits\ConstructionYard.cs" />
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 1824b5586f..212e039030 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -23,7 +23,6 @@ using System.Drawing;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
@@ -43,11 +42,6 @@ namespace OpenRA.Traits
 	public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
 	public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
 	public interface INotifyProduction { void UnitProduced(Actor self, Actor other); }
-	public interface IAcceptOre
-	{
-		void OnDock(Actor harv, DeliverOre dockOrder);
-		int2 DeliverOffset { get; }
-	}
 	public interface IAcceptThief { void OnSteal(Actor self, Actor thief); }
 	public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
 
diff --git a/OpenRA.Game/Traits/World/ResourceLayer.cs b/OpenRA.Game/Traits/World/ResourceLayer.cs
index c38ef02938..ef062bc6e2 100644
--- a/OpenRA.Game/Traits/World/ResourceLayer.cs
+++ b/OpenRA.Game/Traits/World/ResourceLayer.cs
@@ -29,7 +29,7 @@ namespace OpenRA.Traits
 		public object Create(Actor self) { return new ResourceLayer(self); }
 	}
 
-	class ResourceLayer : IRenderOverlay, ILoadWorldHook
+	public class ResourceLayer : IRenderOverlay, ILoadWorldHook
 	{
 		SpriteRenderer sr;
 		World w;
diff --git a/OpenRA.Mods.Cnc/TiberiumRefinery.cs b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
index adae4d95c2..dd2c12e02f 100644
--- a/OpenRA.Mods.Cnc/TiberiumRefinery.cs
+++ b/OpenRA.Mods.Cnc/TiberiumRefinery.cs
@@ -18,6 +18,8 @@
  */
 #endregion
 
+using OpenRA.Mods.RA;
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
@@ -37,7 +39,7 @@ namespace OpenRA.Mods.Cnc
 		}
 
 		public int2 DeliverOffset {	get { return new int2(0, 2); } }
-		public void OnDock(Actor harv, DeliverOre dockOrder)
+		public void OnDock(Actor harv, DeliverResources dockOrder)
 		{
 			// Todo: need to be careful about cancellation and multiple harvs
 			harv.QueueActivity(new Move(self.Location + new int2(1,1), self));
diff --git a/OpenRA.Mods.RA/Activities/CaptureBuilding.cs b/OpenRA.Mods.RA/Activities/CaptureBuilding.cs
index ddd9ba783e..737271b2f8 100644
--- a/OpenRA.Mods.RA/Activities/CaptureBuilding.cs
+++ b/OpenRA.Mods.RA/Activities/CaptureBuilding.cs
@@ -19,7 +19,6 @@
 #endregion
 
 using OpenRA.Traits;
-using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Game/Traits/Activities/DeliverOre.cs b/OpenRA.Mods.RA/Activities/DeliverOre.cs
old mode 100644
new mode 100755
similarity index 89%
rename from OpenRA.Game/Traits/Activities/DeliverOre.cs
rename to OpenRA.Mods.RA/Activities/DeliverOre.cs
index 2851ad67b0..c75df825dd
--- a/OpenRA.Game/Traits/Activities/DeliverOre.cs
+++ b/OpenRA.Mods.RA/Activities/DeliverOre.cs
@@ -19,19 +19,21 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Mods.RA.Activities
 {
-	public class DeliverOre : IActivity
+	public class DeliverResources : IActivity
 	{
 		public IActivity NextActivity { get; set; }
 
 		bool isDocking;
 		Actor refinery;
 
-		public DeliverOre() { }
+		public DeliverResources() { }
 
-		public DeliverOre( Actor refinery )
+		public DeliverResources( Actor refinery )
 		{
 			this.refinery = refinery;
 		}
diff --git a/OpenRA.Game/Traits/Activities/Harvest.cs b/OpenRA.Mods.RA/Activities/Harvest.cs
old mode 100644
new mode 100755
similarity index 91%
rename from OpenRA.Game/Traits/Activities/Harvest.cs
rename to OpenRA.Mods.RA/Activities/Harvest.cs
index 41f5058371..5406b9ce89
--- a/OpenRA.Game/Traits/Activities/Harvest.cs
+++ b/OpenRA.Mods.RA/Activities/Harvest.cs
@@ -20,8 +20,10 @@
 
 using System.Linq;
 using OpenRA.GameRules;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRA.Traits.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	public class Harvest : IActivity
 	{
@@ -36,7 +38,7 @@ namespace OpenRA.Traits.Activities
 			var harv = self.traits.Get<Harvester>();
 
 			if( harv.IsFull )
-				return new DeliverOre { NextActivity = NextActivity };
+				return new DeliverResources { NextActivity = NextActivity };
 
 			if (HarvestThisTile(self))
 				return this;
diff --git a/OpenRA.Game/Traits/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs
old mode 100644
new mode 100755
similarity index 92%
rename from OpenRA.Game/Traits/Harvester.cs
rename to OpenRA.Mods.RA/Harvester.cs
index f810e5d8bb..a97630fa8e
--- a/OpenRA.Game/Traits/Harvester.cs
+++ b/OpenRA.Mods.RA/Harvester.cs
@@ -20,9 +20,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class HarvesterInfo : ITraitInfo
 	{
@@ -87,7 +89,7 @@ namespace OpenRA.Traits
 			else if (order.OrderString == "Deliver")
 			{
 				self.CancelActivity();
-				self.QueueActivity(new DeliverOre(order.TargetActor));
+				self.QueueActivity(new DeliverResources(order.TargetActor));
 			}
 		}
 
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index a5c89c9799..23b62a198e 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -47,6 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activities\CaptureBuilding.cs" />
+    <Compile Include="Activities\DeliverOre.cs" />
     <Compile Include="Activities\Demolish.cs" />
     <Compile Include="Activities\Infiltrate.cs" />
     <Compile Include="Activities\LayMine.cs" />
@@ -55,6 +56,8 @@
     <Compile Include="C4Demolition.cs" />
     <Compile Include="Chronoshiftable.cs" />
     <Compile Include="Effects\NukeLaunch.cs" />
+    <Compile Include="Activities\Harvest.cs" />
+    <Compile Include="Harvester.cs" />
     <Compile Include="OreRefinery.cs" />
     <Compile Include="SupportPowers\ChronoshiftPaletteEffect.cs" />
     <Compile Include="SupportPowers\ChronoshiftPower.cs" />
@@ -86,6 +89,7 @@
     <Compile Include="SupportPowers\NukePower.cs" />
     <Compile Include="Thief.cs" />
     <Compile Include="Crates\ResetRadarCrateAction.cs" />
+    <Compile Include="TraitsInterfaces.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Mods.RA/OreRefinery.cs b/OpenRA.Mods.RA/OreRefinery.cs
index fb337ae35b..206f512847 100755
--- a/OpenRA.Mods.RA/OreRefinery.cs
+++ b/OpenRA.Mods.RA/OreRefinery.cs
@@ -18,6 +18,7 @@
  */
 #endregion
 
+using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
@@ -36,7 +37,7 @@ namespace OpenRA.Mods.RA
 			this.self = self;
 		}
 		public int2 DeliverOffset {	get { return new int2(1, 2); } }
-		public void OnDock(Actor harv, DeliverOre dockOrder)
+		public void OnDock(Actor harv, DeliverResources dockOrder)
 		{
 			var unit = harv.traits.Get<Unit>();
 			if (unit.Facing != 64)
diff --git a/OpenRA.Mods.RA/TraitsInterfaces.cs b/OpenRA.Mods.RA/TraitsInterfaces.cs
new file mode 100755
index 0000000000..e4b4b63c07
--- /dev/null
+++ b/OpenRA.Mods.RA/TraitsInterfaces.cs
@@ -0,0 +1,30 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007,2009,2010 Chris Forbes, Robert Pepperell, Matthew Bowra-Dean, Paul Chote, Alli Witheford.
+ * This file is part of OpenRA.
+ * 
+ *  OpenRA is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  OpenRA is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using OpenRA.Mods.RA.Activities;
+
+namespace OpenRA.Mods.RA
+{
+	public interface IAcceptOre
+	{
+		void OnDock(Actor harv, DeliverResources dockOrder);
+		int2 DeliverOffset { get; }
+	}
+}