diff --git a/config/routes.yaml b/config/routes.yaml
index e4c7f66..cb1e27a 100644
--- a/config/routes.yaml
+++ b/config/routes.yaml
@@ -1,7 +1,7 @@
-controllersIndex:
+controllersBase:
     resource:
-        path: ../src/Controller/
-        namespace: App\Controller
+        path: ../src/Base/Framework/Controller/
+        namespace: App\Base\Framework\Controller
     type: attribute
     defaults:
         schemes: [ 'https' ]
diff --git a/src/Enum/MediaType.php b/src/Base/Enum/MediaType.php
similarity index 78%
rename from src/Enum/MediaType.php
rename to src/Base/Enum/MediaType.php
index a7b554a..cd8f9e2 100644
--- a/src/Enum/MediaType.php
+++ b/src/Base/Enum/MediaType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Enum;
+namespace App\Base\Enum;
 
 enum MediaType: string
 {
diff --git a/src/Command/ConfigSetCommand.php b/src/Base/Framework/Command/ConfigSetCommand.php
similarity index 95%
rename from src/Command/ConfigSetCommand.php
rename to src/Base/Framework/Command/ConfigSetCommand.php
index 0aca7fb..5179c84 100644
--- a/src/Command/ConfigSetCommand.php
+++ b/src/Base/Framework/Command/ConfigSetCommand.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\Command;
 
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
diff --git a/src/Command/SeedDatabaseCommand.php b/src/Base/Framework/Command/SeedDatabaseCommand.php
similarity index 99%
rename from src/Command/SeedDatabaseCommand.php
rename to src/Base/Framework/Command/SeedDatabaseCommand.php
index 341b25f..385d594 100644
--- a/src/Command/SeedDatabaseCommand.php
+++ b/src/Base/Framework/Command/SeedDatabaseCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\Command;
 
 use App\User\Framework\Entity\UserPreference;
 use App\User\Framework\Repository\PreferenceOptionRepository;
diff --git a/src/Command/StartupStatusCommand.php b/src/Base/Framework/Command/StartupStatusCommand.php
similarity index 91%
rename from src/Command/StartupStatusCommand.php
rename to src/Base/Framework/Command/StartupStatusCommand.php
index 95b468e..9fbe74f 100644
--- a/src/Command/StartupStatusCommand.php
+++ b/src/Base/Framework/Command/StartupStatusCommand.php
@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Command;
+namespace App\Base\Framework\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
diff --git a/src/Controller/.gitignore b/src/Base/Framework/Controller/.gitignore
similarity index 100%
rename from src/Controller/.gitignore
rename to src/Base/Framework/Controller/.gitignore
diff --git a/src/Controller/AlertController.php b/src/Base/Framework/Controller/AlertController.php
similarity index 89%
rename from src/Controller/AlertController.php
rename to src/Base/Framework/Controller/AlertController.php
index 4a7816e..6079799 100644
--- a/src/Controller/AlertController.php
+++ b/src/Base/Framework/Controller/AlertController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Controller;
+namespace App\Base\Framework\Controller;
 
-use App\Util\Broadcaster;
+use App\Base\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
diff --git a/src/Controller/IndexController.php b/src/Base/Framework/Controller/IndexController.php
similarity index 82%
rename from src/Controller/IndexController.php
rename to src/Base/Framework/Controller/IndexController.php
index fe1d7f6..f31934a 100644
--- a/src/Controller/IndexController.php
+++ b/src/Base/Framework/Controller/IndexController.php
@@ -1,13 +1,9 @@
 <?php
 
-namespace App\Controller;
+namespace App\Base\Framework\Controller;
 
-use App\Download\Framework\Repository\DownloadRepository;
-use App\Monitor\Action\Command\MonitorTvShowCommand;
 use App\Monitor\Action\Handler\MonitorTvShowHandler;
-use App\Monitor\Framework\Scheduler\MonitorDispatcher;
 use App\Tmdb\Tmdb;
-use App\Tmdb\TmdbResult;
 use App\User\Framework\Entity\User;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Controller/SearchController.php b/src/Base/Framework/Controller/SearchController.php
similarity index 98%
rename from src/Controller/SearchController.php
rename to src/Base/Framework/Controller/SearchController.php
index ce93d37..c0374d5 100644
--- a/src/Controller/SearchController.php
+++ b/src/Base/Framework/Controller/SearchController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller;
+namespace App\Base\Framework\Controller;
 
 use App\Search\Action\Handler\GetMediaInfoHandler;
 use App\Search\Action\Handler\SearchHandler;
diff --git a/src/Util/Broadcaster.php b/src/Base/Util/Broadcaster.php
similarity index 97%
rename from src/Util/Broadcaster.php
rename to src/Base/Util/Broadcaster.php
index d4f7d7a..9aaf685 100644
--- a/src/Util/Broadcaster.php
+++ b/src/Base/Util/Broadcaster.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;
diff --git a/src/Util/CountryCodes.php b/src/Base/Util/CountryCodes.php
similarity index 99%
rename from src/Util/CountryCodes.php
rename to src/Base/Util/CountryCodes.php
index b8b8f63..ae1cd47 100644
--- a/src/Util/CountryCodes.php
+++ b/src/Base/Util/CountryCodes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class CountryCodes
 {
diff --git a/src/Util/CountryLanguages.php b/src/Base/Util/CountryLanguages.php
similarity index 99%
rename from src/Util/CountryLanguages.php
rename to src/Base/Util/CountryLanguages.php
index ee10df0..e012d20 100644
--- a/src/Util/CountryLanguages.php
+++ b/src/Base/Util/CountryLanguages.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class CountryLanguages
 {
diff --git a/src/Util/Paginator.php b/src/Base/Util/Paginator.php
similarity index 98%
rename from src/Util/Paginator.php
rename to src/Base/Util/Paginator.php
index 3dd4a3d..cbff1d2 100644
--- a/src/Util/Paginator.php
+++ b/src/Base/Util/Paginator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
diff --git a/src/Util/ProviderList.php b/src/Base/Util/ProviderList.php
similarity index 94%
rename from src/Util/ProviderList.php
rename to src/Base/Util/ProviderList.php
index 87e3b6e..15d22d1 100644
--- a/src/Util/ProviderList.php
+++ b/src/Base/Util/ProviderList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class ProviderList
 {
diff --git a/src/Util/QualityList.php b/src/Base/Util/QualityList.php
similarity index 98%
rename from src/Util/QualityList.php
rename to src/Base/Util/QualityList.php
index b4a0868..518b14b 100644
--- a/src/Util/QualityList.php
+++ b/src/Base/Util/QualityList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Util;
+namespace App\Base\Util;
 
 class QualityList
 {
diff --git a/src/Download/Framework/Controller/ApiController.php b/src/Download/Framework/Controller/ApiController.php
index ca76fee..f4c8659 100644
--- a/src/Download/Framework/Controller/ApiController.php
+++ b/src/Download/Framework/Controller/ApiController.php
@@ -2,6 +2,7 @@
 
 namespace App\Download\Framework\Controller;
 
+use App\Base\Util\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
@@ -10,7 +11,6 @@ use App\Download\Action\Input\DownloadMediaInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
-use App\Util\Broadcaster;
 use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Download/Framework/Repository/DownloadRepository.php b/src/Download/Framework/Repository/DownloadRepository.php
index de29746..b0b6a35 100644
--- a/src/Download/Framework/Repository/DownloadRepository.php
+++ b/src/Download/Framework/Repository/DownloadRepository.php
@@ -2,9 +2,9 @@
 
 namespace App\Download\Framework\Repository;
 
+use App\Base\Util\Paginator;
 use App\Download\Framework\Entity\Download;
 use App\User\Framework\Entity\User;
-use App\Util\Paginator;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\User\UserInterface;
diff --git a/src/Monitor/Framework/Controller/ApiController.php b/src/Monitor/Framework/Controller/ApiController.php
index 8d68c63..4332c27 100644
--- a/src/Monitor/Framework/Controller/ApiController.php
+++ b/src/Monitor/Framework/Controller/ApiController.php
@@ -2,12 +2,12 @@
 
 namespace App\Monitor\Framework\Controller;
 
+use App\Base\Util\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
 use App\Monitor\Action\Input\DeleteMonitorInput;
 use App\Monitor\Framework\Scheduler\MonitorDispatcher;
-use App\Util\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mercure\HubInterface;
diff --git a/src/Monitor/Framework/Repository/MonitorRepository.php b/src/Monitor/Framework/Repository/MonitorRepository.php
index 0019c2b..b7a1400 100644
--- a/src/Monitor/Framework/Repository/MonitorRepository.php
+++ b/src/Monitor/Framework/Repository/MonitorRepository.php
@@ -2,8 +2,8 @@
 
 namespace App\Monitor\Framework\Repository;
 
+use App\Base\Util\Paginator;
 use App\Monitor\Framework\Entity\Monitor;
-use App\Util\Paginator;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\User\UserInterface;
diff --git a/src/Search/Action/Input/GetMediaInfoInput.php b/src/Search/Action/Input/GetMediaInfoInput.php
index 774f6d0..dc0e607 100644
--- a/src/Search/Action/Input/GetMediaInfoInput.php
+++ b/src/Search/Action/Input/GetMediaInfoInput.php
@@ -2,8 +2,6 @@
 
 namespace App\Search\Action\Input;
 
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Enum\MediaType;
 use App\Search\Action\Command\GetMediaInfoCommand;
 use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Contract\CommandInterface;
diff --git a/src/Tmdb/Tmdb.php b/src/Tmdb/Tmdb.php
index 587cd1a..03f4715 100644
--- a/src/Tmdb/Tmdb.php
+++ b/src/Tmdb/Tmdb.php
@@ -3,14 +3,11 @@
 namespace App\Tmdb;
 
 use Aimeos\Map;
-use App\Enum\MediaType;
+use App\Base\Enum\MediaType;
 use App\ValueObject\ResultFactory;
-use Carbon\Carbon;
 use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\RedisAdapter;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 use Tmdb\Api\Find;
 use Tmdb\Client;
@@ -20,7 +17,6 @@ use Tmdb\Event\Listener\Request\AcceptJsonRequestListener;
 use Tmdb\Event\Listener\Request\ApiTokenRequestListener;
 use Tmdb\Event\Listener\Request\ContentTypeJsonRequestListener;
 use Tmdb\Event\Listener\Request\UserAgentRequestListener;
-use Tmdb\Event\Listener\RequestListener;
 use Tmdb\Event\RequestEvent;
 use Tmdb\Model\Movie;
 use Tmdb\Model\Search\SearchQuery\KeywordSearchQuery;
diff --git a/src/Torrentio/Framework/Controller/ApiController.php b/src/Torrentio/Framework/Controller/ApiController.php
index 5c482d7..7e8dc8a 100644
--- a/src/Torrentio/Framework/Controller/ApiController.php
+++ b/src/Torrentio/Framework/Controller/ApiController.php
@@ -2,20 +2,10 @@
 
 namespace App\Torrentio\Framework\Controller;
 
-use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
-use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
-use App\Torrentio\Action\Input\GetMovieOptionsInput;
-use App\Torrentio\Action\Input\GetTvShowOptionsInput;
 use App\Torrentio\Client\Torrentio;
-use App\Torrentio\Exception\TorrentioRateLimitException;
-use App\Util\Broadcaster;
-use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
 
 final class ApiController extends AbstractController
 {
diff --git a/src/Torrentio/Framework/Controller/WebController.php b/src/Torrentio/Framework/Controller/WebController.php
index a7b912d..45c6603 100644
--- a/src/Torrentio/Framework/Controller/WebController.php
+++ b/src/Torrentio/Framework/Controller/WebController.php
@@ -2,12 +2,12 @@
 
 namespace App\Torrentio\Framework\Controller;
 
+use App\Base\Util\Broadcaster;
 use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;
 use App\Torrentio\Action\Input\GetTvShowOptionsInput;
 use App\Torrentio\Exception\TorrentioRateLimitException;
-use App\Util\Broadcaster;
 use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Torrentio/Result/ResultFactory.php b/src/Torrentio/Result/ResultFactory.php
index 6c428bb..7615155 100644
--- a/src/Torrentio/Result/ResultFactory.php
+++ b/src/Torrentio/Result/ResultFactory.php
@@ -2,8 +2,7 @@
 
 namespace App\Torrentio\Result;
 
-use App\Util\CountryCodes;
-use App\Util\CountryLanguages;
+use App\Base\Util\CountryLanguages;
 use Nihilarr\PTN;
 
 class ResultFactory
diff --git a/src/Twig/Components/DownloadList.php b/src/Twig/Components/DownloadList.php
index 0cf1797..6fdc508 100644
--- a/src/Twig/Components/DownloadList.php
+++ b/src/Twig/Components/DownloadList.php
@@ -3,11 +3,8 @@
 namespace App\Twig\Components;
 
 use App\Download\Framework\Repository\DownloadRepository;
-use App\Util\Paginator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
-use Symfony\UX\LiveComponent\Attribute\LiveAction;
-use Symfony\UX\LiveComponent\Attribute\LiveArg;
 use Symfony\UX\LiveComponent\Attribute\LiveProp;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
diff --git a/src/Twig/Components/Filter.php b/src/Twig/Components/Filter.php
index 4ab789c..43efd23 100644
--- a/src/Twig/Components/Filter.php
+++ b/src/Twig/Components/Filter.php
@@ -3,8 +3,8 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
+use App\Base\Util\QualityList;
 use App\User\Framework\Repository\PreferencesRepository;
-use App\Util\QualityList;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\DefaultActionTrait;
diff --git a/src/Twig/Components/PaginateTrait.php b/src/Twig/Components/PaginateTrait.php
index bc68bad..0cc507b 100644
--- a/src/Twig/Components/PaginateTrait.php
+++ b/src/Twig/Components/PaginateTrait.php
@@ -2,7 +2,7 @@
 
 namespace App\Twig\Components;
 
-use App\Util\Paginator;
+use App\Base\Util\Paginator;
 use Doctrine\ORM\Query;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
 use Symfony\UX\LiveComponent\Attribute\LiveArg;
diff --git a/src/User/Framework/Controller/Web/PreferencesController.php b/src/User/Framework/Controller/Web/PreferencesController.php
index 0e59bf7..8edbbb1 100644
--- a/src/User/Framework/Controller/Web/PreferencesController.php
+++ b/src/User/Framework/Controller/Web/PreferencesController.php
@@ -4,15 +4,15 @@ declare(strict_types=1);
 
 namespace App\User\Framework\Controller\Web;
 
+use App\Base\Util\Broadcaster;
+use App\Base\Util\CountryLanguages;
+use App\Base\Util\ProviderList;
+use App\Base\Util\QualityList;
 use App\User\Action\Handler\SaveUserDownloadPreferencesHandler;
 use App\User\Action\Handler\SaveUserMediaPreferencesHandler;
 use App\User\Action\Input\SaveUserDownloadPreferencesInput;
 use App\User\Action\Input\SaveUserMediaPreferencesInput;
 use App\User\Framework\Repository\PreferencesRepository;
-use App\Util\Broadcaster;
-use App\Util\CountryLanguages;
-use App\Util\ProviderList;
-use App\Util\QualityList;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;