diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 46abfa129b..e43eda319f 100755
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -77,8 +77,9 @@ namespace OpenRA
 			ConnectionStateChanged( orderManager );
 		}
 
-		internal static int RenderFrame = 0;
-		internal static int LocalTick { get { return orderManager.LocalFrameNumber; } }
+		public static int RenderFrame = 0;
+		public static int NetFrameNumber { get { return orderManager.NetFrameNumber; } }
+		public static int LocalTick { get { return orderManager.LocalFrameNumber; } }
 		const int NetTickScale = 3;		// 120ms net tick for 40ms local tick
 
 		public static event Action<OrderManager> ConnectionStateChanged = _ => { };
diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 20798064ed..6533cbdb5b 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,12 +83,6 @@
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
     <Compile Include="Widgets\ChatEntryWidget.cs" />
-    <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
-    <Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" />
-    <Compile Include="Widgets\Delegates\DiplomacyDelegate.cs" />
-    <Compile Include="Widgets\Delegates\MainMenuButtonsDelegate.cs" />
-    <Compile Include="Widgets\Delegates\ServerBrowserDelegate.cs" />
-    <Compile Include="Widgets\Delegates\SettingsMenuDelegate.cs" />
     <Compile Include="Widgets\MapPreviewWidget.cs" />
     <Compile Include="Widgets\WidgetUtils.cs" />
     <Compile Include="Effects\DelayedAction.cs" />
@@ -165,16 +159,12 @@
     <Compile Include="Widgets\BackgroundWidget.cs" />
     <Compile Include="Widgets\LabelWidget.cs" />
     <Compile Include="Widgets\CheckboxWidget.cs" />
-    <Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
     <Compile Include="Widgets\PerfGraphWidget.cs" />
-    <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
-    <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
     <Compile Include="Widgets\ColorBlockWidget.cs" />
     <Compile Include="GameRules\MusicInfo.cs" />
     <Compile Include="Widgets\ImageWidget.cs" />
     <Compile Include="Widgets\TextFieldWidget.cs" />
     <Compile Include="Widgets\ChatDisplayWidget.cs" />
-    <Compile Include="Widgets\Delegates\MapChooserDelegate.cs" />
     <Compile Include="Widgets\ListBoxWidget.cs" />
     <Compile Include="Widgets\SliderWidget.cs" />
     <Compile Include="Widgets\TimerWidget.cs" />
@@ -186,7 +176,6 @@
     <Compile Include="Traits\RevealsShroud.cs" />
     <Compile Include="Traits\Health.cs" />
     <Compile Include="Widgets\VqaPlayerWidget.cs" />
-    <Compile Include="Widgets\Delegates\VideoPlayerDelegate.cs" />
     <Compile Include="GameRules\Settings.cs" />
     <Compile Include="Support\Arguments.cs" />
     <Compile Include="Traits\ActorStance.cs" />
@@ -216,7 +205,6 @@
     <Compile Include="Traits\Activities\CancelableActivity.cs" />
     <Compile Include="Traits\SharesCell.cs" />
     <Compile Include="Widgets\PasswordFieldWidget.cs" />
-    <Compile Include="Widgets\Delegates\DeveloperModeDelegate.cs" />
     <Compile Include="Widgets\ScrollingTextWidget.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -239,9 +227,6 @@
   <ItemGroup>
     <Content Include="OpenRA.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="ServerTraits\" />
-  </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.Game/Widgets/BackgroundWidget.cs b/OpenRA.Game/Widgets/BackgroundWidget.cs
index ffb9419f6b..206fcc51d6 100644
--- a/OpenRA.Game/Widgets/BackgroundWidget.cs
+++ b/OpenRA.Game/Widgets/BackgroundWidget.cs
@@ -12,7 +12,7 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Widgets
 {
-	class BackgroundWidget : Widget
+	public class BackgroundWidget : Widget
 	{
 		public readonly string Background = "dialog";
 		
diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs
index 07fec84d11..2680906f1f 100644
--- a/OpenRA.Game/Widgets/Widget.cs
+++ b/OpenRA.Game/Widgets/Widget.cs
@@ -345,7 +345,7 @@ namespace OpenRA.Widgets
 		}
 	}
 
-	class ContainerWidget : Widget {
+	public class ContainerWidget : Widget {
 		public ContainerWidget() : base() { }
 
 		public ContainerWidget(Widget other) : base(other) { }
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index f2437d15f8..5d4a96e53b 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -312,6 +312,18 @@
     <Compile Include="ServerTraits\LobbyCommands.cs" />
     <Compile Include="Scripting\RASpecialPowers.cs" />
     <Compile Include="PaletteFromCurrentTileset.cs" />
+    <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
+    <Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" />
+    <Compile Include="Widgets\Delegates\DeveloperModeDelegate.cs" />
+    <Compile Include="Widgets\Delegates\DiplomacyDelegate.cs" />
+    <Compile Include="Widgets\Delegates\LobbyDelegate.cs" />
+    <Compile Include="Widgets\Delegates\MainMenuButtonsDelegate.cs" />
+    <Compile Include="Widgets\Delegates\MapChooserDelegate.cs" />
+    <Compile Include="Widgets\Delegates\MusicPlayerDelegate.cs" />
+    <Compile Include="Widgets\Delegates\PerfDebugDelegate.cs" />
+    <Compile Include="Widgets\Delegates\ServerBrowserDelegate.cs" />
+    <Compile Include="Widgets\Delegates\SettingsMenuDelegate.cs" />
+    <Compile Include="Widgets\Delegates\VideoPlayerDelegate.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs
similarity index 92%
rename from OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs
index 3fa38332e8..81f39487e8 100644
--- a/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs
@@ -9,8 +9,9 @@
 #endregion
 
 using OpenRA.Network;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class ConnectionDialogsDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/CreateServerMenuDelegate.cs
similarity index 94%
rename from OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/CreateServerMenuDelegate.cs
index 8c7a5d87c4..8ebf0fdea4 100644
--- a/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/CreateServerMenuDelegate.cs
@@ -10,8 +10,9 @@
 
 using System.Linq;
 using System.Net;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class CreateServerMenuDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/DeveloperModeDelegate.cs
similarity index 98%
rename from OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/DeveloperModeDelegate.cs
index d4d8908f9c..d2e712a394 100644
--- a/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/DeveloperModeDelegate.cs
@@ -23,7 +23,7 @@ using OpenRA;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class DeveloperModeDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs
similarity index 94%
rename from OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs
index 2926568108..e2966827fb 100644
--- a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/DiplomacyDelegate.cs
@@ -13,8 +13,9 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Traits;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class DiplomacyDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
similarity index 97%
rename from OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
index 5ae7d58598..ca13162a64 100755
--- a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
@@ -7,14 +7,13 @@
  * see LICENSE.
  */
 #endregion
-
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Network;
 using OpenRA.Graphics;
-using System;
 
 namespace OpenRA.Widgets.Delegates
 {
diff --git a/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/MainMenuButtonsDelegate.cs
similarity index 95%
rename from OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/MainMenuButtonsDelegate.cs
index 54e2a04743..2762301e14 100755
--- a/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/MainMenuButtonsDelegate.cs
@@ -8,12 +8,13 @@
  */
 #endregion
 
-using OpenRA.FileFormats;
-using OpenRA.Server;
-using OpenRA.Network;
 using System.Collections.Generic;
+using OpenRA.FileFormats;
+using OpenRA.Network;
+using OpenRA.Server;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class MainMenuButtonsDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs
similarity index 94%
rename from OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs
index 8fef6546b0..5b6aac5a57 100644
--- a/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/MapChooserDelegate.cs
@@ -12,8 +12,9 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Network;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class MapChooserDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs
similarity index 95%
rename from OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs
index b3a1dc9ad2..975bbfc01b 100644
--- a/OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/MusicPlayerDelegate.cs
@@ -1,7 +1,3 @@
-using System.Linq;
-using OpenRA.FileFormats;
-using System.Drawing;
-using OpenRA.Support;
 #region Copyright & License Information
 /*
  * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
@@ -10,9 +6,15 @@ using OpenRA.Support;
  * as published by the Free Software Foundation. For more information,
  * see LICENSE.
  */
-#endregion
+#endregion
 
-namespace OpenRA.Widgets.Delegates
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Support;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class MusicPlayerDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/PerfDebugDelegate.cs
similarity index 88%
rename from OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/PerfDebugDelegate.cs
index 36459c9871..3ff7a7d8fa 100644
--- a/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/PerfDebugDelegate.cs
@@ -9,8 +9,9 @@
 #endregion
 
 using OpenRA.Support;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class PerfDebugDelegate : IWidgetDelegate
 	{
@@ -24,7 +25,7 @@ namespace OpenRA.Widgets.Delegates
 			var perfText = perfRoot.GetWidget<LabelWidget>("TEXT");
 			perfText.GetText = () => "Render {0} ({5}={2:F1} ms)\nTick {4} ({3:F1} ms)".F(
 					Game.RenderFrame,
-					Game.orderManager.NetFrameNumber,
+					Game.NetFrameNumber,
 					PerfHistory.items["render"].LastValue,
 					PerfHistory.items["tick_time"].LastValue,
 					Game.LocalTick,
diff --git a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs
similarity index 95%
rename from OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs
index 1c213ce789..1d9fc3200e 100644
--- a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/ServerBrowserDelegate.cs
@@ -13,8 +13,9 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.FileFormats;
 using OpenRA.Server;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class ServerBrowserDelegate : IWidgetDelegate
 	{
diff --git a/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/SettingsMenuDelegate.cs
similarity index 92%
rename from OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/SettingsMenuDelegate.cs
index 801f98e796..4018501676 100755
--- a/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/SettingsMenuDelegate.cs
@@ -9,11 +9,11 @@
 #endregion
 
 using System;
-using System.Windows.Forms;
 using OpenRA.FileFormats.Graphics;
 using OpenRA.GameRules;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class SettingsMenuDelegate : IWidgetDelegate
 	{
@@ -111,10 +111,8 @@ namespace OpenRA.Widgets.Delegates
 			{
 				try {
 					var w = int.Parse(width.Text);
-					if (w > Game.Settings.Graphics.MinResolution.X && w <= Screen.PrimaryScreen.Bounds.Size.Width)
+					if (w > Game.Settings.Graphics.MinResolution.X)
 						Game.Settings.Graphics.WindowedSize = new int2(w, Game.Settings.Graphics.WindowedSize.Y);
-					else
-						width.Text = Game.Settings.Graphics.WindowedSize.X.ToString();
 				}
 				catch (FormatException) {
 					width.Text = Game.Settings.Graphics.WindowedSize.X.ToString();
@@ -130,7 +128,7 @@ namespace OpenRA.Widgets.Delegates
 			{
 				try {
 					var h = int.Parse(height.Text);
-					if (h > Game.Settings.Graphics.MinResolution.Y  && h <= Screen.PrimaryScreen.Bounds.Size.Height)
+					if (h > Game.Settings.Graphics.MinResolution.Y)
 						Game.Settings.Graphics.WindowedSize = new int2(Game.Settings.Graphics.WindowedSize.X, h);	
 					else 
 						height.Text = Game.Settings.Graphics.WindowedSize.Y.ToString();
diff --git a/OpenRA.Game/Widgets/Delegates/VideoPlayerDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/VideoPlayerDelegate.cs
similarity index 96%
rename from OpenRA.Game/Widgets/Delegates/VideoPlayerDelegate.cs
rename to OpenRA.Mods.RA/Widgets/Delegates/VideoPlayerDelegate.cs
index 1d9ff73007..36badba508 100644
--- a/OpenRA.Game/Widgets/Delegates/VideoPlayerDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/VideoPlayerDelegate.cs
@@ -9,9 +9,10 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.FileFormats;
+using OpenRA.FileFormats;
+using OpenRA.Widgets;
 
-namespace OpenRA.Widgets.Delegates
+namespace OpenRA.Mods.RA.Widgets.Delegates
 {
 	public class VideoPlayerDelegate : IWidgetDelegate
 	{