diff --git a/src/RpcClient.php b/src/Client/RpcClient.php
similarity index 94%
rename from src/RpcClient.php
rename to src/Client/RpcClient.php
index 6ce3160..d285dd9 100644
--- a/src/RpcClient.php
+++ b/src/Client/RpcClient.php
@@ -1,11 +1,12 @@
 <?php
 // RpcClient.php
 // Created: 2024-08-13
-// Updated: 2024-08-13
+// Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Client;
 
 use InvalidArgumentException;
+use Aiwass\{AiwassMsgPack,IHttpRequest,IVerificationProvider};
 
 /**
  * Implemens an RPC client.
diff --git a/src/IRpcActionHandler.php b/src/Server/IRpcActionHandler.php
similarity index 93%
rename from src/IRpcActionHandler.php
rename to src/Server/IRpcActionHandler.php
index 1b7845f..d49fd2c 100644
--- a/src/IRpcActionHandler.php
+++ b/src/Server/IRpcActionHandler.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-15
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 /**
  * Provides the interface for IRpcServer::register().
diff --git a/src/IRpcServer.php b/src/Server/IRpcServer.php
similarity index 98%
rename from src/IRpcServer.php
rename to src/Server/IRpcServer.php
index 419988a..545d3b3 100644
--- a/src/IRpcServer.php
+++ b/src/Server/IRpcServer.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-16
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 use RuntimeException;
 use InvalidArgumentException;
diff --git a/src/RpcAction.php b/src/Server/RpcAction.php
similarity index 98%
rename from src/RpcAction.php
rename to src/Server/RpcAction.php
index 6c7c427..282b7f6 100644
--- a/src/RpcAction.php
+++ b/src/Server/RpcAction.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-15
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 use Attribute;
 use ReflectionAttribute;
diff --git a/src/RpcActionHandler.php b/src/Server/RpcActionHandler.php
similarity index 87%
rename from src/RpcActionHandler.php
rename to src/Server/RpcActionHandler.php
index cfbc3b5..4238885 100644
--- a/src/RpcActionHandler.php
+++ b/src/Server/RpcActionHandler.php
@@ -1,9 +1,9 @@
 <?php
 // RpcActionHandler.php
 // Created: 2024-08-15
-// Updated: 2024-08-15
+// Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 /**
  * Provides an abstract class version of IRpcActionHandler that already includes the trait as well,
diff --git a/src/RpcActionHandlerTrait.php b/src/Server/RpcActionHandlerTrait.php
similarity index 94%
rename from src/RpcActionHandlerTrait.php
rename to src/Server/RpcActionHandlerTrait.php
index 3a1cae1..58fe323 100644
--- a/src/RpcActionHandlerTrait.php
+++ b/src/Server/RpcActionHandlerTrait.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-15
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 /**
  * Provides an implementation of IRpcActionHandler::registerRpcActions that uses the attributes.
diff --git a/src/RpcActionInfo.php b/src/Server/RpcActionInfo.php
similarity index 99%
rename from src/RpcActionInfo.php
rename to src/Server/RpcActionInfo.php
index 7af906f..c56eba5 100644
--- a/src/RpcActionInfo.php
+++ b/src/Server/RpcActionInfo.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-13
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 use Closure;
 use InvalidArgumentException;
diff --git a/src/RpcProcedure.php b/src/Server/RpcProcedure.php
similarity index 94%
rename from src/RpcProcedure.php
rename to src/Server/RpcProcedure.php
index a3990a3..fdb483d 100644
--- a/src/RpcProcedure.php
+++ b/src/Server/RpcProcedure.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-15
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 use Attribute;
 /**
diff --git a/src/RpcQuery.php b/src/Server/RpcQuery.php
similarity index 94%
rename from src/RpcQuery.php
rename to src/Server/RpcQuery.php
index 0771323..bb557ee 100644
--- a/src/RpcQuery.php
+++ b/src/Server/RpcQuery.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-15
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 use Attribute;
 /**
diff --git a/src/RpcRouteHandler.php b/src/Server/RpcRouteHandler.php
similarity index 97%
rename from src/RpcRouteHandler.php
rename to src/Server/RpcRouteHandler.php
index c65d74f..20ad7c6 100644
--- a/src/RpcRouteHandler.php
+++ b/src/Server/RpcRouteHandler.php
@@ -3,10 +3,11 @@
 // Created: 2024-08-13
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 use Exception;
 use RuntimeException;
+use Aiwass\{AiwassMsgPack,IVerificationProvider};
 use Index\Http\{HttpResponseBuilder,HttpRequest};
 use Index\Http\Content\FormContent;
 use Index\Http\Routing\{HttpGet,HttpPost,RouteHandler};
diff --git a/src/RpcServer.php b/src/Server/RpcServer.php
similarity index 97%
rename from src/RpcServer.php
rename to src/Server/RpcServer.php
index bbb4cf5..027eece 100644
--- a/src/RpcServer.php
+++ b/src/Server/RpcServer.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-13
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 use InvalidArgumentException;
 use RuntimeException;
diff --git a/src/RpcServerScoped.php b/src/Server/RpcServerScoped.php
similarity index 96%
rename from src/RpcServerScoped.php
rename to src/Server/RpcServerScoped.php
index 7a1c3ff..cd418f0 100644
--- a/src/RpcServerScoped.php
+++ b/src/Server/RpcServerScoped.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-16
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 /**
  * Provides a scoped RPC server implementation.
diff --git a/src/RpcServerTrait.php b/src/Server/RpcServerTrait.php
similarity index 96%
rename from src/RpcServerTrait.php
rename to src/Server/RpcServerTrait.php
index b797720..80ef6dd 100644
--- a/src/RpcServerTrait.php
+++ b/src/Server/RpcServerTrait.php
@@ -3,7 +3,7 @@
 // Created: 2024-08-16
 // Updated: 2024-08-16
 
-namespace Aiwass;
+namespace Aiwass\Server;
 
 /**
  * Provides implementations for IRpcServer methods that are likely going to be identical across implementations.
diff --git a/tests/AttributesTest.php b/tests/AttributesTest.php
index b1921ac..309d07f 100644
--- a/tests/AttributesTest.php
+++ b/tests/AttributesTest.php
@@ -8,7 +8,7 @@ declare(strict_types=1);
 use RuntimeException;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\{CoversClass,UsesClass};
-use Aiwass\{RpcAction,RpcActionHandler,RpcProcedure,RpcQuery,RpcServer};
+use Aiwass\Server\{RpcAction,RpcActionHandler,RpcProcedure,RpcQuery,RpcServer};
 
 #[CoversClass(RpcAction::class)]
 #[CoversClass(RpcActionHandler::class)]
diff --git a/tests/ScopedServerTest.php b/tests/ScopedServerTest.php
index 893dd56..6db0e62 100644
--- a/tests/ScopedServerTest.php
+++ b/tests/ScopedServerTest.php
@@ -7,7 +7,7 @@ declare(strict_types=1);
 
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\{CoversClass,UsesClass};
-use Aiwass\{RpcServer,RpcServerScoped};
+use Aiwass\Server\{RpcServer,RpcServerScoped};
 
 #[CoversClass(RpcServerScoped::class)]
 #[UsesClass(RpcServer::class)]