diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 0ca34282ae..dd7f59b0a4 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -475,6 +475,7 @@
     <Compile Include="Warheads\HealthPercentageDamageWarhead.cs" />
     <Compile Include="Warheads\LeaveSmudgeWarhead.cs" />
     <Compile Include="Warheads\SpreadDamageWarhead.cs" />
+    <Compile Include="Widgets\ActorPreviewWidget.cs" />
     <Compile Include="Widgets\ColorMixerWidget.cs" />
     <Compile Include="Widgets\ColorPreviewManagerWidget.cs" />
     <Compile Include="Widgets\ConfirmationDialogs.cs" />
@@ -487,29 +488,61 @@
     <Compile Include="Widgets\Logic\ColorPickerLogic.cs" />
     <Compile Include="Widgets\Logic\ConnectionLogic.cs" />
     <Compile Include="Widgets\Logic\CountryTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\CreditsLogic.cs" />
     <Compile Include="Widgets\Logic\DirectConnectLogic.cs" />
     <Compile Include="Widgets\Logic\DisconnectWatcherLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\AddRaceSuffixLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ClassicProductionLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ControlGroupLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\DebugMenuLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\DiplomacyLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoBriefingLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoObjectivesLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameInfoStatsLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\GameTimerLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngameChatLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngameCashCounterLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngameMenuLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngamePowerBarLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngamePowerCounterLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\IngameSiloBarLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngameRadarDisplayLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\LeaveMapLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\LoadIngamePlayerOrObserverUILogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ObserverShroudSelectorLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ObserverStatsLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\OrderButtonsChromeLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ProductionTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\ReplayControlBarLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\SupportPowerBinLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\SupportPowerTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\Ingame\WorldTooltipLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\InstallFromCDLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\DownloadPackagesLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\InstallLogic.cs" />
+    <Compile Include="Widgets\Logic\Installation\InstallMusicLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\ClientTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\KickClientLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\KickSpectatorsLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\LobbyLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\LobbyMapPreviewLogic.cs" />
     <Compile Include="Widgets\Logic\Lobby\LobbyUtils.cs" />
+    <Compile Include="Widgets\Logic\Lobby\SpawnSelectorTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\MainMenuLogic.cs" />
     <Compile Include="Widgets\Logic\MapChooserLogic.cs" />
+    <Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
-    <Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\SupportPowerBinLogic.cs" />
+    <Compile Include="Widgets\Logic\MusicPlayerLogic.cs" />
+    <Compile Include="Widgets\Logic\PerfDebugLogic.cs" />
     <Compile Include="Widgets\Logic\ReplayBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ServerBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ServerCreationLogic.cs" />
     <Compile Include="Widgets\Logic\SettingsLogic.cs" />
+    <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
     <Compile Include="Widgets\MenuButtonWidget.cs" />
+    <Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
     <Compile Include="Widgets\ObserverSupportPowerIconsWidget.cs" />
     <Compile Include="Widgets\ProductionPaletteWidget.cs" />
     <Compile Include="Widgets\ProductionTabsWidget.cs" />
@@ -519,13 +552,13 @@
     <Compile Include="Widgets\StrategicProgressWidget.cs" />
     <Compile Include="Widgets\SupportPowersWidget.cs" />
     <Compile Include="Widgets\SupportPowerTimerWidget.cs" />
+    <Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
+    <Compile Include="Widgets\WorldCommandWidget.cs" />
     <Compile Include="SpriteLoaders\ShpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpTSLoader.cs" />
     <Compile Include="SpriteLoaders\TmpRALoader.cs" />
     <Compile Include="SpriteLoaders\TmpTDLoader.cs" />
     <Compile Include="SpriteLoaders\ShpD2Loader.cs" />
-    <Compile Include="Widgets\ActorPreviewWidget.cs" />
-    <Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
     <Compile Include="LoadScreens\LogoStripeLoadScreen.cs" />
     <Compile Include="LoadScreens\BlankLoadScreen.cs" />
     <Compile Include="UtilityCommands\CheckYaml.cs" />
