diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index 24a64ab..117a846 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -30,6 +30,12 @@ doctrine:
                 dir: '%kernel.project_dir%/src/User/Framework/Entity'
                 prefix: 'App\User\Framework\Entity'
                 alias: User
+            Monitor:
+                type: attribute
+                is_bundle: false
+                dir: '%kernel.project_dir%/src/Monitor/Framework/Entity'
+                prefix: 'App\Monitor\Framework\Entity'
+                alias: Download
         controller_resolver:
             auto_mapping: false
 
diff --git a/config/packages/messenger.yaml b/config/packages/messenger.yaml
index f2ba2b3..b7726bf 100644
--- a/config/packages/messenger.yaml
+++ b/config/packages/messenger.yaml
@@ -25,10 +25,10 @@ framework:
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
             'App\Download\Action\Command\DownloadMediaCommand': async
-            'App\Download\Action\Command\MonitorTvEpisodeCommand': async
-            'App\Download\Action\Command\MonitorTvSeasonCommand': async
-            'App\Download\Action\Command\MonitorTvShowCommand': async
-            'App\Download\Action\Command\MonitorMovieCommand': async
+            'App\Monitor\Action\Command\MonitorTvEpisodeCommand': async
+            'App\Monitor\Action\Command\MonitorTvSeasonCommand': async
+            'App\Monitor\Action\Command\MonitorTvShowCommand': async
+            'App\Monitor\Action\Command\MonitorMovieCommand': async
 
 # when@test:
 #    framework:
diff --git a/config/routes.yaml b/config/routes.yaml
index 9e306f7..7fe8633 100644
--- a/config/routes.yaml
+++ b/config/routes.yaml
@@ -14,10 +14,10 @@ controllersUser:
     defaults:
         schemes: ['https']
 
-controllersDownload:
+controllersMonitor:
     resource:
-        path: ../src/Download/Framework/Controller
-        namespace: App\Download\Framework\Controller
+        path: ../src/Monitor/Framework/Controller
+        namespace: App\Monitor\Framework\Controller
     type: attribute
     defaults:
         schemes: ['https']
diff --git a/src/Controller/DownloadController.php b/src/Controller/DownloadController.php
index 76b51af..18579e4 100644
--- a/src/Controller/DownloadController.php
+++ b/src/Controller/DownloadController.php
@@ -2,19 +2,8 @@
 
 namespace App\Controller;
 
-use App\Download\Action\Command\MonitorMovieCommand;
-use App\Download\Action\Command\MonitorTvSeasonCommand;
-use App\Download\Action\Command\MonitorTvShowCommand;
-use App\Download\Action\Handler\MonitorMovieHandler;
-use App\Download\Action\Handler\MonitorTvSeasonHandler;
-use App\Download\Action\Handler\MonitorTvShowHandler;
 use App\Download\Action\Input\DownloadMediaInput;
-use App\Download\Framework\Entity\Monitor;
 use App\Download\Framework\Repository\DownloadRepository;
-use App\Download\Framework\Repository\MonitorRepository;
-use App\Download\Service\MediaFiles;
-use DateTimeImmutable;
-use Nihilarr\PTN;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -25,35 +14,8 @@ class DownloadController extends AbstractController
     public function __construct(
         private DownloadRepository $downloadRepository,
         private MessageBusInterface $bus,
-        private readonly MonitorRepository $monitorRepository,
     ) {}
 
