diff --git a/.bithoundrc b/.bithoundrc
index c21a7b8..cc9802b 100644
--- a/.bithoundrc
+++ b/.bithoundrc
@@ -16,8 +16,6 @@
         ]
     },
     "ignore": [
-        "public/src/**",
-        "public/webssh2.js",
-        "public/webssh2.min.js"
+        "public/webssh2.bundle.js",
     ]
 }
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 7206202..3a49101 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -4,9 +4,7 @@ engines:
     enabled: true
   duplication:
     exclude_paths:
-      - "public/src/**"
-      - "public/webssh2.js"
-      - "public/webssh2.min.js"
+      - "public/webssh2.bundle.js"
     enabled: true
     config:
       languages:
@@ -30,6 +28,5 @@ ratings:
   - "**.rb"
 exclude_paths:
 - node_modules/
-- "public/src/**"
-- "public/webssh2.js"
-- "public/webssh2.min.js"
+- "public/webssh2.bundle.js"
+
diff --git a/ChangeLog.md b/ChangeLog.md
index 8a50c85..257e350 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,6 +4,9 @@ Mostly client (browser) related changes in this release
 
 ### Changed
 - Updated xterm.js to 3.0.2
+  - See https://github.com/xtermjs/xterm.js/releases/tag/3.0.2
+  - See https://github.com/xtermjs/xterm.js/releases/tag/3.0.1
+  - See https://github.com/xtermjs/xterm.js/releases/tag/3.0.0
 - Moved javascript events out of html into javascript
 - Changed asset packaging from grunt to Webpack to be inline with xterm.js direction
 ### Fixed
diff --git a/README.md b/README.md
index c5f85f5..16273c6 100644
--- a/README.md
+++ b/README.md
@@ -195,6 +195,6 @@ Clicking `Start logging` on the status bar will log all data to the client. A `D
 http://localhost:2222/ssh/host/192.168.1.1?port=2244&header=My%20Header&color=red
 
 # Tips
-* If you want to add custom JavaScript to the browser client you can either modify `./public/client-(full|min).html` and add a **<script>** element or check out `Gulpfile.js` and add your custom javascript file to the concat task
+* If you want to add custom JavaScript to the browser client you can either modify `./src/client-(full|min).html` and add a **<script>** element, modify `./src/index.js` directly, or check out `webpack.*.js` and add your custom javascript file to a task there.
 * BIG-IP Acess Policy Manager (APM) doesn't always care for minified javascript when run in portal mode. Be sure to Set `useminified` option in `config.json` to `false` for these environments
 * Set `useminified` option in `config.json` to `true` to utilize minified javascript
diff --git a/src/css/xterm.css b/src/css/xterm.css
deleted file mode 100644
index 35e92f6..0000000
--- a/src/css/xterm.css
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Copyright (c) 2014 The xterm.js authors. All rights reserved.
- * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
- * https://github.com/chjj/term.js
- * @license MIT
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Originally forked from (with the author's permission):
- *   Fabrice Bellard's javascript vt100 for jslinux:
- *   http://bellard.org/jslinux/
- *   Copyright (c) 2011 Fabrice Bellard
- *   The original design remains. The terminal itself
- *   has been extended to include xterm CSI codes, among
- *   other features.
- */
-
-/**
- *  Default styles for xterm.js
- */
-
-.xterm {
-    font-family: courier-new, courier, monospace;
-    font-feature-settings: "liga" 0;
-    position: relative;
-    user-select: none;
-    -ms-user-select: none;
-    -webkit-user-select: none;
-}
-
-.xterm.focus,
-.xterm:focus {
-    outline: none;
-}
-
-.xterm .xterm-helpers {
-    position: absolute;
-    top: 0;
-    /**
-     * The z-index of the helpers must be higher than the canvases in order for
-     * IMEs to appear on top.
-     */
-    z-index: 10;
-}
-
-.xterm .xterm-helper-textarea {
-    /*
-     * HACK: to fix IE's blinking cursor
-     * Move textarea out of the screen to the far left, so that the cursor is not visible.
-     */
-    position: absolute;
-    opacity: 0;
-    left: -9999em;
-    top: 0;
-    width: 0;
-    height: 0;
-    z-index: -10;
-    /** Prevent wrapping so the IME appears against the textarea at the correct position */
-    white-space: nowrap;
-    overflow: hidden;
-    resize: none;
-}
-
-.xterm .composition-view {
-    /* TODO: Composition position got messed up somewhere */
-    background: #000;
-    color: #FFF;
-    display: none;
-    position: absolute;
-    white-space: nowrap;
-    z-index: 1;
-}
-
-.xterm .composition-view.active {
-    display: block;
-}
-
-.xterm .xterm-viewport {
-    /* On OS X this is required in order for the scroll bar to appear fully opaque */
-    background-color: #000;
-    overflow-y: scroll;
-}
-
-.xterm canvas {
-    position: absolute;
-    left: 0;
-    top: 0;
-}
-
-.xterm .xterm-scroll-area {
-    visibility: hidden;
-}
-
-.xterm .xterm-char-measure-element {
-    display: inline-block;
-    visibility: hidden;
-    position: absolute;
-    left: -9999em;
-}
-
-.xterm.enable-mouse-events {
-    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
-    cursor: default;
-}
-
-.xterm:not(.enable-mouse-events) {
-    cursor: text;
-}