diff --git a/OpenRA.Mods.RA/Widgets/Logic/CreditsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
similarity index 96%
rename from OpenRA.Mods.RA/Widgets/Logic/CreditsLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
index 80a8a2b4b8..e879a66193 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/CreditsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs
@@ -13,7 +13,7 @@ using System;
 using OpenRA.FileSystem;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class CreditsLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs
similarity index 95%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs
index 3faeecf244..76a2ba3cab 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/AddRaceSuffixLogic.cs
@@ -11,7 +11,7 @@
 using System;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class AddRaceSuffixLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs
index a950637432..b862eb7fc5 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ClassicProductionLogic.cs
@@ -12,11 +12,10 @@ using System;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Widgets;
-using OpenRA.Mods.RA.Widgets;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ClassicProductionLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs
similarity index 95%
rename from OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs
index 221a3ab584..a2f72ccb16 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ControlGroupLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ControlGroupLogic.cs
@@ -12,7 +12,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ControlGroupLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/DebugMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/DebugMenuLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
index ffedb6cb41..9a2ed13567 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/DebugMenuLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DebugMenuLogic.cs
@@ -10,12 +10,11 @@
 
 using System;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Support;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class DebugMenuLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/DiplomacyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/DiplomacyLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs
index b393316898..48e4998588 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/DiplomacyLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/DiplomacyLogic.cs
@@ -10,12 +10,11 @@
 
 using System;
 using System.Linq;
-using OpenRA.Mods.Common.Widgets.Logic;
 using OpenRA.Network;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class DiplomacyLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs
similarity index 91%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs
index b255eff5ea..daa56f6d85 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoBriefingLogic.cs
@@ -8,13 +8,9 @@
  */
 #endregion
 
-using System;
-using System.Linq;
-using OpenRA.Mods.RA;
-using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	class GameInfoBriefingLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs
index 2acb716fdd..48901b8595 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs
@@ -10,11 +10,10 @@
 
 using System;
 using System.Linq;
