diff --git a/index.php b/index.php
index 0d64ca56..b86f1d92 100755
--- a/index.php
+++ b/index.php
@@ -10,20 +10,14 @@
 
 namespace Rawilum;
 
-// Register the auto-loader.
-$autoload = __DIR__ . '/vendor/autoload.php';
+// Check PHP Version
+version_compare($ver = PHP_VERSION, $req = '7.1.3', '<') and exit(sprintf('You are running PHP %s, but Rawilum needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 
-// Ensure vendor libraries exist
-!is_file($autoload) and exit("Please run: <i>composer install</i>");
+// Ensure vendor libraries exist and Register The Auto Loader
+!is_file($autoload = __DIR__ . '/vendor/autoload.php') and exit("Please run: <i>composer install</i>");
 
 // Register the auto-loader.
 $loader = require_once $autoload;
 
-// Check PHP Version
-version_compare($ver = PHP_VERSION, $req = '7.1.3', '<') and exit(sprintf('You are running PHP %s, but Rawilum needs at least <strong>PHP %s</strong> to run.', $ver, $req));
-
-// Get Rawilum Instance
-$app = Rawilum::instance();
-
 // Run Rawilum Application
-$app->run();
+$rawilum = Rawilum::instance()->run();
diff --git a/monstra/Cache.php b/rawilum/Cache.php
similarity index 100%
rename from monstra/Cache.php
rename to rawilum/Cache.php
diff --git a/monstra/Config.php b/rawilum/Config.php
similarity index 100%
rename from monstra/Config.php
rename to rawilum/Config.php
diff --git a/monstra/Filter.php b/rawilum/Filter.php
similarity index 100%
rename from monstra/Filter.php
rename to rawilum/Filter.php
diff --git a/monstra/Page.php b/rawilum/Page.php
similarity index 100%
rename from monstra/Page.php
rename to rawilum/Page.php
diff --git a/monstra/Pages.php b/rawilum/Pages.php
similarity index 100%
rename from monstra/Pages.php
rename to rawilum/Pages.php
diff --git a/monstra/Plugin.php b/rawilum/Plugin.php
similarity index 100%
rename from monstra/Plugin.php
rename to rawilum/Plugin.php
diff --git a/monstra/Plugins.php b/rawilum/Plugins.php
similarity index 100%
rename from monstra/Plugins.php
rename to rawilum/Plugins.php
diff --git a/monstra/Monstra.php b/rawilum/Rawilum.php
similarity index 95%
rename from monstra/Monstra.php
rename to rawilum/Rawilum.php
index ac313104..6b91680f 100755
--- a/monstra/Monstra.php
+++ b/rawilum/Rawilum.php
@@ -60,10 +60,6 @@ class Rawilum extends Container
             return new Config($c);
         };
 
-        $container['router'] = function ($c) {
-            return new \Klein\Klein();
-        };
-
         // Start the session
         //\Session::start();
 
@@ -93,8 +89,6 @@ class Rawilum extends Container
             return new Themes($c);
         };
 
-        $container['router']->dispatch();
-
         return $container;
     }
 
diff --git a/monstra/MonstraTrait.php b/rawilum/RawilumTrait.php
similarity index 100%
rename from monstra/MonstraTrait.php
rename to rawilum/RawilumTrait.php
diff --git a/monstra/Themes.php b/rawilum/Themes.php
similarity index 100%
rename from monstra/Themes.php
rename to rawilum/Themes.php
diff --git a/monstra/boot/defines.php b/rawilum/boot/defines.php
similarity index 100%
rename from monstra/boot/defines.php
rename to rawilum/boot/defines.php