diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 978220e072..371356b305 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -85,7 +85,6 @@
     <Compile Include="Traits\DetectCloaked.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
     <Compile Include="Traits\Modifiers\FrozenUnderFog.cs" />
-    <Compile Include="Traits\Player\ActorGroupProxy.cs" />
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\TechTreeCache.cs" />
     <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index b53bb99fb8..2e7bbe53bf 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -69,8 +69,9 @@
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
     <Compile Include="Activities\Wait.cs" />
+    <Compile Include="Player\ActorGroupProxy.cs" />
     <Compile Include="Aircraft.cs" />
-    <Compile Include="AirstrikePower.cs" />
+    <Compile Include="SupportPowers\AirstrikePower.cs" />
     <Compile Include="AttackFrontal.cs" />
     <Compile Include="AttackHeli.cs" />
     <Compile Include="AttackLeap.cs" />
@@ -116,7 +117,7 @@
     <Compile Include="LightPaletteRotator.cs" />
     <Compile Include="OreRefinery.cs" />
     <Compile Include="ChronoshiftPaletteEffect.cs" />
-    <Compile Include="ChronoshiftPower.cs" />
+    <Compile Include="SupportPowers\ChronoshiftPower.cs" />
     <Compile Include="Crates\ArmorUpgradeCrateAction.cs" />
     <Compile Include="Crates\ExplodeCrateAction.cs" />
     <Compile Include="Crates\FirepowerUpgradeCrateAction.cs" />
@@ -126,14 +127,14 @@
     <Compile Include="Effects\Parachute.cs" />
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="EngineerCapture.cs" />
-    <Compile Include="GpsPower.cs" />
+    <Compile Include="SupportPowers\GpsPower.cs" />
     <Compile Include="InfiltrateForSonarPulse.cs" />
     <Compile Include="IronCurtainable.cs" />
-    <Compile Include="IronCurtainPower.cs" />
+    <Compile Include="SupportPowers\IronCurtainPower.cs" />
     <Compile Include="PaletteFromFile.cs" />
     <Compile Include="PaletteFromRGBA.cs" />
     <Compile Include="ParaDrop.cs" />
-    <Compile Include="ParatroopersPower.cs" />
+    <Compile Include="SupportPowers\ParatroopersPower.cs" />
     <Compile Include="Passenger.cs" />
     <Compile Include="Plane.cs" />
     <Compile Include="ProductionSurround.cs" />
@@ -161,12 +162,12 @@
     <Compile Include="SeedsResource.cs" />
     <Compile Include="SelfHealing.cs" />
     <Compile Include="ShroudPalette.cs" />
-    <Compile Include="SonarPulsePower.cs" />
+    <Compile Include="SupportPowers\SonarPulsePower.cs" />
     <Compile Include="SpawnDefaultUnits.cs" />
     <Compile Include="SpawnMapActors.cs" />
     <Compile Include="Spy.cs" />
-    <Compile Include="SpyPlanePower.cs" />
-    <Compile Include="NukePower.cs" />
+    <Compile Include="SupportPowers\SpyPlanePower.cs" />
+    <Compile Include="SupportPowers\NukePower.cs" />
     <Compile Include="TakeCover.cs" />
     <Compile Include="TeslaInstantKills.cs" />
     <Compile Include="Crates\ResetRadarCrateAction.cs" />
diff --git a/OpenRA.Game/Traits/Player/ActorGroupProxy.cs b/OpenRA.Mods.RA/Player/ActorGroupProxy.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Game/Traits/Player/ActorGroupProxy.cs
rename to OpenRA.Mods.RA/Player/ActorGroupProxy.cs
diff --git a/OpenRA.Mods.RA/AirstrikePower.cs b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/AirstrikePower.cs
rename to OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
diff --git a/OpenRA.Mods.RA/ChronoshiftPower.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/ChronoshiftPower.cs
rename to OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
diff --git a/OpenRA.Mods.RA/GpsPower.cs b/OpenRA.Mods.RA/SupportPowers/GpsPower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/GpsPower.cs
rename to OpenRA.Mods.RA/SupportPowers/GpsPower.cs
diff --git a/OpenRA.Mods.RA/IronCurtainPower.cs b/OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/IronCurtainPower.cs
rename to OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs
diff --git a/OpenRA.Mods.RA/NukePower.cs b/OpenRA.Mods.RA/SupportPowers/NukePower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/NukePower.cs
rename to OpenRA.Mods.RA/SupportPowers/NukePower.cs
diff --git a/OpenRA.Mods.RA/ParatroopersPower.cs b/OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/ParatroopersPower.cs
rename to OpenRA.Mods.RA/SupportPowers/ParatroopersPower.cs
diff --git a/OpenRA.Mods.RA/SonarPulsePower.cs b/OpenRA.Mods.RA/SupportPowers/SonarPulsePower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/SonarPulsePower.cs
rename to OpenRA.Mods.RA/SupportPowers/SonarPulsePower.cs
diff --git a/OpenRA.Mods.RA/SpyPlanePower.cs b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
old mode 100644
new mode 100755
similarity index 100%
rename from OpenRA.Mods.RA/SpyPlanePower.cs
rename to OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs