diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 69f2b1fa62..9849faea5e 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -17,7 +17,6 @@
 use System\Classes\ErrorHandler;
 use System\Classes\Extensions\ModuleManager;
 use System\Classes\Extensions\PluginManager;
-use Winter\Storm\Foundation\Extension\WinterExtension;
 use System\Classes\FileManifest;
 use System\Classes\MailManager;
 use System\Classes\MarkupManager;
@@ -32,6 +31,7 @@
 use Twig\Extension\CoreExtension;
 use Winter\Storm\Console\Command;
 use Winter\Storm\Exception\SystemException;
+use Winter\Storm\Foundation\Extension\WinterExtension;
 use Winter\Storm\Router\Helper as RouterHelper;
 use Winter\Storm\Support\ClassLoader;
 use Winter\Storm\Support\Facades\Event;
@@ -314,34 +314,34 @@ protected function registerConsole()
         /*
          * Register console commands
          */
-        $this->registerConsoleCommand('create.command', \System\Console\CreateCommand::class);
-        $this->registerConsoleCommand('create.job', \System\Console\CreateJob::class);
-        $this->registerConsoleCommand('create.migration', \System\Console\CreateMigration::class);
-        $this->registerConsoleCommand('create.model', \System\Console\CreateModel::class);
-        $this->registerConsoleCommand('create.factory', \System\Console\CreateFactory::class);
-        $this->registerConsoleCommand('create.plugin', \System\Console\CreatePlugin::class);
-        $this->registerConsoleCommand('create.settings', \System\Console\CreateSettings::class);
-        $this->registerConsoleCommand('create.test', \System\Console\CreateTest::class);
-
-        $this->registerConsoleCommand('winter.up', \System\Console\WinterUp::class);
-        $this->registerConsoleCommand('winter.down', \System\Console\WinterDown::class);
-        $this->registerConsoleCommand('winter.update', \System\Console\WinterUpdate::class);
-        $this->registerConsoleCommand('winter.util', \System\Console\WinterUtil::class);
-        $this->registerConsoleCommand('winter.mirror', \System\Console\WinterMirror::class);
-        $this->registerConsoleCommand('winter.fresh', \System\Console\WinterFresh::class);
-        $this->registerConsoleCommand('winter.env', \System\Console\WinterEnv::class);
-        $this->registerConsoleCommand('winter.install', \System\Console\WinterInstall::class);
-        $this->registerConsoleCommand('winter.version', \System\Console\WinterVersion::class);
-        $this->registerConsoleCommand('winter.manifest', \System\Console\WinterManifest::class);
-        $this->registerConsoleCommand('winter.test', \System\Console\WinterTest::class);
-
-        $this->registerConsoleCommand('plugin.install', \System\Console\PluginInstall::class);
-        $this->registerConsoleCommand('plugin.remove', \System\Console\PluginRemove::class);
-        $this->registerConsoleCommand('plugin.disable', \System\Console\PluginDisable::class);
-        $this->registerConsoleCommand('plugin.enable', \System\Console\PluginEnable::class);
-        $this->registerConsoleCommand('plugin.refresh', \System\Console\PluginRefresh::class);
-        $this->registerConsoleCommand('plugin.rollback', \System\Console\PluginRollback::class);
-        $this->registerConsoleCommand('plugin.list', \System\Console\PluginList::class);
+        $this->registerConsoleCommand('create.command', Console\Create\CreateCommand::class);
+        $this->registerConsoleCommand('create.job', Console\Create\CreateJob::class);
+        $this->registerConsoleCommand('create.migration', Console\Create\CreateMigration::class);
+        $this->registerConsoleCommand('create.model', Console\Create\CreateModel::class);
+        $this->registerConsoleCommand('create.factory', Console\Create\CreateFactory::class);
+        $this->registerConsoleCommand('create.plugin', Console\Create\CreatePlugin::class);
+        $this->registerConsoleCommand('create.settings', Console\Create\CreateSettings::class);
+        $this->registerConsoleCommand('create.test', Console\Create\CreateTest::class);
+
+        $this->registerConsoleCommand('winter.up', Console\WinterUp::class);
+        $this->registerConsoleCommand('winter.down', Console\WinterDown::class);
+        $this->registerConsoleCommand('winter.update', Console\WinterUpdate::class);
+        $this->registerConsoleCommand('winter.util', Console\WinterUtil::class);
+        $this->registerConsoleCommand('winter.mirror', Console\WinterMirror::class);
+        $this->registerConsoleCommand('winter.fresh', Console\WinterFresh::class);
+        $this->registerConsoleCommand('winter.env', Console\WinterEnv::class);
+        $this->registerConsoleCommand('winter.install', Console\WinterInstall::class);
+        $this->registerConsoleCommand('winter.version', Console\WinterVersion::class);
+        $this->registerConsoleCommand('winter.manifest', Console\WinterManifest::class);
+        $this->registerConsoleCommand('winter.test', Console\WinterTest::class);
+
+        $this->registerConsoleCommand('plugin.install', Console\Plugin\PluginInstall::class);
+        $this->registerConsoleCommand('plugin.remove', Console\Plugin\PluginRemove::class);
+        $this->registerConsoleCommand('plugin.disable', Console\Plugin\PluginDisable::class);
+        $this->registerConsoleCommand('plugin.enable', Console\Plugin\PluginEnable::class);
+        $this->registerConsoleCommand('plugin.refresh', Console\Plugin\PluginRefresh::class);
+        $this->registerConsoleCommand('plugin.rollback', Console\Plugin\PluginRollback::class);
+        $this->registerConsoleCommand('plugin.list', Console\Plugin\PluginList::class);
 
         $this->registerConsoleCommand('mix.compile', Console\Asset\Mix\MixCompile::class);
         $this->registerConsoleCommand('mix.config', Console\Asset\Mix\MixCreate::class);
diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index 520cd3b329..f9709d14df 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -92,20 +92,20 @@
     'Illuminate\Support\Debug\HtmlDumper' => Symfony\Component\VarDumper\Dumper\HtmlDumper::class,
 
     // Scaffolds were moved from the Storm library into their corresponding modules.
-    'Winter\Storm\Scaffold\Console\CreateCommand'        => System\Console\CreateCommand::class,
-    'Winter\Storm\Scaffold\Console\CreateModel'          => System\Console\CreateModel::class,
-    'Winter\Storm\Scaffold\Console\CreatePlugin'         => System\Console\CreatePlugin::class,
-    'Winter\Storm\Scaffold\Console\CreateSettings'       => System\Console\CreateSettings::class,
+    'Winter\Storm\Scaffold\Console\CreateCommand'        => System\Console\Create\CreateCommand::class,
+    'Winter\Storm\Scaffold\Console\CreateModel'          => System\Console\Create\CreateModel::class,
+    'Winter\Storm\Scaffold\Console\CreatePlugin'         => System\Console\Create\CreatePlugin::class,
+    'Winter\Storm\Scaffold\Console\CreateSettings'       => System\Console\Create\CreateSettings::class,
     'Winter\Storm\Scaffold\Console\CreateController'     => Backend\Console\CreateController::class,
     'Winter\Storm\Scaffold\Console\CreateFormWidget'     => Backend\Console\CreateFormWidget::class,
     'Winter\Storm\Scaffold\Console\CreateReportWidget'   => Backend\Console\CreateReportWidget::class,
     'Winter\Storm\Scaffold\Console\CreateTheme'          => Cms\Console\CreateTheme::class,
     'Winter\Storm\Scaffold\Console\CreateComponent'      => Cms\Console\CreateComponent::class,
 
-    'October\Rain\Scaffold\Console\CreateCommand'        => System\Console\CreateCommand::class,
-    'October\Rain\Scaffold\Console\CreateModel'          => System\Console\CreateModel::class,
-    'October\Rain\Scaffold\Console\CreatePlugin'         => System\Console\CreatePlugin::class,
-    'October\Rain\Scaffold\Console\CreateSettings'       => System\Console\CreateSettings::class,
+    'October\Rain\Scaffold\Console\CreateCommand'        => System\Console\Create\CreateCommand::class,
+    'October\Rain\Scaffold\Console\CreateModel'          => System\Console\Create\CreateModel::class,
+    'October\Rain\Scaffold\Console\CreatePlugin'         => System\Console\Create\CreatePlugin::class,
+    'October\Rain\Scaffold\Console\CreateSettings'       => System\Console\Create\CreateSettings::class,
     'October\Rain\Scaffold\Console\CreateController'     => Backend\Console\CreateController::class,
     'October\Rain\Scaffold\Console\CreateFormWidget'     => Backend\Console\CreateFormWidget::class,
     'October\Rain\Scaffold\Console\CreateReportWidget'   => Backend\Console\CreateReportWidget::class,
