diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index b47af8bcb1..87d9f1e3ec 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -80,10 +80,8 @@
     <Compile Include="Effects\Corpse.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
     <Compile Include="Effects\FlashTarget.cs" />
-    <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\MoveFlash.cs" />
     <Compile Include="Effects\RepairIndicator.cs" />
-    <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\Smoke.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
     <Compile Include="Exts.cs" />
@@ -212,7 +210,6 @@
     <Compile Include="Traits\Explodes.cs" />
     <Compile Include="Traits\Fake.cs" />
     <Compile Include="Traits\GeneratesGap.cs" />
-    <Compile Include="Traits\GpsPower.cs" />
     <Compile Include="Traits\Harvester.cs" />
     <Compile Include="Traits\Helicopter.cs" />
     <Compile Include="Traits\InvisibleToOthers.cs" />
diff --git a/OpenRa.Game/Effects/GpsSatellite.cs b/OpenRa.Mods.RA/Effects/GpsSatellite.cs
old mode 100755
new mode 100644
similarity index 87%
rename from OpenRa.Game/Effects/GpsSatellite.cs
rename to OpenRa.Mods.RA/Effects/GpsSatellite.cs
index 7dbab9fd15..c2de1cec29
--- a/OpenRa.Game/Effects/GpsSatellite.cs
+++ b/OpenRa.Mods.RA/Effects/GpsSatellite.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using OpenRa.Effects;
 using OpenRa.Graphics;
 using OpenRa.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRa.Mods.RA.Effects
 {
 	class GpsSatellite : IEffect
 	{
diff --git a/OpenRa.Game/Effects/SatelliteLaunch.cs b/OpenRa.Mods.RA/Effects/SatelliteLaunch.cs
old mode 100755
new mode 100644
similarity index 89%
rename from OpenRa.Game/Effects/SatelliteLaunch.cs
rename to OpenRa.Mods.RA/Effects/SatelliteLaunch.cs
index 441f4c4cf8..1a40c7ff1e
--- a/OpenRa.Game/Effects/SatelliteLaunch.cs
+++ b/OpenRa.Mods.RA/Effects/SatelliteLaunch.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using OpenRa.Effects;
 using OpenRa.Graphics;
 using OpenRa.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRa.Mods.RA.Effects
 {
 	class SatelliteLaunch : IEffect
 	{
diff --git a/OpenRa.Mods.RA/EngineerCapture.cs b/OpenRa.Mods.RA/EngineerCapture.cs
index 1056b9d9b2..6d6032862c 100644
--- a/OpenRa.Mods.RA/EngineerCapture.cs
+++ b/OpenRa.Mods.RA/EngineerCapture.cs
@@ -1,6 +1,6 @@
-using OpenRa.Traits.Activities;
+using OpenRa.Mods.RA.Activities;
 using OpenRa.Traits;
-using OpenRa.Mods.RA.Activities;
+using OpenRa.Traits.Activities;
 
 namespace OpenRa.Mods.RA
 {
diff --git a/OpenRa.Game/Traits/GpsPower.cs b/OpenRa.Mods.RA/GpsPower.cs
similarity index 85%
rename from OpenRa.Game/Traits/GpsPower.cs
rename to OpenRa.Mods.RA/GpsPower.cs
index dc16b770b9..a7673e97d7 100644
--- a/OpenRa.Game/Traits/GpsPower.cs
+++ b/OpenRa.Mods.RA/GpsPower.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using OpenRa.Effects;
+using OpenRa.Mods.RA.Effects;
+using OpenRa.Traits;
 
-namespace OpenRa.Traits
+namespace OpenRa.Mods.RA
 {
 	class GpsPowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
index bff7beb4c1..4b5b5b0782 100644
--- a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
+++ b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
@@ -53,9 +53,12 @@
     <Compile Include="Activities\Steal.cs" />
     <Compile Include="C4Demolition.cs" />
     <Compile Include="Effects\CrateEffect.cs" />
+    <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\InvulnEffect.cs" />
     <Compile Include="Effects\Parachute.cs" />
+    <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="EngineerCapture.cs" />
+    <Compile Include="GpsPower.cs" />
     <Compile Include="InfiltrateForSonarPulse.cs" />
     <Compile Include="IronCurtainable.cs" />
     <Compile Include="IronCurtainPower.cs" />