diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index ed6428e559..350b3f8e9e 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -70,6 +70,7 @@
     <Compile Include="Activities\HarvesterDockSequence.cs" />
     <Compile Include="CncLoadScreen.cs" />
     <Compile Include="Effects\IonCannon.cs" />
+    <Compile Include="Traits\AttackPopupTurreted.cs" />
     <Compile Include="Traits\Buildings\ProductionAirdrop.cs" />
     <Compile Include="Traits\Buildings\TiberiumRefinery.cs" />
     <Compile Include="Traits\PoisonedByTiberium.cs" />
diff --git a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs b/OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
similarity index 98%
rename from OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
rename to OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
index 9304ddca13..8f731068c6 100644
--- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
+++ b/OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
@@ -12,11 +12,12 @@ using System.Linq;
 using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Cnc.Traits
 {
 	[Desc("Actor's turret rises from the ground before attacking.")]
 	class AttackPopupTurretedInfo : AttackTurretedInfo, Requires<BuildingInfo>, Requires<RenderBuildingInfo>
diff --git a/OpenRA.Mods.D2k/Activities/SwallowActor.cs b/OpenRA.Mods.D2k/Activities/SwallowActor.cs
index 84fb5bde0f..fb69b8c0a6 100644
--- a/OpenRA.Mods.D2k/Activities/SwallowActor.cs
+++ b/OpenRA.Mods.D2k/Activities/SwallowActor.cs
@@ -14,7 +14,8 @@ using OpenRA.Activities;
 using OpenRA.GameRules;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.D2k.Traits;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.D2k.Activities
diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.sln b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.sln
deleted file mode 100644
index 4d2936cdc9..0000000000
--- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.D2k", "OpenRA.Mods.D2k.csproj", "{C0B0465C-6BE2-409C-8770-3A9BF64C4344}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0B0465C-6BE2-409C-8770-3A9BF64C4344}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = OpenRA.Mods.D2k.csproj
-	EndGlobalSection
-EndGlobal
diff --git a/OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs b/OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs
index a4b1570466..488653f00c 100644
--- a/OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs
+++ b/OpenRA.Mods.D2k/Traits/Render/WithProductionOverlay.cs
@@ -14,6 +14,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.D2k.Traits
diff --git a/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs b/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
index aa550836ae..70f9dc51cc 100644
--- a/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
+++ b/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
@@ -11,6 +11,7 @@
 using System.Linq;
 using OpenRA.Mods.D2k.Widgets;
 using OpenRA.Mods.RA;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
diff --git a/OpenRA.Mods.RA/AI/AttackOrFleeFuzzy.cs b/OpenRA.Mods.RA/AI/AttackOrFleeFuzzy.cs
index 3bb49b6269..012113f309 100644
--- a/OpenRA.Mods.RA/AI/AttackOrFleeFuzzy.cs
+++ b/OpenRA.Mods.RA/AI/AttackOrFleeFuzzy.cs
@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using AI.Fuzzy.Library;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/AI/HackyAI.cs b/OpenRA.Mods.RA/AI/HackyAI.cs
index a0504ac662..b261b48591 100644
--- a/OpenRA.Mods.RA/AI/HackyAI.cs
+++ b/OpenRA.Mods.RA/AI/HackyAI.cs
@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Activities/Attack.cs b/OpenRA.Mods.RA/Activities/Attack.cs
index 5dafb7ed9c..3432f5d525 100755
--- a/OpenRA.Mods.RA/Activities/Attack.cs
+++ b/OpenRA.Mods.RA/Activities/Attack.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs b/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
index 43054a7cf6..4ec3420fc3 100644
--- a/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
+++ b/OpenRA.Mods.RA/Activities/AttackMoveActivity.cs
@@ -10,7 +10,6 @@
 
 using System.Collections.Generic;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Enter.cs b/OpenRA.Mods.RA/Activities/Enter.cs
