diff --git a/modules/cms/classes/ThemeManager.php b/modules/cms/classes/ThemeManager.php
index 8eb2abc1a..cda79214f 100644
--- a/modules/cms/classes/ThemeManager.php
+++ b/modules/cms/classes/ThemeManager.php
@@ -2,9 +2,8 @@
 
 namespace Cms\Classes;
 
-use Cms\Classes\Theme;
 use System\Classes\Extensions\ExtensionManager;
-use System\Classes\Extensions\ExtensionSource;
+use System\Classes\Extensions\Source\ExtensionSource;
 use System\Classes\Extensions\WinterExtension;
 use System\Models\Parameter;
 use Winter\Storm\Exception\ApplicationException;
diff --git a/modules/system/classes/extensions/ExtensionManager.php b/modules/system/classes/extensions/ExtensionManager.php
index 4814dc0bd..ef4dd43d5 100644
--- a/modules/system/classes/extensions/ExtensionManager.php
+++ b/modules/system/classes/extensions/ExtensionManager.php
@@ -2,6 +2,7 @@
 
 namespace System\Classes\Extensions;
 
+use System\Classes\Extensions\Source\ExtensionSource;
 use Winter\Storm\Exception\ApplicationException;
 
 interface ExtensionManager
diff --git a/modules/system/classes/extensions/PluginManager.php b/modules/system/classes/extensions/PluginManager.php
index c689cc74a..30ba82e8a 100644
--- a/modules/system/classes/extensions/PluginManager.php
+++ b/modules/system/classes/extensions/PluginManager.php
@@ -14,6 +14,7 @@
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use System\Classes\ComposerManager;
+use System\Classes\Extensions\Source\ExtensionSource;
 use System\Classes\SettingsManager;
 use System\Classes\UpdateManager;
 use System\Classes\VersionManager;
diff --git a/modules/system/classes/extensions/source/ComposerSource.php b/modules/system/classes/extensions/source/ComposerSource.php
new file mode 100644
index 000000000..837da28e8
--- /dev/null
+++ b/modules/system/classes/extensions/source/ComposerSource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace System\Classes\Extensions\Source;
+
+use Winter\Storm\Exception\ApplicationException;
+
+class ComposerSource extends ExtensionSource
+{
+    /**
+     * @throws ApplicationException
+     */
+    public function __construct(
+        string $type,
+        ?string $code = null,
+        ?string $composerPackage = null,
+        ?string $path = null
+    ) {
+        parent::__construct(static::SOURCE_COMPOSER, $type, $code, $composerPackage, $path);
+    }
+}
diff --git a/modules/system/classes/extensions/ExtensionSource.php b/modules/system/classes/extensions/source/ExtensionSource.php
similarity index 97%
rename from modules/system/classes/extensions/ExtensionSource.php
rename to modules/system/classes/extensions/source/ExtensionSource.php
index c4b5e8fa9..0af52c05e 100644
--- a/modules/system/classes/extensions/ExtensionSource.php
+++ b/modules/system/classes/extensions/source/ExtensionSource.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace System\Classes\Extensions;
+namespace System\Classes\Extensions\Source;
 
 use Cms\Classes\ThemeManager;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\File;
+use System\Classes\Extensions\ExtensionManager;
+use System\Classes\Extensions\WinterExtension;
 use System\Classes\Packager\Composer;
 use Winter\Packager\Exceptions\CommandException;
 use Winter\Storm\Exception\ApplicationException;
diff --git a/modules/system/classes/extensions/source/LocalSource.php b/modules/system/classes/extensions/source/LocalSource.php
new file mode 100644
index 000000000..f9db2fe52
--- /dev/null
+++ b/modules/system/classes/extensions/source/LocalSource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace System\Classes\Extensions\Source;
+
+use Winter\Storm\Exception\ApplicationException;
+
+class LocalSource extends ExtensionSource
+{
+    /**
+     * @throws ApplicationException
+     */
+    public function __construct(
+        string $type,
+        ?string $code = null,
+        ?string $composerPackage = null,
+        ?string $path = null
+    ) {
+        parent::__construct(static::SOURCE_LOCAL, $type, $code, $composerPackage, $path);
+    }
+}
diff --git a/modules/system/classes/extensions/source/MarketSource.php b/modules/system/classes/extensions/source/MarketSource.php
new file mode 100644
index 000000000..736b41455
--- /dev/null
+++ b/modules/system/classes/extensions/source/MarketSource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace System\Classes\Extensions\Source;
+
+use Winter\Storm\Exception\ApplicationException;
+
+class MarketSource extends ExtensionSource
+{
+    /**
+     * @throws ApplicationException
+     */
+    public function __construct(
+        string $type,
+        ?string $code = null,
+        ?string $composerPackage = null,
+        ?string $path = null
+    ) {
+        parent::__construct(static::SOURCE_MARKET, $type, $code, $composerPackage, $path);
+    }
+}