diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 836ffcc6e9..b2b8db7722 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -139,13 +139,17 @@
+
+
+
+
diff --git a/OpenRA.Mods.RA/Render/RenderNameTag.cs b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs
similarity index 97%
rename from OpenRA.Mods.RA/Render/RenderNameTag.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs
index 5fbb6883e0..3c6f68972a 100644
--- a/OpenRA.Mods.RA/Render/RenderNameTag.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderNameTag.cs
@@ -14,7 +14,7 @@ using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Displays the player name above the unit")]
class RenderNameTagInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Render/WithShadow.cs b/OpenRA.Mods.Common/Traits/Render/WithShadow.cs
similarity index 92%
rename from OpenRA.Mods.RA/Render/WithShadow.cs
rename to OpenRA.Mods.Common/Traits/Render/WithShadow.cs
index a48e655c6d..6081f03981 100644
--- a/OpenRA.Mods.RA/Render/WithShadow.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithShadow.cs
@@ -12,11 +12,9 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Clones the aircraft sprite with another palette below it.")]
class WithShadowInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Render/WithSmoke.cs b/OpenRA.Mods.Common/Traits/Render/WithSmoke.cs
similarity index 95%
rename from OpenRA.Mods.RA/Render/WithSmoke.cs
rename to OpenRA.Mods.Common/Traits/Render/WithSmoke.cs
index 2ffea3c2d6..56cc848d22 100644
--- a/OpenRA.Mods.RA/Render/WithSmoke.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithSmoke.cs
@@ -9,10 +9,9 @@
#endregion
using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA.Render
+namespace OpenRA.Mods.Common.Traits
{
[Desc("Renders an overlay when the actor is taking heavy damage.")]
public class WithSmokeInfo : ITraitInfo, Requires
diff --git a/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs b/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
similarity index 97%
rename from OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
rename to OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
index 98a0946092..5ce1f6e9a6 100644
--- a/OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
+++ b/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs
@@ -11,7 +11,7 @@
using OpenRA.Mods.Common.Effects;
using OpenRA.Traits;
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
{
class SmokeTrailWhenDamagedInfo : ITraitInfo, Requires
{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index c67ec758cc..94f8d9665c 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -247,17 +247,13 @@
-
-
-
-