-    #[Route('/test', name: 'app_test')]
-    public function test(
-        MonitorTvShowHandler $handler,
-    ) {
-        $monitor = (new Monitor())
-            ->setUser($this->getUser())
-            ->setTmdbId('112442')
-            ->setImdbId('tt9288860')
-            ->setTitle('Trash Truck')
-            ->setMonitorType('tvseason')
-            ->setSeason(1)
-            ->setEpisode(null)
-            ->setCreatedAt(new DateTimeImmutable())
-            ->setSearchCount(0)
-            ->setStatus('New');
-        $this->monitorRepository->getEntityManager()->persist($monitor);
-        $this->monitorRepository->getEntityManager()->flush();
-
-        $command = new MonitorTvSeasonCommand($monitor->getId());
-//        $handler->handle($command);
-        return $this->json([
-            'status' => 200,
-            'message' => $command
-        ]);
-    }
-
     #[Route('/download', name: 'app_download', methods: ['POST'])]
     public function download(
         DownloadMediaInput $input,
diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
index 5fa3475..1f0e129 100644
--- a/src/Controller/IndexController.php
+++ b/src/Controller/IndexController.php
@@ -2,11 +2,7 @@
 
 namespace App\Controller;
 
-use App\Download\Action\Command\MonitorMovieCommand;
-use App\Download\Action\Handler\MonitorMovieHandler;
-use App\Download\Framework\Entity\Monitor;
 use App\Download\Framework\Repository\DownloadRepository;
-use App\Download\Framework\Repository\MonitorRepository;
 use App\Tmdb\Tmdb;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Controller/TorrentioController.php b/src/Controller/TorrentioController.php
index 37968a7..bfe38ae 100644
--- a/src/Controller/TorrentioController.php
+++ b/src/Controller/TorrentioController.php
@@ -10,6 +10,7 @@ use Carbon\Carbon;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mercure\HubInterface;
+use Symfony\Component\Mercure\Update;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
@@ -73,10 +74,7 @@ final class TorrentioController extends AbstractController
         );
         $cache->delete($cacheId);
 
