diff --git a/lib/roles/app.js b/lib/roles/app.js
index 9138613b..dfd3e18d 100644
--- a/lib/roles/app.js
+++ b/lib/roles/app.js
@@ -17,9 +17,6 @@ var wireutil = require('../wire/util')
 var wirerouter = require('../wire/router')
 var dbapi = require('../db/api')
 
-var webpackMiddleware = require("webpack-dev-middleware")
-var webpack = require("webpack")
-
 var auth = require('../middleware/auth')
 
 module.exports = function(options) {
@@ -41,50 +38,7 @@ module.exports = function(options) {
   app.use('/static/lib', express.static(pathutil.resource('lib')))
   app.use('/static', express.static(pathutil.resource('app')))
 
-  // WebPack settings
-  app.use(webpackMiddleware(webpack( {
-    cache: true,
-    debug: true,
-    devtool: 'eval',
-    entry: pathutil.resource('app') + '/entry.js',
-    output: {
-      path: '/static/build/',
-      filename: 'bundle.js'
-    },
-    resolve: {
-      modulesDirectories: [pathutil.resource('lib'), 'web_modules', './../../node_modules'],
-      alias: {
-        'socket.io': 'socket.io-client/dist/socket.io'
-      }
-    },
-    module: {
-      loaders: [
-        { test: /\.css$/, loader: 'style!css' },
-        { test: /\.jade/, loader: 'template-html-loader' },
-        { test: /angular\.js/, loader: 'exports?angular'},
-        { test: /angular-route\.js/, loader: 'imports?angular=angular'}
-      ],
-      noParse: [
-        pathutil.resource('lib')
-      ]
-    },
-    plugins: [
-      new webpack.ResolverPlugin(
-        new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('bower.json', ['main'])
-      ),
-      new webpack.ResolverPlugin(
-        new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('.bower.json', ['main'])
-      )
-    ]
-  }), {
-    noInfo: false,
-    quiet: false,
-    lazy: false,
-    publicPath: '/static/build/',
-    stats: {
-      colors: true
-    }
-  }))
+  app.use(require('./webpack-config'))
 
   app.use(express.cookieParser(options.secret))
   app.use(express.cookieSession({
diff --git a/lib/roles/webpack-config.js b/lib/roles/webpack-config.js
new file mode 100644
index 00000000..9d4a9567
--- /dev/null
+++ b/lib/roles/webpack-config.js
@@ -0,0 +1,49 @@
+var webpackMiddleware = require('webpack-dev-middleware')
+var webpack = require('webpack')
+
+var pathutil = require('../util/pathutil')
+
+module.exports = webpackMiddleware(webpack({
+  cache: true,
+  debug: true,
+  devtool: 'eval-source-map',
+  entry: pathutil.resource('app') + '/app.js',
+  output: {
+    path: '/static/build/',
+    filename: 'bundle.js'
+  },
+  resolve: {
+    modulesDirectories: [pathutil.resource('lib'), 'web_modules', './../../node_modules'],
+    alias: {
+      'socket.io': 'socket.io-client/dist/socket.io'
+    }
+  },
+  module: {
+    loaders: [
+      { test: /\.css$/, loader: 'style!css' },
+      { test: /\.jade/, loader: 'template-html-loader' },
+      { test: /angular\.js/, loader: 'exports?angular'},
+      { test: /angular-route\.js/, loader: 'imports?angular=angular'}
+    ],
+    noParse: [
+      pathutil.resource('lib')
+    ]
+  },
+  plugins: [
+    new webpack.ResolverPlugin(
+      new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('bower.json', ['main'])
+    ),
+    new webpack.ResolverPlugin(
+      new webpack.ResolverPlugin.DirectoryDescriptionFilePlugin('.bower.json', ['main'])
+    )
+    //new webpack.optimize.UglifyJsPlugin()
+  ]
+}), {
+  noInfo: false,
+  quiet: false,
+  lazy: false,
+  publicPath: '/static/build/',
+  stats: {
+    colors: true
+  }
+})
diff --git a/res/app/entry.js b/res/app/entry.js
deleted file mode 100644
index 4cd59214..00000000
--- a/res/app/entry.js
+++ /dev/null
@@ -1 +0,0 @@
-require('./app');
diff --git a/res/app/views/index.jade b/res/app/views/index.jade
index b358251e..aa01c531 100644
--- a/res/app/views/index.jade
+++ b/res/app/views/index.jade
@@ -4,7 +4,5 @@ html
     meta(charset='utf-8')
     title STF
   body(ng-app='app', ng-cloak)
-    h1 Test
     div(ng-view)
-    h2 Test 2
     script(src='/static/build/bundle.js')
\ No newline at end of file