diff --git a/composer.json b/composer.json
index a6464b0..265ae09 100644
--- a/composer.json
+++ b/composer.json
@@ -17,13 +17,13 @@
         "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
     },
     "autoload": {
-        "psr-0": {
-            "Clue\\Redis\\Protocol": "src/"
+        "psr-4": {
+            "Clue\\Redis\\Protocol\\": "src/"
         }
     }    ,
     "autoload-dev": {
-        "psr-0": {
-            "": "tests/"
+        "psr-4": {
+            "Clue\\Tests\\Redis\\Protocol\\": "tests/"
         }
     }
 }
diff --git a/src/Clue/Redis/Protocol/Factory.php b/src/Factory.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Factory.php
rename to src/Factory.php
diff --git a/src/Clue/Redis/Protocol/Model/BulkReply.php b/src/Model/BulkReply.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Model/BulkReply.php
rename to src/Model/BulkReply.php
diff --git a/src/Clue/Redis/Protocol/Model/ErrorReply.php b/src/Model/ErrorReply.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Model/ErrorReply.php
rename to src/Model/ErrorReply.php
diff --git a/src/Clue/Redis/Protocol/Model/IntegerReply.php b/src/Model/IntegerReply.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Model/IntegerReply.php
rename to src/Model/IntegerReply.php
diff --git a/src/Clue/Redis/Protocol/Model/ModelInterface.php b/src/Model/ModelInterface.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Model/ModelInterface.php
rename to src/Model/ModelInterface.php
diff --git a/src/Clue/Redis/Protocol/Model/MultiBulkReply.php b/src/Model/MultiBulkReply.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Model/MultiBulkReply.php
rename to src/Model/MultiBulkReply.php
diff --git a/src/Clue/Redis/Protocol/Model/Request.php b/src/Model/Request.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Model/Request.php
rename to src/Model/Request.php
diff --git a/src/Clue/Redis/Protocol/Model/StatusReply.php b/src/Model/StatusReply.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Model/StatusReply.php
rename to src/Model/StatusReply.php
diff --git a/src/Clue/Redis/Protocol/Parser/MessageBuffer.php b/src/Parser/MessageBuffer.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Parser/MessageBuffer.php
rename to src/Parser/MessageBuffer.php
diff --git a/src/Clue/Redis/Protocol/Parser/ParserException.php b/src/Parser/ParserException.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Parser/ParserException.php
rename to src/Parser/ParserException.php
diff --git a/src/Clue/Redis/Protocol/Parser/ParserInterface.php b/src/Parser/ParserInterface.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Parser/ParserInterface.php
rename to src/Parser/ParserInterface.php
diff --git a/src/Clue/Redis/Protocol/Parser/RequestParser.php b/src/Parser/RequestParser.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Parser/RequestParser.php
rename to src/Parser/RequestParser.php
diff --git a/src/Clue/Redis/Protocol/Parser/ResponseParser.php b/src/Parser/ResponseParser.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Parser/ResponseParser.php
rename to src/Parser/ResponseParser.php
diff --git a/src/Clue/Redis/Protocol/Serializer/RecursiveSerializer.php b/src/Serializer/RecursiveSerializer.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Serializer/RecursiveSerializer.php
rename to src/Serializer/RecursiveSerializer.php
diff --git a/src/Clue/Redis/Protocol/Serializer/SerializerInterface.php b/src/Serializer/SerializerInterface.php
similarity index 100%
rename from src/Clue/Redis/Protocol/Serializer/SerializerInterface.php
rename to src/Serializer/SerializerInterface.php
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
index a645127..6beaeba 100644
--- a/tests/FactoryTest.php
+++ b/tests/FactoryTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol;
+
 use Clue\Redis\Protocol\Factory;
 
 class FactoryTest extends TestCase
diff --git a/tests/Model/AbstractModelTest.php b/tests/Model/AbstractModelTest.php
index 7324850..7d1f517 100644
--- a/tests/Model/AbstractModelTest.php
+++ b/tests/Model/AbstractModelTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Serializer\RecursiveSerializer;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractModelTest extends TestCase
 {
diff --git a/tests/Model/BulkReplyTest.php b/tests/Model/BulkReplyTest.php
index 78ed04c..a5a63eb 100644
--- a/tests/Model/BulkReplyTest.php
+++ b/tests/Model/BulkReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\BulkReply;
 
 class BulkReplyTest extends AbstractModelTest
diff --git a/tests/Model/ErrorReplyTest.php b/tests/Model/ErrorReplyTest.php
index 16497fb..4556a3f 100644
--- a/tests/Model/ErrorReplyTest.php
+++ b/tests/Model/ErrorReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\ErrorReply;
 
 class ErrorReplyTest extends AbstractModelTest
diff --git a/tests/Model/IntegerReplyTest.php b/tests/Model/IntegerReplyTest.php
index f6a2e10..c90080f 100644
--- a/tests/Model/IntegerReplyTest.php
+++ b/tests/Model/IntegerReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\IntegerReply;
 
 class IntegerReplyTest extends AbstractModelTest
diff --git a/tests/Model/MultiBulkReplyTest.php b/tests/Model/MultiBulkReplyTest.php
index f5fe962..cf35602 100644
--- a/tests/Model/MultiBulkReplyTest.php
+++ b/tests/Model/MultiBulkReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\BulkReply;
 use Clue\Redis\Protocol\Model\IntegerReply;
 use Clue\Redis\Protocol\Model\MultiBulkReply;
diff --git a/tests/Model/RequestTest.php b/tests/Model/RequestTest.php
index 6719481..a327529 100644
--- a/tests/Model/RequestTest.php
+++ b/tests/Model/RequestTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\Request;
 
 class RequestTest extends AbstractModelTest
diff --git a/tests/Model/StatusReplyTest.php b/tests/Model/StatusReplyTest.php
index 8debd85..7b218aa 100644
--- a/tests/Model/StatusReplyTest.php
+++ b/tests/Model/StatusReplyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Model;
+
 use Clue\Redis\Protocol\Model\StatusReply;
 
 class StatusReplyTest extends AbstractModelTest
diff --git a/tests/Parser/AbstractParserTest.php b/tests/Parser/AbstractParserTest.php
index 4717880..56bb970 100644
--- a/tests/Parser/AbstractParserTest.php
+++ b/tests/Parser/AbstractParserTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Parser\MessageBuffer;
 use Clue\Redis\Protocol\Parser\ParserInterface;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractParserTest extends TestCase
 {
diff --git a/tests/Parser/RequestParserTest.php b/tests/Parser/RequestParserTest.php
index 668124e..d2c8706 100644
--- a/tests/Parser/RequestParserTest.php
+++ b/tests/Parser/RequestParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Model\Request;
 use Clue\Redis\Protocol\Parser\RequestParser;
 
diff --git a/tests/Parser/ResponseParserTest.php b/tests/Parser/ResponseParserTest.php
index 17ed387..4e1f24f 100644
--- a/tests/Parser/ResponseParserTest.php
+++ b/tests/Parser/ResponseParserTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Parser;
+
 use Clue\Redis\Protocol\Parser\ResponseParser;
 
 class ResponseParserTest extends AbstractParserTest
diff --git a/tests/Serializer/AbstractSerializerTest.php b/tests/Serializer/AbstractSerializerTest.php
index e3dc625..87a500e 100644
--- a/tests/Serializer/AbstractSerializerTest.php
+++ b/tests/Serializer/AbstractSerializerTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Serializer;
+
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
+use Clue\Tests\Redis\Protocol\TestCase;
 
 abstract class AbstractSerializerTest extends TestCase
 {
@@ -88,10 +91,10 @@ public function testArrayMultiBulkReply()
 
     public function testErrorReply()
     {
-        $model = $this->serializer->createReplyModel(new Exception('ERR failure'));
+        $model = $this->serializer->createReplyModel(new \Exception('ERR failure'));
         $this->assertInstanceOf('Clue\Redis\Protocol\Model\ErrorReply', $model);
         $this->assertEquals('ERR failure', $model->getValueNative());
-        $this->assertEquals($model->getMessageSerialized($this->serializer), $this->serializer->getReplyMessage(new Exception('ERR failure')));
+        $this->assertEquals($model->getMessageSerialized($this->serializer), $this->serializer->getReplyMessage(new \Exception('ERR failure')));
     }
 
     public function testInvalidArgument()
diff --git a/tests/Serializer/RecursiveSerializerTest.php b/tests/Serializer/RecursiveSerializerTest.php
index fe62ac5..e991b86 100644
--- a/tests/Serializer/RecursiveSerializerTest.php
+++ b/tests/Serializer/RecursiveSerializerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Clue\Tests\Redis\Protocol\Serializer;
+
 use Clue\Redis\Protocol\Serializer\RecursiveSerializer;
 
 class RecursiveSerializerTest extends AbstractSerializerTest
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 3f65834..1c45a87 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,6 +1,10 @@
 <?php
 
-class TestCase extends \PHPUnit\Framework\TestCase
+namespace Clue\Tests\Redis\Protocol;
+
+use PHPUnit\Framework\TestCase as BaseTestCase;
+
+class TestCase extends BaseTestCase
 {
     public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
     {