diff --git a/bin/server_es6.js b/bin/server_es6.js
index 88e46c1..fc2f8dc 100644
--- a/bin/server_es6.js
+++ b/bin/server_es6.js
@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-const renderer = require('../lib/server').default;
+const express = require('../lib/server.js').default;
+const renderer = require('../lib/server/renderer').default;
+const start = require('../lib/start').default;
 const userConfig = require('./user-config');
 
 // since typically the dev server is logging this out too
@@ -7,15 +9,6 @@ userConfig.verbose = false;
 
 const config = require('./merge-configs')(userConfig);
 
-// method 1
-renderer.setup(config);
-renderer.start();
-
-// method 2
-// renderer.setup(config);
-// renderer.start();
-
-// method 3
-// renderer.configure(config);
-// renderer.setup();
-// renderer.start();
+const app = express(config);
+app.use(renderer(config));
+start(app, config);