diff --git a/autoload.php b/autoload.php
index a7dc3858..6b5a00b1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -9,6 +9,6 @@
  * file that was distributed with this source code.
  */
 
-require __DIR__.'/lib/Autoloader.php';
+require __DIR__.'/src/Autoloader.php';
 
 Predis\Autoloader::register();
diff --git a/bin/create-command-test b/bin/create-command-test
index c4657704..52399435 100755
--- a/bin/create-command-test
+++ b/bin/create-command-test
@@ -95,7 +95,7 @@ class CommandTestCaseGenerator
         $options['fqn'] = "Predis\\Command\\{$options['class']}";
         $options['path'] = "Command/{$options['class']}.php";
 
-        $source = __DIR__.'/../lib/'.$options['path'];
+        $source = __DIR__.'/../src/'.$options['path'];
         if (!file_exists($source)) {
             throw new RuntimeException("Cannot find class file for {$options['fqn']} in $source.");
         }
diff --git a/bin/create-phar b/bin/create-phar
index 8db972a4..8501d4a7 100755
--- a/bin/create-phar
+++ b/bin/create-phar
@@ -19,7 +19,7 @@
 
 $options = array(
     'name'           => 'predis',
-    'project_path'   => __DIR__ . '/../lib/',
+    'project_path'   => __DIR__ . '/../src',
     'compression'    => Phar::NONE,
     'append_version' => true,
 );
diff --git a/bin/create-single-file b/bin/create-single-file
index 6e47c53d..7537729b 100755
--- a/bin/create-single-file
+++ b/bin/create-single-file
@@ -36,7 +36,7 @@ class CommandLine
         $getops = getopt(implode(array_keys($parameters)), $parameters);
 
         $options = array(
-            'source'  => __DIR__ . "/../lib",
+            'source'  => __DIR__ . "/../src",
             'output'  => PredisFile::NS_ROOT . '.php',
             'exclude' => array(),
         );
