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/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index a694b2a925..4dc8ecc07e 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -135,7 +135,6 @@
     <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" />
@@ -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" />
@@ -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" />
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
 	{