diff --git a/src/Base/Framework/Controller/AlertController.php b/src/Base/Framework/Controller/AlertController.php
index 6079799..d877350 100644
--- a/src/Base/Framework/Controller/AlertController.php
+++ b/src/Base/Framework/Controller/AlertController.php
@@ -2,7 +2,7 @@
 
 namespace App\Base\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
diff --git a/src/Base/Util/Broadcaster.php b/src/Base/Service/Broadcaster.php
similarity index 97%
rename from src/Base/Util/Broadcaster.php
rename to src/Base/Service/Broadcaster.php
index 9aaf685..b3d6c6c 100644
--- a/src/Base/Util/Broadcaster.php
+++ b/src/Base/Service/Broadcaster.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\Base\Service;
 
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;
diff --git a/src/Download/Framework/Controller/ApiController.php b/src/Download/Framework/Controller/ApiController.php
index 9a9086c..4a0bb82 100644
--- a/src/Download/Framework/Controller/ApiController.php
+++ b/src/Download/Framework/Controller/ApiController.php
@@ -2,9 +2,8 @@
 
 namespace App\Download\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Download\Action\Handler\DeleteDownloadHandler;
-use App\Download\Action\Handler\DownloadSeasonHandler;
 use App\Download\Action\Handler\PauseDownloadHandler;
 use App\Download\Action\Handler\ResumeDownloadHandler;
 use App\Download\Action\Input\DeleteDownloadInput;
@@ -13,8 +12,6 @@ use App\Download\Action\Input\DownloadSeasonInput;
 use App\Download\Action\Input\PauseDownloadInput;
 use App\Download\Action\Input\ResumeDownloadInput;
 use App\Download\Framework\Repository\DownloadRepository;
-use App\User\Dto\UserPreferencesFactory;
-use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
diff --git a/src/Monitor/Framework/Controller/ApiController.php b/src/Monitor/Framework/Controller/ApiController.php
index 5b51469..fe4bb48 100644
--- a/src/Monitor/Framework/Controller/ApiController.php
+++ b/src/Monitor/Framework/Controller/ApiController.php
@@ -2,7 +2,7 @@
 
 namespace App\Monitor\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Monitor\Action\Handler\AddMonitorHandler;
 use App\Monitor\Action\Handler\DeleteMonitorHandler;
 use App\Monitor\Action\Input\AddMonitorInput;
diff --git a/src/Torrentio/Framework/Controller/WebController.php b/src/Torrentio/Framework/Controller/WebController.php
index 45c6603..06d2321 100644
--- a/src/Torrentio/Framework/Controller/WebController.php
+++ b/src/Torrentio/Framework/Controller/WebController.php
@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Framework\Controller;
 
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use App\Torrentio\Action\Input\GetMovieOptionsInput;
diff --git a/src/Torrentio/Result/ResultFactory.php b/src/Torrentio/Result/ResultFactory.php
index 5104810..44bd8ab 100644
--- a/src/Torrentio/Result/ResultFactory.php
+++ b/src/Torrentio/Result/ResultFactory.php
@@ -2,7 +2,7 @@
 
 namespace App\Torrentio\Result;
 
-use App\Base\Util\CountryLanguages;
+use App\User\Database\CountryLanguages;
 use Nihilarr\PTN;
 
 class ResultFactory
diff --git a/src/Twig/Components/Filter.php b/src/Twig/Components/Filter.php
index 43efd23..8db95d3 100644
--- a/src/Twig/Components/Filter.php
+++ b/src/Twig/Components/Filter.php
@@ -3,7 +3,7 @@
 namespace App\Twig\Components;
 
 use Aimeos\Map;
-use App\Base\Util\QualityList;
+use App\User\Database\QualityList;
 use App\User\Framework\Repository\PreferencesRepository;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
diff --git a/src/Base/Util/CountryCodes.php b/src/User/Database/CountryCodes.php
similarity index 99%
rename from src/Base/Util/CountryCodes.php
rename to src/User/Database/CountryCodes.php
index ae1cd47..f551e30 100644
--- a/src/Base/Util/CountryCodes.php
+++ b/src/User/Database/CountryCodes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class CountryCodes
 {
diff --git a/src/Base/Util/CountryLanguages.php b/src/User/Database/CountryLanguages.php
similarity index 99%
rename from src/Base/Util/CountryLanguages.php
rename to src/User/Database/CountryLanguages.php
index e012d20..cff5efd 100644
--- a/src/Base/Util/CountryLanguages.php
+++ b/src/User/Database/CountryLanguages.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class CountryLanguages
 {
diff --git a/src/Base/Util/ProviderList.php b/src/User/Database/ProviderList.php
similarity index 93%
rename from src/Base/Util/ProviderList.php
rename to src/User/Database/ProviderList.php
index 15d22d1..64af104 100644
--- a/src/Base/Util/ProviderList.php
+++ b/src/User/Database/ProviderList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class ProviderList
 {
diff --git a/src/Base/Util/QualityList.php b/src/User/Database/QualityList.php
similarity index 98%
rename from src/Base/Util/QualityList.php
rename to src/User/Database/QualityList.php
index 518b14b..4ddd653 100644
--- a/src/Base/Util/QualityList.php
+++ b/src/User/Database/QualityList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Base\Util;
+namespace App\User\Database;
 
 class QualityList
 {
diff --git a/src/User/Framework/Controller/Web/PreferencesController.php b/src/User/Framework/Controller/Web/PreferencesController.php
index beaf538..598323f 100644
--- a/src/User/Framework/Controller/Web/PreferencesController.php
+++ b/src/User/Framework/Controller/Web/PreferencesController.php
@@ -4,14 +4,14 @@ 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\Base\Service\Broadcaster;
 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\Database\CountryLanguages;
+use App\User\Database\ProviderList;
+use App\User\Database\QualityList;
 use App\User\Framework\Repository\PreferencesRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/User/Framework/EventListener/LoginSuccessListener.php b/src/User/Framework/EventListener/LoginSuccessListener.php
index 3d249de..4f8af33 100644
--- a/src/User/Framework/EventListener/LoginSuccessListener.php
+++ b/src/User/Framework/EventListener/LoginSuccessListener.php
@@ -3,7 +3,7 @@
 namespace App\User\Framework\EventListener;
 
 use App\Base\ConfigResolver;
-use App\Base\Util\Broadcaster;
+use App\Base\Service\Broadcaster;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Security\Core\Event\AuthenticationSuccessEvent;