diff --git a/modules/system/console/CreateCommand.php b/modules/system/console/create/CreateCommand.php
similarity index 98%
rename from modules/system/console/CreateCommand.php
rename to modules/system/console/create/CreateCommand.php
index ddd5cbbdad..c7e527b345 100644
--- a/modules/system/console/CreateCommand.php
+++ b/modules/system/console/create/CreateCommand.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Create;
 
 use InvalidArgumentException;
 use System\Console\BaseScaffoldCommand;
diff --git a/modules/system/console/CreateFactory.php b/modules/system/console/create/CreateFactory.php
similarity index 97%
rename from modules/system/console/CreateFactory.php
rename to modules/system/console/create/CreateFactory.php
index 25bffba7fa..4c99e51b24 100644
--- a/modules/system/console/CreateFactory.php
+++ b/modules/system/console/create/CreateFactory.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Create;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/system/console/CreateJob.php b/modules/system/console/create/CreateJob.php
similarity index 97%
rename from modules/system/console/CreateJob.php
rename to modules/system/console/create/CreateJob.php
index d03835e2d9..b4413298e4 100644
--- a/modules/system/console/CreateJob.php
+++ b/modules/system/console/create/CreateJob.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Create;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/system/console/CreateMigration.php b/modules/system/console/create/CreateMigration.php
similarity index 99%
rename from modules/system/console/CreateMigration.php
rename to modules/system/console/create/CreateMigration.php
index 0f7a06a31a..fcf313d9fd 100644
--- a/modules/system/console/CreateMigration.php
+++ b/modules/system/console/create/CreateMigration.php
@@ -1,7 +1,10 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Create;
 
 use InvalidArgumentException;
 use System\Classes\Extensions\Plugins\PluginVersionManager;
+use System\Console\BaseScaffoldCommand;
 use Winter\Storm\Database\Model;
 use Winter\Storm\Support\Str;
 use Yaml;
diff --git a/modules/system/console/CreateModel.php b/modules/system/console/create/CreateModel.php
similarity index 99%
rename from modules/system/console/CreateModel.php
rename to modules/system/console/create/CreateModel.php
index 0b4fa6de39..452ef6b82a 100644
--- a/modules/system/console/CreateModel.php
+++ b/modules/system/console/create/CreateModel.php
@@ -1,7 +1,9 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Create;
 
-use Winter\Storm\Support\Str;
 use System\Console\BaseScaffoldCommand;
