diff --git a/src/Chat/Rag.php b/src/Blog/Chat/Blog.php
similarity index 97%
rename from src/Chat/Rag.php
rename to src/Blog/Chat/Blog.php
index 22528ed..44b8c69 100644
--- a/src/Chat/Rag.php
+++ b/src/Blog/Chat/Blog.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Chat;
+namespace App\Blog\Chat;
 
 use PhpLlm\LlmChain\ChainInterface;
 use PhpLlm\LlmChain\Model\Message\Message;
@@ -11,7 +11,7 @@
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RequestStack;
 
-final class Rag
+final class Blog
 {
     private const SESSION_KEY = 'rag-chat';
 
diff --git a/src/Command/BlogEmbedCommand.php b/src/Blog/Command/BlogEmbedCommand.php
similarity index 97%
rename from src/Command/BlogEmbedCommand.php
rename to src/Blog/Command/BlogEmbedCommand.php
index 27affd9..81ec7aa 100644
--- a/src/Command/BlogEmbedCommand.php
+++ b/src/Blog/Command/BlogEmbedCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Command;
+namespace App\Blog\Command;
 
 use App\Blog\Embedder;
 use Symfony\Component\Console\Attribute\AsCommand;
diff --git a/src/Twig/RagComponent.php b/src/Blog/Twig/BlogComponent.php
similarity index 87%
rename from src/Twig/RagComponent.php
rename to src/Blog/Twig/BlogComponent.php
index b64559b..ae92d6c 100644
--- a/src/Twig/RagComponent.php
+++ b/src/Blog/Twig/BlogComponent.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Twig;
+namespace App\Blog\Twig;
 
-use App\Chat\Rag;
+use App\Blog\Chat\Blog;
 use PhpLlm\LlmChain\Model\Message\MessageBag;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
@@ -12,12 +12,12 @@
 use Symfony\UX\LiveComponent\DefaultActionTrait;
 
 #[AsLiveComponent('rag')]
-final class RagComponent
+final class BlogComponent
 {
     use DefaultActionTrait;
 
     public function __construct(
-        private readonly Rag $chat,
+        private readonly Blog $chat,
     ) {
     }
 
diff --git a/src/Chat/Wikipedia.php b/src/Wikipedia/Chat/Wikipedia.php
similarity index 98%
rename from src/Chat/Wikipedia.php
rename to src/Wikipedia/Chat/Wikipedia.php
index ca5f4d1..10734ef 100644
--- a/src/Chat/Wikipedia.php
+++ b/src/Wikipedia/Chat/Wikipedia.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Chat;
+namespace App\Wikipedia\Chat;
 
 use PhpLlm\LlmChain\ChainInterface;
 use PhpLlm\LlmChain\Model\Message\Message;
diff --git a/src/Twig/WikipediaComponent.php b/src/Wikipedia/Twig/WikipediaComponent.php
similarity index 92%
rename from src/Twig/WikipediaComponent.php
rename to src/Wikipedia/Twig/WikipediaComponent.php
index c7201ba..0c0489c 100644
--- a/src/Twig/WikipediaComponent.php
+++ b/src/Wikipedia/Twig/WikipediaComponent.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Twig;
+namespace App\Wikipedia\Twig;
 
-use App\Chat\Wikipedia;
+use App\Wikipedia\Chat\Wikipedia;
 use PhpLlm\LlmChain\Model\Message\MessageBag;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
diff --git a/src/Chat/YouTube.php b/src/YouTube/Chat/YouTube.php
similarity index 98%
rename from src/Chat/YouTube.php
rename to src/YouTube/Chat/YouTube.php
index ec731d3..ea69f4e 100644
--- a/src/Chat/YouTube.php
+++ b/src/YouTube/Chat/YouTube.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Chat;
+namespace App\YouTube\Chat;
 
 use App\YouTube\TranscriptFetcher;
 use PhpLlm\LlmChain\ChainInterface;
diff --git a/src/Twig/YouTubeComponent.php b/src/YouTube/Twig/YouTubeComponent.php
similarity index 96%
rename from src/Twig/YouTubeComponent.php
rename to src/YouTube/Twig/YouTubeComponent.php
index c246bcf..dd09894 100644
--- a/src/Twig/YouTubeComponent.php
+++ b/src/YouTube/Twig/YouTubeComponent.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Twig;
+namespace App\YouTube\Twig;
 
-use App\Chat\YouTube;
+use App\YouTube\Chat\YouTube;
 use PhpLlm\LlmChain\Model\Message\MessageBag;
 use Psr\Log\LoggerInterface;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;