diff --git a/composer.json b/composer.json
index 1b221154..711308ea 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "ext-curl": "Allows access to Webdis when paired with phpiredis"
     },
     "autoload": {
-        "psr-4": {"Predis\\": "lib/"}
+        "psr-4": {"Predis\\": "src/"}
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e9b09313..dcac5301 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -21,7 +21,7 @@
 
     <filter>
         <whitelist>
-            <directory suffix=".php">lib/</directory>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 
diff --git a/phpunit.xml.travisci b/phpunit.xml.travisci
index 02918099..6e485efa 100644
--- a/phpunit.xml.travisci
+++ b/phpunit.xml.travisci
@@ -21,7 +21,7 @@
 
     <filter>
         <whitelist>
-            <directory suffix=".php">lib/</directory>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 
diff --git a/lib/Autoloader.php b/src/Autoloader.php
similarity index 100%
rename from lib/Autoloader.php
rename to src/Autoloader.php
diff --git a/lib/BasicClientInterface.php b/src/BasicClientInterface.php
similarity index 100%
rename from lib/BasicClientInterface.php
rename to src/BasicClientInterface.php
diff --git a/lib/Client.php b/src/Client.php
similarity index 100%
rename from lib/Client.php
rename to src/Client.php
diff --git a/lib/ClientException.php b/src/ClientException.php
similarity index 100%
rename from lib/ClientException.php
rename to src/ClientException.php
diff --git a/lib/ClientInterface.php b/src/ClientInterface.php
similarity index 100%
rename from lib/ClientInterface.php
rename to src/ClientInterface.php
diff --git a/lib/Cluster/Distributor/DistributorInterface.php b/src/Cluster/Distributor/DistributorInterface.php
similarity index 100%
rename from lib/Cluster/Distributor/DistributorInterface.php
rename to src/Cluster/Distributor/DistributorInterface.php
diff --git a/lib/Cluster/Distributor/EmptyRingException.php b/src/Cluster/Distributor/EmptyRingException.php
similarity index 100%
rename from lib/Cluster/Distributor/EmptyRingException.php
rename to src/Cluster/Distributor/EmptyRingException.php
diff --git a/lib/Cluster/Distributor/HashRing.php b/src/Cluster/Distributor/HashRing.php
similarity index 100%
rename from lib/Cluster/Distributor/HashRing.php
rename to src/Cluster/Distributor/HashRing.php
diff --git a/lib/Cluster/Distributor/KetamaRing.php b/src/Cluster/Distributor/KetamaRing.php
similarity index 100%
rename from lib/Cluster/Distributor/KetamaRing.php
rename to src/Cluster/Distributor/KetamaRing.php
diff --git a/lib/Cluster/Hash/CRC16.php b/src/Cluster/Hash/CRC16.php
similarity index 100%
rename from lib/Cluster/Hash/CRC16.php
rename to src/Cluster/Hash/CRC16.php
diff --git a/lib/Cluster/Hash/HashGeneratorInterface.php b/src/Cluster/Hash/HashGeneratorInterface.php
similarity index 100%
rename from lib/Cluster/Hash/HashGeneratorInterface.php
rename to src/Cluster/Hash/HashGeneratorInterface.php
diff --git a/lib/Cluster/PredisStrategy.php b/src/Cluster/PredisStrategy.php
similarity index 100%
rename from lib/Cluster/PredisStrategy.php
rename to src/Cluster/PredisStrategy.php
diff --git a/lib/Cluster/RedisStrategy.php b/src/Cluster/RedisStrategy.php
similarity index 100%
rename from lib/Cluster/RedisStrategy.php
rename to src/Cluster/RedisStrategy.php
diff --git a/lib/Cluster/StrategyInterface.php b/src/Cluster/StrategyInterface.php
similarity index 100%
rename from lib/Cluster/StrategyInterface.php
rename to src/Cluster/StrategyInterface.php
diff --git a/lib/Collection/Iterator/CursorBasedIterator.php b/src/Collection/Iterator/CursorBasedIterator.php
similarity index 100%
rename from lib/Collection/Iterator/CursorBasedIterator.php
rename to src/Collection/Iterator/CursorBasedIterator.php
diff --git a/lib/Collection/Iterator/HashKey.php b/src/Collection/Iterator/HashKey.php
similarity index 100%
rename from lib/Collection/Iterator/HashKey.php
rename to src/Collection/Iterator/HashKey.php
diff --git a/lib/Collection/Iterator/Keyspace.php b/src/Collection/Iterator/Keyspace.php
similarity index 100%
rename from lib/Collection/Iterator/Keyspace.php
rename to src/Collection/Iterator/Keyspace.php
diff --git a/lib/Collection/Iterator/ListKey.php b/src/Collection/Iterator/ListKey.php
similarity index 100%
rename from lib/Collection/Iterator/ListKey.php
rename to src/Collection/Iterator/ListKey.php
diff --git a/lib/Collection/Iterator/SetKey.php b/src/Collection/Iterator/SetKey.php
similarity index 100%
rename from lib/Collection/Iterator/SetKey.php
rename to src/Collection/Iterator/SetKey.php
diff --git a/lib/Collection/Iterator/SortedSetKey.php b/src/Collection/Iterator/SortedSetKey.php
similarity index 100%
rename from lib/Collection/Iterator/SortedSetKey.php
rename to src/Collection/Iterator/SortedSetKey.php
diff --git a/lib/Command/Command.php b/src/Command/Command.php
similarity index 100%
rename from lib/Command/Command.php
rename to src/Command/Command.php
diff --git a/lib/Command/CommandInterface.php b/src/Command/CommandInterface.php
similarity index 100%
rename from lib/Command/CommandInterface.php
rename to src/Command/CommandInterface.php
diff --git a/lib/Command/ConnectionAuth.php b/src/Command/ConnectionAuth.php
similarity index 100%
rename from lib/Command/ConnectionAuth.php
rename to src/Command/ConnectionAuth.php
diff --git a/lib/Command/ConnectionEcho.php b/src/Command/ConnectionEcho.php
similarity index 100%
rename from lib/Command/ConnectionEcho.php
rename to src/Command/ConnectionEcho.php
diff --git a/lib/Command/ConnectionPing.php b/src/Command/ConnectionPing.php
similarity index 100%
rename from lib/Command/ConnectionPing.php
rename to src/Command/ConnectionPing.php
diff --git a/lib/Command/ConnectionQuit.php b/src/Command/ConnectionQuit.php
similarity index 100%
rename from lib/Command/ConnectionQuit.php
rename to src/Command/ConnectionQuit.php
diff --git a/lib/Command/ConnectionSelect.php b/src/Command/ConnectionSelect.php
similarity index 100%
rename from lib/Command/ConnectionSelect.php
rename to src/Command/ConnectionSelect.php
diff --git a/lib/Command/HashDelete.php b/src/Command/HashDelete.php
similarity index 100%
rename from lib/Command/HashDelete.php
rename to src/Command/HashDelete.php
diff --git a/lib/Command/HashExists.php b/src/Command/HashExists.php
similarity index 100%
rename from lib/Command/HashExists.php
rename to src/Command/HashExists.php
diff --git a/lib/Command/HashGet.php b/src/Command/HashGet.php
similarity index 100%
rename from lib/Command/HashGet.php
rename to src/Command/HashGet.php
diff --git a/lib/Command/HashGetAll.php b/src/Command/HashGetAll.php
similarity index 100%
rename from lib/Command/HashGetAll.php
rename to src/Command/HashGetAll.php
diff --git a/lib/Command/HashGetMultiple.php b/src/Command/HashGetMultiple.php
similarity index 100%
rename from lib/Command/HashGetMultiple.php
rename to src/Command/HashGetMultiple.php
diff --git a/lib/Command/HashIncrementBy.php b/src/Command/HashIncrementBy.php
similarity index 100%
rename from lib/Command/HashIncrementBy.php
rename to src/Command/HashIncrementBy.php
diff --git a/lib/Command/HashIncrementByFloat.php b/src/Command/HashIncrementByFloat.php
similarity index 100%
rename from lib/Command/HashIncrementByFloat.php
rename to src/Command/HashIncrementByFloat.php
diff --git a/lib/Command/HashKeys.php b/src/Command/HashKeys.php
similarity index 100%
rename from lib/Command/HashKeys.php
rename to src/Command/HashKeys.php
diff --git a/lib/Command/HashLength.php b/src/Command/HashLength.php
similarity index 100%
rename from lib/Command/HashLength.php
rename to src/Command/HashLength.php
diff --git a/lib/Command/HashScan.php b/src/Command/HashScan.php
similarity index 100%
rename from lib/Command/HashScan.php
rename to src/Command/HashScan.php
diff --git a/lib/Command/HashSet.php b/src/Command/HashSet.php
similarity index 100%
rename from lib/Command/HashSet.php
rename to src/Command/HashSet.php
diff --git a/lib/Command/HashSetMultiple.php b/src/Command/HashSetMultiple.php
similarity index 100%
rename from lib/Command/HashSetMultiple.php
rename to src/Command/HashSetMultiple.php
diff --git a/lib/Command/HashSetPreserve.php b/src/Command/HashSetPreserve.php
similarity index 100%
rename from lib/Command/HashSetPreserve.php
rename to src/Command/HashSetPreserve.php
diff --git a/lib/Command/HashValues.php b/src/Command/HashValues.php
similarity index 100%
rename from lib/Command/HashValues.php
rename to src/Command/HashValues.php
diff --git a/lib/Command/HyperLogLogAdd.php b/src/Command/HyperLogLogAdd.php
similarity index 100%
rename from lib/Command/HyperLogLogAdd.php
rename to src/Command/HyperLogLogAdd.php
diff --git a/lib/Command/HyperLogLogCount.php b/src/Command/HyperLogLogCount.php
similarity index 100%
rename from lib/Command/HyperLogLogCount.php
rename to src/Command/HyperLogLogCount.php
diff --git a/lib/Command/HyperLogLogMerge.php b/src/Command/HyperLogLogMerge.php
similarity index 100%
rename from lib/Command/HyperLogLogMerge.php
rename to src/Command/HyperLogLogMerge.php
diff --git a/lib/Command/KeyDelete.php b/src/Command/KeyDelete.php
similarity index 100%
rename from lib/Command/KeyDelete.php
rename to src/Command/KeyDelete.php
diff --git a/lib/Command/KeyDump.php b/src/Command/KeyDump.php
similarity index 100%
rename from lib/Command/KeyDump.php
rename to src/Command/KeyDump.php
diff --git a/lib/Command/KeyExists.php b/src/Command/KeyExists.php
similarity index 100%
rename from lib/Command/KeyExists.php
rename to src/Command/KeyExists.php
diff --git a/lib/Command/KeyExpire.php b/src/Command/KeyExpire.php
similarity index 100%
rename from lib/Command/KeyExpire.php
rename to src/Command/KeyExpire.php
diff --git a/lib/Command/KeyExpireAt.php b/src/Command/KeyExpireAt.php
similarity index 100%
rename from lib/Command/KeyExpireAt.php
rename to src/Command/KeyExpireAt.php
diff --git a/lib/Command/KeyKeys.php b/src/Command/KeyKeys.php
similarity index 100%
rename from lib/Command/KeyKeys.php
rename to src/Command/KeyKeys.php
diff --git a/lib/Command/KeyKeysV12x.php b/src/Command/KeyKeysV12x.php
similarity index 100%
rename from lib/Command/KeyKeysV12x.php
rename to src/Command/KeyKeysV12x.php
diff --git a/lib/Command/KeyMove.php b/src/Command/KeyMove.php
similarity index 100%
rename from lib/Command/KeyMove.php
rename to src/Command/KeyMove.php
diff --git a/lib/Command/KeyPersist.php b/src/Command/KeyPersist.php
similarity index 100%
rename from lib/Command/KeyPersist.php
rename to src/Command/KeyPersist.php
diff --git a/lib/Command/KeyPreciseExpire.php b/src/Command/KeyPreciseExpire.php
similarity index 100%
rename from lib/Command/KeyPreciseExpire.php
rename to src/Command/KeyPreciseExpire.php
diff --git a/lib/Command/KeyPreciseExpireAt.php b/src/Command/KeyPreciseExpireAt.php
similarity index 100%
rename from lib/Command/KeyPreciseExpireAt.php
rename to src/Command/KeyPreciseExpireAt.php
diff --git a/lib/Command/KeyPreciseTimeToLive.php b/src/Command/KeyPreciseTimeToLive.php
similarity index 100%
rename from lib/Command/KeyPreciseTimeToLive.php
rename to src/Command/KeyPreciseTimeToLive.php
diff --git a/lib/Command/KeyRandom.php b/src/Command/KeyRandom.php
similarity index 100%
rename from lib/Command/KeyRandom.php
rename to src/Command/KeyRandom.php
diff --git a/lib/Command/KeyRename.php b/src/Command/KeyRename.php
similarity index 100%
rename from lib/Command/KeyRename.php
rename to src/Command/KeyRename.php
diff --git a/lib/Command/KeyRenamePreserve.php b/src/Command/KeyRenamePreserve.php
similarity index 100%
rename from lib/Command/KeyRenamePreserve.php
rename to src/Command/KeyRenamePreserve.php
diff --git a/lib/Command/KeyRestore.php b/src/Command/KeyRestore.php
similarity index 100%
rename from lib/Command/KeyRestore.php
rename to src/Command/KeyRestore.php
diff --git a/lib/Command/KeyScan.php b/src/Command/KeyScan.php
similarity index 100%
rename from lib/Command/KeyScan.php
rename to src/Command/KeyScan.php
diff --git a/lib/Command/KeySort.php b/src/Command/KeySort.php
similarity index 100%
rename from lib/Command/KeySort.php
rename to src/Command/KeySort.php
diff --git a/lib/Command/KeyTimeToLive.php b/src/Command/KeyTimeToLive.php
similarity index 100%
rename from lib/Command/KeyTimeToLive.php
rename to src/Command/KeyTimeToLive.php
diff --git a/lib/Command/KeyType.php b/src/Command/KeyType.php
similarity index 100%
rename from lib/Command/KeyType.php
rename to src/Command/KeyType.php
diff --git a/lib/Command/ListIndex.php b/src/Command/ListIndex.php
similarity index 100%
rename from lib/Command/ListIndex.php
rename to src/Command/ListIndex.php
diff --git a/lib/Command/ListInsert.php b/src/Command/ListInsert.php
similarity index 100%
rename from lib/Command/ListInsert.php
rename to src/Command/ListInsert.php
diff --git a/lib/Command/ListLength.php b/src/Command/ListLength.php
similarity index 100%
rename from lib/Command/ListLength.php
rename to src/Command/ListLength.php
diff --git a/lib/Command/ListPopFirst.php b/src/Command/ListPopFirst.php
similarity index 100%
rename from lib/Command/ListPopFirst.php
rename to src/Command/ListPopFirst.php
diff --git a/lib/Command/ListPopFirstBlocking.php b/src/Command/ListPopFirstBlocking.php
similarity index 100%
rename from lib/Command/ListPopFirstBlocking.php
rename to src/Command/ListPopFirstBlocking.php
diff --git a/lib/Command/ListPopLast.php b/src/Command/ListPopLast.php
similarity index 100%
rename from lib/Command/ListPopLast.php
rename to src/Command/ListPopLast.php
diff --git a/lib/Command/ListPopLastBlocking.php b/src/Command/ListPopLastBlocking.php
similarity index 100%
rename from lib/Command/ListPopLastBlocking.php
rename to src/Command/ListPopLastBlocking.php
diff --git a/lib/Command/ListPopLastPushHead.php b/src/Command/ListPopLastPushHead.php
similarity index 100%
rename from lib/Command/ListPopLastPushHead.php
rename to src/Command/ListPopLastPushHead.php
diff --git a/lib/Command/ListPopLastPushHeadBlocking.php b/src/Command/ListPopLastPushHeadBlocking.php
similarity index 100%
rename from lib/Command/ListPopLastPushHeadBlocking.php
rename to src/Command/ListPopLastPushHeadBlocking.php
diff --git a/lib/Command/ListPushHead.php b/src/Command/ListPushHead.php
similarity index 100%
rename from lib/Command/ListPushHead.php
rename to src/Command/ListPushHead.php
diff --git a/lib/Command/ListPushHeadX.php b/src/Command/ListPushHeadX.php
similarity index 100%
rename from lib/Command/ListPushHeadX.php
rename to src/Command/ListPushHeadX.php
diff --git a/lib/Command/ListPushTail.php b/src/Command/ListPushTail.php
similarity index 100%
rename from lib/Command/ListPushTail.php
rename to src/Command/ListPushTail.php
diff --git a/lib/Command/ListPushTailX.php b/src/Command/ListPushTailX.php
similarity index 100%
rename from lib/Command/ListPushTailX.php
rename to src/Command/ListPushTailX.php
diff --git a/lib/Command/ListRange.php b/src/Command/ListRange.php
similarity index 100%
rename from lib/Command/ListRange.php
rename to src/Command/ListRange.php
diff --git a/lib/Command/ListRemove.php b/src/Command/ListRemove.php
similarity index 100%
rename from lib/Command/ListRemove.php
rename to src/Command/ListRemove.php
diff --git a/lib/Command/ListSet.php b/src/Command/ListSet.php
similarity index 100%
rename from lib/Command/ListSet.php
rename to src/Command/ListSet.php
diff --git a/lib/Command/ListTrim.php b/src/Command/ListTrim.php
similarity index 100%
rename from lib/Command/ListTrim.php
rename to src/Command/ListTrim.php
diff --git a/lib/Command/PrefixableCommandInterface.php b/src/Command/PrefixableCommandInterface.php
similarity index 100%
rename from lib/Command/PrefixableCommandInterface.php
rename to src/Command/PrefixableCommandInterface.php
diff --git a/lib/Command/Processor/KeyPrefixProcessor.php b/src/Command/Processor/KeyPrefixProcessor.php
similarity index 100%
rename from lib/Command/Processor/KeyPrefixProcessor.php
rename to src/Command/Processor/KeyPrefixProcessor.php
diff --git a/lib/Command/Processor/ProcessorChain.php b/src/Command/Processor/ProcessorChain.php
similarity index 100%
rename from lib/Command/Processor/ProcessorChain.php
rename to src/Command/Processor/ProcessorChain.php
diff --git a/lib/Command/Processor/ProcessorInterface.php b/src/Command/Processor/ProcessorInterface.php
similarity index 100%
rename from lib/Command/Processor/ProcessorInterface.php
rename to src/Command/Processor/ProcessorInterface.php
diff --git a/lib/Command/PubSubPublish.php b/src/Command/PubSubPublish.php
similarity index 100%
rename from lib/Command/PubSubPublish.php
rename to src/Command/PubSubPublish.php
diff --git a/lib/Command/PubSubPubsub.php b/src/Command/PubSubPubsub.php
similarity index 100%
rename from lib/Command/PubSubPubsub.php
rename to src/Command/PubSubPubsub.php
diff --git a/lib/Command/PubSubSubscribe.php b/src/Command/PubSubSubscribe.php
similarity index 100%
rename from lib/Command/PubSubSubscribe.php
rename to src/Command/PubSubSubscribe.php
diff --git a/lib/Command/PubSubSubscribeByPattern.php b/src/Command/PubSubSubscribeByPattern.php
similarity index 100%
rename from lib/Command/PubSubSubscribeByPattern.php
rename to src/Command/PubSubSubscribeByPattern.php
diff --git a/lib/Command/PubSubUnsubscribe.php b/src/Command/PubSubUnsubscribe.php
similarity index 100%
rename from lib/Command/PubSubUnsubscribe.php
rename to src/Command/PubSubUnsubscribe.php
diff --git a/lib/Command/PubSubUnsubscribeByPattern.php b/src/Command/PubSubUnsubscribeByPattern.php
similarity index 100%
rename from lib/Command/PubSubUnsubscribeByPattern.php
rename to src/Command/PubSubUnsubscribeByPattern.php
diff --git a/lib/Command/RawCommand.php b/src/Command/RawCommand.php
similarity index 100%
rename from lib/Command/RawCommand.php
rename to src/Command/RawCommand.php
diff --git a/lib/Command/ScriptCommand.php b/src/Command/ScriptCommand.php
similarity index 100%
rename from lib/Command/ScriptCommand.php
rename to src/Command/ScriptCommand.php
diff --git a/lib/Command/ServerBackgroundRewriteAOF.php b/src/Command/ServerBackgroundRewriteAOF.php
similarity index 100%
rename from lib/Command/ServerBackgroundRewriteAOF.php
rename to src/Command/ServerBackgroundRewriteAOF.php
diff --git a/lib/Command/ServerBackgroundSave.php b/src/Command/ServerBackgroundSave.php
similarity index 100%
rename from lib/Command/ServerBackgroundSave.php
rename to src/Command/ServerBackgroundSave.php
diff --git a/lib/Command/ServerClient.php b/src/Command/ServerClient.php
similarity index 100%
rename from lib/Command/ServerClient.php
rename to src/Command/ServerClient.php
diff --git a/lib/Command/ServerConfig.php b/src/Command/ServerConfig.php
similarity index 100%
rename from lib/Command/ServerConfig.php
rename to src/Command/ServerConfig.php
diff --git a/lib/Command/ServerDatabaseSize.php b/src/Command/ServerDatabaseSize.php
similarity index 100%
rename from lib/Command/ServerDatabaseSize.php
rename to src/Command/ServerDatabaseSize.php
diff --git a/lib/Command/ServerEval.php b/src/Command/ServerEval.php
similarity index 100%
rename from lib/Command/ServerEval.php
rename to src/Command/ServerEval.php
diff --git a/lib/Command/ServerEvalSHA.php b/src/Command/ServerEvalSHA.php
similarity index 100%
rename from lib/Command/ServerEvalSHA.php
rename to src/Command/ServerEvalSHA.php
diff --git a/lib/Command/ServerFlushAll.php b/src/Command/ServerFlushAll.php
similarity index 100%
rename from lib/Command/ServerFlushAll.php
rename to src/Command/ServerFlushAll.php
diff --git a/lib/Command/ServerFlushDatabase.php b/src/Command/ServerFlushDatabase.php
similarity index 100%
rename from lib/Command/ServerFlushDatabase.php
rename to src/Command/ServerFlushDatabase.php
diff --git a/lib/Command/ServerInfo.php b/src/Command/ServerInfo.php
similarity index 100%
rename from lib/Command/ServerInfo.php
rename to src/Command/ServerInfo.php
diff --git a/lib/Command/ServerInfoV26x.php b/src/Command/ServerInfoV26x.php
similarity index 100%
rename from lib/Command/ServerInfoV26x.php
rename to src/Command/ServerInfoV26x.php
diff --git a/lib/Command/ServerLastSave.php b/src/Command/ServerLastSave.php
similarity index 100%
rename from lib/Command/ServerLastSave.php
rename to src/Command/ServerLastSave.php
diff --git a/lib/Command/ServerMonitor.php b/src/Command/ServerMonitor.php
similarity index 100%
rename from lib/Command/ServerMonitor.php
rename to src/Command/ServerMonitor.php
diff --git a/lib/Command/ServerObject.php b/src/Command/ServerObject.php
similarity index 100%
rename from lib/Command/ServerObject.php
rename to src/Command/ServerObject.php
diff --git a/lib/Command/ServerSave.php b/src/Command/ServerSave.php
similarity index 100%
rename from lib/Command/ServerSave.php
rename to src/Command/ServerSave.php
diff --git a/lib/Command/ServerScript.php b/src/Command/ServerScript.php
similarity index 100%
rename from lib/Command/ServerScript.php
rename to src/Command/ServerScript.php
diff --git a/lib/Command/ServerSentinel.php b/src/Command/ServerSentinel.php
similarity index 100%
rename from lib/Command/ServerSentinel.php
rename to src/Command/ServerSentinel.php
diff --git a/lib/Command/ServerShutdown.php b/src/Command/ServerShutdown.php
similarity index 100%
rename from lib/Command/ServerShutdown.php
rename to src/Command/ServerShutdown.php
diff --git a/lib/Command/ServerSlaveOf.php b/src/Command/ServerSlaveOf.php
similarity index 100%
rename from lib/Command/ServerSlaveOf.php
rename to src/Command/ServerSlaveOf.php
diff --git a/lib/Command/ServerSlowlog.php b/src/Command/ServerSlowlog.php
similarity index 100%
rename from lib/Command/ServerSlowlog.php
rename to src/Command/ServerSlowlog.php
diff --git a/lib/Command/ServerTime.php b/src/Command/ServerTime.php
similarity index 100%
rename from lib/Command/ServerTime.php
rename to src/Command/ServerTime.php
diff --git a/lib/Command/SetAdd.php b/src/Command/SetAdd.php
similarity index 100%
rename from lib/Command/SetAdd.php
rename to src/Command/SetAdd.php
diff --git a/lib/Command/SetCardinality.php b/src/Command/SetCardinality.php
similarity index 100%
rename from lib/Command/SetCardinality.php
rename to src/Command/SetCardinality.php
diff --git a/lib/Command/SetDifference.php b/src/Command/SetDifference.php
similarity index 100%
rename from lib/Command/SetDifference.php
rename to src/Command/SetDifference.php
diff --git a/lib/Command/SetDifferenceStore.php b/src/Command/SetDifferenceStore.php
similarity index 100%
rename from lib/Command/SetDifferenceStore.php
rename to src/Command/SetDifferenceStore.php
diff --git a/lib/Command/SetIntersection.php b/src/Command/SetIntersection.php
similarity index 100%
rename from lib/Command/SetIntersection.php
rename to src/Command/SetIntersection.php
diff --git a/lib/Command/SetIntersectionStore.php b/src/Command/SetIntersectionStore.php
similarity index 100%
rename from lib/Command/SetIntersectionStore.php
rename to src/Command/SetIntersectionStore.php
diff --git a/lib/Command/SetIsMember.php b/src/Command/SetIsMember.php
similarity index 100%
rename from lib/Command/SetIsMember.php
rename to src/Command/SetIsMember.php
diff --git a/lib/Command/SetMembers.php b/src/Command/SetMembers.php
similarity index 100%
rename from lib/Command/SetMembers.php
rename to src/Command/SetMembers.php
diff --git a/lib/Command/SetMove.php b/src/Command/SetMove.php
similarity index 100%
rename from lib/Command/SetMove.php
rename to src/Command/SetMove.php
diff --git a/lib/Command/SetPop.php b/src/Command/SetPop.php
similarity index 100%
rename from lib/Command/SetPop.php
rename to src/Command/SetPop.php
diff --git a/lib/Command/SetRandomMember.php b/src/Command/SetRandomMember.php
similarity index 100%
rename from lib/Command/SetRandomMember.php
rename to src/Command/SetRandomMember.php
diff --git a/lib/Command/SetRemove.php b/src/Command/SetRemove.php
similarity index 100%
rename from lib/Command/SetRemove.php
rename to src/Command/SetRemove.php
diff --git a/lib/Command/SetScan.php b/src/Command/SetScan.php
similarity index 100%
rename from lib/Command/SetScan.php
rename to src/Command/SetScan.php
diff --git a/lib/Command/SetUnion.php b/src/Command/SetUnion.php
similarity index 100%
rename from lib/Command/SetUnion.php
rename to src/Command/SetUnion.php
diff --git a/lib/Command/SetUnionStore.php b/src/Command/SetUnionStore.php
similarity index 100%
rename from lib/Command/SetUnionStore.php
rename to src/Command/SetUnionStore.php
diff --git a/lib/Command/StringAppend.php b/src/Command/StringAppend.php
similarity index 100%
rename from lib/Command/StringAppend.php
rename to src/Command/StringAppend.php
diff --git a/lib/Command/StringBitCount.php b/src/Command/StringBitCount.php
similarity index 100%
rename from lib/Command/StringBitCount.php
rename to src/Command/StringBitCount.php
diff --git a/lib/Command/StringBitOp.php b/src/Command/StringBitOp.php
similarity index 100%
rename from lib/Command/StringBitOp.php
rename to src/Command/StringBitOp.php
diff --git a/lib/Command/StringDecrement.php b/src/Command/StringDecrement.php
similarity index 100%
rename from lib/Command/StringDecrement.php
rename to src/Command/StringDecrement.php
diff --git a/lib/Command/StringDecrementBy.php b/src/Command/StringDecrementBy.php
similarity index 100%
rename from lib/Command/StringDecrementBy.php
rename to src/Command/StringDecrementBy.php
diff --git a/lib/Command/StringGet.php b/src/Command/StringGet.php
similarity index 100%
rename from lib/Command/StringGet.php
rename to src/Command/StringGet.php
diff --git a/lib/Command/StringGetBit.php b/src/Command/StringGetBit.php
similarity index 100%
rename from lib/Command/StringGetBit.php
rename to src/Command/StringGetBit.php
diff --git a/lib/Command/StringGetMultiple.php b/src/Command/StringGetMultiple.php
similarity index 100%
rename from lib/Command/StringGetMultiple.php
rename to src/Command/StringGetMultiple.php
diff --git a/lib/Command/StringGetRange.php b/src/Command/StringGetRange.php
similarity index 100%
rename from lib/Command/StringGetRange.php
rename to src/Command/StringGetRange.php
diff --git a/lib/Command/StringGetSet.php b/src/Command/StringGetSet.php
similarity index 100%
rename from lib/Command/StringGetSet.php
rename to src/Command/StringGetSet.php
diff --git a/lib/Command/StringIncrement.php b/src/Command/StringIncrement.php
similarity index 100%
rename from lib/Command/StringIncrement.php
rename to src/Command/StringIncrement.php
diff --git a/lib/Command/StringIncrementBy.php b/src/Command/StringIncrementBy.php
similarity index 100%
rename from lib/Command/StringIncrementBy.php
rename to src/Command/StringIncrementBy.php
diff --git a/lib/Command/StringIncrementByFloat.php b/src/Command/StringIncrementByFloat.php
similarity index 100%
rename from lib/Command/StringIncrementByFloat.php
rename to src/Command/StringIncrementByFloat.php
diff --git a/lib/Command/StringPreciseSetExpire.php b/src/Command/StringPreciseSetExpire.php
similarity index 100%
rename from lib/Command/StringPreciseSetExpire.php
rename to src/Command/StringPreciseSetExpire.php
diff --git a/lib/Command/StringSet.php b/src/Command/StringSet.php
similarity index 100%
rename from lib/Command/StringSet.php
rename to src/Command/StringSet.php
diff --git a/lib/Command/StringSetBit.php b/src/Command/StringSetBit.php
similarity index 100%
rename from lib/Command/StringSetBit.php
rename to src/Command/StringSetBit.php
diff --git a/lib/Command/StringSetExpire.php b/src/Command/StringSetExpire.php
similarity index 100%
rename from lib/Command/StringSetExpire.php
rename to src/Command/StringSetExpire.php
diff --git a/lib/Command/StringSetMultiple.php b/src/Command/StringSetMultiple.php
similarity index 100%
rename from lib/Command/StringSetMultiple.php
rename to src/Command/StringSetMultiple.php
diff --git a/lib/Command/StringSetMultiplePreserve.php b/src/Command/StringSetMultiplePreserve.php
similarity index 100%
rename from lib/Command/StringSetMultiplePreserve.php
rename to src/Command/StringSetMultiplePreserve.php
diff --git a/lib/Command/StringSetPreserve.php b/src/Command/StringSetPreserve.php
similarity index 100%
rename from lib/Command/StringSetPreserve.php
rename to src/Command/StringSetPreserve.php
diff --git a/lib/Command/StringSetRange.php b/src/Command/StringSetRange.php
similarity index 100%
rename from lib/Command/StringSetRange.php
rename to src/Command/StringSetRange.php
diff --git a/lib/Command/StringStrlen.php b/src/Command/StringStrlen.php
similarity index 100%
rename from lib/Command/StringStrlen.php
rename to src/Command/StringStrlen.php
diff --git a/lib/Command/StringSubstr.php b/src/Command/StringSubstr.php
similarity index 100%
rename from lib/Command/StringSubstr.php
rename to src/Command/StringSubstr.php
diff --git a/lib/Command/TransactionDiscard.php b/src/Command/TransactionDiscard.php
similarity index 100%
rename from lib/Command/TransactionDiscard.php
rename to src/Command/TransactionDiscard.php
diff --git a/lib/Command/TransactionExec.php b/src/Command/TransactionExec.php
similarity index 100%
rename from lib/Command/TransactionExec.php
rename to src/Command/TransactionExec.php
diff --git a/lib/Command/TransactionMulti.php b/src/Command/TransactionMulti.php
similarity index 100%
rename from lib/Command/TransactionMulti.php
rename to src/Command/TransactionMulti.php
diff --git a/lib/Command/TransactionUnwatch.php b/src/Command/TransactionUnwatch.php
similarity index 100%
rename from lib/Command/TransactionUnwatch.php
rename to src/Command/TransactionUnwatch.php
diff --git a/lib/Command/TransactionWatch.php b/src/Command/TransactionWatch.php
similarity index 100%
rename from lib/Command/TransactionWatch.php
rename to src/Command/TransactionWatch.php
diff --git a/lib/Command/ZSetAdd.php b/src/Command/ZSetAdd.php
similarity index 100%
rename from lib/Command/ZSetAdd.php
rename to src/Command/ZSetAdd.php
diff --git a/lib/Command/ZSetCardinality.php b/src/Command/ZSetCardinality.php
similarity index 100%
rename from lib/Command/ZSetCardinality.php
rename to src/Command/ZSetCardinality.php
diff --git a/lib/Command/ZSetCount.php b/src/Command/ZSetCount.php
similarity index 100%
rename from lib/Command/ZSetCount.php
rename to src/Command/ZSetCount.php
diff --git a/lib/Command/ZSetIncrementBy.php b/src/Command/ZSetIncrementBy.php
similarity index 100%
rename from lib/Command/ZSetIncrementBy.php
rename to src/Command/ZSetIncrementBy.php
diff --git a/lib/Command/ZSetIntersectionStore.php b/src/Command/ZSetIntersectionStore.php
similarity index 100%
rename from lib/Command/ZSetIntersectionStore.php
rename to src/Command/ZSetIntersectionStore.php
diff --git a/lib/Command/ZSetLexCount.php b/src/Command/ZSetLexCount.php
similarity index 100%
rename from lib/Command/ZSetLexCount.php
rename to src/Command/ZSetLexCount.php
diff --git a/lib/Command/ZSetRange.php b/src/Command/ZSetRange.php
similarity index 100%
rename from lib/Command/ZSetRange.php
rename to src/Command/ZSetRange.php
diff --git a/lib/Command/ZSetRangeByLex.php b/src/Command/ZSetRangeByLex.php
similarity index 100%
rename from lib/Command/ZSetRangeByLex.php
rename to src/Command/ZSetRangeByLex.php
diff --git a/lib/Command/ZSetRangeByScore.php b/src/Command/ZSetRangeByScore.php
similarity index 100%
rename from lib/Command/ZSetRangeByScore.php
rename to src/Command/ZSetRangeByScore.php
diff --git a/lib/Command/ZSetRank.php b/src/Command/ZSetRank.php
similarity index 100%
rename from lib/Command/ZSetRank.php
rename to src/Command/ZSetRank.php
diff --git a/lib/Command/ZSetRemove.php b/src/Command/ZSetRemove.php
similarity index 100%
rename from lib/Command/ZSetRemove.php
rename to src/Command/ZSetRemove.php
diff --git a/lib/Command/ZSetRemoveRangeByLex.php b/src/Command/ZSetRemoveRangeByLex.php
similarity index 100%
rename from lib/Command/ZSetRemoveRangeByLex.php
rename to src/Command/ZSetRemoveRangeByLex.php
diff --git a/lib/Command/ZSetRemoveRangeByRank.php b/src/Command/ZSetRemoveRangeByRank.php
similarity index 100%
rename from lib/Command/ZSetRemoveRangeByRank.php
rename to src/Command/ZSetRemoveRangeByRank.php
diff --git a/lib/Command/ZSetRemoveRangeByScore.php b/src/Command/ZSetRemoveRangeByScore.php
similarity index 100%
rename from lib/Command/ZSetRemoveRangeByScore.php
rename to src/Command/ZSetRemoveRangeByScore.php
diff --git a/lib/Command/ZSetReverseRange.php b/src/Command/ZSetReverseRange.php
similarity index 100%
rename from lib/Command/ZSetReverseRange.php
rename to src/Command/ZSetReverseRange.php
diff --git a/lib/Command/ZSetReverseRangeByScore.php b/src/Command/ZSetReverseRangeByScore.php
similarity index 100%
rename from lib/Command/ZSetReverseRangeByScore.php
rename to src/Command/ZSetReverseRangeByScore.php
diff --git a/lib/Command/ZSetReverseRank.php b/src/Command/ZSetReverseRank.php
similarity index 100%
rename from lib/Command/ZSetReverseRank.php
rename to src/Command/ZSetReverseRank.php
diff --git a/lib/Command/ZSetScan.php b/src/Command/ZSetScan.php
similarity index 100%
rename from lib/Command/ZSetScan.php
rename to src/Command/ZSetScan.php
diff --git a/lib/Command/ZSetScore.php b/src/Command/ZSetScore.php
similarity index 100%
rename from lib/Command/ZSetScore.php
rename to src/Command/ZSetScore.php
diff --git a/lib/Command/ZSetUnionStore.php b/src/Command/ZSetUnionStore.php
similarity index 100%
rename from lib/Command/ZSetUnionStore.php
rename to src/Command/ZSetUnionStore.php
diff --git a/lib/CommunicationException.php b/src/CommunicationException.php
similarity index 100%
rename from lib/CommunicationException.php
rename to src/CommunicationException.php
diff --git a/lib/Configuration/ClusterOption.php b/src/Configuration/ClusterOption.php
similarity index 100%
rename from lib/Configuration/ClusterOption.php
rename to src/Configuration/ClusterOption.php
diff --git a/lib/Configuration/ConnectionFactoryOption.php b/src/Configuration/ConnectionFactoryOption.php
similarity index 100%
rename from lib/Configuration/ConnectionFactoryOption.php
rename to src/Configuration/ConnectionFactoryOption.php
diff --git a/lib/Configuration/ExceptionsOption.php b/src/Configuration/ExceptionsOption.php
similarity index 100%
rename from lib/Configuration/ExceptionsOption.php
rename to src/Configuration/ExceptionsOption.php
diff --git a/lib/Configuration/OptionInterface.php b/src/Configuration/OptionInterface.php
similarity index 100%
rename from lib/Configuration/OptionInterface.php
rename to src/Configuration/OptionInterface.php
diff --git a/lib/Configuration/Options.php b/src/Configuration/Options.php
similarity index 100%
rename from lib/Configuration/Options.php
rename to src/Configuration/Options.php
diff --git a/lib/Configuration/OptionsInterface.php b/src/Configuration/OptionsInterface.php
similarity index 100%
rename from lib/Configuration/OptionsInterface.php
rename to src/Configuration/OptionsInterface.php
diff --git a/lib/Configuration/PrefixOption.php b/src/Configuration/PrefixOption.php
similarity index 100%
rename from lib/Configuration/PrefixOption.php
rename to src/Configuration/PrefixOption.php
diff --git a/lib/Configuration/ProfileOption.php b/src/Configuration/ProfileOption.php
similarity index 100%
rename from lib/Configuration/ProfileOption.php
rename to src/Configuration/ProfileOption.php
diff --git a/lib/Configuration/ReplicationOption.php b/src/Configuration/ReplicationOption.php
similarity index 100%
rename from lib/Configuration/ReplicationOption.php
rename to src/Configuration/ReplicationOption.php
diff --git a/lib/Connection/AbstractConnection.php b/src/Connection/AbstractConnection.php
similarity index 100%
rename from lib/Connection/AbstractConnection.php
rename to src/Connection/AbstractConnection.php
diff --git a/lib/Connection/Aggregate/ClusterInterface.php b/src/Connection/Aggregate/ClusterInterface.php
similarity index 100%
rename from lib/Connection/Aggregate/ClusterInterface.php
rename to src/Connection/Aggregate/ClusterInterface.php
diff --git a/lib/Connection/Aggregate/MasterSlaveReplication.php b/src/Connection/Aggregate/MasterSlaveReplication.php
similarity index 100%
rename from lib/Connection/Aggregate/MasterSlaveReplication.php
rename to src/Connection/Aggregate/MasterSlaveReplication.php
diff --git a/lib/Connection/Aggregate/PredisCluster.php b/src/Connection/Aggregate/PredisCluster.php
similarity index 100%
rename from lib/Connection/Aggregate/PredisCluster.php
rename to src/Connection/Aggregate/PredisCluster.php
diff --git a/lib/Connection/Aggregate/RedisCluster.php b/src/Connection/Aggregate/RedisCluster.php
similarity index 100%
rename from lib/Connection/Aggregate/RedisCluster.php
rename to src/Connection/Aggregate/RedisCluster.php
diff --git a/lib/Connection/Aggregate/ReplicationInterface.php b/src/Connection/Aggregate/ReplicationInterface.php
similarity index 100%
rename from lib/Connection/Aggregate/ReplicationInterface.php
rename to src/Connection/Aggregate/ReplicationInterface.php
diff --git a/lib/Connection/AggregateConnectionInterface.php b/src/Connection/AggregateConnectionInterface.php
similarity index 100%
rename from lib/Connection/AggregateConnectionInterface.php
rename to src/Connection/AggregateConnectionInterface.php
diff --git a/lib/Connection/CompositeConnectionInterface.php b/src/Connection/CompositeConnectionInterface.php
similarity index 100%
rename from lib/Connection/CompositeConnectionInterface.php
rename to src/Connection/CompositeConnectionInterface.php
diff --git a/lib/Connection/CompositeStreamConnection.php b/src/Connection/CompositeStreamConnection.php
similarity index 100%
rename from lib/Connection/CompositeStreamConnection.php
rename to src/Connection/CompositeStreamConnection.php
diff --git a/lib/Connection/ConnectionException.php b/src/Connection/ConnectionException.php
similarity index 100%
rename from lib/Connection/ConnectionException.php
rename to src/Connection/ConnectionException.php
diff --git a/lib/Connection/ConnectionInterface.php b/src/Connection/ConnectionInterface.php
similarity index 100%
rename from lib/Connection/ConnectionInterface.php
rename to src/Connection/ConnectionInterface.php
diff --git a/lib/Connection/Factory.php b/src/Connection/Factory.php
similarity index 100%
rename from lib/Connection/Factory.php
rename to src/Connection/Factory.php
diff --git a/lib/Connection/FactoryInterface.php b/src/Connection/FactoryInterface.php
similarity index 100%
rename from lib/Connection/FactoryInterface.php
rename to src/Connection/FactoryInterface.php
diff --git a/lib/Connection/NodeConnectionInterface.php b/src/Connection/NodeConnectionInterface.php
similarity index 100%
rename from lib/Connection/NodeConnectionInterface.php
rename to src/Connection/NodeConnectionInterface.php
diff --git a/lib/Connection/Parameters.php b/src/Connection/Parameters.php
similarity index 100%
rename from lib/Connection/Parameters.php
rename to src/Connection/Parameters.php
diff --git a/lib/Connection/ParametersInterface.php b/src/Connection/ParametersInterface.php
similarity index 100%
rename from lib/Connection/ParametersInterface.php
rename to src/Connection/ParametersInterface.php
diff --git a/lib/Connection/PhpiredisSocketConnection.php b/src/Connection/PhpiredisSocketConnection.php
similarity index 100%
rename from lib/Connection/PhpiredisSocketConnection.php
rename to src/Connection/PhpiredisSocketConnection.php
diff --git a/lib/Connection/PhpiredisStreamConnection.php b/src/Connection/PhpiredisStreamConnection.php
similarity index 100%
rename from lib/Connection/PhpiredisStreamConnection.php
rename to src/Connection/PhpiredisStreamConnection.php
diff --git a/lib/Connection/StreamConnection.php b/src/Connection/StreamConnection.php
similarity index 100%
rename from lib/Connection/StreamConnection.php
rename to src/Connection/StreamConnection.php
diff --git a/lib/Connection/WebdisConnection.php b/src/Connection/WebdisConnection.php
similarity index 100%
rename from lib/Connection/WebdisConnection.php
rename to src/Connection/WebdisConnection.php
diff --git a/lib/ExecutableContextInterface.php b/src/ExecutableContextInterface.php
similarity index 100%
rename from lib/ExecutableContextInterface.php
rename to src/ExecutableContextInterface.php
diff --git a/lib/Monitor/Consumer.php b/src/Monitor/Consumer.php
similarity index 100%
rename from lib/Monitor/Consumer.php
rename to src/Monitor/Consumer.php
diff --git a/lib/NotSupportedException.php b/src/NotSupportedException.php
similarity index 100%
rename from lib/NotSupportedException.php
rename to src/NotSupportedException.php
diff --git a/lib/Pipeline/Atomic.php b/src/Pipeline/Atomic.php
similarity index 100%
rename from lib/Pipeline/Atomic.php
rename to src/Pipeline/Atomic.php
diff --git a/lib/Pipeline/ConnectionErrorProof.php b/src/Pipeline/ConnectionErrorProof.php
similarity index 100%
rename from lib/Pipeline/ConnectionErrorProof.php
rename to src/Pipeline/ConnectionErrorProof.php
diff --git a/lib/Pipeline/FireAndForget.php b/src/Pipeline/FireAndForget.php
similarity index 100%
rename from lib/Pipeline/FireAndForget.php
rename to src/Pipeline/FireAndForget.php
diff --git a/lib/Pipeline/Pipeline.php b/src/Pipeline/Pipeline.php
similarity index 100%
rename from lib/Pipeline/Pipeline.php
rename to src/Pipeline/Pipeline.php
diff --git a/lib/PredisException.php b/src/PredisException.php
similarity index 100%
rename from lib/PredisException.php
rename to src/PredisException.php
diff --git a/lib/Profile/Factory.php b/src/Profile/Factory.php
similarity index 100%
rename from lib/Profile/Factory.php
rename to src/Profile/Factory.php
diff --git a/lib/Profile/ProfileInterface.php b/src/Profile/ProfileInterface.php
similarity index 100%
rename from lib/Profile/ProfileInterface.php
rename to src/Profile/ProfileInterface.php
diff --git a/lib/Profile/RedisProfile.php b/src/Profile/RedisProfile.php
similarity index 100%
rename from lib/Profile/RedisProfile.php
rename to src/Profile/RedisProfile.php
diff --git a/lib/Profile/RedisUnstable.php b/src/Profile/RedisUnstable.php
similarity index 100%
rename from lib/Profile/RedisUnstable.php
rename to src/Profile/RedisUnstable.php
diff --git a/lib/Profile/RedisVersion120.php b/src/Profile/RedisVersion120.php
similarity index 100%
rename from lib/Profile/RedisVersion120.php
rename to src/Profile/RedisVersion120.php
diff --git a/lib/Profile/RedisVersion200.php b/src/Profile/RedisVersion200.php
similarity index 100%
rename from lib/Profile/RedisVersion200.php
rename to src/Profile/RedisVersion200.php
diff --git a/lib/Profile/RedisVersion220.php b/src/Profile/RedisVersion220.php
similarity index 100%
rename from lib/Profile/RedisVersion220.php
rename to src/Profile/RedisVersion220.php
diff --git a/lib/Profile/RedisVersion240.php b/src/Profile/RedisVersion240.php
similarity index 100%
rename from lib/Profile/RedisVersion240.php
rename to src/Profile/RedisVersion240.php
diff --git a/lib/Profile/RedisVersion260.php b/src/Profile/RedisVersion260.php
similarity index 100%
rename from lib/Profile/RedisVersion260.php
rename to src/Profile/RedisVersion260.php
diff --git a/lib/Profile/RedisVersion280.php b/src/Profile/RedisVersion280.php
similarity index 100%
rename from lib/Profile/RedisVersion280.php
rename to src/Profile/RedisVersion280.php
diff --git a/lib/Protocol/ProtocolException.php b/src/Protocol/ProtocolException.php
similarity index 100%
rename from lib/Protocol/ProtocolException.php
rename to src/Protocol/ProtocolException.php
diff --git a/lib/Protocol/ProtocolProcessorInterface.php b/src/Protocol/ProtocolProcessorInterface.php
similarity index 100%
rename from lib/Protocol/ProtocolProcessorInterface.php
rename to src/Protocol/ProtocolProcessorInterface.php
diff --git a/lib/Protocol/RequestSerializerInterface.php b/src/Protocol/RequestSerializerInterface.php
similarity index 100%
rename from lib/Protocol/RequestSerializerInterface.php
rename to src/Protocol/RequestSerializerInterface.php
diff --git a/lib/Protocol/ResponseReaderInterface.php b/src/Protocol/ResponseReaderInterface.php
similarity index 100%
rename from lib/Protocol/ResponseReaderInterface.php
rename to src/Protocol/ResponseReaderInterface.php
diff --git a/lib/Protocol/Text/CompositeProtocolProcessor.php b/src/Protocol/Text/CompositeProtocolProcessor.php
similarity index 100%
rename from lib/Protocol/Text/CompositeProtocolProcessor.php
rename to src/Protocol/Text/CompositeProtocolProcessor.php
diff --git a/lib/Protocol/Text/Handler/BulkResponse.php b/src/Protocol/Text/Handler/BulkResponse.php
similarity index 100%
rename from lib/Protocol/Text/Handler/BulkResponse.php
rename to src/Protocol/Text/Handler/BulkResponse.php
diff --git a/lib/Protocol/Text/Handler/ErrorResponse.php b/src/Protocol/Text/Handler/ErrorResponse.php
similarity index 100%
rename from lib/Protocol/Text/Handler/ErrorResponse.php
rename to src/Protocol/Text/Handler/ErrorResponse.php
diff --git a/lib/Protocol/Text/Handler/IntegerResponse.php b/src/Protocol/Text/Handler/IntegerResponse.php
similarity index 100%
rename from lib/Protocol/Text/Handler/IntegerResponse.php
rename to src/Protocol/Text/Handler/IntegerResponse.php
diff --git a/lib/Protocol/Text/Handler/MultiBulkResponse.php b/src/Protocol/Text/Handler/MultiBulkResponse.php
similarity index 100%
rename from lib/Protocol/Text/Handler/MultiBulkResponse.php
rename to src/Protocol/Text/Handler/MultiBulkResponse.php
diff --git a/lib/Protocol/Text/Handler/ResponseHandlerInterface.php b/src/Protocol/Text/Handler/ResponseHandlerInterface.php
similarity index 100%
rename from lib/Protocol/Text/Handler/ResponseHandlerInterface.php
rename to src/Protocol/Text/Handler/ResponseHandlerInterface.php
diff --git a/lib/Protocol/Text/Handler/StatusResponse.php b/src/Protocol/Text/Handler/StatusResponse.php
similarity index 100%
rename from lib/Protocol/Text/Handler/StatusResponse.php
rename to src/Protocol/Text/Handler/StatusResponse.php
diff --git a/lib/Protocol/Text/Handler/StreamableMultiBulkResponse.php b/src/Protocol/Text/Handler/StreamableMultiBulkResponse.php
similarity index 100%
rename from lib/Protocol/Text/Handler/StreamableMultiBulkResponse.php
rename to src/Protocol/Text/Handler/StreamableMultiBulkResponse.php
diff --git a/lib/Protocol/Text/ProtocolProcessor.php b/src/Protocol/Text/ProtocolProcessor.php
similarity index 100%
rename from lib/Protocol/Text/ProtocolProcessor.php
rename to src/Protocol/Text/ProtocolProcessor.php
diff --git a/lib/Protocol/Text/RequestSerializer.php b/src/Protocol/Text/RequestSerializer.php
similarity index 100%
rename from lib/Protocol/Text/RequestSerializer.php
rename to src/Protocol/Text/RequestSerializer.php
diff --git a/lib/Protocol/Text/ResponseReader.php b/src/Protocol/Text/ResponseReader.php
similarity index 100%
rename from lib/Protocol/Text/ResponseReader.php
rename to src/Protocol/Text/ResponseReader.php
diff --git a/lib/PubSub/AbstractConsumer.php b/src/PubSub/AbstractConsumer.php
similarity index 100%
rename from lib/PubSub/AbstractConsumer.php
rename to src/PubSub/AbstractConsumer.php
diff --git a/lib/PubSub/Consumer.php b/src/PubSub/Consumer.php
similarity index 100%
rename from lib/PubSub/Consumer.php
rename to src/PubSub/Consumer.php
diff --git a/lib/PubSub/DispatcherLoop.php b/src/PubSub/DispatcherLoop.php
similarity index 100%
rename from lib/PubSub/DispatcherLoop.php
rename to src/PubSub/DispatcherLoop.php
diff --git a/lib/Replication/ReplicationStrategy.php b/src/Replication/ReplicationStrategy.php
similarity index 100%
rename from lib/Replication/ReplicationStrategy.php
rename to src/Replication/ReplicationStrategy.php
diff --git a/lib/Response/Error.php b/src/Response/Error.php
similarity index 100%
rename from lib/Response/Error.php
rename to src/Response/Error.php
diff --git a/lib/Response/ErrorInterface.php b/src/Response/ErrorInterface.php
similarity index 100%
rename from lib/Response/ErrorInterface.php
rename to src/Response/ErrorInterface.php
diff --git a/lib/Response/Iterator/MultiBulk.php b/src/Response/Iterator/MultiBulk.php
similarity index 100%
rename from lib/Response/Iterator/MultiBulk.php
rename to src/Response/Iterator/MultiBulk.php
diff --git a/lib/Response/Iterator/MultiBulkIterator.php b/src/Response/Iterator/MultiBulkIterator.php
similarity index 100%
rename from lib/Response/Iterator/MultiBulkIterator.php
rename to src/Response/Iterator/MultiBulkIterator.php
diff --git a/lib/Response/Iterator/MultiBulkTuple.php b/src/Response/Iterator/MultiBulkTuple.php
similarity index 100%
rename from lib/Response/Iterator/MultiBulkTuple.php
rename to src/Response/Iterator/MultiBulkTuple.php
diff --git a/lib/Response/ResponseInterface.php b/src/Response/ResponseInterface.php
similarity index 100%
rename from lib/Response/ResponseInterface.php
rename to src/Response/ResponseInterface.php
diff --git a/lib/Response/ServerException.php b/src/Response/ServerException.php
similarity index 100%
rename from lib/Response/ServerException.php
rename to src/Response/ServerException.php
diff --git a/lib/Response/Status.php b/src/Response/Status.php
similarity index 100%
rename from lib/Response/Status.php
rename to src/Response/Status.php
diff --git a/lib/Session/Handler.php b/src/Session/Handler.php
similarity index 100%
rename from lib/Session/Handler.php
rename to src/Session/Handler.php
diff --git a/lib/Transaction/AbortedMultiExecException.php b/src/Transaction/AbortedMultiExecException.php
similarity index 100%
rename from lib/Transaction/AbortedMultiExecException.php
rename to src/Transaction/AbortedMultiExecException.php
diff --git a/lib/Transaction/MultiExec.php b/src/Transaction/MultiExec.php
similarity index 100%
rename from lib/Transaction/MultiExec.php
rename to src/Transaction/MultiExec.php
diff --git a/lib/Transaction/MultiExecState.php b/src/Transaction/MultiExecState.php
similarity index 100%
rename from lib/Transaction/MultiExecState.php
rename to src/Transaction/MultiExecState.php