diff --git a/composer.json b/composer.json
index bd9cb41..53c9e74 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,6 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "psr-0": { "pjdietz\\WellRESTed": "./" }
+        "psr-0": { "pjdietz\\WellRESTed": "src/" }
     }
 }
diff --git a/Handler.php b/src/pjdietz/WellRESTed/Handler.php
similarity index 100%
rename from Handler.php
rename to src/pjdietz/WellRESTed/Handler.php
diff --git a/Message.php b/src/pjdietz/WellRESTed/Message.php
similarity index 100%
rename from Message.php
rename to src/pjdietz/WellRESTed/Message.php
diff --git a/Request.php b/src/pjdietz/WellRESTed/Request.php
similarity index 100%
rename from Request.php
rename to src/pjdietz/WellRESTed/Request.php
diff --git a/Response.php b/src/pjdietz/WellRESTed/Response.php
similarity index 100%
rename from Response.php
rename to src/pjdietz/WellRESTed/Response.php
diff --git a/Route.php b/src/pjdietz/WellRESTed/Route.php
similarity index 100%
rename from Route.php
rename to src/pjdietz/WellRESTed/Route.php
diff --git a/Router.php b/src/pjdietz/WellRESTed/Router.php
similarity index 100%
rename from Router.php
rename to src/pjdietz/WellRESTed/Router.php
diff --git a/exceptions/CurlException.php b/src/pjdietz/WellRESTed/exceptions/CurlException.php
similarity index 100%
rename from exceptions/CurlException.php
rename to src/pjdietz/WellRESTed/exceptions/CurlException.php
diff --git a/exceptions/WellrestedException.php b/src/pjdietz/WellRESTed/exceptions/WellrestedException.php
similarity index 100%
rename from exceptions/WellrestedException.php
rename to src/pjdietz/WellRESTed/exceptions/WellrestedException.php