diff --git a/OpenRA.Mods.Common/DefaultLoadScreen.cs b/OpenRA.Mods.Common/LoadScreens/DefaultLoadScreen.cs
similarity index 98%
rename from OpenRA.Mods.Common/DefaultLoadScreen.cs
rename to OpenRA.Mods.Common/LoadScreens/DefaultLoadScreen.cs
index d744d1a6e4..b10262a0e0 100644
--- a/OpenRA.Mods.Common/DefaultLoadScreen.cs
+++ b/OpenRA.Mods.Common/LoadScreens/DefaultLoadScreen.cs
@@ -16,7 +16,7 @@ using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.LoadScreens
 {
 	public class DefaultLoadScreen : ILoadScreen
 	{
diff --git a/OpenRA.Mods.Common/ModChooserLoadScreen.cs b/OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs
similarity index 96%
rename from OpenRA.Mods.Common/ModChooserLoadScreen.cs
rename to OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs
index b8f18f5be5..25b66ed4dc 100644
--- a/OpenRA.Mods.Common/ModChooserLoadScreen.cs
+++ b/OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs
@@ -13,7 +13,7 @@ using System.Drawing;
 using OpenRA.Graphics;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.LoadScreens
 {
 	public class ModChooserLoadScreen : ILoadScreen
 	{
diff --git a/OpenRA.Mods.Common/NullLoadScreen.cs b/OpenRA.Mods.Common/LoadScreens/NullLoadScreen.cs
similarity index 94%
rename from OpenRA.Mods.Common/NullLoadScreen.cs
rename to OpenRA.Mods.Common/LoadScreens/NullLoadScreen.cs
index 6b91a81445..34318d38cb 100644
--- a/OpenRA.Mods.Common/NullLoadScreen.cs
+++ b/OpenRA.Mods.Common/LoadScreens/NullLoadScreen.cs
@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.LoadScreens
 {
 	public class NullLoadScreen : ILoadScreen
 	{
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 4cbe8db346..0922d8026e 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -49,7 +49,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CommonTraitsInterfaces.cs" />
-    <Compile Include="DefaultLoadScreen.cs" />
     <Compile Include="Effects\Beacon.cs" />
     <Compile Include="Effects\Bullet.cs" />
     <Compile Include="Effects\Contrail.cs" />
@@ -77,9 +76,9 @@
     <Compile Include="Graphics\TextRenderable.cs" />
     <Compile Include="Graphics\VoxelActorPreview.cs" />
     <Compile Include="Graphics\VoxelRenderable.cs" />
-    <Compile Include="LoadWidgetAtGameStart.cs" />
-    <Compile Include="ModChooserLoadScreen.cs" />
-    <Compile Include="NullLoadScreen.cs" />
+    <Compile Include="LoadScreens\DefaultLoadScreen.cs" />
+    <Compile Include="LoadScreens\ModChooserLoadScreen.cs" />
+    <Compile Include="LoadScreens\NullLoadScreen.cs" />
     <Compile Include="Orders\DeployOrderTargeter.cs" />
     <Compile Include="Orders\EnterAlliedActorTargeter.cs" />
     <Compile Include="Orders\UnitOrderTargeter.cs" />
@@ -160,6 +159,7 @@
     <Compile Include="Traits\Upgrades\UpgradeManager.cs" />
     <Compile Include="Traits\Valued.cs" />
     <Compile Include="Traits\World\CreateMPPlayers.cs" />
+    <Compile Include="Traits\World\LoadWidgetAtGameStart.cs" />
     <Compile Include="Traits\World\MPStartLocations.cs" />
     <Compile Include="Traits\World\MPStartUnits.cs" />
     <Compile Include="Traits\World\PaletteFromCurrentTileset.cs" />
diff --git a/OpenRA.Mods.Common/LoadWidgetAtGameStart.cs b/OpenRA.Mods.Common/Traits/World/LoadWidgetAtGameStart.cs
similarity index 96%
rename from OpenRA.Mods.Common/LoadWidgetAtGameStart.cs
rename to OpenRA.Mods.Common/Traits/World/LoadWidgetAtGameStart.cs
index 6eeba74222..009e83e058 100644
--- a/OpenRA.Mods.Common/LoadWidgetAtGameStart.cs
+++ b/OpenRA.Mods.Common/Traits/World/LoadWidgetAtGameStart.cs
@@ -12,7 +12,7 @@ using OpenRA.Graphics;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Traits
 {
 	public class LoadWidgetAtGameStartInfo : ITraitInfo
 	{