diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e8e05ce
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/index-new"]
+	path = lib/index-new
+	url = https://git.flash.moe/flash/index.git
diff --git a/lib/index-new b/lib/index-new
new file mode 160000
index 0000000..ac2255d
--- /dev/null
+++ b/lib/index-new
@@ -0,0 +1 @@
+Subproject commit ac2255d24d7dd39ac91fa50d3a7aa71ce0a92188
diff --git a/makai.php b/makai.php
index bdfdcb9..0c5a50c 100644
--- a/makai.php
+++ b/makai.php
@@ -19,7 +19,7 @@ define('MKI_DIR_PUB', MKI_ROOT . '/public');
 define('MKI_DIR_PAGES', MKI_ROOT . '/pages');
 define('MKI_DIR_CONFIG', MKI_ROOT . '/config');
 
-require_once MKI_DIR_LIB . '/index/index.php';
+require_once MKI_DIR_LIB . '/index-new/index.php';
 
 Autoloader::addNamespace(__NAMESPACE__, MKI_DIR_SRC);
 Environment::setDebug(MKI_DEBUG);