index fced8312ee..607706b15a 100755
--- a/OpenRA.Mods.RA/Activities/Enter.cs
+++ b/OpenRA.Mods.RA/Activities/Enter.cs
@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs b/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
index a28f7065f6..010c05c165 100644
--- a/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
+++ b/OpenRA.Mods.RA/Activities/ExternalCaptureActor.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Activities;
 using OpenRA.Effects;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/FindResources.cs b/OpenRA.Mods.RA/Activities/FindResources.cs
index cda984495b..12bdc40242 100755
--- a/OpenRA.Mods.RA/Activities/FindResources.cs
+++ b/OpenRA.Mods.RA/Activities/FindResources.cs
@@ -14,7 +14,6 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/Hunt.cs b/OpenRA.Mods.RA/Activities/Hunt.cs
index 71a477dc7c..004dac25aa 100644
--- a/OpenRA.Mods.RA/Activities/Hunt.cs
+++ b/OpenRA.Mods.RA/Activities/Hunt.cs
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Activities
 				return this;
 
 			return Util.SequenceActivities(
-				new AttackMoveActivity(self, new Move.Move(self, target.Location, WRange.FromCells(2))),
+				new AttackMoveActivity(self, new Move(self, target.Location, WRange.FromCells(2))),
 				new Wait(25),
 				this);
 		}
diff --git a/OpenRA.Mods.RA/Activities/Infiltrate.cs b/OpenRA.Mods.RA/Activities/Infiltrate.cs
index fd539d31b1..a73e29e282 100644
--- a/OpenRA.Mods.RA/Activities/Infiltrate.cs
+++ b/OpenRA.Mods.RA/Activities/Infiltrate.cs
@@ -10,8 +10,8 @@
 
 using OpenRA.Activities;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Traits;
 using OpenRA.Mods.RA.Traits;
+using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
diff --git a/OpenRA.Mods.RA/Activities/Leap.cs b/OpenRA.Mods.RA/Activities/Leap.cs
index 7cdf7fd081..54bf7d8284 100644
--- a/OpenRA.Mods.RA/Activities/Leap.cs
+++ b/OpenRA.Mods.RA/Activities/Leap.cs
@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Activities;
 using OpenRA.GameRules;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Move/Move.cs b/OpenRA.Mods.RA/Activities/Move.cs
