diff --git a/composer.json b/composer.json
index 25a9e79..c541b99 100755
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,9 @@
 {
+    "name": "winterwolfie/phphare",
+
     "description": "a framework",
     "keywords": ["php", "framework"],
-    "license": "BSD-3-Clause",
+    "license": "MIT",
 
     "authors": [
         {
@@ -10,14 +12,14 @@
         }
     ],
 
-    "name": "winterwolfie/phphare",
+
     "require": {
         "php": "^7.1.3 || ^8.0"
     },
 
     "autoload": {
         "psr-4": {
-            "PhpHare\\": "./"
+            "PhpHare\\": "src"
         }
     }
 }
diff --git a/Application.php b/src/Application.php
similarity index 100%
rename from Application.php
rename to src/Application.php
diff --git a/Controller.php b/src/Controller.php
similarity index 100%
rename from Controller.php
rename to src/Controller.php
diff --git a/Model.php b/src/Model.php
similarity index 100%
rename from Model.php
rename to src/Model.php
diff --git a/Request.php b/src/Request.php
similarity index 100%
rename from Request.php
rename to src/Request.php
diff --git a/Response.php b/src/Response.php
similarity index 100%
rename from Response.php
rename to src/Response.php
diff --git a/Router.php b/src/Router.php
similarity index 100%
rename from Router.php
rename to src/Router.php
diff --git a/Session.php b/src/Session.php
similarity index 100%
rename from Session.php
rename to src/Session.php
diff --git a/UserModel.php b/src/UserModel.php
similarity index 100%
rename from UserModel.php
rename to src/UserModel.php
diff --git a/View.php b/src/View.php
similarity index 100%
rename from View.php
rename to src/View.php
diff --git a/db/Database.php b/src/db/Database.php
similarity index 100%
rename from db/Database.php
rename to src/db/Database.php
diff --git a/db/DbModel.php b/src/db/DbModel.php
similarity index 100%
rename from db/DbModel.php
rename to src/db/DbModel.php
diff --git a/exceptions/ForbiddenException.php b/src/exceptions/ForbiddenException.php
similarity index 100%
rename from exceptions/ForbiddenException.php
rename to src/exceptions/ForbiddenException.php
diff --git a/exceptions/NotFoundException.php b/src/exceptions/NotFoundException.php
similarity index 100%
rename from exceptions/NotFoundException.php
rename to src/exceptions/NotFoundException.php
diff --git a/form/BaseField.php b/src/form/BaseField.php
similarity index 100%
rename from form/BaseField.php
rename to src/form/BaseField.php
diff --git a/form/Form.php b/src/form/Form.php
similarity index 100%
rename from form/Form.php
rename to src/form/Form.php
diff --git a/form/InputField.php b/src/form/InputField.php
similarity index 100%
rename from form/InputField.php
rename to src/form/InputField.php
diff --git a/form/TextAreaField.php b/src/form/TextAreaField.php
similarity index 100%
rename from form/TextAreaField.php
rename to src/form/TextAreaField.php
diff --git a/middlewares/AuthMiddleware.php b/src/middlewares/AuthMiddleware.php
similarity index 100%
rename from middlewares/AuthMiddleware.php
rename to src/middlewares/AuthMiddleware.php
diff --git a/middlewares/BaseMiddleware.php b/src/middlewares/BaseMiddleware.php
similarity index 100%
rename from middlewares/BaseMiddleware.php
rename to src/middlewares/BaseMiddleware.php