diff --git a/bin/cnc b/bin/cnc
index c499df74a..7e566db47 100755
--- a/bin/cnc
+++ b/bin/cnc
@@ -25,7 +25,7 @@ if (program.debug) {
 }
 
 var settings = require('../app/config/settings');
-var server = require('../server');
+var server = require('../app/server');
 
 // Overrides defaults
 _.set(settings, 'port', program.port || settings.port);
diff --git a/index.js b/index.js
index 685b067ee..09a09f020 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 var path = require('path');
 var webappengine = require('webappengine');
-var server = require('./server');
+var server = require('./app/server');
 var options = {
     port: 8000,
     routes: [