diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
index 406af22135..0abe436556 100644
--- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
+++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj
@@ -55,12 +55,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ShroudPalette.cs" />
     <Compile Include="Activities\VoxelHarvesterDockSequence.cs" />
-    <Compile Include="TiberianSunRefinery.cs" />
-    <Compile Include="Render\WithVoxelWalkerBody.cs" />
-    <Compile Include="Render\WithVoxelUnloadBody.cs" />
     <Compile Include="SpriteLoaders\TmpTSLoader.cs" />
+    <Compile Include="Traits\Buildings\TiberianSunRefinery.cs" />
+    <Compile Include="Traits\Render\WithVoxelWalkerBody.cs" />
+    <Compile Include="Traits\Render\WithVoxelUnloadBody.cs" />
+    <Compile Include="Traits\World\ShroudPalette.cs" />
     <Compile Include="UtilityCommands\LegacyTilesetImporter.cs" />
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/OpenRA.Mods.TS/TiberianSunRefinery.cs b/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs
similarity index 96%
rename from OpenRA.Mods.TS/TiberianSunRefinery.cs
rename to OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs
index 68fffba0ac..9b9bafd8ae 100644
--- a/OpenRA.Mods.TS/TiberianSunRefinery.cs
+++ b/OpenRA.Mods.TS/Traits/Buildings/TiberianSunRefinery.cs
@@ -11,7 +11,7 @@
 using OpenRA.Mods.RA;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.TS
+namespace OpenRA.Mods.TS.Traits
 {
 	public class TiberianSunRefineryInfo : OreRefineryInfo
 	{
diff --git a/OpenRA.Mods.TS/Render/WithVoxelUnloadBody.cs b/OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs
old mode 100755
new mode 100644
similarity index 100%
rename from OpenRA.Mods.TS/Render/WithVoxelUnloadBody.cs
rename to OpenRA.Mods.TS/Traits/Render/WithVoxelUnloadBody.cs
diff --git a/OpenRA.Mods.TS/Render/WithVoxelWalkerBody.cs b/OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs
similarity index 100%
rename from OpenRA.Mods.TS/Render/WithVoxelWalkerBody.cs
rename to OpenRA.Mods.TS/Traits/Render/WithVoxelWalkerBody.cs
diff --git a/OpenRA.Mods.TS/ShroudPalette.cs b/OpenRA.Mods.TS/Traits/World/ShroudPalette.cs
similarity index 97%
rename from OpenRA.Mods.TS/ShroudPalette.cs
rename to OpenRA.Mods.TS/Traits/World/ShroudPalette.cs
index adf5956d2e..21dcc579c3 100644
--- a/OpenRA.Mods.TS/ShroudPalette.cs
+++ b/OpenRA.Mods.TS/Traits/World/ShroudPalette.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.TS
+namespace OpenRA.Mods.TS.Traits
 {
 	[Desc("Adds the hard-coded shroud palette to the game")]
 	class TSShroudPaletteInfo : ITraitInfo