diff --git a/bin/remotedev.js b/bin/remotedev.js
index 4dca3aa..30f4121 100755
--- a/bin/remotedev.js
+++ b/bin/remotedev.js
@@ -70,4 +70,4 @@ if (argv.injectserver) {
   process.exit(pass ? 0 : 1);
 }
 
-require('./server')(argv);
+require('../index')(argv);
diff --git a/bin/server.js b/index.js
similarity index 92%
rename from bin/server.js
rename to index.js
index 7837158..d9e5313 100644
--- a/bin/server.js
+++ b/index.js
@@ -1,7 +1,7 @@
 var assign = require('object-assign');
 var repeat = require('repeat-string');
-var getOptions = require('./../lib/options');
 var getPort = require('getport');
+var getOptions = require('./lib/options');
 
 var LOG_LEVEL_NONE = 0;
 var LOG_LEVEL_ERROR = 1;
@@ -11,7 +11,7 @@ var LOG_LEVEL_INFO = 3;
 module.exports = function(argv) {
   var SocketCluster = require('socketcluster').SocketCluster;
   var options = assign(getOptions(argv), {
-    workerController: __dirname + '/../lib/worker.js',
+    workerController: __dirname + '/lib/worker.js',
     allowClientPublish: false
   });
   var port = options.port;
diff --git a/lib/worker.js b/lib/worker.js
index 238d755..4008ff0 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -14,7 +14,7 @@ module.exports.run = function(worker) {
   app.set('view engine', 'ejs');
   app.set('views', path.resolve(__dirname, '..', 'views'));
   
-  app.get('/', function(req, res) {
+  app.get('*', function(req, res) {
     res.render('index', { port: worker.options.port });
   });
 
diff --git a/package.json b/package.json
index e4905b8..3a54307 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "remotedev-server",
   "version": "0.2.0",
   "description": "Run the RemoteDev monitor on your local server.",
-  "main": "bin/server.js",
+  "main": "index.js",
   "bin": {
     "remotedev": "bin/remotedev.js"
   },