diff --git a/autoload.php b/autoload.php
new file mode 100644
index 0000000..59f3712
--- /dev/null
+++ b/autoload.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once('config.php');
+
+// Autoloader for the core classes
+spl_autoload_register(function ($className) {
+    $fp = str_replace('\\', '/', $className);
+    $name = basename($fp);
+    $dir  = dirname($fp);
+    $file = ROOT_CORE . '/' . $dir . '/' . $name . '.php';
+    if (file_exists($file)) {
+        require_once $file;
+    }
+});
diff --git a/index.php b/index.php
index 964bc17..7a11baf 100644
--- a/index.php
+++ b/index.php
@@ -3,24 +3,13 @@
 use Libs\Loader;
 use Libs\Router;
 
-require_once('config.php');
+require_once('autoload.php');
 
-// Class autoloader
-spl_autoload_register(function ($className) {
-    $fp = str_replace('\\', '/', $className);
-    $name = basename($fp);
-    $dir  = dirname($fp);
-    $file = ROOT_CORE . '/' . $dir . '/' . $name . '.php';
-    if (file_exists($file)) {
-        require_once $file;
-    }
-});
-
-// Router autoloader
+// Router autoload
 Loader::load(ROOT_CORE . '/Routers/');
 
-// Other autoloaders
-Loader::load(ROOT_CORE . '/Autoload/');
+// Other autoloads
+Loader::load(ROOT_CORE . '/Autoloads/');
 
 // Run the routers
 Router::apply();