diff --git a/forever.js b/forever.js
index 08765a53e6..02ebfebece 100644
--- a/forever.js
+++ b/forever.js
@@ -1,8 +1,5 @@
-var forever = require('forever-monitor');
-var child = new (forever.Monitor)('server.js');
+require('coffee-script') // remove intermediate compilation requirement
+require('./src/server').listen(process.env.PORT || 3000);
 
-child.on('exit', function () {
-    console.log('server.js has exited after 10 restarts');
-});
-
-child.start();
\ No newline at end of file
+// Note: removed "up" module, which is default for development (but interferes with and production + PaaS)
+// Restore to 5310bb0 if I want it back (see https://github.com/codeparty/derby/issues/165#issuecomment-10405693)
diff --git a/package.json b/package.json
index 71fe44cdc2..296afc796a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "habitrpg",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
   "version": "0.0.0-146",
-  "main": "./forever.js",
+  "main": "./server.js",
   "dependencies": {
     "derby": "git://github.com/codeparty/derby#master",
     "racer": "git://github.com/codeparty/racer#master",
@@ -30,9 +30,6 @@
     "habitrpg.com",
     "www.habitrpg.com"
   ],
-  "scripts": {
-    "start": "node forever.js"
-  },
   "engines": {
     "node": "0.8.x",
     "npm": "1.1.x"
diff --git a/server.js b/server.js
index 02ebfebece..d33b5704e4 100644
--- a/server.js
+++ b/server.js
@@ -1,5 +1,8 @@
-require('coffee-script') // remove intermediate compilation requirement
-require('./src/server').listen(process.env.PORT || 3000);
+var forever = require('forever-monitor');
+var child = new (forever.Monitor)('forever.js');
 
-// Note: removed "up" module, which is default for development (but interferes with and production + PaaS)
-// Restore to 5310bb0 if I want it back (see https://github.com/codeparty/derby/issues/165#issuecomment-10405693)
+child.on('exit', function () {
+    console.log('server.js has exited after 10 restarts');
+});
+
+child.start();