diff --git a/.gitignore b/.gitignore
index 506fc93..898b527 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 node_modules
 coverage/
-bundle.js
+dist
diff --git a/package.json b/package.json
index d50c581..5697684 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "babel-plugin-__coverage__": "0.111111.1",
     "babel-preset-es2015-webpack": "6.4.1",
     "babel-preset-stage-2": "6.5.0",
+    "cpy-cli": "1.0.0",
     "cross-env": "1.0.7",
     "css-loader": "0.23.1",
     "eslint": "2.9.0",
@@ -24,6 +25,7 @@
     "karma-firefox-launcher": "0.1.7",
     "karma-jasmine": "0.3.8",
     "karma-webpack": "1.7.0",
+    "rimraf": "2.5.2",
     "style-loader": "0.13.1",
     "webpack": "2.1.0-beta.6",
     "webpack-dev-server": "2.0.0-beta"
@@ -31,7 +33,12 @@
   "scripts": {
     "test": "cross-env NODE_ENV=test karma start",
     "watch:test": "cross-env NODE_ENV=test karma start --auto-watch --no-single-run",
-    "start": "webpack-dev-server",
+    "clean-dist": "rimraf dist",
+    "copy-files": "cpy src/index.html src/favicon.ico dist",
+    "clean-and-copy": "npm run clean-dist && npm run copy-files",
+    "prestart": "npm run clean-and-copy",
+    "start": "webpack-dev-server --content-base dist",
+    "prebuild": "npm run clean-and-copy",
     "build": "webpack",
     "lint": "eslint ."
   }
diff --git a/favicon.ico b/src/favicon.ico
similarity index 100%
rename from favicon.ico
rename to src/favicon.ico
diff --git a/index.html b/src/index.html
similarity index 100%
rename from index.html
rename to src/index.html
diff --git a/js/app.js b/src/js/app.js
similarity index 100%
rename from js/app.js
rename to src/js/app.js
diff --git a/js/controller.js b/src/js/controller.js
similarity index 100%
rename from js/controller.js
rename to src/js/controller.js
diff --git a/js/helpers.js b/src/js/helpers.js
similarity index 100%
rename from js/helpers.js
rename to src/js/helpers.js
diff --git a/js/model.js b/src/js/model.js
similarity index 100%
rename from js/model.js
rename to src/js/model.js
diff --git a/js/store.js b/src/js/store.js
similarity index 100%
rename from js/store.js
rename to src/js/store.js
diff --git a/js/template.js b/src/js/template.js
similarity index 100%
rename from js/template.js
rename to src/js/template.js
diff --git a/js/view.js b/src/js/view.js
similarity index 100%
rename from js/view.js
rename to src/js/view.js
diff --git a/webpack.config.js b/webpack.config.js
index eee7246..d26f8b3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,10 +1,12 @@
+const {resolve} = require('path')
 module.exports = {
   entry: './js/app.js',
   output: {
     filename: 'bundle.js',
+    path: resolve(__dirname, 'dist'),
     pathinfo: true,
   },
-  context: __dirname,
+  context: resolve(__dirname, 'src'),
   devtool: 'eval',
   module: {
     loaders: [