diff --git a/server.js b/index.js
similarity index 100%
rename from server.js
rename to index.js
diff --git a/package.json b/package.json
index 836d857..ef46e4b 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "node": ">=4"
   },
   "scripts": {
+    "start": "node index.js",
     "test": "grunt test"
   },
   "dependencies": {
diff --git a/src/worker.js b/src/app.js
similarity index 100%
rename from src/worker.js
rename to src/app.js
diff --git a/src/routes/hkp.js b/src/route/hkp.js
similarity index 100%
rename from src/routes/hkp.js
rename to src/route/hkp.js
diff --git a/src/routes/rest.js b/src/route/rest.js
similarity index 100%
rename from src/routes/rest.js
rename to src/route/rest.js
diff --git a/src/ctrl/public-key.js b/src/service/public-key.js
similarity index 100%
rename from src/ctrl/public-key.js
rename to src/service/public-key.js
diff --git a/src/ctrl/user-id.js b/src/service/user-id.js
similarity index 100%
rename from src/ctrl/user-id.js
rename to src/service/user-id.js
diff --git a/src/ctrl/util.js b/src/service/util.js
similarity index 100%
rename from src/ctrl/util.js
rename to src/service/util.js
diff --git a/test/integration/worker-test.js b/test/integration/app-test.js
similarity index 100%
rename from test/integration/worker-test.js
rename to test/integration/app-test.js