diff --git a/composer.json b/composer.json
index be710f474..2706a3660 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     "satooshi/php-coveralls": "^0.6"
   },
   "autoload": {
-    "psr-0" :{
+    "psr-4" :{
       "Moloquent\\": "src/"
     }
   },
diff --git a/src/Moloquent/Auth/DatabaseTokenRepository.php b/src/Auth/DatabaseTokenRepository.php
similarity index 100%
rename from src/Moloquent/Auth/DatabaseTokenRepository.php
rename to src/Auth/DatabaseTokenRepository.php
diff --git a/src/Moloquent/Auth/PasswordBrokerManager.php b/src/Auth/PasswordBrokerManager.php
similarity index 100%
rename from src/Moloquent/Auth/PasswordBrokerManager.php
rename to src/Auth/PasswordBrokerManager.php
diff --git a/src/Moloquent/Auth/PasswordResetServiceProvider.php b/src/Auth/PasswordResetServiceProvider.php
similarity index 100%
rename from src/Moloquent/Auth/PasswordResetServiceProvider.php
rename to src/Auth/PasswordResetServiceProvider.php
diff --git a/src/Moloquent/Collection.php b/src/Collection.php
similarity index 100%
rename from src/Moloquent/Collection.php
rename to src/Collection.php
diff --git a/src/Moloquent/Connection.php b/src/Connection.php
similarity index 100%
rename from src/Moloquent/Connection.php
rename to src/Connection.php
diff --git a/src/Moloquent/Eloquent/Builder.php b/src/Eloquent/Builder.php
similarity index 100%
rename from src/Moloquent/Eloquent/Builder.php
rename to src/Eloquent/Builder.php
diff --git a/src/Moloquent/Eloquent/HybridRelations.php b/src/Eloquent/HybridRelations.php
similarity index 100%
rename from src/Moloquent/Eloquent/HybridRelations.php
rename to src/Eloquent/HybridRelations.php
diff --git a/src/Moloquent/Eloquent/Model.php b/src/Eloquent/Model.php
similarity index 100%
rename from src/Moloquent/Eloquent/Model.php
rename to src/Eloquent/Model.php
diff --git a/src/Moloquent/Eloquent/SoftDeletes.php b/src/Eloquent/SoftDeletes.php
similarity index 100%
rename from src/Moloquent/Eloquent/SoftDeletes.php
rename to src/Eloquent/SoftDeletes.php
diff --git a/src/Moloquent/MongodbQueueServiceProvider.php b/src/MongodbQueueServiceProvider.php
similarity index 100%
rename from src/Moloquent/MongodbQueueServiceProvider.php
rename to src/MongodbQueueServiceProvider.php
diff --git a/src/Moloquent/MongodbServiceProvider.php b/src/MongodbServiceProvider.php
similarity index 100%
rename from src/Moloquent/MongodbServiceProvider.php
rename to src/MongodbServiceProvider.php
diff --git a/src/Moloquent/Query/Builder.php b/src/Query/Builder.php
similarity index 100%
rename from src/Moloquent/Query/Builder.php
rename to src/Query/Builder.php
diff --git a/src/Moloquent/Query/Grammar.php b/src/Query/Grammar.php
similarity index 100%
rename from src/Moloquent/Query/Grammar.php
rename to src/Query/Grammar.php
diff --git a/src/Moloquent/Query/Processor.php b/src/Query/Processor.php
similarity index 100%
rename from src/Moloquent/Query/Processor.php
rename to src/Query/Processor.php
diff --git a/src/Moloquent/Queue/Failed/MongoFailedJobProvider.php b/src/Queue/Failed/MongoFailedJobProvider.php
similarity index 100%
rename from src/Moloquent/Queue/Failed/MongoFailedJobProvider.php
rename to src/Queue/Failed/MongoFailedJobProvider.php
diff --git a/src/Moloquent/Queue/MongoConnector.php b/src/Queue/MongoConnector.php
similarity index 100%
rename from src/Moloquent/Queue/MongoConnector.php
rename to src/Queue/MongoConnector.php
diff --git a/src/Moloquent/Queue/MongoQueue.php b/src/Queue/MongoQueue.php
similarity index 100%
rename from src/Moloquent/Queue/MongoQueue.php
rename to src/Queue/MongoQueue.php
diff --git a/src/Moloquent/Relations/BelongsTo.php b/src/Relations/BelongsTo.php
similarity index 100%
rename from src/Moloquent/Relations/BelongsTo.php
rename to src/Relations/BelongsTo.php
diff --git a/src/Moloquent/Relations/BelongsToMany.php b/src/Relations/BelongsToMany.php
similarity index 100%
rename from src/Moloquent/Relations/BelongsToMany.php
rename to src/Relations/BelongsToMany.php
diff --git a/src/Moloquent/Relations/EmbedsMany.php b/src/Relations/EmbedsMany.php
similarity index 100%
rename from src/Moloquent/Relations/EmbedsMany.php
rename to src/Relations/EmbedsMany.php
diff --git a/src/Moloquent/Relations/EmbedsOne.php b/src/Relations/EmbedsOne.php
similarity index 100%
rename from src/Moloquent/Relations/EmbedsOne.php
rename to src/Relations/EmbedsOne.php
diff --git a/src/Moloquent/Relations/EmbedsOneOrMany.php b/src/Relations/EmbedsOneOrMany.php
similarity index 100%
rename from src/Moloquent/Relations/EmbedsOneOrMany.php
rename to src/Relations/EmbedsOneOrMany.php
diff --git a/src/Moloquent/Relations/HasMany.php b/src/Relations/HasMany.php
similarity index 100%
rename from src/Moloquent/Relations/HasMany.php
rename to src/Relations/HasMany.php
diff --git a/src/Moloquent/Relations/HasOne.php b/src/Relations/HasOne.php
similarity index 100%
rename from src/Moloquent/Relations/HasOne.php
rename to src/Relations/HasOne.php
diff --git a/src/Moloquent/Relations/HasOneOrManyTrait.php b/src/Relations/HasOneOrManyTrait.php
similarity index 100%
rename from src/Moloquent/Relations/HasOneOrManyTrait.php
rename to src/Relations/HasOneOrManyTrait.php
diff --git a/src/Moloquent/Relations/MorphMany.php b/src/Relations/MorphMany.php
similarity index 100%
rename from src/Moloquent/Relations/MorphMany.php
rename to src/Relations/MorphMany.php
diff --git a/src/Moloquent/Relations/MorphOne.php b/src/Relations/MorphOne.php
similarity index 100%
rename from src/Moloquent/Relations/MorphOne.php
rename to src/Relations/MorphOne.php
diff --git a/src/Moloquent/Relations/MorphTo.php b/src/Relations/MorphTo.php
similarity index 100%
rename from src/Moloquent/Relations/MorphTo.php
rename to src/Relations/MorphTo.php
diff --git a/src/Moloquent/Schema/Blueprint.php b/src/Schema/Blueprint.php
similarity index 100%
rename from src/Moloquent/Schema/Blueprint.php
rename to src/Schema/Blueprint.php
diff --git a/src/Moloquent/Schema/Builder.php b/src/Schema/Builder.php
similarity index 100%
rename from src/Moloquent/Schema/Builder.php
rename to src/Schema/Builder.php