diff --git a/framework/core/src/Console/Command/AbstractCommand.php b/framework/core/src/Console/AbstractCommand.php
similarity index 97%
rename from framework/core/src/Console/Command/AbstractCommand.php
rename to framework/core/src/Console/AbstractCommand.php
index 771a85b6e..3d01d5ecc 100644
--- a/framework/core/src/Console/Command/AbstractCommand.php
+++ b/framework/core/src/Console/AbstractCommand.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Console\Command;
+namespace Flarum\Console;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/framework/core/src/Console/Server.php b/framework/core/src/Console/Server.php
index f58971735..ecbf3f8ab 100644
--- a/framework/core/src/Console/Server.php
+++ b/framework/core/src/Console/Server.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Console;
 
-use Flarum\Console\Command\GenerateMigrationCommand;
+use Flarum\Database\Console\GenerateMigrationCommand;
 use Flarum\Debug\Console\CacheClearCommand;
 use Flarum\Debug\Console\InfoCommand;
 use Flarum\Foundation\AbstractServer;
diff --git a/framework/core/src/Console/Command/GenerateMigrationCommand.php b/framework/core/src/Database/Console/GenerateMigrationCommand.php
similarity index 97%
rename from framework/core/src/Console/Command/GenerateMigrationCommand.php
rename to framework/core/src/Database/Console/GenerateMigrationCommand.php
index cfdc59229..edf7a7024 100644
--- a/framework/core/src/Console/Command/GenerateMigrationCommand.php
+++ b/framework/core/src/Database/Console/GenerateMigrationCommand.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Console\Command;
+namespace Flarum\Database\Console;
 
+use Flarum\Console\AbstractCommand;
 use Flarum\Database\MigrationCreator;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/framework/core/src/Debug/Console/CacheClearCommand.php b/framework/core/src/Debug/Console/CacheClearCommand.php
index 554e24824..76b66b3b0 100644
--- a/framework/core/src/Debug/Console/CacheClearCommand.php
+++ b/framework/core/src/Debug/Console/CacheClearCommand.php
@@ -12,7 +12,7 @@
 namespace Flarum\Debug\Console;
 
 use Flarum\Admin\Frontend as AdminWebApp;
-use Flarum\Console\Command\AbstractCommand;
+use Flarum\Console\AbstractCommand;
 use Flarum\Forum\WebApp as ForumWebApp;
 use Illuminate\Contracts\Cache\Store;
 
diff --git a/framework/core/src/Debug/Console/InfoCommand.php b/framework/core/src/Debug/Console/InfoCommand.php
index 9f3c36831..e14fb8468 100644
--- a/framework/core/src/Debug/Console/InfoCommand.php
+++ b/framework/core/src/Debug/Console/InfoCommand.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Debug\Console;
 
-use Flarum\Console\Command\AbstractCommand;
+use Flarum\Console\AbstractCommand;
 use Flarum\Extension\ExtensionManager;
 use Flarum\Foundation\Application;
 
diff --git a/framework/core/src/Install/Console/InstallCommand.php b/framework/core/src/Install/Console/InstallCommand.php
index 6dacaeb6f..1a7317830 100644
--- a/framework/core/src/Install/Console/InstallCommand.php
+++ b/framework/core/src/Install/Console/InstallCommand.php
@@ -12,7 +12,7 @@
 namespace Flarum\Install\Console;
 
 use Exception;
-use Flarum\Console\Command\AbstractCommand;
+use Flarum\Console\AbstractCommand;
 use Flarum\Core\Group;
 use Flarum\Core\Permission;
 use Flarum\Core\User;
diff --git a/framework/core/src/Update/Console/MigrateCommand.php b/framework/core/src/Update/Console/MigrateCommand.php
index 1f2c62f83..bdff208c0 100644
--- a/framework/core/src/Update/Console/MigrateCommand.php
+++ b/framework/core/src/Update/Console/MigrateCommand.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Update\Console;
 
-use Flarum\Console\Command\AbstractCommand;
+use Flarum\Console\AbstractCommand;
 use Illuminate\Contracts\Container\Container;
 
 class MigrateCommand extends AbstractCommand