diff --git a/OpenRA.Game/Network/OrderIO.cs b/OpenRA.Game/Network/OrderIO.cs
index 610824e2f0..5ebf787222 100755
--- a/OpenRA.Game/Network/OrderIO.cs
+++ b/OpenRA.Game/Network/OrderIO.cs
@@ -13,7 +13,7 @@ using System.IO;
 
 namespace OpenRA.Network
 {
-	static class OrderIO
+	public static class OrderIO
 	{
 		public static void Write(this Stream s, byte[] buf)
 		{
diff --git a/OpenRA.Game/Network/ReplayConnection.cs b/OpenRA.Game/Network/ReplayConnection.cs
index 8ef46442eb..357d37d3bd 100755
--- a/OpenRA.Game/Network/ReplayConnection.cs
+++ b/OpenRA.Game/Network/ReplayConnection.cs
@@ -6,7 +6,7 @@ using System.IO;
 
 namespace OpenRA.Network
 {
-	class ReplayConnection : IConnection
+	public class ReplayConnection : IConnection
 	{
 		//uint nextFrame = 1;
 		FileStream replayStream;
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 9fd3df9b19..3ba6a6d040 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>
@@ -201,7 +201,6 @@
     <Compile Include="TraitDictionary.cs" />
     <Compile Include="Traits\Activities\CancelableActivity.cs" />
     <Compile Include="Traits\SharesCell.cs" />
-    <Compile Include="Widgets\Delegates\ReplayBrowserDelegate.cs" />
     <Compile Include="Widgets\PasswordFieldWidget.cs" />
     <Compile Include="Widgets\ScrollingTextWidget.cs" />
   </ItemGroup>
@@ -225,6 +224,9 @@
   <ItemGroup>
     <Content Include="OpenRA.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Widgets\Delegates\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs b/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
index ac093d644a..7009149f2a 100644
--- a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
+++ b/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.FileFormats;
 using OpenRA.Graphics;
 using OpenRA.Traits;
-using OpenRA.Widgets.Delegates;
+using OpenRA.Mods.RA.Widgets.Delegates;
 
 namespace OpenRA.Mods.RA
 {
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index baf58a6d53..5a720977f7 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -259,6 +259,7 @@
     <Compile Include="Widgets\BuildPaletteWidget.cs" />
     <Compile Include="Widgets\Delegates\IngameObserverChromeDelegate.cs" />
     <Compile Include="Widgets\Delegates\IngameChromeDelegate.cs" />
+    <Compile Include="Widgets\Delegates\ReplayBrowserDelegate.cs" />
     <Compile Include="Widgets\MoneyBinWidget.cs" />
     <Compile Include="Widgets\OrderButtonWidget.cs" />
     <Compile Include="Widgets\PowerBinWidget.cs" />
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
index 9732c52034..6eb04ed3ad 100755
--- a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
@@ -7,6 +7,7 @@
  * see LICENSE.
  */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -14,8 +15,9 @@ using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Network;
 using OpenRA.Graphics;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class LobbyDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/ReplayBrowserDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/ReplayBrowserDelegate.cs
similarity index 95%
rename from OpenRA.Game/Widgets/Delegates/ReplayBrowserDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/ReplayBrowserDelegate.cs
index e735b2844b..776430bdb8 100644
--- a/OpenRA.Game/Widgets/Delegates/ReplayBrowserDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/ReplayBrowserDelegate.cs
@@ -13,8 +13,9 @@ using System.Drawing;
 using System.IO;
 using OpenRA.FileFormats;
 using OpenRA.Network;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class ReplayBrowserDelegate : IWidgetDelegate
 	{