diff --git a/composer.json b/composer.json
index 3d07361..2fbe96e 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     },
     "autoload" : {
         "psr-0" : {
-            "Unirest" : "lib"
+            "Unirest" : "src"
         }
     },
     "support" : {
diff --git a/lib/Unirest.php b/src/Unirest.php
similarity index 100%
rename from lib/Unirest.php
rename to src/Unirest.php
diff --git a/lib/Unirest/Method.php b/src/Unirest/Method.php
similarity index 100%
rename from lib/Unirest/Method.php
rename to src/Unirest/Method.php
diff --git a/lib/Unirest/Request.php b/src/Unirest/Request.php
similarity index 100%
rename from lib/Unirest/Request.php
rename to src/Unirest/Request.php
diff --git a/lib/Unirest/Response.php b/src/Unirest/Response.php
similarity index 100%
rename from lib/Unirest/Response.php
rename to src/Unirest/Response.php
diff --git a/test/Unirest/UnirestTest.php b/tests/Unirest/RequestTest.php
similarity index 100%
rename from test/Unirest/UnirestTest.php
rename to tests/Unirest/RequestTest.php
diff --git a/test/fixtures/upload.txt b/tests/fixtures/upload.txt
similarity index 100%
rename from test/fixtures/upload.txt
rename to tests/fixtures/upload.txt