diff --git a/OpenRA.Game/Controller.cs b/OpenRA.Game/Controller.cs
index 55004947f2..7ce0214c3b 100644
--- a/OpenRA.Game/Controller.cs
+++ b/OpenRA.Game/Controller.cs
@@ -79,8 +79,7 @@ namespace OpenRA
 
 			if (mi.Button == MouseButton.Left && mi.Event == MouseInputEvent.Down)
 			{
-				if (!(orderGenerator is PlaceBuildingOrderGenerator))
-					dragStart = dragEnd = xy;
+				dragStart = dragEnd = xy;
 				ApplyOrders(world, xy, mi);
 			}
 
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 88bfc3da59..4f7cdb18ce 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -219,7 +219,6 @@
     <Compile Include="Traits\Building.cs" />
     <Compile Include="Traits\World\BuildingInfluence.cs" />
     <Compile Include="Traits\CanPowerDown.cs" />
-    <Compile Include="Traits\Crate.cs" />
     <Compile Include="Traits\Fake.cs" />
     <Compile Include="Traits\Helicopter.cs" />
     <Compile Include="Traits\Modifiers\InvisibleToOthers.cs" />
@@ -291,8 +290,6 @@
     <Compile Include="Widgets\LabelWidget.cs" />
     <Compile Include="Widgets\CheckboxWidget.cs" />
     <Compile Include="Traits\Activities\Wait.cs" />
-    <Compile Include="Traits\CrateAction.cs" />
-    <Compile Include="Effects\CrateEffect.cs" />
     <Compile Include="Traits\World\GlobalDefaults.cs" />
     <Compile Include="Traits\RepairsUnits.cs" />
     <Compile Include="Traits\World\BibLayer.cs" />
diff --git a/OpenRA.Game/Traits/Crate.cs b/OpenRA.Mods.RA/Crate.cs
similarity index 95%
rename from OpenRA.Game/Traits/Crate.cs
rename to OpenRA.Mods.RA/Crate.cs
index 18ac662864..ab7de582e8 100644
--- a/OpenRA.Game/Traits/Crate.cs
+++ b/OpenRA.Mods.RA/Crate.cs
@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
+using OpenRA.Traits;
 
 /*
  * Crates left to implement:
@@ -36,7 +37,7 @@ Invulnerability=3,INVULBOX,1.0  ; invulnerability (duration in minutes)
 TimeQuake=3,TQUAKE              ; time quake
 */
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class CrateInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
 	{
diff --git a/OpenRA.Game/Traits/CrateAction.cs b/OpenRA.Mods.RA/CrateAction.cs
similarity index 92%
rename from OpenRA.Game/Traits/CrateAction.cs
rename to OpenRA.Mods.RA/CrateAction.cs
index 43e6bf7aa5..b311743f64 100644
--- a/OpenRA.Game/Traits/CrateAction.cs
+++ b/OpenRA.Mods.RA/CrateAction.cs
@@ -18,9 +18,10 @@
  */
 #endregion
 
-using OpenRA.Effects;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	public class CrateActionInfo : ITraitInfo
 	{
diff --git a/OpenRA.Game/Effects/CrateEffect.cs b/OpenRA.Mods.RA/Effects/CrateEffect.cs
similarity index 93%
rename from OpenRA.Game/Effects/CrateEffect.cs
rename to OpenRA.Mods.RA/Effects/CrateEffect.cs
index 1d36ddf2c6..49f69d5269 100644
--- a/OpenRA.Game/Effects/CrateEffect.cs
+++ b/OpenRA.Mods.RA/Effects/CrateEffect.cs
@@ -19,10 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Effects;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Effects
+namespace OpenRA.Mods.RA.Effects
 {
 	class CrateEffect : IEffect
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index ea36fe2ef2..30cc2f2641 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -61,8 +61,11 @@
     <Compile Include="Cargo.cs" />
     <Compile Include="CarpetBomb.cs" />
     <Compile Include="Chronoshiftable.cs" />
+    <Compile Include="Crate.cs" />
+    <Compile Include="CrateAction.cs" />
     <Compile Include="CrateDrop.cs" />
     <Compile Include="Crates\SupportPowerCrateAction.cs" />
+    <Compile Include="Effects\CrateEffect.cs" />
     <Compile Include="Effects\NukeLaunch.cs" />
     <Compile Include="Activities\Harvest.cs" />
     <Compile Include="EmitInfantryOnSell.cs" />