-using OpenRA.Mods.RA;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public enum IngameInfoPanel { AutoSelect, Map, Objectives, Debug }
 
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs
similarity index 96%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs
index f210a86116..f10276ab7d 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoObjectivesLogic.cs
@@ -15,11 +15,11 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	class GameInfoObjectivesLogic
 	{
-		ContainerWidget template;
+		readonly ContainerWidget template;
 
 		[ObjectCreator.UseCtor]
 		public GameInfoObjectivesLogic(Widget widget, World world)
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
index fe398766d2..2bebdb5108 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	class GameInfoStatsLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/GameTimerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/Logic/GameTimerLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs
index 024b008632..f1cf7ae764 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/GameTimerLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs
@@ -12,7 +12,7 @@ using System;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class GameTimerLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
similarity index 92%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
index 473ede2f36..12e6e779db 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameCashCounterLogic.cs
@@ -8,11 +8,10 @@
  */
 #endregion
 
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngameCashCounterLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
index a36d0cd634..c1a819a0a3 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs
@@ -11,10 +11,9 @@
 using System;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngameMenuLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
similarity index 93%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
index 9941e421b9..12f72fa276 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerBarLogic.cs
@@ -10,10 +10,9 @@
 
 using System.Drawing;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngamePowerBarLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
similarity index 94%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
index 4ab3f5e424..c4c9a5b48d 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngamePowerCounterLogic.cs
@@ -10,10 +10,9 @@
 
 using System.Drawing;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngamePowerCounterLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
similarity index 93%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
index a11ec21cad..4732ea5586 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
@@ -9,11 +9,10 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class IngameSiloBarLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LeaveMapLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/LeaveMapLogic.cs
index 3284b5b16c..3b060bf450 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/LeaveMapLogic.cs
@@ -17,14 +17,15 @@ using OpenRA.Network;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	class LeaveMapLogic
 	{
+		readonly OrderManager orderManager;
+
 		enum Tab { Objectives, Chat }
 		Tab currentTab;
 
-		OrderManager orderManager;
 		bool newChatMessage;
 
 		[ObjectCreator.UseCtor]
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
index cc72546c30..8459981b2f 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
@@ -12,11 +12,10 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ObserverShroudSelectorLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
index e99df26f07..8533236410 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
@@ -14,14 +14,11 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.Common.Widgets;
-using OpenRA.Mods.Common.Widgets.Logic;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Network;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ObserverStatsLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs
index ba212be7ae..e0ac35b121 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/OrderButtonsChromeLogic.cs
@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class OrderButtonsChromeLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/ProductionTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs
similarity index 100%
rename from OpenRA.Mods.Common/Widgets/Logic/ProductionTooltipLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs
index 4a8c119eab..acd3a781cd 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ReplayControlBarLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ReplayControlBarLogic.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ReplayControlBarLogic
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/SupportPowerBinLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs
similarity index 100%
rename from OpenRA.Mods.Common/Widgets/Logic/SupportPowerBinLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs
diff --git a/OpenRA.Mods.Common/Widgets/Logic/SupportPowerTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs
similarity index 100%
rename from OpenRA.Mods.Common/Widgets/Logic/SupportPowerTooltipLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs
diff --git a/OpenRA.Mods.RA/Widgets/Logic/WorldTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/WorldTooltipLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs
index 5fb8c222c0..30424c6783 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/WorldTooltipLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/WorldTooltipLogic.cs
@@ -13,7 +13,7 @@ using System.Drawing;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class WorldTooltipLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs
index 4b2a052779..a79e0da3ef 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/DownloadPackagesLogic.cs
@@ -17,7 +17,7 @@ using System.Net;
 using OpenRA.Support;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class DownloadPackagesLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs
similarity index 92%
rename from OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs
index a08370cdaa..4e81894ae0 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromCDLogic.cs
@@ -14,16 +14,16 @@ using System.Linq;
 using System.Threading;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class InstallFromCDLogic
 	{
-		Widget panel;
-		ProgressBarWidget progressBar;
-		LabelWidget statusLabel;
-		Action continueLoading;
-		ButtonWidget retryButton, backButton;
-		Widget installingContainer, insertDiskContainer;
+		readonly Widget panel;
+		readonly ProgressBarWidget progressBar;
+		readonly LabelWidget statusLabel;
+		readonly Action continueLoading;
+		readonly ButtonWidget retryButton, backButton;
+		readonly Widget installingContainer, insertDiskContainer;
 
 		[ObjectCreator.UseCtor]
 		public InstallFromCDLogic(Widget widget, Action continueLoading)
diff --git a/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs
similarity index 96%
rename from OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs
index a1d555d4ec..e35bc9bea6 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallLogic.cs
@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class InstallLogic : Widget
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs
index 1b028372b8..be0134846f 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/InstallMusicLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallMusicLogic.cs
@@ -15,7 +15,7 @@ using System.Linq;
 using OpenRA.FileSystem;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class InstallMusicLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/SpawnSelectorTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/SpawnSelectorTooltipLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs
index 752a71ab06..a928f19898 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/SpawnSelectorTooltipLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/SpawnSelectorTooltipLogic.cs
@@ -12,7 +12,7 @@ using System;
 using System.Linq;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class SpawnSelectorTooltipLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/Logic/MissionBrowserLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
index ad5c90eac5..45e4770ba6 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/MissionBrowserLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
@@ -19,7 +19,7 @@ using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class MissionBrowserLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs
index 26143a3810..e109d97a77 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs
@@ -11,11 +11,10 @@
 using System;
 using System.Linq;
 using OpenRA.GameRules;
-using OpenRA.Mods.Common.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class MusicPlayerLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
similarity index 96%
rename from OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
index 4d4bf48349..9db2bd0932 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/PerfDebugLogic.cs
@@ -11,7 +11,7 @@
 using OpenRA.Support;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class PerfDebugLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/SimpleTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
similarity index 95%
rename from OpenRA.Mods.RA/Widgets/Logic/SimpleTooltipLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
index faea2a490f..a33fc14d41 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/SimpleTooltipLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/SimpleTooltipLogic.cs
@@ -11,7 +11,7 @@
 using System;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class SimpleTooltipLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs b/OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs
rename to OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs
index b8a3416023..1eff05759f 100644
--- a/OpenRA.Mods.RA/Widgets/ObserverProductionIconsWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs
@@ -16,7 +16,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class ObserverProductionIconsWidget : Widget
 	{
diff --git a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs b/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
rename to OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
index e200c7dfca..fd9a392925 100644
--- a/OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
@@ -13,12 +13,11 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Orders;
 using OpenRA.Primitives;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class WorldCommandWidget : Widget
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 35b58f7c47..17d50f86dc 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -99,50 +99,17 @@
     <Compile Include="Traits\LeavesHusk.cs" />
     <Compile Include="Traits\TargetableSubmarine.cs" />
     <Compile Include="Traits\TransformOnPassenger.cs" />
-    <Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\DiplomacyLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\GameInfoLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\GameInfoBriefingLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\GameInfoObjectivesLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\GameInfoStatsLogic.cs" />
-    <Compile Include="Widgets\Logic\IngameMenuLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\LeaveMapLogic.cs" />
-    <Compile Include="Widgets\Logic\DownloadPackagesLogic.cs" />
-    <Compile Include="Widgets\Logic\MusicPlayerLogic.cs" />
-    <Compile Include="Widgets\Logic\ObserverStatsLogic.cs" />
-    <Compile Include="Widgets\Logic\OrderButtonsChromeLogic.cs" />
-    <Compile Include="Widgets\Logic\PerfDebugLogic.cs" />
-    <Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
-    <Compile Include="Widgets\WorldCommandWidget.cs" />
     <Compile Include="Traits\Render\RenderShroudCircle.cs" />
     <Compile Include="Traits\Infiltration\InfiltrateForCash.cs" />
     <Compile Include="Traits\Infiltration\InfiltrateForExploration.cs" />
     <Compile Include="Traits\Infiltration\InfiltrateForPowerOutage.cs" />
     <Compile Include="Traits\Infiltration\InfiltrateForSupportPower.cs" />
     <Compile Include="Traits\Infiltration\Infiltrates.cs" />
-    <Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" />
-    <Compile Include="Widgets\Logic\SpawnSelectorTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\CreditsLogic.cs" />
-    <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
-    <Compile Include="Widgets\Logic\InstallLogic.cs" />
     <Compile Include="CombatDebugOverlay.cs" />
-    <Compile Include="Widgets\Logic\GameTimerLogic.cs" />
-    <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
     <Compile Include="Traits\Attack\AttackGarrisoned.cs" />
-    <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
-    <Compile Include="Widgets\Logic\InstallFromCDLogic.cs" />
-    <Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
     <Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
     <Compile Include="Traits\Cloneable.cs" />
-    <Compile Include="Widgets\Logic\Ingame\IngameCashCounterLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\IngamePowerCounterLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\IngamePowerBarLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\IngameSiloBarLogic.cs" />
-    <Compile Include="Widgets\Logic\Ingame\AddRaceSuffixLogic.cs" />
-    <Compile Include="Widgets\Logic\ClassicProductionLogic.cs" />
-    <Compile Include="Widgets\Logic\DebugMenuLogic.cs" />
     <Compile Include="Scripting\Properties\HarvesterProperties.cs" />
     <Compile Include="Scripting\Properties\TransportProperties.cs" />
     <Compile Include="Traits\InvulnerabilityUpgrade.cs" />