+use Winter\Storm\Support\Str;
 
 class CreateModel extends BaseScaffoldCommand
 {
diff --git a/modules/system/console/CreatePlugin.php b/modules/system/console/create/CreatePlugin.php
similarity index 97%
rename from modules/system/console/CreatePlugin.php
rename to modules/system/console/create/CreatePlugin.php
index 0366148496..2a9a760401 100644
--- a/modules/system/console/CreatePlugin.php
+++ b/modules/system/console/create/CreatePlugin.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Create;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/system/console/CreateSettings.php b/modules/system/console/create/CreateSettings.php
similarity index 97%
rename from modules/system/console/CreateSettings.php
rename to modules/system/console/create/CreateSettings.php
index 1826797e22..984f0d1cf4 100644
--- a/modules/system/console/CreateSettings.php
+++ b/modules/system/console/create/CreateSettings.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Create;
 
 use System\Console\BaseScaffoldCommand;
 
diff --git a/modules/system/console/CreateTest.php b/modules/system/console/create/CreateTest.php
similarity index 99%
rename from modules/system/console/CreateTest.php
rename to modules/system/console/create/CreateTest.php
index c973299252..3281c00c07 100644
--- a/modules/system/console/CreateTest.php
+++ b/modules/system/console/create/CreateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace System\Console;
+namespace System\Console\Create;
 
 use System\Console\BaseScaffoldCommand;
 use Winter\Storm\Support\Str;
diff --git a/modules/system/console/PluginDisable.php b/modules/system/console/plugin/PluginDisable.php
similarity index 93%
rename from modules/system/console/PluginDisable.php
rename to modules/system/console/plugin/PluginDisable.php
index 152fbaeca2..21700dbfd4 100644
--- a/modules/system/console/PluginDisable.php
+++ b/modules/system/console/plugin/PluginDisable.php
@@ -1,6 +1,9 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Plugin;
 
 use System\Classes\Extensions\PluginManager;
+use System\Console\Traits;
 use Winter\Storm\Console\Command;
 
 /**
diff --git a/modules/system/console/PluginEnable.php b/modules/system/console/plugin/PluginEnable.php
similarity index 94%
rename from modules/system/console/PluginEnable.php
rename to modules/system/console/plugin/PluginEnable.php
index 75aa0523b3..f4d6b6da4b 100644
--- a/modules/system/console/PluginEnable.php
+++ b/modules/system/console/plugin/PluginEnable.php
@@ -1,6 +1,9 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Plugin;
 
 use System\Classes\Extensions\PluginManager;
+use System\Console\Traits;
 use Winter\Storm\Console\Command;
 
 /**
diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/plugin/PluginInstall.php
similarity index 99%
rename from modules/system/console/PluginInstall.php
rename to modules/system/console/plugin/PluginInstall.php
index 3091db2005..c2f3ed351b 100644
--- a/modules/system/console/PluginInstall.php
+++ b/modules/system/console/plugin/PluginInstall.php
@@ -1,4 +1,6 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Plugin;
 
 use System\Classes\Extensions\PluginManager;
 use System\Classes\UpdateManager;
diff --git a/modules/system/console/PluginList.php b/modules/system/console/plugin/PluginList.php
similarity index 92%
rename from modules/system/console/PluginList.php
rename to modules/system/console/plugin/PluginList.php
index abfbcbd5d0..829a37c82e 100644
--- a/modules/system/console/PluginList.php
+++ b/modules/system/console/plugin/PluginList.php
@@ -1,7 +1,7 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Plugin;
 
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableSeparator;
 use System\Classes\Extensions\PluginManager;
 use System\Models\PluginVersion;
 use Winter\Storm\Console\Command;
diff --git a/modules/system/console/PluginRefresh.php b/modules/system/console/plugin/PluginRefresh.php
similarity index 95%
rename from modules/system/console/PluginRefresh.php
rename to modules/system/console/plugin/PluginRefresh.php
index 8cefcfefbf..6cecb4845c 100644
--- a/modules/system/console/PluginRefresh.php
+++ b/modules/system/console/plugin/PluginRefresh.php
@@ -1,8 +1,10 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Plugin;
 
 use System\Classes\Extensions\PluginManager;
+use System\Console\Traits;
 use Winter\Storm\Console\Command;
-use System\Classes\UpdateManager;
 
 /**
  * Console command to refresh a plugin.
diff --git a/modules/system/console/PluginRemove.php b/modules/system/console/plugin/PluginRemove.php
similarity index 96%
rename from modules/system/console/PluginRemove.php
rename to modules/system/console/plugin/PluginRemove.php
index 6860127586..cb0cb86d34 100644
--- a/modules/system/console/PluginRemove.php
+++ b/modules/system/console/plugin/PluginRemove.php
@@ -1,8 +1,9 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Plugin;
 
-use File;
 use System\Classes\Extensions\PluginManager;
-use System\Classes\UpdateManager;
+use System\Console\Traits;
 use Winter\Storm\Console\Command;
 use Winter\Storm\Exception\ApplicationException;
 
diff --git a/modules/system/console/PluginRollback.php b/modules/system/console/plugin/PluginRollback.php
similarity index 93%
rename from modules/system/console/PluginRollback.php
rename to modules/system/console/plugin/PluginRollback.php
index 7bb538974a..04055623cf 100644
--- a/modules/system/console/PluginRollback.php
+++ b/modules/system/console/plugin/PluginRollback.php
@@ -1,10 +1,11 @@
-<?php namespace System\Console;
+<?php
+
+namespace System\Console\Plugin;
 
 use InvalidArgumentException;
 use System\Classes\Extensions\PluginManager;
+use System\Console\Traits;
 use Winter\Storm\Console\Command;
-use System\Classes\UpdateManager;
-use System\Classes\VersionManager;
 
 /**
  * Console command to rollback a plugin.
@@ -37,7 +38,7 @@ class PluginRollback extends Command
 
     /**
      * Execute the console command.
-     * @throws Exception if the UpdateManager is unable to rollback the requested plugin to the requested version
+     * @throws \Exception if the UpdateManager is unable to rollback the requested plugin to the requested version
      * @throws InvalidArgumentException if the requested rollback version can't be found
      */
     public function handle(): int