diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 860813ba42..fc03f4333e 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -130,7 +130,6 @@
-
diff --git a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
index 7080965c39..551953f4d4 100644
--- a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
+++ b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
@@ -6,19 +6,19 @@
* as published by the Free Software Foundation. For more information,
* see LICENSE.
*/
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-using OpenRA.Traits;
-using OpenRA.Widgets;
-using OpenRA.Traits.Activities;
-using OpenRA.FileFormats;
-using OpenRA;
-using OpenRA.Mods.RA.Activities;
-using System;
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA;
+using OpenRA.FileFormats;
using OpenRA.Mods.RA;
-using OpenRA.Mods.RA.Move;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Move;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
+using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc
{
diff --git a/OpenRA.Game/Traits/Activities/RemoveSelf.cs b/OpenRA.Mods.RA/Activities/RemoveSelf.cs
old mode 100644
new mode 100755
similarity index 86%
rename from OpenRA.Game/Traits/Activities/RemoveSelf.cs
rename to OpenRA.Mods.RA/Activities/RemoveSelf.cs
index cff8b64727..8496b81f46
--- a/OpenRA.Game/Traits/Activities/RemoveSelf.cs
+++ b/OpenRA.Mods.RA/Activities/RemoveSelf.cs
@@ -8,7 +8,9 @@
*/
#endregion
-namespace OpenRA.Traits.Activities
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Activities
{
public class RemoveSelf : CancelableActivity
{
diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs
index 74b45523a4..511c381f45 100644
--- a/OpenRA.Mods.RA/Mine.cs
+++ b/OpenRA.Mods.RA/Mine.cs
@@ -9,6 +9,7 @@
#endregion
using System.Collections.Generic;
+using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 572f7a4392..371f8b924c 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -73,6 +73,7 @@
+