diff --git a/OpenRA.Mods.Common/Console/ChatCommands.cs b/OpenRA.Mods.Common/Commands/ChatCommands.cs
similarity index 97%
rename from OpenRA.Mods.Common/Console/ChatCommands.cs
rename to OpenRA.Mods.Common/Commands/ChatCommands.cs
index fbea1f8e44..d6d5a189bd 100644
--- a/OpenRA.Mods.Common/Console/ChatCommands.cs
+++ b/OpenRA.Mods.Common/Commands/ChatCommands.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Commands
 {
 	[Desc("Enables commands triggered by typing them into the chatbox. Attach this to the world actor.")]
 	public class ChatCommandsInfo : TraitInfo<ChatCommands> { }
diff --git a/OpenRA.Mods.Common/Console/DevCommands.cs b/OpenRA.Mods.Common/Commands/DevCommands.cs
similarity index 98%
rename from OpenRA.Mods.Common/Console/DevCommands.cs
rename to OpenRA.Mods.Common/Commands/DevCommands.cs
index 5cd20bff1b..1bb576d5b3 100644
--- a/OpenRA.Mods.Common/Console/DevCommands.cs
+++ b/OpenRA.Mods.Common/Commands/DevCommands.cs
@@ -13,7 +13,7 @@ using System.Globalization;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Commands
 {
 	[Desc("Enables developer cheats via the chatbox. Attach this to the world actor.")]
 	public class DevCommandsInfo : TraitInfo<DevCommands> { }
diff --git a/OpenRA.Mods.Common/Console/HelpCommand.cs b/OpenRA.Mods.Common/Commands/HelpCommand.cs
similarity index 97%
rename from OpenRA.Mods.Common/Console/HelpCommand.cs
rename to OpenRA.Mods.Common/Commands/HelpCommand.cs
index 4055d90acb..7697ad1e16 100644
--- a/OpenRA.Mods.Common/Console/HelpCommand.cs
+++ b/OpenRA.Mods.Common/Commands/HelpCommand.cs
@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Commands
 {
 	[Desc("Shows a list of available commands in the chatbox. Attach this to the world actor.")]
 	public class HelpCommandInfo : TraitInfo<HelpCommand> { }
diff --git a/OpenRA.Mods.Common/Console/PlayerCommands.cs b/OpenRA.Mods.Common/Commands/PlayerCommands.cs
similarity index 97%
rename from OpenRA.Mods.Common/Console/PlayerCommands.cs
rename to OpenRA.Mods.Common/Commands/PlayerCommands.cs
index 3051f2b73f..b19c5d8fc8 100644
--- a/OpenRA.Mods.Common/Console/PlayerCommands.cs
+++ b/OpenRA.Mods.Common/Commands/PlayerCommands.cs
@@ -11,7 +11,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common
+namespace OpenRA.Mods.Common.Commands
 {
 	[Desc("Allows the player to pause or surrender the game via the chatbox. Attach this to the world actor.")]
 	public class PlayerCommandsInfo : TraitInfo<PlayerCommands> { }
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 25a741cc5d..901ca4dcc7 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -55,10 +55,10 @@
     <Compile Include="Effects\Missile.cs" />
     <Compile Include="Effects\RallyPoint.cs" />
     <Compile Include="Effects\Smoke.cs" />
-    <Compile Include="Console\ChatCommands.cs" />
-    <Compile Include="Console\DevCommands.cs" />
-    <Compile Include="Console\HelpCommand.cs" />
-    <Compile Include="Console\PlayerCommands.cs" />
+    <Compile Include="Commands\ChatCommands.cs" />
+    <Compile Include="Commands\DevCommands.cs" />
+    <Compile Include="Commands\HelpCommand.cs" />
+    <Compile Include="Commands\PlayerCommands.cs" />
     <Compile Include="Graphics\ActorPreview.cs" />
     <Compile Include="Graphics\BeamRenderable.cs" />
     <Compile Include="Graphics\ContrailRenderable.cs" />
diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs
index c7adba0af3..1301a81c49 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs
@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Mods.Common;
+using OpenRA.Mods.Common.Commands;
 using OpenRA.Network;
 using OpenRA.Widgets;