diff --git a/OpenRA.Game/Graphics/SheetBuilder.cs b/OpenRA.Game/Graphics/SheetBuilder.cs
index 6af79654b7..383e40ed0f 100644
--- a/OpenRA.Game/Graphics/SheetBuilder.cs
+++ b/OpenRA.Game/Graphics/SheetBuilder.cs
@@ -22,15 +22,15 @@ using System.Drawing;
 
 namespace OpenRA.Graphics
 {
-	class SheetBuilder
+	public class SheetBuilder
 	{
 		public static SheetBuilder SharedInstance;
-		public static void Initialize(Renderer r)
+		internal static void Initialize(Renderer r)
 		{
 			SharedInstance = new SheetBuilder(r, TextureChannel.Red);
 		}
 
-		public SheetBuilder(Renderer r, TextureChannel ch)
+		internal SheetBuilder(Renderer r, TextureChannel ch)
 		{
 			renderer = r;
 			current = null;
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index bb172e0721..82eaf8922b 100755
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -214,7 +214,6 @@
     <Compile Include="Traits\AI\AutoHeal.cs" />
     <Compile Include="Traits\AI\AutoTarget.cs" />
     <Compile Include="Traits\Modifiers\BelowUnits.cs" />
-    <Compile Include="Traits\Bridge.cs" />
     <Compile Include="Traits\Buildable.cs" />
     <Compile Include="Traits\Building.cs" />
     <Compile Include="Traits\World\BuildingInfluence.cs" />
@@ -298,7 +297,6 @@
     <Compile Include="Widgets\PerfGraphWidget.cs" />
     <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
     <Compile Include="Widgets\BuildPaletteWidget.cs" />
-    <Compile Include="Traits\World\BridgeLayer.cs" />
     <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="GameRules\MusicInfo.cs" />
diff --git a/OpenRA.Game/Traits/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs
similarity index 96%
rename from OpenRA.Game/Traits/Bridge.cs
rename to OpenRA.Mods.RA/Bridge.cs
index 29692867dc..2c18f9d83e 100644
--- a/OpenRA.Game/Traits/Bridge.cs
+++ b/OpenRA.Mods.RA/Bridge.cs
@@ -24,8 +24,9 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class BridgeInfo : ITraitInfo
 	{
diff --git a/OpenRA.Game/Traits/World/BridgeLayer.cs b/OpenRA.Mods.RA/BridgeLayer.cs
similarity index 95%
rename from OpenRA.Game/Traits/World/BridgeLayer.cs
rename to OpenRA.Mods.RA/BridgeLayer.cs
index cea14db3f1..1653a3d427 100644
--- a/OpenRA.Game/Traits/World/BridgeLayer.cs
+++ b/OpenRA.Mods.RA/BridgeLayer.cs
@@ -21,8 +21,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.GameRules;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA
 {
 	class BridgeLayerInfo : TraitInfo<BridgeLayer> { }
 
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 62c609239a..8a4843be42 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -56,6 +56,8 @@
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="Activities\UnloadCargo.cs" />
     <Compile Include="AirstrikePower.cs" />
+    <Compile Include="Bridge.cs" />
+    <Compile Include="BridgeLayer.cs" />
     <Compile Include="Burns.cs" />
     <Compile Include="C4Demolition.cs" />
     <Compile Include="Cargo.cs" />