-        $cacheId = sprintf("page.%s.%s", "tvshows", $input->tmdbId);
-        $cache->delete($cacheId);
-
-        $this->hub->publish(new \Symfony\Component\Mercure\Update(
+        $this->hub->publish(new Update(
             'alerts',
             $this->renderer->render('broadcast/Alert.html.twig', [
                 'alert_id' => uniqid(),
diff --git a/src/Download/Action/Command/AddMonitorCommand.php b/src/Monitor/Action/Command/AddMonitorCommand.php
similarity index 82%
rename from src/Download/Action/Command/AddMonitorCommand.php
rename to src/Monitor/Action/Command/AddMonitorCommand.php
index 71ffdf4..3f6f5a6 100644
--- a/src/Download/Action/Command/AddMonitorCommand.php
+++ b/src/Monitor/Action/Command/AddMonitorCommand.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace App\Download\Action\Command;
+namespace App\Monitor\Action\Command;
 
-use App\Download\Framework\Entity\Monitor;
 use OneToMany\RichBundle\Contract\CommandInterface;
 
 class AddMonitorCommand implements CommandInterface
diff --git a/src/Download/Action/Command/MonitorMovieCommand.php b/src/Monitor/Action/Command/MonitorMovieCommand.php
similarity index 83%
rename from src/Download/Action/Command/MonitorMovieCommand.php
rename to src/Monitor/Action/Command/MonitorMovieCommand.php
index dc9c28f..3a80291 100644
--- a/src/Download/Action/Command/MonitorMovieCommand.php
+++ b/src/Monitor/Action/Command/MonitorMovieCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Action\Command;
+namespace App\Monitor\Action\Command;
 
 use OneToMany\RichBundle\Contract\CommandInterface;
 
diff --git a/src/Download/Action/Command/MonitorTvEpisodeCommand.php b/src/Monitor/Action/Command/MonitorTvEpisodeCommand.php
similarity index 83%
rename from src/Download/Action/Command/MonitorTvEpisodeCommand.php
rename to src/Monitor/Action/Command/MonitorTvEpisodeCommand.php
index abebf96..c96618f 100644
--- a/src/Download/Action/Command/MonitorTvEpisodeCommand.php
+++ b/src/Monitor/Action/Command/MonitorTvEpisodeCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Action\Command;
+namespace App\Monitor\Action\Command;
 
 use OneToMany\RichBundle\Contract\CommandInterface;
 
diff --git a/src/Download/Action/Command/MonitorTvSeasonCommand.php b/src/Monitor/Action/Command/MonitorTvSeasonCommand.php
similarity index 83%
rename from src/Download/Action/Command/MonitorTvSeasonCommand.php
rename to src/Monitor/Action/Command/MonitorTvSeasonCommand.php
index 8c172ae..bfcd5cc 100644
--- a/src/Download/Action/Command/MonitorTvSeasonCommand.php
+++ b/src/Monitor/Action/Command/MonitorTvSeasonCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Action\Command;
+namespace App\Monitor\Action\Command;
 
 use OneToMany\RichBundle\Contract\CommandInterface;
 
diff --git a/src/Download/Action/Command/MonitorTvShowCommand.php b/src/Monitor/Action/Command/MonitorTvShowCommand.php
similarity index 83%
rename from src/Download/Action/Command/MonitorTvShowCommand.php
rename to src/Monitor/Action/Command/MonitorTvShowCommand.php
index 4d795d2..ffa06de 100644
--- a/src/Download/Action/Command/MonitorTvShowCommand.php
+++ b/src/Monitor/Action/Command/MonitorTvShowCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Action\Command;
+namespace App\Monitor\Action\Command;
 
 use OneToMany\RichBundle\Contract\CommandInterface;
 
diff --git a/src/Download/Action/Handler/AddMonitorHandler.php b/src/Monitor/Action/Handler/AddMonitorHandler.php
similarity index 82%
rename from src/Download/Action/Handler/AddMonitorHandler.php
rename to src/Monitor/Action/Handler/AddMonitorHandler.php
index 9284542..0aed8b6 100644
--- a/src/Download/Action/Handler/AddMonitorHandler.php
+++ b/src/Monitor/Action/Handler/AddMonitorHandler.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace App\Download\Action\Handler;
+namespace App\Monitor\Action\Handler;
 
-use App\Download\Action\Command\AddMonitorCommand;
-use App\Download\Action\Result\AddMonitorResult;
-use App\Download\Action\Result\MonitorMovieResult;
-use App\Download\Framework\Entity\Monitor;
-use App\Download\Framework\Repository\MonitorRepository;
+use App\Monitor\Action\Command\AddMonitorCommand;
+use App\Monitor\Action\Result\AddMonitorResult;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Framework\Repository\MonitorRepository;
 use App\User\Framework\Repository\UserRepository;
 use DateTimeImmutable;
 use OneToMany\RichBundle\Contract\CommandInterface;
diff --git a/src/Download/Action/Handler/MonitorMovieHandler.php b/src/Monitor/Action/Handler/MonitorMovieHandler.php
similarity index 89%
rename from src/Download/Action/Handler/MonitorMovieHandler.php
rename to src/Monitor/Action/Handler/MonitorMovieHandler.php
index 05c78b3..8257a9d 100644
--- a/src/Download/Action/Handler/MonitorMovieHandler.php
+++ b/src/Monitor/Action/Handler/MonitorMovieHandler.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Download\Action\Handler;
+namespace App\Monitor\Action\Handler;
 
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\Action\Command\MonitorMovieCommand;
-use App\Download\Action\Result\MonitorMovieResult;
-use App\Download\Framework\Repository\MonitorRepository;
-use App\Download\Service\MonitorOptionEvaluator;
+use App\Monitor\Action\Command\DownloadMediaCommand;
+use App\Monitor\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MonitorOptionEvaluator;
 use App\Torrentio\Action\Command\GetMovieOptionsCommand;
 use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use DateTimeImmutable;
diff --git a/src/Download/Action/Handler/MonitorTvEpisodeHandler.php b/src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php
similarity index 87%
rename from src/Download/Action/Handler/MonitorTvEpisodeHandler.php
rename to src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php
index 470a6ac..1632a92 100644
--- a/src/Download/Action/Handler/MonitorTvEpisodeHandler.php
+++ b/src/Monitor/Action/Handler/MonitorTvEpisodeHandler.php
@@ -1,15 +1,13 @@
 <?php
 
-namespace App\Download\Action\Handler;
+namespace App\Monitor\Action\Handler;
 
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\Action\Command\MonitorMovieCommand;
-use App\Download\Action\Result\MonitorMovieResult;
-use App\Download\Framework\Repository\MonitorRepository;
-use App\Download\Service\MonitorOptionEvaluator;
-use App\Torrentio\Action\Command\GetMovieOptionsCommand;
+use App\Monitor\Action\Command\DownloadMediaCommand;
+use App\Monitor\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MonitorOptionEvaluator;
 use App\Torrentio\Action\Command\GetTvShowOptionsCommand;
-use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use App\Torrentio\Action\Handler\GetTvShowOptionsHandler;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Download/Action/Handler/MonitorTvSeasonHandler.php b/src/Monitor/Action/Handler/MonitorTvSeasonHandler.php
similarity index 87%
rename from src/Download/Action/Handler/MonitorTvSeasonHandler.php
rename to src/Monitor/Action/Handler/MonitorTvSeasonHandler.php
index 4e384f0..77bd99e 100644
--- a/src/Download/Action/Handler/MonitorTvSeasonHandler.php
+++ b/src/Monitor/Action/Handler/MonitorTvSeasonHandler.php
@@ -1,20 +1,15 @@
 <?php
 
-namespace App\Download\Action\Handler;
+namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\Action\Command\MonitorMovieCommand;
-use App\Download\Action\Command\MonitorTvEpisodeCommand;
-use App\Download\Action\Command\MonitorTvSeasonCommand;
-use App\Download\Action\Result\MonitorMovieResult;
-use App\Download\Framework\Entity\Monitor;
-use App\Download\Framework\Repository\MonitorRepository;
-use App\Download\Service\MediaFiles;
-use App\Download\Service\MonitorOptionEvaluator;
+use App\Monitor\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
+use App\Monitor\Action\Result\MonitorMovieResult;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
-use App\Torrentio\Action\Command\GetMovieOptionsCommand;
-use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Nihilarr\PTN;
diff --git a/src/Download/Action/Handler/MonitorTvShowHandler.php b/src/Monitor/Action/Handler/MonitorTvShowHandler.php
similarity index 84%
rename from src/Download/Action/Handler/MonitorTvShowHandler.php
rename to src/Monitor/Action/Handler/MonitorTvShowHandler.php
index c377362..0dda3ff 100644
--- a/src/Download/Action/Handler/MonitorTvShowHandler.php
+++ b/src/Monitor/Action/Handler/MonitorTvShowHandler.php
@@ -1,21 +1,15 @@
 <?php
 
-namespace App\Download\Action\Handler;
+namespace App\Monitor\Action\Handler;
 
 use Aimeos\Map;
-use App\Download\Action\Command\DownloadMediaCommand;
-use App\Download\Action\Command\MonitorMovieCommand;
-use App\Download\Action\Command\MonitorTvEpisodeCommand;
-use App\Download\Action\Command\MonitorTvSeasonCommand;
-use App\Download\Action\Result\MonitorMovieResult;
-use App\Download\Action\Result\MonitorTvEpisodeResult;
-use App\Download\Framework\Entity\Monitor;
-use App\Download\Framework\Repository\MonitorRepository;
-use App\Download\Service\MediaFiles;
-use App\Download\Service\MonitorOptionEvaluator;
+use App\Monitor\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
+use App\Monitor\Action\Result\MonitorTvEpisodeResult;
+use App\Monitor\Framework\Entity\Monitor;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use App\Monitor\Service\MediaFiles;
 use App\Tmdb\Tmdb;
-use App\Torrentio\Action\Command\GetMovieOptionsCommand;
-use App\Torrentio\Action\Handler\GetMovieOptionsHandler;
 use DateTimeImmutable;
 use Doctrine\ORM\EntityManagerInterface;
 use Nihilarr\PTN;
diff --git a/src/Download/Action/Input/AddMonitorInput.php b/src/Monitor/Action/Input/AddMonitorInput.php
similarity index 89%
rename from src/Download/Action/Input/AddMonitorInput.php
rename to src/Monitor/Action/Input/AddMonitorInput.php
index 5bc4dac..72cdaf6 100644
--- a/src/Download/Action/Input/AddMonitorInput.php
+++ b/src/Monitor/Action/Input/AddMonitorInput.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Download\Action\Input;
+namespace App\Monitor\Action\Input;
 
-use App\Download\Action\Command\AddMonitorCommand;
+use App\Monitor\Action\Command\AddMonitorCommand;
 use OneToMany\RichBundle\Attribute\SourceRequest;
-use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Attribute\SourceSecurity;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\InputInterface;
diff --git a/src/Download/Action/Input/MonitorMovieInput.php b/src/Monitor/Action/Input/MonitorMovieInput.php
similarity index 85%
rename from src/Download/Action/Input/MonitorMovieInput.php
rename to src/Monitor/Action/Input/MonitorMovieInput.php
index 63b3f27..3561f55 100644
--- a/src/Download/Action/Input/MonitorMovieInput.php
+++ b/src/Monitor/Action/Input/MonitorMovieInput.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Download\Action\Input;
+namespace App\Monitor\Action\Input;
 
-use App\Download\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Command\MonitorMovieCommand;
 use OneToMany\RichBundle\Attribute\SourceRoute;
 use OneToMany\RichBundle\Contract\CommandInterface;
 use OneToMany\RichBundle\Contract\InputInterface;
diff --git a/src/Download/Action/Result/AddMonitorResult.php b/src/Monitor/Action/Result/AddMonitorResult.php
similarity index 85%
rename from src/Download/Action/Result/AddMonitorResult.php
rename to src/Monitor/Action/Result/AddMonitorResult.php
index 594c5ea..633f520 100644
--- a/src/Download/Action/Result/AddMonitorResult.php
+++ b/src/Monitor/Action/Result/AddMonitorResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Action\Result;
+namespace App\Monitor\Action\Result;
 
 use OneToMany\RichBundle\Contract\ResultInterface;
 
diff --git a/src/Download/Action/Result/MonitorMovieResult.php b/src/Monitor/Action/Result/MonitorMovieResult.php
similarity index 85%
rename from src/Download/Action/Result/MonitorMovieResult.php
rename to src/Monitor/Action/Result/MonitorMovieResult.php
index 766a7aa..f29bed9 100644
--- a/src/Download/Action/Result/MonitorMovieResult.php
+++ b/src/Monitor/Action/Result/MonitorMovieResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Action\Result;
+namespace App\Monitor\Action\Result;
 
 use OneToMany\RichBundle\Contract\ResultInterface;
 
diff --git a/src/Download/Action/Result/MonitorTvEpisodeResult.php b/src/Monitor/Action/Result/MonitorTvEpisodeResult.php
similarity index 85%
rename from src/Download/Action/Result/MonitorTvEpisodeResult.php
rename to src/Monitor/Action/Result/MonitorTvEpisodeResult.php
index 33dbfac..9aeb7ad 100644
--- a/src/Download/Action/Result/MonitorTvEpisodeResult.php
+++ b/src/Monitor/Action/Result/MonitorTvEpisodeResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Action\Result;
+namespace App\Monitor\Action\Result;
 
 use OneToMany\RichBundle\Contract\ResultInterface;
 
diff --git a/src/Download/Framework/Controller/ApiController.php b/src/Monitor/Framework/Controller/ApiController.php
similarity index 89%
rename from src/Download/Framework/Controller/ApiController.php
rename to src/Monitor/Framework/Controller/ApiController.php
index e70b8f5..42c5b3e 100644
--- a/src/Download/Framework/Controller/ApiController.php
+++ b/src/Monitor/Framework/Controller/ApiController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Download\Framework\Controller;
+namespace App\Monitor\Framework\Controller;
 
-use App\Download\Action\Handler\AddMonitorHandler;
-use App\Download\Action\Input\AddMonitorInput;
+use App\Monitor\Action\Handler\AddMonitorHandler;
+use App\Monitor\Action\Input\AddMonitorInput;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Mercure\HubInterface;
diff --git a/src/Monitor/Framework/Entity/.gitignore b/src/Monitor/Framework/Entity/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/src/Download/Framework/Entity/Monitor.php b/src/Monitor/Framework/Entity/Monitor.php
similarity index 96%
rename from src/Download/Framework/Entity/Monitor.php
rename to src/Monitor/Framework/Entity/Monitor.php
index 663015c..9880eb9 100644
--- a/src/Download/Framework/Entity/Monitor.php
+++ b/src/Monitor/Framework/Entity/Monitor.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace App\Download\Framework\Entity;
+namespace App\Monitor\Framework\Entity;
 
-use App\Download\Framework\Repository\MonitorRepository;
+use App\Monitor\Framework\Repository\MonitorRepository;
 use App\User\Framework\Entity\User;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Attribute\Ignore;
-use Symfony\Component\Serializer\Attribute\MaxDepth;
 
 #[ORM\Entity(repositoryClass: MonitorRepository::class)]
 class Monitor
diff --git a/src/Monitor/Framework/Repository/.gitignore b/src/Monitor/Framework/Repository/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/src/Download/Framework/Repository/MonitorRepository.php b/src/Monitor/Framework/Repository/MonitorRepository.php
similarity index 92%
rename from src/Download/Framework/Repository/MonitorRepository.php
rename to src/Monitor/Framework/Repository/MonitorRepository.php
index bae82eb..b34d594 100644
--- a/src/Download/Framework/Repository/MonitorRepository.php
+++ b/src/Monitor/Framework/Repository/MonitorRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Download\Framework\Repository;
+namespace App\Monitor\Framework\Repository;
 
-use App\Download\Framework\Entity\Monitor;
+use App\Monitor\Framework\Entity\Monitor;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
diff --git a/src/Download/Framework/Scheduler/MonitorDispatcher.php b/src/Monitor/Framework/Scheduler/MonitorDispatcher.php
similarity index 80%
rename from src/Download/Framework/Scheduler/MonitorDispatcher.php
rename to src/Monitor/Framework/Scheduler/MonitorDispatcher.php
index f2f878d..bdba0c7 100644
--- a/src/Download/Framework/Scheduler/MonitorDispatcher.php
+++ b/src/Monitor/Framework/Scheduler/MonitorDispatcher.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Download\Framework\Scheduler;
+namespace App\Monitor\Framework\Scheduler;
 
-use App\Download\Action\Command\MonitorMovieCommand;
-use App\Download\Action\Command\MonitorTvEpisodeCommand;
-use App\Download\Action\Command\MonitorTvSeasonCommand;
-use App\Download\Action\Command\MonitorTvShowCommand;
-use App\Download\Framework\Repository\MonitorRepository;
+use App\Monitor\Action\Command\MonitorMovieCommand;
+use App\Monitor\Action\Command\MonitorTvEpisodeCommand;
+use App\Monitor\Action\Command\MonitorTvSeasonCommand;
+use App\Monitor\Action\Command\MonitorTvShowCommand;
+use App\Monitor\Framework\Repository\MonitorRepository;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Scheduler\Attribute\AsCronTask;
diff --git a/src/Download/Service/MediaFiles.php b/src/Monitor/Service/MediaFiles.php
similarity index 97%
rename from src/Download/Service/MediaFiles.php
rename to src/Monitor/Service/MediaFiles.php
index c0a23f9..9da8fd5 100644
--- a/src/Download/Service/MediaFiles.php
+++ b/src/Monitor/Service/MediaFiles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Download\Service;
+namespace App\Monitor\Service;
 
 use Aimeos\Map;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
@@ -61,7 +61,7 @@ class MediaFiles
         if (!str_starts_with($path, $this->tvShowsPath)) {
             $path = $this->tvShowsPath . DIRECTORY_SEPARATOR . $path;
         }
-
+        
         $results = [];
         foreach ($this->finder->in($path)->files() as $file) {
             if ($onlyFilenames) {
diff --git a/src/Download/Service/MonitorOptionEvaluator.php b/src/Monitor/Service/MonitorOptionEvaluator.php
similarity index 97%
rename from src/Download/Service/MonitorOptionEvaluator.php
rename to src/Monitor/Service/MonitorOptionEvaluator.php
index b977cd7..b595709 100644
--- a/src/Download/Service/MonitorOptionEvaluator.php
+++ b/src/Monitor/Service/MonitorOptionEvaluator.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Download\Service;
+namespace App\Monitor\Service;
 
 use Aimeos\Map;
-use App\Download\Framework\Entity\Monitor;
+use App\Monitor\Framework\Entity\Monitor;
 use App\Torrentio\Result\TorrentioResult;
 
 class MonitorOptionEvaluator
diff --git a/src/User/Framework/Entity/User.php b/src/User/Framework/Entity/User.php
index ac151d8..8263231 100644
--- a/src/User/Framework/Entity/User.php
+++ b/src/User/Framework/Entity/User.php
@@ -3,7 +3,7 @@
 namespace App\User\Framework\Entity;
 
 use Aimeos\Map;
-use App\Download\Framework\Entity\Monitor;
+use App\Monitor\Framework\Entity\Monitor;
 use App\User\Framework\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;