diff --git a/api-server/development-entry.js b/api-server/development-start.js
similarity index 100%
rename from api-server/development-entry.js
rename to api-server/development-start.js
diff --git a/api-server/package.json b/api-server/package.json
index e4b028fd9d..5a4026ed2b 100644
--- a/api-server/package.json
+++ b/api-server/package.json
@@ -5,16 +5,15 @@
   "repository": "freecodecamp/freecodecamp",
   "main": "development-entry.js",
   "scripts": {
-    "develop": "node development-entry.js",
-    "babel-dev-server": "babel-node --inspect=0.0.0.0 ./server/server.js",
+    "develop": "node development-start.js",
+    "babel-dev-server": "babel-node --inspect=0.0.0.0 ./server/index.js",
     "build": "babel server --out-dir lib --ignore 'node_modules /**/*','/**/*.test.js' --copy-files",
     "ensure-env": "node ./config/ensure-env.js",
     "only-once": "echo '/****/' && echo 'Seeding Database' && echo '/****/' && SEEDING=true node seed/index.js && echo '/****/' && echo 'Seeding Completed' && echo '/****/'",
     "postonly-once": "gulp generate-migration-map",
     "postseed": "node post-seed.js",
     "seed": "node ../seed/index.js",
-    "start": "DEBUG=fcc* babel-node server/server.js",
-    "start-production": "node pm2Start",
+    "start": "DEBUG=fcc* babel-node server/index.js",
     "test": "jest"
   },
   "license": "(BSD-3-Clause AND CC-BY-SA-4.0)",
diff --git a/api-server/server/production-start.js b/api-server/production-start.js
similarity index 100%
rename from api-server/server/production-start.js
rename to api-server/production-start.js
diff --git a/api-server/server/debug-entry.js b/api-server/server/debug-entry.js
deleted file mode 100644
index f0e969a841..0000000000
--- a/api-server/server/debug-entry.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// use this file with runners like node-debug
-// or mocha.
-require('babel-register');
-var app = require('./server');
-
-app.start();
diff --git a/api-server/server/server.js b/api-server/server/index.js
similarity index 100%
rename from api-server/server/server.js
rename to api-server/server/index.js