diff --git a/lib/Predis/Network/ComposableStreamConnection.php b/lib/Predis/Network/ComposableStreamConnection.php
index 716d1c37..5676791a 100644
--- a/lib/Predis/Network/ComposableStreamConnection.php
+++ b/lib/Predis/Network/ComposableStreamConnection.php
@@ -6,7 +6,7 @@ use Predis\IConnectionParameters;
 use Predis\CommunicationException;
 use Predis\Commands\ICommand;
 use Predis\Protocols\IProtocolProcessor;
-use Predis\Protocols\TextProtocol;
+use Predis\Protocols\Text\TextProtocol;
 
 class ComposableStreamConnection extends StreamConnection implements IConnectionComposable {
     private $_protocol;
diff --git a/lib/Predis/Protocols/IProtocolProcessor.php b/lib/Predis/Protocols/IProtocolProcessor.php
index 7b323ea0..e974ec16 100644
--- a/lib/Predis/Protocols/IProtocolProcessor.php
+++ b/lib/Predis/Protocols/IProtocolProcessor.php
@@ -5,8 +5,7 @@ namespace Predis\Protocols;
 use Predis\Commands\ICommand;
 use Predis\Network\IConnectionComposable;
 
-interface IProtocolProcessor {
+interface IProtocolProcessor extends IResponseReader {
     public function write(IConnectionComposable $connection, ICommand $command);
-    public function read(IConnectionComposable $connection);
     public function setOption($option, $value);
 }
diff --git a/lib/Predis/Protocols/IResponseReader.php b/lib/Predis/Protocols/IResponseReader.php
index 2de2481d..62b3d5d7 100644
--- a/lib/Predis/Protocols/IResponseReader.php
+++ b/lib/Predis/Protocols/IResponseReader.php
@@ -2,7 +2,8 @@
 
 namespace Predis\Protocols;
 
+use Predis\Network\IConnectionComposable;
+
 interface IResponseReader {
-    public function setHandler($prefix, IResponseHandler $handler);
-    public function getHandler($prefix);
+    public function read(IConnectionComposable $connection);
 }
diff --git a/lib/Predis/Protocols/ComposableTextProtocol.php b/lib/Predis/Protocols/Text/ComposableTextProtocol.php
similarity index 92%
rename from lib/Predis/Protocols/ComposableTextProtocol.php
rename to lib/Predis/Protocols/Text/ComposableTextProtocol.php
index 0c664577..a49cce35 100644
--- a/lib/Predis/Protocols/ComposableTextProtocol.php
+++ b/lib/Predis/Protocols/Text/ComposableTextProtocol.php
@@ -1,8 +1,11 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Commands\ICommand;
+use Predis\Protocols\IResponseReader;
+use Predis\Protocols\ICommandSerializer;
+use Predis\Protocols\IProtocolProcessorExtended;
 use Predis\Network\IConnectionComposable;
 
 class ComposableTextProtocol implements IProtocolProcessorExtended {
diff --git a/lib/Predis/Protocols/ResponseBulkHandler.php b/lib/Predis/Protocols/Text/ResponseBulkHandler.php
similarity index 90%
rename from lib/Predis/Protocols/ResponseBulkHandler.php
rename to lib/Predis/Protocols/Text/ResponseBulkHandler.php
index 47a0c51b..89030a94 100644
--- a/lib/Predis/Protocols/ResponseBulkHandler.php
+++ b/lib/Predis/Protocols/Text/ResponseBulkHandler.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseBulkHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/ResponseErrorHandler.php b/lib/Predis/Protocols/Text/ResponseErrorHandler.php
similarity index 79%
rename from lib/Predis/Protocols/ResponseErrorHandler.php
rename to lib/Predis/Protocols/Text/ResponseErrorHandler.php
index 90393792..61cf1b1a 100644
--- a/lib/Predis/Protocols/ResponseErrorHandler.php
+++ b/lib/Predis/Protocols/Text/ResponseErrorHandler.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\ServerException;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseErrorHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/ResponseErrorSilentHandler.php b/lib/Predis/Protocols/Text/ResponseErrorSilentHandler.php
similarity index 79%
rename from lib/Predis/Protocols/ResponseErrorSilentHandler.php
rename to lib/Predis/Protocols/Text/ResponseErrorSilentHandler.php
index 079311a3..f0b69296 100644
--- a/lib/Predis/Protocols/ResponseErrorSilentHandler.php
+++ b/lib/Predis/Protocols/Text/ResponseErrorSilentHandler.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\ResponseError;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseErrorSilentHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/ResponseIntegerHandler.php b/lib/Predis/Protocols/Text/ResponseIntegerHandler.php
similarity index 87%
rename from lib/Predis/Protocols/ResponseIntegerHandler.php
rename to lib/Predis/Protocols/Text/ResponseIntegerHandler.php
index e82efbf0..4caf29fe 100644
--- a/lib/Predis/Protocols/ResponseIntegerHandler.php
+++ b/lib/Predis/Protocols/Text/ResponseIntegerHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Helpers;
-use Predis\ProtocolException;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseIntegerHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/ResponseMultiBulkHandler.php b/lib/Predis/Protocols/Text/ResponseMultiBulkHandler.php
similarity index 94%
rename from lib/Predis/Protocols/ResponseMultiBulkHandler.php
rename to lib/Predis/Protocols/Text/ResponseMultiBulkHandler.php
index b88de722..1b49a8a5 100644
--- a/lib/Predis/Protocols/ResponseMultiBulkHandler.php
+++ b/lib/Predis/Protocols/Text/ResponseMultiBulkHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Helpers;
-use Predis\ProtocolException;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseMultiBulkHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/ResponseMultiBulkStreamHandler.php b/lib/Predis/Protocols/Text/ResponseMultiBulkStreamHandler.php
similarity index 89%
rename from lib/Predis/Protocols/ResponseMultiBulkStreamHandler.php
rename to lib/Predis/Protocols/Text/ResponseMultiBulkStreamHandler.php
index 4addf392..7e90fe9e 100644
--- a/lib/Predis/Protocols/ResponseMultiBulkStreamHandler.php
+++ b/lib/Predis/Protocols/Text/ResponseMultiBulkStreamHandler.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 use Predis\Iterators\MultiBulkResponseSimple;
 
diff --git a/lib/Predis/Protocols/ResponseStatusHandler.php b/lib/Predis/Protocols/Text/ResponseStatusHandler.php
similarity index 85%
rename from lib/Predis/Protocols/ResponseStatusHandler.php
rename to lib/Predis/Protocols/Text/ResponseStatusHandler.php
index 34870120..c22922b7 100644
--- a/lib/Predis/Protocols/ResponseStatusHandler.php
+++ b/lib/Predis/Protocols/Text/ResponseStatusHandler.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\ResponseQueued;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class ResponseStatusHandler implements IResponseHandler {
diff --git a/lib/Predis/Protocols/TextCommandSerializer.php b/lib/Predis/Protocols/Text/TextCommandSerializer.php
similarity index 89%
rename from lib/Predis/Protocols/TextCommandSerializer.php
rename to lib/Predis/Protocols/Text/TextCommandSerializer.php
index 861724dd..f5acf2ab 100644
--- a/lib/Predis/Protocols/TextCommandSerializer.php
+++ b/lib/Predis/Protocols/Text/TextCommandSerializer.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Commands\ICommand;
+use Predis\Protocols\ICommandSerializer;
 
 class TextCommandSerializer implements ICommandSerializer {
     public function serialize(ICommand $command) {
diff --git a/lib/Predis/Protocols/TextProtocol.php b/lib/Predis/Protocols/Text/TextProtocol.php
similarity index 97%
rename from lib/Predis/Protocols/TextProtocol.php
rename to lib/Predis/Protocols/Text/TextProtocol.php
index 6ff6c8f3..8b906fdd 100644
--- a/lib/Predis/Protocols/TextProtocol.php
+++ b/lib/Predis/Protocols/Text/TextProtocol.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Helpers;
 use Predis\ResponseError;
@@ -8,6 +8,7 @@ use Predis\ResponseQueued;
 use Predis\ServerException;
 use Predis\ProtocolException;
 use Predis\Commands\ICommand;
+use Predis\Protocols\IProtocolProcessor;
 use Predis\Network\IConnectionComposable;
 use Predis\Iterators\MultiBulkResponseSimple;
 
diff --git a/lib/Predis/Protocols/TextResponseReader.php b/lib/Predis/Protocols/Text/TextResponseReader.php
similarity index 94%
rename from lib/Predis/Protocols/TextResponseReader.php
rename to lib/Predis/Protocols/Text/TextResponseReader.php
index 0e705c1a..a12edb68 100644
--- a/lib/Predis/Protocols/TextResponseReader.php
+++ b/lib/Predis/Protocols/Text/TextResponseReader.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace Predis\Protocols;
+namespace Predis\Protocols\Text;
 
 use Predis\Helpers;
 use Predis\ProtocolException;
+use Predis\Protocols\IResponseReader;
+use Predis\Protocols\IResponseHandler;
 use Predis\Network\IConnectionComposable;
 
 class TextResponseReader implements IResponseReader {
diff --git a/test/ClientFeaturesTest.php b/test/ClientFeaturesTest.php
index 5cbc8812..1dd0a7b7 100644
--- a/test/ClientFeaturesTest.php
+++ b/test/ClientFeaturesTest.php
@@ -164,7 +164,7 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     function testResponseQueued() {
         $response = new \Predis\ResponseQueued();
         $this->assertTrue($response->queued);
-        $this->assertEquals(\Predis\Protocols\TextProtocol::QUEUED, (string)$response);
+        $this->assertEquals(\Predis\Protocols\Text\TextProtocol::QUEUED, (string)$response);
     }
 
 
@@ -280,27 +280,27 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     /* Predis\Protocols\TextResponseReader */
 
     function testResponseReader_OptionIterableMultiBulkReplies() {
-        $protocol = new Predis\Protocols\ComposableTextProtocol();
+        $protocol = new Predis\Protocols\Text\ComposableTextProtocol();
         $reader = $protocol->getReader();
         $connection = new \Predis\Network\ComposableStreamConnection(RC::getConnectionParameters(), $protocol);
 
         $reader->setHandler(
-            \Predis\Protocols\TextProtocol::PREFIX_MULTI_BULK,
-            new \Predis\Protocols\ResponseMultiBulkHandler()
+            \Predis\Protocols\Text\TextProtocol::PREFIX_MULTI_BULK,
+            new \Predis\Protocols\Text\ResponseMultiBulkHandler()
         );
         $connection->writeBytes("KEYS *\r\n");
         $this->assertInternalType('array', $reader->read($connection));
 
         $reader->setHandler(
-            \Predis\Protocols\TextProtocol::PREFIX_MULTI_BULK, 
-            new \Predis\Protocols\ResponseMultiBulkStreamHandler()
+            \Predis\Protocols\Text\TextProtocol::PREFIX_MULTI_BULK,
+            new \Predis\Protocols\Text\ResponseMultiBulkStreamHandler()
         );
         $connection->writeBytes("KEYS *\r\n");
         $this->assertInstanceOf('\Iterator', $reader->read($connection));
     }
 
     function testResponseReader_OptionExceptionOnError() {
-        $protocol = new Predis\Protocols\ComposableTextProtocol();
+        $protocol = new Predis\Protocols\Text\ComposableTextProtocol();
         $reader = $protocol->getReader();
         $connection = new \Predis\Network\ComposableStreamConnection(RC::getConnectionParameters(), $protocol);
 
@@ -309,8 +309,8 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
         $reader->read($connection);
 
         $reader->setHandler(
-            \Predis\Protocols\TextProtocol::PREFIX_ERROR,
-            new \Predis\Protocols\ResponseErrorSilentHandler()
+            \Predis\Protocols\Text\TextProtocol::PREFIX_ERROR,
+            new \Predis\Protocols\Text\ResponseErrorSilentHandler()
         );
         $connection->writeBytes($rawCmdUnexpected);
         $errorReply = $reader->read($connection);
@@ -318,8 +318,8 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
         $this->assertEquals(RC::EXCEPTION_WRONG_TYPE, $errorReply->message);
 
         $reader->setHandler(
-            \Predis\Protocols\TextProtocol::PREFIX_ERROR,
-            new \Predis\Protocols\ResponseErrorHandler()
+            \Predis\Protocols\Text\TextProtocol::PREFIX_ERROR,
+            new \Predis\Protocols\Text\ResponseErrorHandler()
         );
         RC::testForServerException($this, RC::EXCEPTION_WRONG_TYPE, function()
             use ($connection, $rawCmdUnexpected) {
@@ -330,7 +330,7 @@ class ClientFeaturesTestSuite extends PHPUnit_Framework_TestCase {
     }
 
     function testResponseReader_EmptyBulkResponse() {
-        $protocol = new \Predis\Protocols\ComposableTextProtocol();
+        $protocol = new \Predis\Protocols\Text\ComposableTextProtocol();
         $connection = new \Predis\Network\ComposableStreamConnection(RC::getConnectionParameters(), $protocol);
         $client = new \Predis\Client($connection);