similarity index 99%
rename from OpenRA.Mods.RA/Move/Move.cs
rename to OpenRA.Mods.RA/Activities/Move.cs
index 9f469b1f93..84814c7515 100644
--- a/OpenRA.Mods.RA/Move/Move.cs
+++ b/OpenRA.Mods.RA/Activities/Move.cs
@@ -13,12 +13,11 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Activities
 {
 	class Move : Activity
 	{
diff --git a/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs b/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
index 17896fc592..ea04d0bb31 100755
--- a/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
+++ b/OpenRA.Mods.RA/Activities/MoveAdjacentTo.cs
@@ -12,7 +12,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Activities/MoveWithinRange.cs b/OpenRA.Mods.RA/Activities/MoveWithinRange.cs
index df139fa0db..6fb4c2d1b6 100755
--- a/OpenRA.Mods.RA/Activities/MoveWithinRange.cs
+++ b/OpenRA.Mods.RA/Activities/MoveWithinRange.cs
@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
diff --git a/OpenRA.Mods.RA/Activities/UnloadCargo.cs b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
index a399ecf026..a8bfce003f 100644
--- a/OpenRA.Mods.RA/Activities/UnloadCargo.cs
+++ b/OpenRA.Mods.RA/Activities/UnloadCargo.cs
@@ -12,7 +12,6 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/Attack/AttackFollow.cs b/OpenRA.Mods.RA/Attack/AttackFollow.cs
index 242213f832..6d4aa96c53 100644
--- a/OpenRA.Mods.RA/Attack/AttackFollow.cs
+++ b/OpenRA.Mods.RA/Attack/AttackFollow.cs
@@ -10,7 +10,7 @@
 
 using System;
 using OpenRA.Activities;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Attack/AttackTurreted.cs b/OpenRA.Mods.RA/Attack/AttackTurreted.cs
index 86ef2b71ce..01eb58b8d8 100644
--- a/OpenRA.Mods.RA/Attack/AttackTurreted.cs
+++ b/OpenRA.Mods.RA/Attack/AttackTurreted.cs
@@ -15,12 +15,12 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.RA
 {
 	[Desc("Actor has a visual turret used to attack.")]
-	class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>
+	public class AttackTurretedInfo : AttackFollowInfo, Requires<TurretedInfo>
 	{
 		public override object Create(ActorInitializer init) { return new AttackTurreted(init.self, this); }
 	}
 
-	class AttackTurreted : AttackFollow, ITick, ISync
+	public class AttackTurreted : AttackFollow, ITick, ISync
 	{
 		protected IEnumerable<Turreted> turrets;
 
diff --git a/OpenRA.Mods.RA/Buildings/ClonesProducedUnits.cs b/OpenRA.Mods.RA/Buildings/ClonesProducedUnits.cs
index 6ba3647341..83f160f091 100644
--- a/OpenRA.Mods.RA/Buildings/ClonesProducedUnits.cs
+++ b/OpenRA.Mods.RA/Buildings/ClonesProducedUnits.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/CrateSpawner.cs b/OpenRA.Mods.RA/CrateSpawner.cs
index e0fdba3c72..5c0d19c3a0 100644
--- a/OpenRA.Mods.RA/CrateSpawner.cs
+++ b/OpenRA.Mods.RA/CrateSpawner.cs
@@ -13,11 +13,10 @@ using System.Linq;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	public class CrateSpawnerInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/Crushable.cs b/OpenRA.Mods.RA/Crushable.cs
index f03cc67280..26a9816c3c 100644
--- a/OpenRA.Mods.RA/Crushable.cs
+++ b/OpenRA.Mods.RA/Crushable.cs
@@ -10,10 +10,9 @@
 
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("This actor is crushable.")]
 	class CrushableInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/EjectOnDeath.cs b/OpenRA.Mods.RA/EjectOnDeath.cs
index f2132669be..4e822de16a 100644
--- a/OpenRA.Mods.RA/EjectOnDeath.cs
+++ b/OpenRA.Mods.RA/EjectOnDeath.cs
@@ -9,11 +9,10 @@
 #endregion
 
 using OpenRA.Mods.RA.Effects;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Eject a ground soldier or a paratrooper while in the air.")]
 	public class EjectOnDeathInfo : TraitInfo<EjectOnDeath>
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 7a3a55c6f1..b4f5a1547c 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -126,7 +126,6 @@
     <Compile Include="ActorExts.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
     <Compile Include="Attack\AttackTurreted.cs" />
-    <Compile Include="Crates\DuplicateUnitCrateAction.cs" />
     <Compile Include="Crushable.cs" />
     <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\Rank.cs" />
@@ -135,17 +134,15 @@
     <Compile Include="Render\RenderUnitReload.cs" />
     <Compile Include="Graphics\TeslaZapRenderable.cs" />
     <Compile Include="GainsExperience.cs" />
-    <Compile Include="Infiltration\InfiltrateForPowerOutage.cs" />
     <Compile Include="EjectOnDeath.cs" />
     <Compile Include="AI\RushFuzzy.cs" />
     <Compile Include="AI\StateMachine.cs" />
     <Compile Include="Traits\AttackMove.cs" />
     <Compile Include="Attack\AttackBase.cs" />
     <Compile Include="Attack\AttackFrontal.cs" />
-    <Compile Include="Attack\AttackLeap.cs" />
+    <Compile Include="Traits\Attack\AttackLeap.cs" />
     <Compile Include="Attack\AttackMedic.cs" />
     <Compile Include="Attack\AttackOmni.cs" />
-    <Compile Include="Attack\AttackPopupTurreted.cs" />
     <Compile Include="Attack\AttackCharge.cs" />
     <Compile Include="Attack\AttackWander.cs" />
     <Compile Include="AutoHeal.cs" />
@@ -166,18 +163,20 @@
     <Compile Include="CashTrickler.cs" />
     <Compile Include="Traits\PaletteEffects\ChronoshiftPaletteEffect.cs" />
     <Compile Include="Traits\Chronoshiftable.cs" />
-    <Compile Include="Crate.cs" />
-    <Compile Include="CrateAction.cs" />
     <Compile Include="CrateSpawner.cs" />
-    <Compile Include="Crates\ExplodeCrateAction.cs" />
-    <Compile Include="Crates\GiveCashCrateAction.cs" />
-    <Compile Include="Crates\GiveMcvCrateAction.cs" />
-    <Compile Include="Crates\GiveUnitCrateAction.cs" />
-    <Compile Include="Crates\HealUnitsCrateAction.cs" />
-    <Compile Include="Crates\HideMapCrateAction.cs" />
-    <Compile Include="Crates\LevelUpCrateAction.cs" />
-    <Compile Include="Crates\RevealMapCrateAction.cs" />
-    <Compile Include="Crates\SupportPowerCrateAction.cs" />
+    <Compile Include="Traits\Crates\CrateAction.cs" />
+    <Compile Include="Traits\Crates\Crate.cs" />
+    <Compile Include="Traits\Crates\DuplicateUnitCrateAction.cs" />
+    <Compile Include="Traits\Crates\ExplodeCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveCashCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveMcvCrateAction.cs" />
+    <Compile Include="Traits\Crates\GiveUnitCrateAction.cs" />
+    <Compile Include="Traits\Crates\GrantUpgradeCrateAction.cs" />
+    <Compile Include="Traits\Crates\HealUnitsCrateAction.cs" />
+    <Compile Include="Traits\Crates\HideMapCrateAction.cs" />
+    <Compile Include="Traits\Crates\LevelUpCrateAction.cs" />
+    <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" />
@@ -189,7 +188,6 @@
     <Compile Include="GivesBounty.cs" />
     <Compile Include="GivesExperience.cs" />
     <Compile Include="Guard.cs" />
-    <Compile Include="Infiltration\InfiltrateForSupportPower.cs" />
     <Compile Include="Invulnerable.cs" />
     <Compile Include="Captures.cs" />
     <Compile Include="LimitedAmmo.cs" />
@@ -200,10 +198,10 @@
     <Compile Include="Traits\MadTank.cs" />
     <Compile Include="Traits\Mine.cs" />
     <Compile Include="Traits\Minelayer.cs" />
-    <Compile Include="Move\Mobile.cs" />
-    <Compile Include="Move\Move.cs" />
-    <Compile Include="Move\PathFinder.cs" />
-    <Compile Include="Move\PathSearch.cs" />
+    <Compile Include="Traits\Mobile.cs" />
+    <Compile Include="Activities\Move.cs" />
+    <Compile Include="Traits\World\PathFinder.cs" />
+    <Compile Include="Traits\World\PathSearch.cs" />
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Orders\GlobalButtonOrderGenerator.cs" />
     <Compile Include="Orders\RepairOrderGenerator.cs" />
@@ -326,10 +324,12 @@
     <Compile Include="Widgets\WorldCommandWidget.cs" />
     <Compile Include="Player\BaseAttackNotifier.cs" />
     <Compile Include="Player\HarvesterAttackNotifier.cs" />
-    <Compile Include="Infiltration\InfiltrateForExploration.cs" />
-    <Compile Include="Infiltration\InfiltrateForCash.cs" />
     <Compile Include="RenderShroudCircle.cs" />
-    <Compile Include="Infiltration\Infiltrates.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForExploration.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" />
+    <Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
+    <Compile Include="Traits\Infiltration\Infiltrates.cs" />
     <Compile Include="Armament.cs" />
     <Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" />
     <Compile Include="Activities\RepairBridge.cs" />
@@ -409,7 +409,6 @@
     <Compile Include="InvulnerabilityUpgrade.cs" />
     <Compile Include="DisableUpgrade.cs" />
     <Compile Include="Warheads\GrantUpgradeWarhead.cs" />
-    <Compile Include="Crates\GrantUpgradeCrateAction.cs" />
     <Compile Include="UpgradeActorsNear.cs" />
     <Compile Include="WithRangeCircle.cs" />
     <Compile Include="Scripting\Properties\TransformProperties.cs" />
diff --git a/OpenRA.Mods.RA/Player/ProductionQueue.cs b/OpenRA.Mods.RA/Player/ProductionQueue.cs
index ac9a6bc216..e36e3ba5ad 100644
--- a/OpenRA.Mods.RA/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.RA/Player/ProductionQueue.cs
@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/Production.cs b/OpenRA.Mods.RA/Production.cs
index b8e2e2ac39..80be425522 100755
--- a/OpenRA.Mods.RA/Production.cs
+++ b/OpenRA.Mods.RA/Production.cs
@@ -14,12 +14,10 @@ using System.Linq;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Move;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("This unit has access to build queues.")]
 	public class ProductionInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/ProductionBar.cs b/OpenRA.Mods.RA/ProductionBar.cs
index a7a4dabe18..ddbc52dbb6 100644
--- a/OpenRA.Mods.RA/ProductionBar.cs
+++ b/OpenRA.Mods.RA/ProductionBar.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
diff --git a/OpenRA.Mods.RA/ProductionQueueFromSelection.cs b/OpenRA.Mods.RA/ProductionQueueFromSelection.cs
index da80ef45fa..512120514e 100644
--- a/OpenRA.Mods.RA/ProductionQueueFromSelection.cs
+++ b/OpenRA.Mods.RA/ProductionQueueFromSelection.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Mods.RA.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/ScaredyCat.cs b/OpenRA.Mods.RA/ScaredyCat.cs
index 45c86c3b90..dcd76084de 100644
--- a/OpenRA.Mods.RA/ScaredyCat.cs
+++ b/OpenRA.Mods.RA/ScaredyCat.cs
@@ -8,10 +8,9 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Makes the unit automatically run around when taking damage.")]
 	class ScaredyCatInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs
index e04f39c820..06d2ecfef6 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/MobileProperties.cs
@@ -8,7 +8,8 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
@@ -30,14 +31,14 @@ namespace OpenRA.Mods.RA.Scripting
 			"(in cells) that will be considered close enough to complete the activity.")]
 		public void Move(CPos cell, int closeEnough = 0)
 		{
-			self.QueueActivity(new Move.Move(self, cell, WRange.FromCells(closeEnough)));
+			self.QueueActivity(new Move(self, cell, WRange.FromCells(closeEnough)));
 		}
 
 		[ScriptActorPropertyActivity]
 		[Desc("Moves within the cell grid, ignoring lane biases.")]
 		public void ScriptedMove(CPos cell)
 		{
-			self.QueueActivity(new Move.Move(self, cell));
+			self.QueueActivity(new Move(self, cell));
 		}
 
 		[ScriptActorPropertyActivity]
