diff --git a/examples/chat.php b/examples/chat.php
index 037ab66..873e138 100644
--- a/examples/chat.php
+++ b/examples/chat.php
@@ -3,8 +3,8 @@
 require __DIR__.'/../vendor/autoload.php';
 
 use JDecool\OllamaClient\ClientBuilder;
-use JDecool\OllamaClient\Model\Message;
-use JDecool\OllamaClient\Model\Request\ChatRequest;
+use JDecool\OllamaClient\Client\Message;
+use JDecool\OllamaClient\Client\Request\ChatRequest;
 
 $builder = new ClientBuilder();
 $client = $builder->create();
diff --git a/examples/create.php b/examples/create.php
index bcde110..e3376c6 100644
--- a/examples/create.php
+++ b/examples/create.php
@@ -3,7 +3,7 @@
 require __DIR__.'/../vendor/autoload.php';
 
 use JDecool\OllamaClient\ClientBuilder;
-use JDecool\OllamaClient\Model\Request\CreateRequest;
+use JDecool\OllamaClient\Client\Request\CreateRequest;
 
 $builder = new ClientBuilder();
 
diff --git a/examples/list.php b/examples/list.php
index aecc80d..cffcbd7 100644
--- a/examples/list.php
+++ b/examples/list.php
@@ -3,7 +3,7 @@
 require __DIR__.'/../vendor/autoload.php';
 
 use JDecool\OllamaClient\ClientBuilder;
-use JDecool\OllamaClient\Model\Request\CreateRequest;
+use JDecool\OllamaClient\Client\Request\CreateRequest;
 
 $builder = new ClientBuilder();
 
diff --git a/examples/pull.php b/examples/pull.php
index 5eecb6e..e4ebd7f 100644
--- a/examples/pull.php
+++ b/examples/pull.php
@@ -3,7 +3,7 @@
 require __DIR__.'/../vendor/autoload.php';
 
 use JDecool\OllamaClient\ClientBuilder;
-use JDecool\OllamaClient\Model\Request\PullRequest;
+use JDecool\OllamaClient\Client\Request\PullRequest;
 
 $builder = new ClientBuilder();
 
diff --git a/src/Client.php b/src/Client.php
index 2912410..217e5e6 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -3,8 +3,8 @@
 namespace JDecool\OllamaClient;
 
 use Generator;
-use JDecool\OllamaClient\Model\Request;
-use JDecool\OllamaClient\Model\Response;
+use JDecool\OllamaClient\Client\Request;
+use JDecool\OllamaClient\Client\Response;
 use JsonException;
 use function json_encode;
 
@@ -117,7 +117,7 @@ public function pushStream(Request\PushRequest $request): Generator
     /**
      * @throws OllamaException
      */
