diff --git a/autoloader.php b/autoloader.php
index ead9942..1a64abc 100755
--- a/autoloader.php
+++ b/autoloader.php
@@ -102,8 +102,8 @@
 
 	}
 
-	// On definit l'autoloader comme autoloader (obvious)
-	spl_autoload_register('autoloader', false, true);
+	// // On definit l'autoloader comme autoloader (obvious)
+	// spl_autoload_register('autoloader', false, true);
 
 
 
diff --git a/composer.json b/composer.json
index 6bcfeba..c367efd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,9 +12,18 @@
         "phpro/grumphp": "^0.11.5",
         "jakub-onderka/php-parallel-lint": "^0.9.2",
         "phpunit/phpunit": "^6.1",
-        "crysalead/kahlan": "^2.5"
+        "kahlan/kahlan": "^3.1"
     },
     "autoload": {
+		"psr-4": {
+			"api\\":      "build/api",
+			"database\\": "build/database",
+			"error\\":    "build/error",
+			"http\\":     "build/http",
+			"orm\\":      "build/orm",
+			"router\\":   "build/router",
+			"viewer\\":   "build/viewer"
+		},
 		"files": ["autoloader.php", "lib/vendor/autoload.php"]
     }
 }