diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index c9c3d24f78..dc343d48a8 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -83,7 +83,7 @@
     <Compile Include="Traits\AI\EmitInfantryOnSell.cs" />
     <Compile Include="Traits\AI\ReturnOnIdle.cs" />
     <Compile Include="Traits\Player\VictoryConditions.cs" />
-    <Compile Include="Traits\Render\HiddenUnderFog.cs" />
+    <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
     <Compile Include="Traits\Render\RenderFlare.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
     <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
@@ -252,7 +252,7 @@
     <Compile Include="Traits\Render\RenderBuildingWarFactory.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\Render\RenderUnit.cs" />
-    <Compile Include="Traits\Render\RenderUnitMuzzleFlash.cs" />
+    <Compile Include="Traits\Render\WithMuzzleFlash.cs" />
     <Compile Include="Traits\Render\RenderUnitReload.cs" />
     <Compile Include="Traits\Render\RenderUnitRotor.cs" />
     <Compile Include="Traits\Render\RenderUnitSpinner.cs" />
diff --git a/OpenRA.Game/Traits/Render/HiddenUnderFog.cs b/OpenRA.Game/Traits/Modifiers/HiddenUnderFog.cs
similarity index 100%
rename from OpenRA.Game/Traits/Render/HiddenUnderFog.cs
rename to OpenRA.Game/Traits/Modifiers/HiddenUnderFog.cs
diff --git a/OpenRA.Game/Traits/Render/RenderUnitMuzzleFlash.cs b/OpenRA.Game/Traits/Modifiers/WithMuzzleFlash.cs
similarity index 94%
rename from OpenRA.Game/Traits/Render/RenderUnitMuzzleFlash.cs
rename to OpenRA.Game/Traits/Modifiers/WithMuzzleFlash.cs
index 7b48c3e95b..646dd80e76 100644
--- a/OpenRA.Game/Traits/Render/RenderUnitMuzzleFlash.cs
+++ b/OpenRA.Game/Traits/Modifiers/WithMuzzleFlash.cs
@@ -35,7 +35,6 @@ namespace OpenRA.Traits
 		public WithMuzzleFlash(Actor self)
 		{
 			var unit = self.traits.Get<Unit>();
-			var attack = self.traits.Get<AttackBase>();
 			var attackInfo = self.Info.Traits.Get<AttackBaseInfo>();
 			var render = self.traits.Get<RenderSimple>();