diff --git a/OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs
index a123c81999..b592f8f0c1 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/PlayerProperties.cs
@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using Eluant;
 using OpenRA.Scripting;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Traits;
 
 namespace OpenRA.Mods.RA.Scripting
 {
diff --git a/OpenRA.Mods.RA/SpawnMPUnits.cs b/OpenRA.Mods.RA/SpawnMPUnits.cs
index 02fe55ecda..c42dd6567e 100644
--- a/OpenRA.Mods.RA/SpawnMPUnits.cs
+++ b/OpenRA.Mods.RA/SpawnMPUnits.cs
@@ -12,11 +12,10 @@ using System;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Spawn base actor at the spawnpoint and support units in an annulus around the base actor. Both are defined at MPStartUnits. Attach this to the world actor.")]
 	public class SpawnMPUnitsInfo : TraitInfo<SpawnMPUnits>, Requires<MPStartLocationsInfo>, Requires<MPStartUnitsInfo> { }
diff --git a/OpenRA.Mods.RA/Attack/AttackLeap.cs b/OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs
similarity index 97%
rename from OpenRA.Mods.RA/Attack/AttackLeap.cs
rename to OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs
index 21a5380e47..3d18a94188 100644
--- a/OpenRA.Mods.RA/Attack/AttackLeap.cs
+++ b/OpenRA.Mods.RA/Traits/Attack/AttackLeap.cs
@@ -12,7 +12,7 @@ using OpenRA.Activities;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Dogs use this attack model.")]
 	class AttackLeapInfo : AttackFrontalInfo
diff --git a/OpenRA.Mods.RA/Crate.cs b/OpenRA.Mods.RA/Traits/Crates/Crate.cs
similarity index 99%
rename from OpenRA.Mods.RA/Crate.cs
rename to OpenRA.Mods.RA/Traits/Crates/Crate.cs
index 144471faed..367d8724e5 100644
--- a/OpenRA.Mods.RA/Crate.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/Crate.cs
@@ -12,11 +12,10 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Buildings;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	class CrateInfo : ITraitInfo, IOccupySpaceInfo, Requires<RenderSpritesInfo>
 	{
diff --git a/OpenRA.Mods.RA/CrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/CrateAction.cs
similarity index 98%
rename from OpenRA.Mods.RA/CrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/CrateAction.cs
index 51082423a8..23490f0262 100644
--- a/OpenRA.Mods.RA/CrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/CrateAction.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.RA.Traits
 {
 	public class CrateActionInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/DuplicateUnitCrateAction.cs
similarity index 98%
rename from OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/DuplicateUnitCrateAction.cs
index 0ce20f8673..0693599594 100644
--- a/OpenRA.Mods.RA/Crates/DuplicateUnitCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/DuplicateUnitCrateAction.cs
@@ -12,11 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Creates duplicates of the actor that collects the crate.")]
 	class DuplicateUnitCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/ExplodeCrateAction.cs
similarity index 97%
rename from OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/ExplodeCrateAction.cs
index 7468eca2ba..374b01a596 100644
--- a/OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/ExplodeCrateAction.cs
@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Fires a weapon at the location when collected.")]
 	class ExplodeCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/GiveCashCrateAction.cs
similarity index 97%
rename from OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/GiveCashCrateAction.cs
index b28a3f293f..88612612e6 100644
--- a/OpenRA.Mods.RA/Crates/GiveCashCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/GiveCashCrateAction.cs
@@ -11,7 +11,7 @@
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Gives cash to the collector.")]
 	class GiveCashCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/GiveMcvCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/GiveMcvCrateAction.cs
similarity index 95%
rename from OpenRA.Mods.RA/Crates/GiveMcvCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/GiveMcvCrateAction.cs
index 5df58c50e4..ceb0edb2a4 100644
--- a/OpenRA.Mods.RA/Crates/GiveMcvCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/GiveMcvCrateAction.cs
@@ -8,10 +8,9 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Traits;
 using System.Linq;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Spawns units when collected.", "Adjust selection shares when player has no base.")]
 	class GiveMcvCrateActionInfo : GiveUnitCrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/GiveUnitCrateAction.cs
similarity index 98%
rename from OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/GiveUnitCrateAction.cs
index 044d41c652..3cccd554b5 100644
--- a/OpenRA.Mods.RA/Crates/GiveUnitCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/GiveUnitCrateAction.cs
@@ -10,11 +10,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Spawns units when collected.")]
 	class GiveUnitCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/GrantUpgradeCrateAction.cs
similarity index 98%
rename from OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/GrantUpgradeCrateAction.cs
index b2163d3e99..b54d9f3b55 100644
--- a/OpenRA.Mods.RA/Crates/GrantUpgradeCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/GrantUpgradeCrateAction.cs
@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Grants an upgrade to the collector.")]
 	public class GrantUpgradeCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/HealUnitsCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/HealUnitsCrateAction.cs
similarity index 97%
rename from OpenRA.Mods.RA/Crates/HealUnitsCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/HealUnitsCrateAction.cs
index 930142329c..9b9f90e579 100644
--- a/OpenRA.Mods.RA/Crates/HealUnitsCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/HealUnitsCrateAction.cs
@@ -11,7 +11,7 @@
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Heals all actors that belong to the owner of the collector.")]
 	class HealUnitsCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/HideMapCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/HideMapCrateAction.cs
similarity index 97%
rename from OpenRA.Mods.RA/Crates/HideMapCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/HideMapCrateAction.cs
index 405e4ae514..f6b559de1f 100644
--- a/OpenRA.Mods.RA/Crates/HideMapCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/HideMapCrateAction.cs
@@ -8,7 +8,7 @@
  */
 #endregion
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Hides the entire map in shroud.")]
 	class HideMapCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/LevelUpCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs
similarity index 98%
rename from OpenRA.Mods.RA/Crates/LevelUpCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs
index 5212e408d2..b9deed46eb 100644
--- a/OpenRA.Mods.RA/Crates/LevelUpCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/LevelUpCrateAction.cs
@@ -10,7 +10,7 @@
 
 using System.Linq;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Gives experience levels to the collector.")]
 	class LevelUpCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/RevealMapCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/RevealMapCrateAction.cs
similarity index 97%
rename from OpenRA.Mods.RA/Crates/RevealMapCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/RevealMapCrateAction.cs
index 4675215e82..c02fd6ad6c 100644
--- a/OpenRA.Mods.RA/Crates/RevealMapCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/RevealMapCrateAction.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Reveals the entire map.")]
 	class RevealMapCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs b/OpenRA.Mods.RA/Traits/Crates/SupportPowerCrateAction.cs
similarity index 97%
rename from OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs
rename to OpenRA.Mods.RA/Traits/Crates/SupportPowerCrateAction.cs
index 3086a2e246..9ba54862af 100644
--- a/OpenRA.Mods.RA/Crates/SupportPowerCrateAction.cs
+++ b/OpenRA.Mods.RA/Traits/Crates/SupportPowerCrateAction.cs
@@ -11,7 +11,7 @@
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Crates
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Gives a supportpower to the collector.")]
 	class SupportPowerCrateActionInfo : CrateActionInfo
diff --git a/OpenRA.Mods.RA/Traits/Harvester.cs b/OpenRA.Mods.RA/Traits/Harvester.cs
index 5aa4214626..225a5cf76e 100644
--- a/OpenRA.Mods.RA/Traits/Harvester.cs
+++ b/OpenRA.Mods.RA/Traits/Harvester.cs
@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/Infiltration/InfiltrateForCash.cs b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs
similarity index 97%
rename from OpenRA.Mods.RA/Infiltration/InfiltrateForCash.cs
rename to OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs
index 9e7d4d4c63..ca1aa6a792 100644
--- a/OpenRA.Mods.RA/Infiltration/InfiltrateForCash.cs
+++ b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForCash.cs
@@ -12,7 +12,7 @@ using System;
 using OpenRA.Mods.Common.Effects;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("This structure can be infiltrated causing funds to be stolen.")]
 	class InfiltrateForCashInfo : ITraitInfo
@@ -47,4 +47,3 @@ namespace OpenRA.Mods.RA.Infiltration
 		}
 	}
 }
