diff --git a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs b/OpenRA.Mods.D2k/ChooseBuildTabOnSelect.cs
similarity index 95%
rename from OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
rename to OpenRA.Mods.D2k/ChooseBuildTabOnSelect.cs
index 6962ceba73..cd4c8ce9ea 100644
--- a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
+++ b/OpenRA.Mods.D2k/ChooseBuildTabOnSelect.cs
@@ -9,11 +9,12 @@
 #endregion
 
 using System.Linq;
-using OpenRA.Mods.RA.Widgets;
+using OpenRA.Mods.D2k.Widgets;
+using OpenRA.Mods.RA;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.D2k
 {
 	class ChooseBuildTabOnSelectInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
index 78b1d3bcdd..5e0315656a 100644
--- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
+++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj
@@ -77,6 +77,12 @@
     <Compile Include="Render\WithDockingOverlay.cs" />
     <Compile Include="Render\WithDeliveryOverlay.cs" />
     <Compile Include="PaletteFromScaledPalette.cs" />
+    <Compile Include="Widgets\MoneyBinWidget.cs" />
+    <Compile Include="Widgets\SupportPowerBinWidget.cs" />
+    <Compile Include="Widgets\BuildPaletteWidget.cs" />
+    <Compile Include="Widgets\SlidingContainerWidget.cs" />
+    <Compile Include="Widgets\Logic\IngameChromeLogic.cs" />
+    <Compile Include="ChooseBuildTabOnSelect.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
@@ -112,4 +118,8 @@ cd "$(SolutionDir)"</PostBuildEvent>
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Widgets\" />
+    <Folder Include="Widgets\Logic\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
rename to OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
index d13454c86b..badda1a19d 100644
--- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
+++ b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
@@ -13,15 +13,17 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
 using OpenRA.Mods.RA.Orders;
 using OpenRA.Mods.RA.Render;
+using OpenRA.Mods.RA.Widgets;
 using OpenRA.Network;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.D2k.Widgets
 {
 	class BuildPaletteWidget : Widget
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
similarity index 98%
rename from OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
rename to OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
index 765dcaef7b..0979a9885c 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
+++ b/OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs
@@ -10,11 +10,13 @@
 
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Buildings;
+using OpenRA.Mods.RA.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.D2k.Widgets.Logic
 {
 	public class IngameChromeLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs b/OpenRA.Mods.D2k/Widgets/MoneyBinWidget.cs
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs
rename to OpenRA.Mods.D2k/Widgets/MoneyBinWidget.cs
index f9291b2ddb..9c6a028f55 100644
--- a/OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs
+++ b/OpenRA.Mods.D2k/Widgets/MoneyBinWidget.cs
@@ -13,7 +13,7 @@ using OpenRA.Graphics;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.D2k.Widgets
 {
 	class MoneyBinWidget : Widget
 	{
diff --git a/OpenRA.Mods.RA/Widgets/SlidingContainerWidget.cs b/OpenRA.Mods.D2k/Widgets/SlidingContainerWidget.cs
old mode 100755
new mode 100644
similarity index 97%
rename from OpenRA.Mods.RA/Widgets/SlidingContainerWidget.cs
rename to OpenRA.Mods.D2k/Widgets/SlidingContainerWidget.cs
index 2344dd8ee7..b91b74f941
--- a/OpenRA.Mods.RA/Widgets/SlidingContainerWidget.cs
+++ b/OpenRA.Mods.D2k/Widgets/SlidingContainerWidget.cs
@@ -12,7 +12,7 @@ using System;
 using System.Drawing;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.D2k.Widgets
 {
 	public class SlidingContainerWidget : Widget
 	{
diff --git a/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs b/OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs
old mode 100755
new mode 100644
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs
rename to OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs
index 1da3d25c0a..df73c9fcb3
--- a/OpenRA.Mods.RA/Widgets/SupportPowerBinWidget.cs
+++ b/OpenRA.Mods.D2k/Widgets/SupportPowerBinWidget.cs
@@ -13,10 +13,11 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.RA;
 using OpenRA.Primitives;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.D2k.Widgets
 {
 	class SupportPowerBinWidget : Widget
 	{
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 9620cff63e..050a6de02a 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -367,7 +367,6 @@
     <Compile Include="Turreted.cs" />
     <Compile Include="Valued.cs" />
     <Compile Include="WaterPaletteRotation.cs" />
-    <Compile Include="Widgets\BuildPaletteWidget.cs" />
     <Compile Include="Widgets\LogicTickerWidget.cs" />
     <Compile Include="Widgets\Logic\KickSpectatorsLogic.cs" />
     <Compile Include="Widgets\Logic\MissionBrowserLogic.cs" />
@@ -381,7 +380,6 @@
     <Compile Include="Widgets\Logic\DirectConnectLogic.cs" />
     <Compile Include="Widgets\Logic\DownloadPackagesLogic.cs" />
     <Compile Include="Widgets\Logic\IngameChatLogic.cs" />
-    <Compile Include="Widgets\Logic\IngameChromeLogic.cs" />
     <Compile Include="Widgets\Logic\LobbyLogic.cs" />
     <Compile Include="Widgets\Logic\LobbyUtils.cs" />
     <Compile Include="Widgets\Logic\MainMenuLogic.cs" />
@@ -393,15 +391,12 @@
     <Compile Include="Widgets\Logic\ReplayBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ServerBrowserLogic.cs" />
     <Compile Include="Widgets\Logic\ServerCreationLogic.cs" />
-    <Compile Include="Widgets\MoneyBinWidget.cs" />
     <Compile Include="Widgets\ObserverProductionIconsWidget.cs" />
     <Compile Include="Widgets\ObserverSupportPowerIconsWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\StrategicProgressWidget.cs" />
     <Compile Include="Widgets\SupportPowerTimerWidget.cs" />
-    <Compile Include="Widgets\SupportPowerBinWidget.cs" />
     <Compile Include="Widgets\WorldCommandWidget.cs" />
-    <Compile Include="World\ChooseBuildTabOnSelect.cs" />
     <Compile Include="World\ResourceClaim.cs" />
     <Compile Include="World\ResourceClaimLayer.cs" />
     <Compile Include="World\PlayMusicOnMapLoad.cs" />
@@ -436,7 +431,6 @@
     <Compile Include="Widgets\Logic\CreditsLogic.cs" />
     <Compile Include="Render\WithResources.cs" />
     <Compile Include="Render\WithHarvestAnimation.cs" />
-    <Compile Include="Widgets\SlidingContainerWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
     <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
     <Compile Include="World\DomainIndex.cs" />