diff --git a/app/controllers/welcome.php b/app/controllers/welcome.php
index ed7fc2f..8de7698 100644
--- a/app/controllers/welcome.php
+++ b/app/controllers/welcome.php
@@ -1,8 +1,13 @@
 <?php 
-use sealandia\framework\Template;
+
+use Framework\Template;
 
 class Welcome{
 
+    /**
+     * Show the application welcome page.
+     */
+
     public function index(){
         $template = new Template();
         return $template->render('welcome', []);
diff --git a/composer.json b/composer.json
index 00b02b2..2876e63 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
 	"autoload": {
     	"psr-4": {
-    		"sealandia\\": "./",
-            "sealandia\\framework\\": "framework/"
+            "App\\": "app/",
+			"Framework\\": "framework/"
     	}
 	},
 	"require": {
diff --git a/framework/auth.php b/framework/auth.php
index ca868e3..5be35fd 100644
--- a/framework/auth.php
+++ b/framework/auth.php
@@ -1,5 +1,7 @@
 <?php 
 
+namespace Framework;
+
 use PDO;
 
 class Auth{
diff --git a/framework/database.php b/framework/database.php
index e3b991d..86d6757 100644
--- a/framework/database.php
+++ b/framework/database.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Framework;
+
 use PDO;
 
 Class Database{
diff --git a/framework/router.php b/framework/router.php
index 1c3934d..2d1768d 100644
--- a/framework/router.php
+++ b/framework/router.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace sealandia\framework;
+namespace Framework;
 
 class Router{
 
@@ -29,11 +29,10 @@ class Router{
 
         if(array_key_exists($this->uri, $routes)){
             list($controller, $method) = explode('@', $routes[$this->uri]);
-
             $controllerPath = __DIR__ . '/../app/controllers/' . $controller . '.php';
 
             if(file_exists($controllerPath)){
-                require_once $controllerPath;
+                require $controllerPath;
                 $controller = new $controller();
 
                 if(method_exists($controller, $method)){
diff --git a/framework/template.php b/framework/template.php
index 862e3ea..9b2e204 100644
--- a/framework/template.php
+++ b/framework/template.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace sealandia\framework;
+namespace Framework;
 
 class Template{
 
diff --git a/index.php b/index.php
index 5485241..2f6867c 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace sealandia;
+namespace Sealandia;
 
 session_start();
 
diff --git a/routes/routes.php b/routes/routes.php
index ac7bea7..624f3cf 100644
--- a/routes/routes.php
+++ b/routes/routes.php
@@ -1,6 +1,6 @@
 <?php 
 
-use sealandia\framework\Router;
+use Framework\Router;
 
 $routes = [
     '/' => 'Welcome@index',