diff --git a/OpenRA.Mods.Common/Scripting/ScriptEmmyTypeOverrideAttribute.cs b/OpenRA.Mods.Common/Scripting/ScriptEmmyTypeOverrideAttribute.cs
index bfd7e9553a..0d64d4517b 100644
--- a/OpenRA.Mods.Common/Scripting/ScriptEmmyTypeOverrideAttribute.cs
+++ b/OpenRA.Mods.Common/Scripting/ScriptEmmyTypeOverrideAttribute.cs
@@ -10,7 +10,7 @@
 #endregion
 
 using System;
-using OpenRA.Mods.Common.UtilityCommands;
+using OpenRA.Mods.Common.UtilityCommands.Documentation;
 
 namespace OpenRA.Mods.Common.Scripting
 {
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractEmmyLuaAPI.cs b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractEmmyLuaAPI.cs
similarity index 99%
rename from OpenRA.Mods.Common/UtilityCommands/ExtractEmmyLuaAPI.cs
rename to OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractEmmyLuaAPI.cs
index 962cefd501..7baa812b11 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractEmmyLuaAPI.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractEmmyLuaAPI.cs
@@ -18,7 +18,7 @@ using OpenRA.Mods.Common.Scripting;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands.Documentation
 {
 	// See https://emmylua.github.io/annotation.html for reference
 	sealed class ExtractEmmyLuaAPI : IUtilityCommand
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractLuaDocsCommand.cs
similarity index 99%
rename from OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs
rename to OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractLuaDocsCommand.cs
index 8a071ba2d5..76ceea5aff 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractLuaDocsCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractLuaDocsCommand.cs
@@ -11,9 +11,10 @@
 
 using System;
 using System.Linq;
+using OpenRA;
 using OpenRA.Scripting;
 
-namespace OpenRA.Mods.Common.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands.Documentation
 {
 	sealed class ExtractLuaDocsCommand : IUtilityCommand
 	{
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractSettingsDocsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractSettingsDocsCommand.cs
similarity index 98%
rename from OpenRA.Mods.Common/UtilityCommands/ExtractSettingsDocsCommand.cs
rename to OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractSettingsDocsCommand.cs
index 9db86f82f9..e0666380d6 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractSettingsDocsCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractSettingsDocsCommand.cs
@@ -12,7 +12,7 @@
 using System;
 using System.Linq;
 
-namespace OpenRA.Mods.Common.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands.Documentation
 {
 	sealed class ExtractSettingsDocsCommand : IUtilityCommand
 	{
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractSpriteSequenceDocsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractSpriteSequenceDocsCommand.cs
similarity index 98%
rename from OpenRA.Mods.Common/UtilityCommands/ExtractSpriteSequenceDocsCommand.cs
rename to OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractSpriteSequenceDocsCommand.cs
index 94f2ce4d49..9edeabf4ed 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractSpriteSequenceDocsCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractSpriteSequenceDocsCommand.cs
@@ -19,7 +19,7 @@ using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Primitives;
 
-namespace OpenRA.Mods.Common.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands.Documentation
 {
 	sealed class ExtractSpriteSequenceDocsCommand : IUtilityCommand
 	{
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractTraitDocsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractTraitDocsCommand.cs
similarity index 98%
rename from OpenRA.Mods.Common/UtilityCommands/ExtractTraitDocsCommand.cs
rename to OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractTraitDocsCommand.cs
index eac96b8330..16562ea2e1 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractTraitDocsCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractTraitDocsCommand.cs
@@ -17,7 +17,7 @@ using Newtonsoft.Json;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands.Documentation
 {
 	sealed class ExtractTraitDocsCommand : IUtilityCommand
 	{
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractWeaponDocsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractWeaponDocsCommand.cs
similarity index 98%
rename from OpenRA.Mods.Common/UtilityCommands/ExtractWeaponDocsCommand.cs
rename to OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractWeaponDocsCommand.cs
index 4d3cf3e7f9..925444c261 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractWeaponDocsCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractWeaponDocsCommand.cs
@@ -18,7 +18,7 @@ using OpenRA.GameRules;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands.Documentation
 {
 	sealed class ExtractWeaponDocsCommand : IUtilityCommand
 	{
diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractZeroBraneStudioLuaAPI.cs b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractZeroBraneStudioLuaAPI.cs
similarity index 98%
rename from OpenRA.Mods.Common/UtilityCommands/ExtractZeroBraneStudioLuaAPI.cs
rename to OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractZeroBraneStudioLuaAPI.cs
index 6e4ad7143f..26e3d8c279 100644
--- a/OpenRA.Mods.Common/UtilityCommands/ExtractZeroBraneStudioLuaAPI.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/Documentation/ExtractZeroBraneStudioLuaAPI.cs
@@ -14,7 +14,7 @@ using System.Linq;
 using System.Reflection;
 using OpenRA.Scripting;
 
-namespace OpenRA.Mods.Common.UtilityCommands
+namespace OpenRA.Mods.Common.UtilityCommands.Documentation
 {
 	// See https://studio.zerobrane.com/doc-api-auto-complete for reference
 	sealed class ExtractZeroBraneStudioLuaAPI : IUtilityCommand