diff --git a/config.js b/api/config.js
similarity index 100%
rename from config.js
rename to api/config.js
diff --git a/server.js b/api/index.js
similarity index 69%
rename from server.js
rename to api/index.js
index e114965c..a9983757 100644
--- a/server.js
+++ b/api/index.js
@@ -1,4 +1,11 @@
-var composer = require('./index');
+var Glue = require('glue');
+var Manifest = require('./manifest');
+
+var composeOptions = {
+  relativeTo: __dirname
+};
+
+const composer = Glue.compose.bind(Glue, Manifest.get('/'), composeOptions);
 
 composer(function (err, server) {
   if (err) {
diff --git a/manifest.js b/api/manifest.js
similarity index 77%
rename from manifest.js
rename to api/manifest.js
index a4c217e7..ec6559f0 100644
--- a/manifest.js
+++ b/api/manifest.js
@@ -78,7 +78,7 @@ var manifest = {
             hbs: 'handlebars'
           },
           relativeTo: __dirname,
-          path: './server/web',
+          path: '../server/web',
           layout: true,
           helpersPath: 'templates/helpers',
           partialsPath: 'templates/partials',
@@ -109,7 +109,7 @@ var manifest = {
     { plugin: 'hapi-auth-cookie' },
     {
       plugin: {
-        register: './server/web/auth/strategies',
+        register: '../server/web/auth/strategies',
         options: {
           session: {
             password: config.get('/auth/session/pass'),
@@ -128,7 +128,7 @@ var manifest = {
     },
     {
       plugin: {
-        register: './server/lib/db',
+        register: '../server/lib/db',
         options: {
           host: config.get('/mysql/host'),
           port: config.get('/mysql/port'),
@@ -141,7 +141,7 @@ var manifest = {
     },
     {
       plugin: {
-        register: './server/repositories/browserscope',
+        register: '../server/repositories/browserscope',
         options: {
           api_key: config.get('/browserscope'),
           scheme: config.get('/scheme'),
@@ -151,7 +151,7 @@ var manifest = {
     },
     {
       plugin: {
-        register: './server/lib/cache',
+        register: '../server/lib/cache',
         options: {
           host: config.get('/cache/host'),
           port: config.get('/cache/port'),
@@ -160,30 +160,30 @@ var manifest = {
         }
       }
     },
-    { plugin: './server/repositories/comments' },
-    { plugin: './server/repositories/pages' },
-    { plugin: './server/repositories/tests' },
-    { plugin: './server/services/comments' },
-    { plugin: './server/services/pages' },
-    { plugin: './server/api/json' },
-    { plugin: './server/web/auth/github' },
-    { plugin: './server/web/browse' },
-    { plugin: './server/web/comment' },
-    { plugin: './server/web/contributors' },
-    { plugin: './server/web/errors' },
-    { plugin: './server/web/faq' },
-    { plugin: './server/web/health' },
-    { plugin: './server/web/home' },
-    { plugin: './server/web/popular' },
-    { plugin: './server/web/public' },
-    { plugin: './server/web/redirects' },
-    { plugin: './server/web/search' },
-    { plugin: './server/web/sitemap/xml' },
-    { plugin: './server/web/sponsor' },
-    { plugin: './server/web/test' },
-    { plugin: './server/web/testimonials' },
-    { plugin: './server/web/edit' },
-    { plugin: './server/web/delete' }
+    { plugin: '../server/repositories/comments' },
+    { plugin: '../server/repositories/pages' },
+    { plugin: '../server/repositories/tests' },
+    { plugin: '../server/services/comments' },
+    { plugin: '../server/services/pages' },
+    { plugin: '../server/api/json' },
+    { plugin: '../server/web/auth/github' },
+    { plugin: '../server/web/browse' },
+    { plugin: '../server/web/comment' },
+    { plugin: '../server/web/contributors' },
+    { plugin: '../server/web/errors' },
+    { plugin: '../server/web/faq' },
+    { plugin: '../server/web/health' },
+    { plugin: '../server/web/home' },
+    { plugin: '../server/web/popular' },
+    { plugin: '../server/web/public' },
+    { plugin: '../server/web/redirects' },
+    { plugin: '../server/web/search' },
+    { plugin: '../server/web/sitemap/xml' },
+    { plugin: '../server/web/sponsor' },
+    { plugin: '../server/web/test' },
+    { plugin: '../server/web/testimonials' },
+    { plugin: '../server/web/edit' },
+    { plugin: '../server/web/delete' }
   ]
 };
 
diff --git a/index.js b/index.js
deleted file mode 100644
index 3459b562..00000000
--- a/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var Glue = require('glue');
-var Manifest = require('./manifest');
-
-var composeOptions = {
-  relativeTo: __dirname
-};
-
-module.exports = Glue.compose.bind(Glue, Manifest.get('/'), composeOptions);
diff --git a/package.json b/package.json
index 31b12039..46c48680 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,10 @@
   "scripts": {
     "build": "gulp",
     "lint": "lab -d -L",
-    "start": "node server.js",
+    "start": "node ./api/index.js",
     "test": "lab -I __core-js_shared__,__grim__ -t 100 -c -L -r lcov -o lcov.info -r console -o stdout -r html -o coverage.html test/unit",
     "test-e2e": "lab -L -m 30000 -M 10000 test/e2e",
-    "watch": "nodemon -e js,hbs server.js"
+    "watch": "nodemon -e js,hbs ./api/index.js"
   },
   "repository": {
     "type": "git",
@@ -48,7 +48,7 @@
     "handlebars": "^4.0.12",
     "hapi": "^16.6.2",
     "hapi-auth-cookie": "7.0.0",
-    "hapi-qs": "^1.1.2",
+    "hapi-qs": "1.1.3",
     "highlight.js": "^9.8.0",
     "hoek": "^5.0.4",
     "inert": "^4.2.1",
diff --git a/vercel.json b/vercel.json
index 98eab47c..4670e29f 100644
--- a/vercel.json
+++ b/vercel.json
@@ -4,14 +4,14 @@
   "public": true,
   "builds": [
     {
-      "src": "./server.js",
+      "src": "api/index.js",
       "use": "@vercel/node"
     }
   ],
   "routes": [
     {
       "src": "/(.*)",
-      "dest": "server.js"
+      "dest": "api/index.js"
     }
   ],
   "alias": ["jsperf.com"],