-    private function processRequest(string $method, string $endpoint, ?Model\Request $request = null): array
+    private function processRequest(string $method, string $endpoint, ?Client\Request $request = null): array
     {
         $body = $request?->toArray();
         if ($body !== null) {
@@ -144,7 +144,7 @@ private function processRequest(string $method, string $endpoint, ?Model\Request
     /**
      * @return Generator<array>
      */
-    private function processStream(string $method, string $endpoint, Model\Request $request): Generator
+    private function processStream(string $method, string $endpoint, Client\Request $request): Generator
     {
         $body = $request->toArray();
         $body['stream'] = true;
diff --git a/src/Model/Message.php b/src/Client/Message.php
similarity index 90%
rename from src/Model/Message.php
rename to src/Client/Message.php
index 3c4a5f1..1c2d2e0 100644
--- a/src/Model/Message.php
+++ b/src/Client/Message.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model;
+namespace JDecool\OllamaClient\Client;
 
 class Message extends Request
 {
diff --git a/src/Model/Request.php b/src/Client/Request.php
similarity index 88%
rename from src/Model/Request.php
rename to src/Client/Request.php
index 5181645..12c57df 100644
--- a/src/Model/Request.php
+++ b/src/Client/Request.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model;
+namespace JDecool\OllamaClient\Client;
 
 abstract class Request implements \JsonSerializable
 {
diff --git a/src/Model/Request/ChatRequest.php b/src/Client/Request/ChatRequest.php
similarity index 85%
rename from src/Model/Request/ChatRequest.php
rename to src/Client/Request/ChatRequest.php
index b238b0c..d99648a 100644
--- a/src/Model/Request/ChatRequest.php
+++ b/src/Client/Request/ChatRequest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Request;
+namespace JDecool\OllamaClient\Client\Request;
 
-use JDecool\OllamaClient\Model\Request;
+use JDecool\OllamaClient\Client\Request;
 
 class ChatRequest extends Request
 {
diff --git a/src/Model/Request/CreateRequest.php b/src/Client/Request/CreateRequest.php
similarity index 89%
rename from src/Model/Request/CreateRequest.php
rename to src/Client/Request/CreateRequest.php
index 700907c..bf97f76 100644
--- a/src/Model/Request/CreateRequest.php
+++ b/src/Client/Request/CreateRequest.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Request;
+namespace JDecool\OllamaClient\Client\Request;
 
 use InvalidArgumentException;
-use JDecool\OllamaClient\Model\Request;
+use JDecool\OllamaClient\Client\Request;
 
 class CreateRequest extends Request
 {
diff --git a/src/Model/Request/PullRequest.php b/src/Client/Request/PullRequest.php
similarity index 69%
rename from src/Model/Request/PullRequest.php
rename to src/Client/Request/PullRequest.php
index 27bf8ab..a19af32 100644
--- a/src/Model/Request/PullRequest.php
+++ b/src/Client/Request/PullRequest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Request;
+namespace JDecool\OllamaClient\Client\Request;
 
-use JDecool\OllamaClient\Model\Request;
+use JDecool\OllamaClient\Client\Request;
 
 class PullRequest extends Request
 {
diff --git a/src/Model/Request/PushRequest.php b/src/Client/Request/PushRequest.php
similarity index 69%
rename from src/Model/Request/PushRequest.php
rename to src/Client/Request/PushRequest.php
index f7ccfe5..a29b68a 100644
--- a/src/Model/Request/PushRequest.php
+++ b/src/Client/Request/PushRequest.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Request;
+namespace JDecool\OllamaClient\Client\Request;
 
-use JDecool\OllamaClient\Model\Request;
+use JDecool\OllamaClient\Client\Request;
 
 class PushRequest extends Request
 {
diff --git a/src/Model/Response/ChatResponse.php b/src/Client/Response/ChatResponse.php
similarity index 92%
rename from src/Model/Response/ChatResponse.php
rename to src/Client/Response/ChatResponse.php
index 827893b..3fdf1e0 100644
--- a/src/Model/Response/ChatResponse.php
+++ b/src/Client/Response/ChatResponse.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Response;
+namespace JDecool\OllamaClient\Client\Response;
 
 use DateTimeImmutable;
-use JDecool\OllamaClient\Model\Message;
+use JDecool\OllamaClient\Client\Message;
 
 class ChatResponse
 {
diff --git a/src/Model/Response/ChatStreamFinalResponse.php b/src/Client/Response/ChatStreamFinalResponse.php
similarity index 92%
rename from src/Model/Response/ChatStreamFinalResponse.php
rename to src/Client/Response/ChatStreamFinalResponse.php
index 1d45004..310aef2 100644
--- a/src/Model/Response/ChatStreamFinalResponse.php
+++ b/src/Client/Response/ChatStreamFinalResponse.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Response;
+namespace JDecool\OllamaClient\Client\Response;
 
 use DateTimeImmutable;
-use JDecool\OllamaClient\Model\Message;
+use JDecool\OllamaClient\Client\Message;
 
 class ChatStreamFinalResponse extends ChatStreamResponse
 {
diff --git a/src/Model/Response/ChatStreamResponse.php b/src/Client/Response/ChatStreamResponse.php
similarity index 87%
rename from src/Model/Response/ChatStreamResponse.php
rename to src/Client/Response/ChatStreamResponse.php
index 11f9c55..d30b812 100644
--- a/src/Model/Response/ChatStreamResponse.php
+++ b/src/Client/Response/ChatStreamResponse.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Response;
+namespace JDecool\OllamaClient\Client\Response;
 
 use DateTimeImmutable;
-use JDecool\OllamaClient\Model\Message;
+use JDecool\OllamaClient\Client\Message;
 
 class ChatStreamResponse
 {
diff --git a/src/Model/Response/ListModelsResponse.php b/src/Client/Response/ListModelsResponse.php
similarity index 89%
rename from src/Model/Response/ListModelsResponse.php
rename to src/Client/Response/ListModelsResponse.php
index 0db2137..bbffbd8 100644
--- a/src/Model/Response/ListModelsResponse.php
+++ b/src/Client/Response/ListModelsResponse.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Response;
+namespace JDecool\OllamaClient\Client\Response;
 
 use JDecool\OllamaClient\Resource\Model;
 
diff --git a/src/Model/Response/StreamStatusResponse.php b/src/Client/Response/StreamStatusResponse.php
similarity index 85%
rename from src/Model/Response/StreamStatusResponse.php
rename to src/Client/Response/StreamStatusResponse.php
index 02eac84..1c53ddf 100644
--- a/src/Model/Response/StreamStatusResponse.php
+++ b/src/Client/Response/StreamStatusResponse.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace JDecool\OllamaClient\Model\Response;
+namespace JDecool\OllamaClient\Client\Response;
 
 class StreamStatusResponse
 {