diff --git a/composer.json b/composer.json
index c771330..196f5a9 100644
--- a/composer.json
+++ b/composer.json
@@ -9,5 +9,13 @@
     "indieauth/client": "0.1.3",
     "mpratt/relativetime": ">=1.0",
     "firebase/php-jwt": "dev-master"    
+  },
+  "autoload": {
+    "files": [
+      "lib/Savant.php",
+      "lib/config.php",
+      "lib/helpers.php",
+      "lib/markdown.php"
+    ]
   }
 }
diff --git a/composer.lock b/composer.lock
index 41b6052..a4e4ad6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "676692118149f622d7ca2349f775eb8c",
+    "hash": "3e034e0a6a692d5bbfecfdc95ee69db2",
     "packages": [
         {
             "name": "firebase/php-jwt",
diff --git a/public/index.php b/public/index.php
index c83b8dc..45ffc39 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,10 +1,6 @@
 <?php
 chdir('..');
 require 'vendor/autoload.php';
-require 'lib/Savant.php';
-require 'lib/config.php';
-require 'lib/helpers.php';
-require 'lib/markdown.php';
 
 // Configure the Savant plugin
 \Slim\Extras\Views\Savant::$savantDirectory = 'vendor/saltybeagle/savant3';