diff --git a/src/Model/Chat/ChatInterface.php b/src/Model/Chat/ChatInterface.php
index 408f1b6..f9e3161 100644
--- a/src/Model/Chat/ChatInterface.php
+++ b/src/Model/Chat/ChatInterface.php
@@ -15,7 +15,7 @@
 
 use Devscast\Lugha\Model\Chat\Completion\History;
 use Devscast\Lugha\Model\Chat\Completion\Message;
-use Devscast\Lugha\Model\Prompt\PromptTemplate;
+use Devscast\Lugha\Model\Chat\Prompt\PromptTemplate;
 
 /**
  * Interface ChatInterface.
diff --git a/src/Model/Parser/MarkdownOutputParser.php b/src/Model/Chat/Parser/MarkdownOutputParser.php
similarity index 97%
rename from src/Model/Parser/MarkdownOutputParser.php
rename to src/Model/Chat/Parser/MarkdownOutputParser.php
index 71ebe80..97340a6 100644
--- a/src/Model/Parser/MarkdownOutputParser.php
+++ b/src/Model/Chat/Parser/MarkdownOutputParser.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Devscast\Lugha\Model\Parser;
+namespace Devscast\Lugha\Model\Chat\Parser;
 
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Exception\CommonMarkException;
diff --git a/src/Model/Parser/OutputParserInterface.php b/src/Model/Chat/Parser/OutputParserInterface.php
similarity index 93%
rename from src/Model/Parser/OutputParserInterface.php
rename to src/Model/Chat/Parser/OutputParserInterface.php
index 01ff131..312c995 100644
--- a/src/Model/Parser/OutputParserInterface.php
+++ b/src/Model/Chat/Parser/OutputParserInterface.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Devscast\Lugha\Model\Parser;
+namespace Devscast\Lugha\Model\Chat\Parser;
 
 /**
  * Interface OutputParserInterface.
diff --git a/src/Model/Prompt/PromptTemplate.php b/src/Model/Chat/Prompt/PromptTemplate.php
similarity index 97%
rename from src/Model/Prompt/PromptTemplate.php
rename to src/Model/Chat/Prompt/PromptTemplate.php
index e198555..bbb542c 100644
--- a/src/Model/Prompt/PromptTemplate.php
+++ b/src/Model/Chat/Prompt/PromptTemplate.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Devscast\Lugha\Model\Prompt;
+namespace Devscast\Lugha\Model\Chat\Prompt;
 
 use Webmozart\Assert\Assert;
 
diff --git a/tests/Model/Parser/MarkdownOutputParserTest.php b/tests/Model/Chat/Parser/MarkdownOutputParserTest.php
similarity index 95%
rename from tests/Model/Parser/MarkdownOutputParserTest.php
rename to tests/Model/Chat/Parser/MarkdownOutputParserTest.php
index a487fd5..02c28a2 100644
--- a/tests/Model/Parser/MarkdownOutputParserTest.php
+++ b/tests/Model/Chat/Parser/MarkdownOutputParserTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Devscast\Lugha\Tests\Model\Parser;
+namespace Devscast\Lugha\Tests\Model\Chat\Parser;
 
-use Devscast\Lugha\Model\Parser\MarkdownOutputParser;
+use Devscast\Lugha\Model\Chat\Parser\MarkdownOutputParser;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/Model/Prompt/PromptTemplateTest.php b/tests/Model/Chat/Prompt/PromptTemplateTest.php
similarity index 95%
rename from tests/Model/Prompt/PromptTemplateTest.php
rename to tests/Model/Chat/Prompt/PromptTemplateTest.php
index 9cb3267..afc2bd0 100644
--- a/tests/Model/Prompt/PromptTemplateTest.php
+++ b/tests/Model/Chat/Prompt/PromptTemplateTest.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Devscast\Lugha\Tests\Model\Prompt;
+namespace Devscast\Lugha\Tests\Model\Chat\Prompt;
 
-use Devscast\Lugha\Model\Prompt\PromptTemplate;
+use Devscast\Lugha\Model\Chat\Prompt\PromptTemplate;
 use PHPUnit\Framework\TestCase;
 
 /**