diff --git a/composer.json b/composer.json
index 4902143..e30c26b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
     "minimum-stability": "dev",
     "autoload": {
         "psr-4": {
-            "Fufle\\": "src/",
-            "App\\": "app/"
+            "Fufle\\": "src/Fufle/",
+            "App\\": ""
         }
     }
 }
diff --git a/src/Database/ConnectionManager.php b/src/Fufle/Database/ConnectionManager.php
similarity index 100%
rename from src/Database/ConnectionManager.php
rename to src/Fufle/Database/ConnectionManager.php
diff --git a/src/Database/Connector/IConnector.php b/src/Fufle/Database/Connector/IConnector.php
similarity index 100%
rename from src/Database/Connector/IConnector.php
rename to src/Fufle/Database/Connector/IConnector.php
diff --git a/src/Database/Connector/PostgresConnector.php b/src/Fufle/Database/Connector/PostgresConnector.php
similarity index 100%
rename from src/Database/Connector/PostgresConnector.php
rename to src/Fufle/Database/Connector/PostgresConnector.php
diff --git a/src/ORM/IQuery.php b/src/Fufle/ORM/IQuery.php
similarity index 100%
rename from src/ORM/IQuery.php
rename to src/Fufle/ORM/IQuery.php
diff --git a/src/ORM/Model.php b/src/Fufle/ORM/Model.php
similarity index 100%
rename from src/ORM/Model.php
rename to src/Fufle/ORM/Model.php
diff --git a/src/ORM/Query.php b/src/Fufle/ORM/Query.php
similarity index 100%
rename from src/ORM/Query.php
rename to src/Fufle/ORM/Query.php