diff --git a/src/bin/www.js b/src/bin/www.js
index a3d232b7..57eb9f87 100644
--- a/src/bin/www.js
+++ b/src/bin/www.js
@@ -1,18 +1,13 @@
-/**
- * Created by tmshv on 22/11/14.
- */
-
 require('babel-core/register');
 require('babel-polyfill');
 
-var config = require("../config");
+var config = require("../config").default;
 var db = require("../core/db");
-var server = require("../server");
+var app = require("../server").app;
 var instagram = require("../instagram");
 
 db.init(config.db.uri)
     //.then(instagram)
     .then(function () {
-        var app = server();
         app.listen(config.port);
     });
\ No newline at end of file
diff --git a/src/server.js b/src/server.js
index 88e8c706..1976e551 100644
--- a/src/server.js
+++ b/src/server.js
@@ -22,7 +22,7 @@ import error404 from './routes/404';
 import documents from './routes/documents';
 import collective from './routes/collective';
 
-export default app = koa();
+export const app = koa();
 app.proxy = true;
 
 app.use(bodyParser());