-
diff --git a/OpenRA.Mods.RA/Infiltration/InfiltrateForExploration.cs b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs
similarity index 95%
rename from OpenRA.Mods.RA/Infiltration/InfiltrateForExploration.cs
rename to OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs
index 4a84990cf8..99808c2ef0 100644
--- a/OpenRA.Mods.RA/Infiltration/InfiltrateForExploration.cs
+++ b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Steal and reset the owner's exploration.")]
 	class InfiltrateForExplorationInfo : TraitInfo<InfiltrateForExploration> { }
diff --git a/OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs
similarity index 96%
rename from OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs
rename to OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs
index 927ee9c16a..89b72fe58a 100644
--- a/OpenRA.Mods.RA/Infiltration/InfiltrateForPowerOutage.cs
+++ b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForPowerOutage.cs
@@ -12,7 +12,7 @@ using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	class InfiltrateForPowerOutageInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/Infiltration/InfiltrateForSupportPower.cs b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs
similarity index 96%
rename from OpenRA.Mods.RA/Infiltration/InfiltrateForSupportPower.cs
rename to OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs
index a01c85de2d..7c9f06096a 100644
--- a/OpenRA.Mods.RA/Infiltration/InfiltrateForSupportPower.cs
+++ b/OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForSupportPower.cs
@@ -11,7 +11,7 @@
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	class InfiltrateForSupportPowerInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/Infiltration/Infiltrates.cs b/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs
similarity index 98%
rename from OpenRA.Mods.RA/Infiltration/Infiltrates.cs
rename to OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs
index 3cc61d39f9..0a01d6f7b5 100644
--- a/OpenRA.Mods.RA/Infiltration/Infiltrates.cs
+++ b/OpenRA.Mods.RA/Traits/Infiltration/Infiltrates.cs
@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Infiltration
+namespace OpenRA.Mods.RA.Traits
 {
 	class InfiltratesInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/Traits/LeavesHusk.cs b/OpenRA.Mods.RA/Traits/LeavesHusk.cs
index 4daf9ca877..e1c8e228c1 100644
--- a/OpenRA.Mods.RA/Traits/LeavesHusk.cs
+++ b/OpenRA.Mods.RA/Traits/LeavesHusk.cs
@@ -10,7 +10,6 @@
 
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Traits/MadTank.cs b/OpenRA.Mods.RA/Traits/MadTank.cs
index d6acb4e2d3..7219ee3b47 100644
--- a/OpenRA.Mods.RA/Traits/MadTank.cs
+++ b/OpenRA.Mods.RA/Traits/MadTank.cs
@@ -16,7 +16,6 @@ using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Mods.RA/Traits/Mine.cs b/OpenRA.Mods.RA/Traits/Mine.cs
index e49203f1d1..31defdd545 100644
--- a/OpenRA.Mods.RA/Traits/Mine.cs
+++ b/OpenRA.Mods.RA/Traits/Mine.cs
@@ -9,7 +9,6 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Traits
diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Traits/Mobile.cs
similarity index 99%
rename from OpenRA.Mods.RA/Move/Mobile.cs
rename to OpenRA.Mods.RA/Traits/Mobile.cs
index 4a326a6d02..504c918970 100644
--- a/OpenRA.Mods.RA/Move/Mobile.cs
+++ b/OpenRA.Mods.RA/Traits/Mobile.cs
@@ -18,7 +18,7 @@ using OpenRA.Mods.RA.Activities;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Traits
 {
 	[Flags]
 	public enum CellConditions
diff --git a/OpenRA.Mods.RA/Traits/World/DomainIndex.cs b/OpenRA.Mods.RA/Traits/World/DomainIndex.cs
index 72b78899e2..ef840c1a3a 100644
--- a/OpenRA.Mods.RA/Traits/World/DomainIndex.cs
+++ b/OpenRA.Mods.RA/Traits/World/DomainIndex.cs
@@ -13,7 +13,6 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 using OpenRA.Support;
 
diff --git a/OpenRA.Mods.RA/Move/PathFinder.cs b/OpenRA.Mods.RA/Traits/World/PathFinder.cs
similarity index 99%
rename from OpenRA.Mods.RA/Move/PathFinder.cs
rename to OpenRA.Mods.RA/Traits/World/PathFinder.cs
index 5b66d5b764..b4d6dbd466 100644
--- a/OpenRA.Mods.RA/Move/PathFinder.cs
+++ b/OpenRA.Mods.RA/Traits/World/PathFinder.cs
@@ -12,13 +12,12 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using OpenRA.Mods.RA.Traits;
 using OpenRA;
 using OpenRA.Primitives;
 using OpenRA.Support;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Traits
 {
 	[Desc("Calculates routes for mobile units based on the A* search algorithm.", " Attach this to the world actor.")]
 	public class PathFinderInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Move/PathSearch.cs b/OpenRA.Mods.RA/Traits/World/PathSearch.cs
old mode 100755
new mode 100644
similarity index 99%
rename from OpenRA.Mods.RA/Move/PathSearch.cs
rename to OpenRA.Mods.RA/Traits/World/PathSearch.cs
index 77acc2366d..152981d7a6
--- a/OpenRA.Mods.RA/Move/PathSearch.cs
+++ b/OpenRA.Mods.RA/Traits/World/PathSearch.cs
@@ -15,7 +15,7 @@ using System.Linq;
 using OpenRA;
 using OpenRA.Primitives;
 
-namespace OpenRA.Mods.RA.Move
+namespace OpenRA.Mods.RA.Traits
 {
 	public sealed class PathSearch : IDisposable
 	{