diff --git a/Admin/Installer.php b/Admin/Installer.php
index 308bfbb..d19a118 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Media\Admin;
 
-use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\DataStorage\Database\DatabasePool;
+use phpOMS\DataStorage\Database\DatabaseType;
 use phpOMS\Module\InfoManager;
 use phpOMS\Module\InstallerAbstract;
 
diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php
index 2ca54e6..5eab8de 100644
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@@ -1,9 +1,9 @@
 <?php
 
-use phpOMS\Router\RouteVerb;
-use phpOMS\Account\PermissionType;
-use Modules\Media\Models\PermissionState;
 use Modules\Media\Controller\ApiController;
+use Modules\Media\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/api/media/collection.*$' => [
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 2b9c3c1..08145b5 100644
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -1,9 +1,9 @@
 <?php
 
-use phpOMS\Router\RouteVerb;
-use phpOMS\Account\PermissionType;
-use Modules\Media\Models\PermissionState;
 use Modules\Media\Controller\BackendController;
+use Modules\Media\Models\PermissionState;
+use phpOMS\Account\PermissionType;
+use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/backend/media/list.*$' => [
diff --git a/Admin/Status.php b/Admin/Status.php
index ccc6a3f..9651f2e 100644
--- a/Admin/Status.php
+++ b/Admin/Status.php
@@ -14,9 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Media\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\StatusAbstract;
-use phpOMS\Module\InfoManager;
 
 /**
  * Navigation class.
diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php
index ac401a9..10d5955 100644
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@@ -16,8 +16,8 @@ namespace Modules\Media\Admin;
 
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\DataStorage\Database\Schema\Builder;
-use phpOMS\Module\UninstallerAbstract;
 use phpOMS\Module\InfoManager;
+use phpOMS\Module\UninstallerAbstract;
 
 /**
  * Navigation class.
diff --git a/Admin/Updater.php b/Admin/Updater.php
index 87d3351..5219ce2 100644
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@@ -14,10 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Media\Admin;
 
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Module\UpdaterAbstract;
-use phpOMS\System\File\Local\Directory;
-use phpOMS\Module\InfoManager;
 
 /**
  * Updater class.
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a743688..03c0081 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -21,7 +21,6 @@ use Modules\Media\Models\UploadFile;
 use Modules\Media\Models\UploadStatus;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
-use phpOMS\Model\Html\Head;
 
 /**
  * Media class.
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 57506bf..6d97751 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,10 +14,9 @@ declare(strict_types=1);
 
 namespace Modules\Media\Controller;
 
+use Modules\Media\Models\CollectionMapper;
 use Modules\Media\Models\Media;
 use Modules\Media\Models\MediaMapper;
-use Modules\Media\Models\CollectionMapper;
-use Modules\Media\Models\Collection;
 use Modules\Media\Views\MediaView;
 
 use phpOMS\Asset\AssetType;
diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php
index 478190f..dfe187b 100644
--- a/Models/CollectionMapper.php
+++ b/Models/CollectionMapper.php
@@ -14,9 +14,6 @@ declare(strict_types=1);
 
 namespace Modules\Media\Models;
 
-use Modules\Media\Models\MediaMapper;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
 
 final class CollectionMapper extends MediaMapper
 {
diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php
index c310d02..7806d13 100644
--- a/Models/MediaMapper.php
+++ b/Models/MediaMapper.php
@@ -14,11 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Media\Models;
 
-use phpOMS\DataStorage\Database\DataMapperAbstract;
-use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\DataStorage\Database\Query\Column;
-use phpOMS\DataStorage\Database\RelationType;
 use Modules\Admin\Models\AccountMapper;
+use phpOMS\DataStorage\Database\DataMapperAbstract;
 
 class MediaMapper extends DataMapperAbstract
 {
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index 77b97a5..af8ee66 100644
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -14,8 +14,8 @@ declare(strict_types=1);
 
 namespace Modules\Media\Models;
 
-use phpOMS\System\File\Local\Directory;
 use phpOMS\System\File\FileUtils;
+use phpOMS\System\File\Local\Directory;
 
 /**
  * Upload.
diff --git a/Theme/Backend/Components/Media/BaseView.php b/Theme/Backend/Components/Media/BaseView.php
index ba597d2..5983eb4 100644
--- a/Theme/Backend/Components/Media/BaseView.php
+++ b/Theme/Backend/Components/Media/BaseView.php
@@ -14,10 +14,10 @@ declare(strict_types=1);
 
 namespace Modules\Media\Theme\Backend\Components\Media;
 
-use phpOMS\Views\View;
 use phpOMS\ApplicationAbstract;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
+use phpOMS\Views\View;
 
 class BaseView extends View
 {
diff --git a/Theme/Backend/Components/Upload/BaseView.php b/Theme/Backend/Components/Upload/BaseView.php
index 3f7460d..525da32 100644
--- a/Theme/Backend/Components/Upload/BaseView.php
+++ b/Theme/Backend/Components/Upload/BaseView.php
@@ -14,10 +14,10 @@ declare(strict_types=1);
 
 namespace Modules\Media\Theme\Backend\Components\Upload;
 
-use phpOMS\Views\View;
 use phpOMS\ApplicationAbstract;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
+use phpOMS\Views\View;
 
 class BaseView extends View
 {
diff --git a/Theme/Backend/media-single.tpl.php b/Theme/Backend/media-single.tpl.php
index a7c1266..1bf76ff 100644
--- a/Theme/Backend/media-single.tpl.php
+++ b/Theme/Backend/media-single.tpl.php
@@ -11,9 +11,8 @@
  * @link       http://website.orange-management.de
  */
 
-use \phpOMS\System\File\Local\File;
 use \phpOMS\System\File\FileUtils;
-use \phpOMS\System\File\ExtensionType;
+use \phpOMS\System\File\Local\File;
 use \phpOMS\Uri\UriFactory;
 
 include __DIR__ . '/template-functions.php';
diff --git a/Views/MediaView.php b/Views/MediaView.php
index 31583ac..6a36ec1 100644
--- a/Views/MediaView.php
+++ b/Views/MediaView.php
@@ -14,13 +14,13 @@ declare(strict_types=1);
 
 namespace Modules\Media\Views;
 
-use phpOMS\Views\View;
+use Modules\Media\Models\Media;
+use phpOMS\System\File\ExtensionType;
 use phpOMS\System\File\FileUtils;
 use phpOMS\System\File\Local\File;
 use phpOMS\Utils\StringUtils;
-use phpOMS\System\File\ExtensionType;
 
-use Modules\Media\Models\Media;
+use phpOMS\Views\View;
 
 /**
  * Media view.