diff --git a/benchmarks/Corley/Benchmarks/InfluxDB/AdapterEvent.php b/benchmarks/Benchmarks/InfluxDB/AdapterEvent.php
similarity index 100%
rename from benchmarks/Corley/Benchmarks/InfluxDB/AdapterEvent.php
rename to benchmarks/Benchmarks/InfluxDB/AdapterEvent.php
diff --git a/composer.json b/composer.json
index 0ba459dba..7c0fce5de 100644
--- a/composer.json
+++ b/composer.json
@@ -31,11 +31,16 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "InfluxDB\\": ["./src/", "./tests"],
+        "psr-4": {
+            "InfluxDB\\": ["./src/"],
             "Corley\\": ["./benchmarks/"]
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "InfluxDB\\": ["./tests/"]
+        }
+    },
     "suggest": {
         "fabpot/pimple": "Allows to prepare the client dependencies in order to require an initialized instance",
         "zendframework/zend-servicemanager": "Use a service locator in order to prepare a valid instance",
diff --git a/src/InfluxDB/Adapter/AdapterAbstract.php b/src/Adapter/AdapterAbstract.php
similarity index 100%
rename from src/InfluxDB/Adapter/AdapterAbstract.php
rename to src/Adapter/AdapterAbstract.php
diff --git a/src/InfluxDB/Adapter/AdapterInterface.php b/src/Adapter/AdapterInterface.php
similarity index 100%
rename from src/InfluxDB/Adapter/AdapterInterface.php
rename to src/Adapter/AdapterInterface.php
diff --git a/src/InfluxDB/Adapter/GuzzleAdapter.php b/src/Adapter/GuzzleAdapter.php
similarity index 100%
rename from src/InfluxDB/Adapter/GuzzleAdapter.php
rename to src/Adapter/GuzzleAdapter.php
diff --git a/src/InfluxDB/Adapter/QueryableInterface.php b/src/Adapter/QueryableInterface.php
similarity index 100%
rename from src/InfluxDB/Adapter/QueryableInterface.php
rename to src/Adapter/QueryableInterface.php
diff --git a/src/InfluxDB/Adapter/UdpAdapter.php b/src/Adapter/UdpAdapter.php
similarity index 100%
rename from src/InfluxDB/Adapter/UdpAdapter.php
rename to src/Adapter/UdpAdapter.php
diff --git a/src/InfluxDB/Client.php b/src/Client.php
similarity index 100%
rename from src/InfluxDB/Client.php
rename to src/Client.php
diff --git a/src/InfluxDB/ClientFactory.php b/src/ClientFactory.php
similarity index 100%
rename from src/InfluxDB/ClientFactory.php
rename to src/ClientFactory.php
diff --git a/src/InfluxDB/Options.php b/src/Options.php
similarity index 100%
rename from src/InfluxDB/Options.php
rename to src/Options.php
diff --git a/tests/InfluxDB/Adapter/UdpAdapterTest.php b/tests/Adapter/UdpAdapterTest.php
similarity index 100%
rename from tests/InfluxDB/Adapter/UdpAdapterTest.php
rename to tests/Adapter/UdpAdapterTest.php
diff --git a/tests/InfluxDB/ClientFactoryTest.php b/tests/ClientFactoryTest.php
similarity index 100%
rename from tests/InfluxDB/ClientFactoryTest.php
rename to tests/ClientFactoryTest.php
diff --git a/tests/InfluxDB/ClientTest.php b/tests/ClientTest.php
similarity index 99%
rename from tests/InfluxDB/ClientTest.php
rename to tests/ClientTest.php
index 6d8aff01a..ae08c5ca3 100644
--- a/tests/InfluxDB/ClientTest.php
+++ b/tests/ClientTest.php
@@ -16,7 +16,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $options = include __DIR__ . '/../bootstrap.php';
+        $options = include __DIR__ . '/bootstrap.php';
         $this->rawOptions = $options;
 
         $tcpOptions = $options["tcp"];