diff --git a/bin/createApi.php b/bin/createApi.php
index 6c675c7..d39e6c4 100644
--- a/bin/createApi.php
+++ b/bin/createApi.php
@@ -14,6 +14,7 @@ $apiNamespace   = $argv[2];
 $apiName        = $argv[3];
 $cqrsType       = strtolower($argv[4]) === 'true' ? 'Command' : 'Query';
 $cqrsNamespace  = $argv[5];
+$originalCqrsNamespace = $cqrsNamespace;
 
 $apiDirectoryPath = $projectSourceDirectory . 'ApiDomain/' . $apiType . '/' . $apiNamespace . '/';
 $cqrsDirectoryPath = $projectSourceDirectory . 'HandlingDomain/' . $cqrsNamespace . '/';
@@ -164,7 +165,7 @@ return [
 
 declare(strict_types=1);
 
-namespace MyTube\Handling\{$cqrsNamespace};
+namespace MyTube\Handling\{$originalCqrsNamespace};
 
 class ConfigProvider
 {
diff --git a/src/ApiDomain/External/TagList/config/routes.php b/src/ApiDomain/External/TagList/config/routes.php
deleted file mode 100644
index b1db99f..0000000
--- a/src/ApiDomain/External/TagList/config/routes.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use MyTube\API\External\TagList\Handler\ReadListHandler;
-
-return [
-    [
-        'name' => 'TODO.TODO',
-        'path' => '/api/TODO/TODO[/]',
-        'allowed_methods' => ['POST'],
-        'middleware' => [
-            ReadListHandler::class,
-        ],
-    ],
-];
diff --git a/src/ApiDomain/External/TagList/config/service_manager.php b/src/ApiDomain/External/TagList/config/service_manager.php
deleted file mode 100644
index ca1ecbc..0000000
--- a/src/ApiDomain/External/TagList/config/service_manager.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use MyTube\API\External\TagList\Handler\ReadListHandler;
-use MyTube\API\External\TagList\ResponseFormatter\ReadListResponseFormatter;
-use Reinfi\DependencyInjection\Factory\AutoWiringFactory;
-
-return [
-    'factories' => [
-        // Handler
-        ReadListHandler::class => AutoWiringFactory::class,
-
-        // Response Formatter
-        ::class => AutoWiringFactory::class,
-    ],
-];
diff --git a/src/ApiDomain/External/TagList/src/ConfigProvider.php b/src/ApiDomain/External/TagList/src/ConfigProvider.php
deleted file mode 100644
index 9bd9982..0000000
--- a/src/ApiDomain/External/TagList/src/ConfigProvider.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\API\{External}\{TagList};
-
-class ConfigProvider
-{
-    public function __invoke(): array
-    {
-        return [
-            'dependencies' => require  __DIR__ . './../config/service_manager.php',
-            'routes' => require __DIR__ . '/./../config/routes.php',
-        ];
-    }
-}
diff --git a/src/ApiDomain/External/TagList/src/Handler/ReadListHandler.php b/src/ApiDomain/External/TagList/src/Handler/ReadListHandler.php
deleted file mode 100644
index 8cc9195..0000000
--- a/src/ApiDomain/External/TagList/src/Handler/ReadListHandler.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\API\External\TagList\Handler;
-
-use MyTube\Handling\TagList\Handler\Query\ReadList\ReadListQueryHandler;
-use MyTube\Handling\TagList\Handler\Query\ReadList\ReadListQueryBuilder;
-use MyTube\API\External\TagList\ResponseFormatter\ReadListResponseFormatter;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use MyTube\Infrastructure\Response\SuccessResponse;
-
-class ReadListHandler implements RequestHandlerInterface
-{
-    public function __construct(
-        private readonly ReadListQueryHandler $readListQueryHandler,
-        private readonly ReadListQueryBuilder $readListQueryBuilder,
-        private readonly ReadListResponseFormatter $responseFormatter,
-    ) {
-    }
-    
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $data = json_decode(
-            $request->getBody()->getContents(),
-            true
-        );
-
-        $readListQuery = $this->readListQueryBuilder->build(
-            $data
-        );
-        $result = $this->readListQueryHandler->execute($readListQuery);
-        
-        return new SuccessResponse($this->responseFormatter->format($result));
-    }
-}
diff --git a/src/ApiDomain/External/TagList/src/ResponseFormatter/ReadListResponseFormatter.php b/src/ApiDomain/External/TagList/src/ResponseFormatter/ReadListResponseFormatter.php
deleted file mode 100644
index 23d5563..0000000
--- a/src/ApiDomain/External/TagList/src/ResponseFormatter/ReadListResponseFormatter.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\API\External\TagList\ResponseFormatter;
-
-use MyTube\Handling\TagList\Handler\Query\ReadList\ReadListQueryResult;
-
-class ReadListResponseFormatter
-{
-    public function format(ReadListQueryResult $readListQueryResult): array
-    {
-        return [];
-    }
-}
diff --git a/src/HandlingDomain/TagList/config/service_manager.php b/src/HandlingDomain/TagList/config/service_manager.php
deleted file mode 100644
index c1f936e..0000000
--- a/src/HandlingDomain/TagList/config/service_manager.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use MyTube\Handling\TagList\Handler\Query\ReadList\ReadListQueryHandler;
-use MyTube\Handling\TagList\Handler\Query\ReadList\ReadListQueryBuilder;
-use Reinfi\DependencyInjection\Factory\AutoWiringFactory;
-use Reinfi\DependencyInjection\Factory\InjectionFactory;
-
-return [
-    'factories' => [
-        /// CQRS
-        // ReadList
-        ReadListQueryBuilder::class => AutoWiringFactory::class,
-        ReadListQueryHandler::class => AutoWiringFactory::class,
-    ],
-];
diff --git a/src/HandlingDomain/TagList/src/ConfigProvider.php b/src/HandlingDomain/TagList/src/ConfigProvider.php
deleted file mode 100644
index 4fa6c85..0000000
--- a/src/HandlingDomain/TagList/src/ConfigProvider.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\Handling\{MyTube\Handling\TagList\Handler\Query\ReadList};
-
-class ConfigProvider
-{
-    public function __invoke(): array
-    {
-        return [
-            'dependencies' => require  __DIR__ . './../config/service_manager.php',
-        ];
-    }
-}
diff --git a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQuery.php b/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQuery.php
deleted file mode 100644
index b35468b..0000000
--- a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQuery.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\Handling\TagList\Handler\Query\ReadList;
-
-class ReadListQuery
-{
-    public function __construct(
-        #TODO    
-    ) {    
-    }
-}
diff --git a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryBuilder.php b/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryBuilder.php
deleted file mode 100644
index ccf54bc..0000000
--- a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryBuilder.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\Handling\TagList\Handler\Query\ReadList;
-
-class ReadListQueryBuilder
-{
-    public function build(
-        #TODO
-    ): ReadListQuery {
-        return new ReadListQuery(
-            #TODO
-        );
-    }
-}
diff --git a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryHandler.php b/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryHandler.php
deleted file mode 100644
index 5cb835e..0000000
--- a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryHandler.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\Handling\TagList\Handler\Query\ReadList;
-
-class ReadListQueryHandler
-{
-    public function __construct(
-        #TODO
-    ) {    
-    }
-    
-    public function execute(ReadListQuery $readListQuery): ReadListQueryResult
-    {
-        return new ReadListQueryResult();
-    }
-}
diff --git a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryResult.php b/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryResult.php
deleted file mode 100644
index 15efaee..0000000
--- a/src/HandlingDomain/TagList/src/Handler/Query/ReadList/ReadListQueryResult.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyTube\Handling\TagList\Handler\Query\ReadList;
-
-class ReadListQueryResult
-{
-    public function __construct(
-        #TODO    
-    ) {    
-    }
-}