diff --git a/webpack.common.js b/webpack.common.js
index e8c0bc4..0ca1564 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -13,12 +13,9 @@ module.exports = {
   resolve: {
     extensions: ['.js', '.jsx']
   },
-  entry:  [
-    path.resolve(__dirname, 'src/index.jsx')
-  ],
   output: {
     path: path.resolve(__dirname, 'dist'),
-    filename: 'main.js'
+    filename: '[name]-[chunkhash].js'
   },
   module: {
     loaders: [
diff --git a/webpack.dev.js b/webpack.dev.js
index 5905d98..5e4914c 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -1,4 +1,5 @@
 const merge = require('webpack-merge');
+const path = require('path');
 const common = require('./webpack.common.js');
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
 
@@ -10,6 +11,9 @@ const extractCSS = ExtractTextPlugin.extract({
         });
 
 module.exports = merge(common, {
+  entry: {
+    main: path.resolve(__dirname, 'src/index.jsx')
+  },
   module: {
     loaders: [
       { test: /\.css$/, use: extractCSS },
diff --git a/webpack.prod.js b/webpack.prod.js
index f67cb77..20b0ad3 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -1,4 +1,5 @@
 const webpack = require('webpack');
+const path = require('path');
 const merge = require('webpack-merge');
 const common = require('./webpack.common.js');
 const ExtractTextPlugin = require("extract-text-webpack-plugin");
@@ -15,6 +16,10 @@ const extractCSS = ExtractTextPlugin.extract({
         });
 
 module.exports = merge(common, {
+  entry: {
+    main: path.resolve(__dirname, 'src/index.jsx'),
+    vendor: ['react', 'material-ui', 'mqtt', 'ramda']
+  },
   module: {
     loaders: [
       { test: /\.css$/, use: extractCSS },
@@ -28,6 +33,13 @@ module.exports = merge(common, {
       'process.env': {
         'NODE_ENV': JSON.stringify('production')
       }
-    })
+    }),
+    new webpack.HashedModuleIdsPlugin(),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor'
+    }),
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'runtime'
+    }),
   ]
 });