diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index cb51733..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-# Builds a Docker to deliver dist/
-FROM nginx:latest
-COPY dist/ /usr/share/nginx/html
\ No newline at end of file
diff --git a/Procfile b/Procfile
deleted file mode 100644
index 389e34d..0000000
--- a/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-web: node keystone.js
diff --git a/package.json b/package.json
index 7852551..ccd1f31 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,25 @@
   "name": "keystone-angular2-webpack-starter",
   "version": "0.0.1",
   "private": true,
+  "scripts": {
+    "clean": "rimraf node_modules doc dist && npm cache clean",
+    "clean-install": "npm run clean && npm install",
+    "clean-start": "npm run clean-install && npm start",
+    "build": "rimraf dist && webpack --progress --profile --bail",
+    "webdriver-update": "webdriver-manager update",
+    "webdriver-start": "webdriver-manager start",
+    "lint": "tslint --force \"src/**/*.ts\"",
+    "e2e": "protractor protractor.conf.js",
+    "e2e-live": "protractor --elementExplorer",
+    "pretest": "npm run lint",
+    "test": "karma start",
+    "posttest": "remap-istanbul -i coverage/json/coverage-final.json -o coverage/html -t html",
+    "test-watch": "karma start --no-single-run --auto-watch",
+    "ci": "npm run e2e && npm run test",
+    "docs": "typedoc --options typedoc.json src/app/app.component.ts",
+    "start": "node keystone",
+    "postinstall": "npm run webdriver-update"
+  },
   "dependencies": {
     "@angular/common": "~2.0.0",
     "@angular/compiler": "~2.0.0",
@@ -32,6 +51,7 @@
     "angular2-template-loader": "^0.4.0",
     "autoprefixer": "^6.3.2",
     "awesome-typescript-loader": "^2.2.4",
+    "chromedriver": "^2.24.1",
     "codelyzer": "0.0.26",
     "copy-webpack-plugin": "^3.0.0",
     "css-loader": "^0.25.0",
@@ -56,7 +76,7 @@
     "null-loader": "0.1.1",
     "phantomjs-prebuilt": "^2.1.4",
     "postcss-loader": "^0.13.0",
-    "protractor": "^3.1.1",
+    "protractor": "^3.3.0",
     "raw-loader": "0.5.1",
     "remap-istanbul": "^0.6.4",
     "rimraf": "^2.5.1",
@@ -73,25 +93,5 @@
     "webpack-dashboard": "^0.1.8",
     "webpack-dev-middleware": "^1.8.4",
     "webpack-hot-middleware": "^2.13.0"
-  },
-  "scripts": {
-    "clean": "rimraf node_modules doc dist && npm cache clean",
-    "clean-install": "npm run clean && npm install",
-    "clean-start": "npm run clean-install && npm start",
-    "watch": "webpack --watch --progress --profile",
-    "build": "rimraf dist && webpack --progress --profile --bail",
-    "webdriver-update": "webdriver-manager update",
-    "webdriver-start": "webdriver-manager start",
-    "lint": "tslint --force \"ng2/**/*.ts\"",
-    "e2e": "protractor",
-    "e2e-live": "protractor --elementExplorer",
-    "pretest": "npm run lint",
-    "test": "karma start",
-    "posttest": "remap-istanbul -i coverage/json/coverage-final.json -o coverage/html -t html",
-    "test-watch": "karma start --no-single-run --auto-watch",
-    "ci": "npm run e2e && npm run test",
-    "docs": "typedoc --options typedoc.json ng2/app/app.component.ts",
-    "start": "node keystone",
-    "postinstall": "npm run webdriver-update"
   }
 }
diff --git a/protractor.conf.js b/protractor.conf.js
index 7f4c12b..90a0d81 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -1,8 +1,9 @@
 exports.config = {
-  baseUrl: 'http://localhost:8080/',
-
+  baseUrl: 'http://localhost:3000/',
+  chromeDriver: './node_modules/chromedriver/lib/chromedriver/chromedriver.exe',
+  seleniumAddress: 'http://localhost:4444/wd/hub',
   specs: [
-    'ng2/**/*.e2e-spec.js'
+    'src/**/*.e2e-spec.js'
   ],
   exclude: [],
 
@@ -19,9 +20,14 @@ exports.config = {
   },
   directConnect: true,
 
-  capabilities: {
-    'browserName': 'chrome'
-  },
+  multiCapabilities: [{
+    'browserName': 'chrome',
+    'chromeOptions': {
+                binary: 'C:/Program Files (x86)/Google/Chrome/Application/chrome.exe',
+                args: [],
+                extensions: [],
+            }
+  }],
 
   onPrepare: function () {
     var SpecReporter = require('jasmine-spec-reporter');