diff --git a/.travis.yml b/.travis.yml
index 2af5cf5..9f1f9ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,12 @@
 language: php
 php:
-  - 5.4
   - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7
+  - hhvm
+
 before_script:
   - composer install --dev --prefer-source --no-interaction
 script:
diff --git a/composer.json b/composer.json
index d99e2ee..bd3e683 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,6 @@
         "php": ">=5.3"
     },
     "autoload": {
-        "psr-0": { "Clue\\Redis\\Protocol": "src" }
+        "psr-4": { "Clue\\Redis\\Protocol\\": "src/" }
     }
 }
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