diff --git a/.gitignore b/.gitignore
index d510b4da..59218d55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 node_modules
 npm-debug.log
 .vscode
-build
-bundle
-css
+dist
 .idea
 *.iml
diff --git a/.travis.yml b/.travis.yml
index b5e1f8e2..777cd170 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ before_script:
   - npm run lint
 
 script:
-  - cd ./config-serializer && node ./test-serializer.js
+  - cd ./test-serializer && node ./test-serializer.js
 
 cache:
   directories:
diff --git a/README.md b/README.md
index c95d4d7f..1df21f3e 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ First up, make sure that Node.js 4.x.x is installed on your system.
 git clone git@github.com:UltimateHackingKeyboard/agent.git
 cd agent
 npm install
-npm run build
-npm run webpack-dev-server
+npm run build sass
+npm run dev
 ```
 
 Webpack dev server exposes Agent at `localhost:8080`
diff --git a/gulpfile.js b/gulpfile.js
index a4be9156..58ec6453 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -6,8 +6,8 @@ var sourcemaps = require('gulp-sourcemaps');
 var webpackStream = require('webpack-stream');
 
 var paths = {
-  sassAll: 'sass/**/*.scss',
-  cssDest: 'css'
+  sassAll: 'src/sass/**/*.scss',
+  cssDest: 'dist/css'
 }
 
 gulp.task('sass', function () {
@@ -24,12 +24,12 @@ gulp.task('watch', function () {
 
 gulp.task('webpack', function () {
   return gulp.src('./src/boot.ts')
-    .pipe(webpackStream(require('./webpack.config.js'))
+    .pipe(webpackStream(require('./src/webpack.config.js'))
       .on('error', function (error) {
         // console.error(error.message);
         this.emit('end');
       }))
-    .pipe(gulp.dest('build/'));
+    .pipe(gulp.dest('dist/'));
 });
 
 gulp.task('default', ['sass', 'webpack']);
diff --git a/package.json b/package.json
index 450d266a..7acbd625 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,14 @@
   },
   "license": "GPL-3.0",
   "devDependencies": {
+    "copy-webpack-plugin": "^3.0.1",
     "gulp": "^3.9.1",
     "gulp-if": "^2.0.1",
     "gulp-sass": "^2.3.2",
     "gulp-sourcemaps": "^1.6.0",
     "html-loader": "0.4.3",
     "npm-run-all": "^2.3.0",
+    "path": "^0.12.7",
     "raw-loader": "^0.5.1",
     "sass-loader": "^4.0.0",
     "string-replace-loader": "^1.0.3",
@@ -54,12 +56,11 @@
     "zone.js": "^0.6.12"
   },
   "scripts": {
-    "tslint": "tslint \"src/**/*.ts\" \"config-serializer/**/*.ts\"",
-    "stylelint": "stylelint \"src/**/*.scss\" \"sass/**/*.scss\" --syntax scss",
+    "tslint": "tslint \"src/**/*.ts\" \"test-serializer/**/*.ts\"",
+    "stylelint": "stylelint \"src/**/*.scss\" --syntax scss",
     "lint": "run-s -scn tslint stylelint",
     "build": "gulp",
-    "build:test": "webpack --config \"config-serializer/webpack.config.js\"",
-    "webpack": "webpack",
-    "webpack-dev-server": "webpack-dev-server"
+    "build:test": "webpack --config \"test-serializer/webpack.config.js\"",
+    "dev": "webpack-dev-server --config \"src/webpack.config.js\" --content-base \"./dist\""
   }
 }
diff --git a/app.js b/src/app.js
similarity index 100%
rename from app.js
rename to src/app.js
diff --git a/src/app.module.ts b/src/app.module.ts
index c546c282..6b0bf163 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -2,12 +2,10 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { LocationStrategy, HashLocationStrategy } from '@angular/common';
 
-import { APP_ROUTER_PROVIDERS } from './main-app.routes';
-
 import { DataProviderService } from './services/data-provider.service';
 import { MapperService } from './services/mapper.service';
 
-import { MainAppComponent }  from './main-app.component';
+import { MainAppComponent, APP_ROUTER_PROVIDERS }  from './main-app';
 import { KeymapComponent } from './components/keymap';
 import { MacroComponent } from './components/macro';
 import { LegacyLoaderComponent } from './components/legacy-loader';
diff --git a/src/components/keymap/keymap.component.ts b/src/components/keymap/keymap.component.ts
index eb31e528..73e4b0de 100644
--- a/src/components/keymap/keymap.component.ts
+++ b/src/components/keymap/keymap.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { Layers } from '../../../config-serializer/config-items/Layers';
+import { Layers } from '../../config-serializer/config-items/Layers';
 import { UhkConfigurationService } from '../../services/uhk-configuration.service';
-import { Keymap } from '../../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../config-serializer/config-items/Keymap';
 import { Subscription } from 'rxjs/Subscription';
 
 @Component({
diff --git a/src/components/popover/popover.component.ts b/src/components/popover/popover.component.ts
index f0efdd0f..786954ce 100644
--- a/src/components/popover/popover.component.ts
+++ b/src/components/popover/popover.component.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit, Input, Output, EventEmitter, ViewChild} from '@angular/core';
 import {NgSwitch, NgSwitchCase} from '@angular/common';
 
-import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
+import {KeyAction} from '../../config-serializer/config-items/KeyAction';
 
 import {KeypressTabComponent} from './tab/keypress/keypress-tab.component';
 import {LayerTabComponent} from './tab/layer/layer-tab.component';
@@ -11,11 +11,11 @@ import {KeymapTabComponent} from './tab/keymap/keymap-tab.component';
 import {NoneTabComponent} from './tab/none/none-tab.component';
 
 import {Tab} from './tab/tab';
-import {KeystrokeAction} from '../../../config-serializer/config-items/KeystrokeAction';
-import {SwitchLayerAction} from '../../../config-serializer/config-items/SwitchLayerAction';
-import {MouseAction} from '../../../config-serializer/config-items/MouseAction';
-import {PlayMacroAction} from '../../../config-serializer/config-items/PlayMacroAction';
-import {SwitchKeymapAction} from '../../../config-serializer/config-items/SwitchKeymapAction';
+import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction';
+import {SwitchLayerAction} from '../../config-serializer/config-items/SwitchLayerAction';
+import {MouseAction} from '../../config-serializer/config-items/MouseAction';
+import {PlayMacroAction} from '../../config-serializer/config-items/PlayMacroAction';
+import {SwitchKeymapAction} from '../../config-serializer/config-items/SwitchKeymapAction';
 
 enum TabName {
     Keypress,
diff --git a/src/components/popover/tab/keymap/keymap-tab.component.ts b/src/components/popover/tab/keymap/keymap-tab.component.ts
index 48603908..32b59b30 100644
--- a/src/components/popover/tab/keymap/keymap-tab.component.ts
+++ b/src/components/popover/tab/keymap/keymap-tab.component.ts
@@ -1,11 +1,11 @@
 import {Component, OnInit, Input} from '@angular/core';
 
 import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
-import {Keymap} from '../../../../../config-serializer/config-items/Keymap';
-import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
+import {Keymap} from '../../../../config-serializer/config-items/Keymap';
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
 import {SvgKeyboardComponent} from '../../../svg/keyboard';
 import {Tab} from '../tab';
-import {SwitchKeymapAction} from '../../../../../config-serializer/config-items/SwitchKeymapAction';
+import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
 
 import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
 
diff --git a/src/components/popover/tab/keypress/keypress-tab.component.ts b/src/components/popover/tab/keypress/keypress-tab.component.ts
index 40c2d82e..19cdd320 100644
--- a/src/components/popover/tab/keypress/keypress-tab.component.ts
+++ b/src/components/popover/tab/keypress/keypress-tab.component.ts
@@ -2,8 +2,8 @@ import {Component, OnInit, Input} from '@angular/core';
 
 import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
 
-import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
-import {KeystrokeAction} from '../../../../../config-serializer/config-items/KeystrokeAction';
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
 
 import {IconComponent} from '../../widgets/icon';
 import {CaptureKeystrokeButtonComponent} from '../../widgets/capture-keystroke';
diff --git a/src/components/popover/tab/layer/layer-tab.component.ts b/src/components/popover/tab/layer/layer-tab.component.ts
index 44838f10..c42eba03 100644
--- a/src/components/popover/tab/layer/layer-tab.component.ts
+++ b/src/components/popover/tab/layer/layer-tab.component.ts
@@ -1,8 +1,8 @@
 import {Component, OnInit, Input, ViewChild} from '@angular/core';
 import {NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
 
-import {LayerName, SwitchLayerAction} from '../../../../../config-serializer/config-items/SwitchLayerAction';
-import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
+import {LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/SwitchLayerAction';
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
 
 import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
 
diff --git a/src/components/popover/tab/macro/macro-item.component.ts b/src/components/popover/tab/macro/macro-item.component.ts
index 088415d1..bb928a88 100644
--- a/src/components/popover/tab/macro/macro-item.component.ts
+++ b/src/components/popover/tab/macro/macro-item.component.ts
@@ -1,17 +1,17 @@
 import { Component, OnInit, OnChanges, Input } from '@angular/core';
 
-import {MacroAction} from '../../../../../config-serializer/config-items/MacroAction';
-import {DelayMacroAction} from '../../../../../config-serializer/config-items/DelayMacroAction';
-import {HoldModifiersMacroAction} from '../../../../../config-serializer/config-items/HoldModifiersMacroAction';
-import {MoveMouseMacroAction} from '../../../../../config-serializer/config-items/MoveMouseMacroAction';
-import {PressModifiersMacroAction} from '../../../../../config-serializer/config-items/PressModifiersMacroAction';
-import {ReleaseModifiersMacroAction} from '../../../../../config-serializer/config-items/ReleaseModifiersMacroAction';
-import {ScrollMouseMacroAction} from '../../../../../config-serializer/config-items/ScrollMouseMacroAction';
-import {TextMacroAction} from '../../../../../config-serializer/config-items/TextMacroAction';
+import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
+import {DelayMacroAction} from '../../../../config-serializer/config-items/DelayMacroAction';
+import {HoldModifiersMacroAction} from '../../../../config-serializer/config-items/HoldModifiersMacroAction';
+import {MoveMouseMacroAction} from '../../../../config-serializer/config-items/MoveMouseMacroAction';
+import {PressModifiersMacroAction} from '../../../../config-serializer/config-items/PressModifiersMacroAction';
+import {ReleaseModifiersMacroAction} from '../../../../config-serializer/config-items/ReleaseModifiersMacroAction';
+import {ScrollMouseMacroAction} from '../../../../config-serializer/config-items/ScrollMouseMacroAction';
+import {TextMacroAction} from '../../../../config-serializer/config-items/TextMacroAction';
 
 import {IconComponent} from '../../widgets/icon';
 
-import {KeyModifiers}  from '../../../../../config-serializer/config-items/KeyModifiers';
+import {KeyModifiers}  from '../../../../config-serializer/config-items/KeyModifiers';
 
 @Component({
     moduleId: module.id,
diff --git a/src/components/popover/tab/macro/macro-tab.component.ts b/src/components/popover/tab/macro/macro-tab.component.ts
index 464ff438..e8920039 100644
--- a/src/components/popover/tab/macro/macro-tab.component.ts
+++ b/src/components/popover/tab/macro/macro-tab.component.ts
@@ -1,9 +1,9 @@
 import {Component, OnInit, Input} from '@angular/core';
 
 import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
-import {Macro} from '../../../../../config-serializer/config-items/Macro';
-import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
-import {PlayMacroAction} from '../../../../../config-serializer/config-items/PlayMacroAction';
+import {Macro} from '../../../../config-serializer/config-items/Macro';
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
 
 import {Tab} from '../tab';
 import {MacroItemComponent} from './macro-item.component';
diff --git a/src/components/popover/tab/mouse/mouse-tab.component.ts b/src/components/popover/tab/mouse/mouse-tab.component.ts
index 7a4e50f5..3c128e72 100644
--- a/src/components/popover/tab/mouse/mouse-tab.component.ts
+++ b/src/components/popover/tab/mouse/mouse-tab.component.ts
@@ -2,8 +2,8 @@ import {Component, OnInit, Input} from '@angular/core';
 import {NgSwitch, NgSwitchCase, NgSwitchDefault} from '@angular/common';
 
 import {Tab} from '../tab';
-import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
-import {MouseAction, MouseActionParam} from '../../../../../config-serializer/config-items/MouseAction';
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction';
 
 @Component({
     moduleId: module.id,
diff --git a/src/components/popover/tab/none/none-tab.component.ts b/src/components/popover/tab/none/none-tab.component.ts
index 3f6a8680..ff727fb8 100644
--- a/src/components/popover/tab/none/none-tab.component.ts
+++ b/src/components/popover/tab/none/none-tab.component.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit } from '@angular/core';
 
 import {Tab} from '../tab';
-import {NoneAction} from '../../../../../config-serializer/config-items/NoneAction';
+import {NoneAction} from '../../../../config-serializer/config-items/NoneAction';
 
 @Component({
     moduleId: module.id,
diff --git a/src/components/popover/tab/tab.ts b/src/components/popover/tab/tab.ts
index 908538f8..9882e106 100644
--- a/src/components/popover/tab/tab.ts
+++ b/src/components/popover/tab/tab.ts
@@ -1,4 +1,4 @@
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
 
 export interface Tab {
     keyActionValid(): boolean;
diff --git a/src/components/side-menu/side-menu.component.ts b/src/components/side-menu/side-menu.component.ts
index 7338c126..a3288f22 100644
--- a/src/components/side-menu/side-menu.component.ts
+++ b/src/components/side-menu/side-menu.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 
-import { Keymap } from '../../../config-serializer/config-items/Keymap';
+import { Keymap } from '../../config-serializer/config-items/Keymap';
 import { UhkConfigurationService } from '../../services/uhk-configuration.service';
-import { Macro } from '../../../config-serializer/config-items/Macro';
+import { Macro } from '../../config-serializer/config-items/Macro';
 import { ROUTER_DIRECTIVES } from '@angular/router';
 
 @Component({
diff --git a/src/components/svg/keyboard/svg-keyboard.component.ts b/src/components/svg/keyboard/svg-keyboard.component.ts
index 78b090da..28ac841f 100644
--- a/src/components/svg/keyboard/svg-keyboard.component.ts
+++ b/src/components/svg/keyboard/svg-keyboard.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, Input, Output, EventEmitter} from '@angular/core';
 
-import {Module} from '../../../../config-serializer/config-items/Module';
+import {Module} from '../../../config-serializer/config-items/Module';
 import {SvgModule, SvgModuleComponent} from '../module';
 import {DataProviderService} from '../../../services/data-provider.service';
 
diff --git a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
index 40b608a3..b086eea5 100644
--- a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnInit, Input, OnChanges, SimpleChange } from '@angular/core';
 
-import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
-import {KeystrokeAction} from '../../../../../config-serializer/config-items/KeystrokeAction';
-import {KeyModifiers} from '../../../../../config-serializer/config-items/KeyModifiers';
-import {PlayMacroAction} from '../../../../../config-serializer/config-items/PlayMacroAction';
-import {SwitchLayerAction, LayerName}  from '../../../../../config-serializer/config-items/SwitchLayerAction';
-import {SwitchKeymapAction} from '../../../../../config-serializer/config-items/SwitchKeymapAction';
-import {UhkConfiguration} from '../../../../../config-serializer/config-items/UhkConfiguration';
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
+import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModifiers';
+import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
+import {SwitchLayerAction, LayerName}  from '../../../../config-serializer/config-items/SwitchLayerAction';
+import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
+import {UhkConfiguration} from '../../../../config-serializer/config-items/UhkConfiguration';
 import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
 import {MapperService} from '../../../../services/mapper.service';
 
diff --git a/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts b/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts
index 04cd8ec7..822c017f 100644
--- a/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts
+++ b/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnChanges, Input } from '@angular/core';
 
-import { KeystrokeAction } from '../../../../../config-serializer/config-items/KeystrokeAction';
-import { KeyModifiers } from '../../../../../config-serializer/config-items/KeyModifiers';
+import { KeystrokeAction } from '../../../../config-serializer/config-items/KeystrokeAction';
+import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers';
 import { MapperService } from '../../../../services/mapper.service';
 
 class SvgAttributes {
diff --git a/src/components/svg/module/svg-module.component.ts b/src/components/svg/module/svg-module.component.ts
index 8821a600..03a3d9d0 100644
--- a/src/components/svg/module/svg-module.component.ts
+++ b/src/components/svg/module/svg-module.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 
 import { SvgKeyboardKey, SvgKeyboardKeyComponent } from '../keys';
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
 
 @Component({
     selector: 'g[svg-module]',
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.ts b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
index 4f7abe24..03fd21aa 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.ts
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
@@ -3,8 +3,8 @@ import {
     state, animate, transition, trigger
 } from '@angular/core';
 
-import { KeyAction } from '../../../../config-serializer/config-items/KeyAction';
-import { Layer } from '../../../../config-serializer/config-items/Layer';
+import { KeyAction } from '../../../config-serializer/config-items/KeyAction';
+import { Layer } from '../../../config-serializer/config-items/Layer';
 
 @Component({
     selector: 'svg-keyboard-wrap',
diff --git a/config-serializer/ClassArray.ts b/src/config-serializer/ClassArray.ts
similarity index 100%
rename from config-serializer/ClassArray.ts
rename to src/config-serializer/ClassArray.ts
diff --git a/config-serializer/Function.d.ts b/src/config-serializer/Function.d.ts
similarity index 100%
rename from config-serializer/Function.d.ts
rename to src/config-serializer/Function.d.ts
diff --git a/config-serializer/README.md b/src/config-serializer/README.md
similarity index 100%
rename from config-serializer/README.md
rename to src/config-serializer/README.md
diff --git a/config-serializer/Serializable.ts b/src/config-serializer/Serializable.ts
similarity index 100%
rename from config-serializer/Serializable.ts
rename to src/config-serializer/Serializable.ts
diff --git a/config-serializer/UhkBuffer.ts b/src/config-serializer/UhkBuffer.ts
similarity index 100%
rename from config-serializer/UhkBuffer.ts
rename to src/config-serializer/UhkBuffer.ts
diff --git a/config-serializer/assert.ts b/src/config-serializer/assert.ts
similarity index 100%
rename from config-serializer/assert.ts
rename to src/config-serializer/assert.ts
diff --git a/config-serializer/config-items/DelayMacroAction.ts b/src/config-serializer/config-items/DelayMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/DelayMacroAction.ts
rename to src/config-serializer/config-items/DelayMacroAction.ts
diff --git a/config-serializer/config-items/HoldKeyMacroAction.ts b/src/config-serializer/config-items/HoldKeyMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/HoldKeyMacroAction.ts
rename to src/config-serializer/config-items/HoldKeyMacroAction.ts
diff --git a/config-serializer/config-items/HoldModifiersMacroAction.ts b/src/config-serializer/config-items/HoldModifiersMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/HoldModifiersMacroAction.ts
rename to src/config-serializer/config-items/HoldModifiersMacroAction.ts
diff --git a/config-serializer/config-items/HoldMouseButtonsMacroAction.ts b/src/config-serializer/config-items/HoldMouseButtonsMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/HoldMouseButtonsMacroAction.ts
rename to src/config-serializer/config-items/HoldMouseButtonsMacroAction.ts
diff --git a/config-serializer/config-items/KeyAction.ts b/src/config-serializer/config-items/KeyAction.ts
similarity index 100%
rename from config-serializer/config-items/KeyAction.ts
rename to src/config-serializer/config-items/KeyAction.ts
diff --git a/config-serializer/config-items/KeyActions.ts b/src/config-serializer/config-items/KeyActions.ts
similarity index 100%
rename from config-serializer/config-items/KeyActions.ts
rename to src/config-serializer/config-items/KeyActions.ts
diff --git a/config-serializer/config-items/KeyModifiers.ts b/src/config-serializer/config-items/KeyModifiers.ts
similarity index 100%
rename from config-serializer/config-items/KeyModifiers.ts
rename to src/config-serializer/config-items/KeyModifiers.ts
diff --git a/config-serializer/config-items/Keymap.ts b/src/config-serializer/config-items/Keymap.ts
similarity index 100%
rename from config-serializer/config-items/Keymap.ts
rename to src/config-serializer/config-items/Keymap.ts
diff --git a/config-serializer/config-items/Keymaps.ts b/src/config-serializer/config-items/Keymaps.ts
similarity index 100%
rename from config-serializer/config-items/Keymaps.ts
rename to src/config-serializer/config-items/Keymaps.ts
diff --git a/config-serializer/config-items/KeystrokeAction.ts b/src/config-serializer/config-items/KeystrokeAction.ts
similarity index 100%
rename from config-serializer/config-items/KeystrokeAction.ts
rename to src/config-serializer/config-items/KeystrokeAction.ts
diff --git a/config-serializer/config-items/Layer.ts b/src/config-serializer/config-items/Layer.ts
similarity index 91%
rename from config-serializer/config-items/Layer.ts
rename to src/config-serializer/config-items/Layer.ts
index 21be0eaa..4e0ed56b 100644
--- a/config-serializer/config-items/Layer.ts
+++ b/src/config-serializer/config-items/Layer.ts
@@ -1,7 +1,7 @@
 import { Serializable } from '../Serializable';
 import { Modules } from './Modules';
 import { UhkBuffer } from '../UhkBuffer';
-import { AnimationKeyboard } from '../../src/components/svg/wrap';
+import { AnimationKeyboard } from '../../components/svg/wrap';
 
 export class Layer extends Serializable<Layer> {
 
diff --git a/config-serializer/config-items/Layers.ts b/src/config-serializer/config-items/Layers.ts
similarity index 100%
rename from config-serializer/config-items/Layers.ts
rename to src/config-serializer/config-items/Layers.ts
diff --git a/config-serializer/config-items/LongPressAction.ts b/src/config-serializer/config-items/LongPressAction.ts
similarity index 100%
rename from config-serializer/config-items/LongPressAction.ts
rename to src/config-serializer/config-items/LongPressAction.ts
diff --git a/config-serializer/config-items/Macro.ts b/src/config-serializer/config-items/Macro.ts
similarity index 100%
rename from config-serializer/config-items/Macro.ts
rename to src/config-serializer/config-items/Macro.ts
diff --git a/config-serializer/config-items/MacroAction.ts b/src/config-serializer/config-items/MacroAction.ts
similarity index 100%
rename from config-serializer/config-items/MacroAction.ts
rename to src/config-serializer/config-items/MacroAction.ts
diff --git a/config-serializer/config-items/MacroActions.ts b/src/config-serializer/config-items/MacroActions.ts
similarity index 100%
rename from config-serializer/config-items/MacroActions.ts
rename to src/config-serializer/config-items/MacroActions.ts
diff --git a/config-serializer/config-items/Macros.ts b/src/config-serializer/config-items/Macros.ts
similarity index 100%
rename from config-serializer/config-items/Macros.ts
rename to src/config-serializer/config-items/Macros.ts
diff --git a/config-serializer/config-items/Module.ts b/src/config-serializer/config-items/Module.ts
similarity index 100%
rename from config-serializer/config-items/Module.ts
rename to src/config-serializer/config-items/Module.ts
diff --git a/config-serializer/config-items/ModuleConfiguration.ts b/src/config-serializer/config-items/ModuleConfiguration.ts
similarity index 100%
rename from config-serializer/config-items/ModuleConfiguration.ts
rename to src/config-serializer/config-items/ModuleConfiguration.ts
diff --git a/config-serializer/config-items/ModuleConfigurations.ts b/src/config-serializer/config-items/ModuleConfigurations.ts
similarity index 100%
rename from config-serializer/config-items/ModuleConfigurations.ts
rename to src/config-serializer/config-items/ModuleConfigurations.ts
diff --git a/config-serializer/config-items/Modules.ts b/src/config-serializer/config-items/Modules.ts
similarity index 100%
rename from config-serializer/config-items/Modules.ts
rename to src/config-serializer/config-items/Modules.ts
diff --git a/config-serializer/config-items/MouseAction.ts b/src/config-serializer/config-items/MouseAction.ts
similarity index 100%
rename from config-serializer/config-items/MouseAction.ts
rename to src/config-serializer/config-items/MouseAction.ts
diff --git a/config-serializer/config-items/MoveMouseMacroAction.ts b/src/config-serializer/config-items/MoveMouseMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/MoveMouseMacroAction.ts
rename to src/config-serializer/config-items/MoveMouseMacroAction.ts
diff --git a/config-serializer/config-items/NoneAction.ts b/src/config-serializer/config-items/NoneAction.ts
similarity index 100%
rename from config-serializer/config-items/NoneAction.ts
rename to src/config-serializer/config-items/NoneAction.ts
diff --git a/config-serializer/config-items/PlayMacroAction.ts b/src/config-serializer/config-items/PlayMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/PlayMacroAction.ts
rename to src/config-serializer/config-items/PlayMacroAction.ts
diff --git a/config-serializer/config-items/PressKeyMacroAction.ts b/src/config-serializer/config-items/PressKeyMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/PressKeyMacroAction.ts
rename to src/config-serializer/config-items/PressKeyMacroAction.ts
diff --git a/config-serializer/config-items/PressModifiersMacroAction.ts b/src/config-serializer/config-items/PressModifiersMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/PressModifiersMacroAction.ts
rename to src/config-serializer/config-items/PressModifiersMacroAction.ts
diff --git a/config-serializer/config-items/PressMouseButtonsMacroAction.ts b/src/config-serializer/config-items/PressMouseButtonsMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/PressMouseButtonsMacroAction.ts
rename to src/config-serializer/config-items/PressMouseButtonsMacroAction.ts
diff --git a/config-serializer/config-items/ReleaseKeyMacroAction.ts b/src/config-serializer/config-items/ReleaseKeyMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/ReleaseKeyMacroAction.ts
rename to src/config-serializer/config-items/ReleaseKeyMacroAction.ts
diff --git a/config-serializer/config-items/ReleaseModifiersMacroAction.ts b/src/config-serializer/config-items/ReleaseModifiersMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/ReleaseModifiersMacroAction.ts
rename to src/config-serializer/config-items/ReleaseModifiersMacroAction.ts
diff --git a/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts b/src/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts
rename to src/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts
diff --git a/config-serializer/config-items/ScrollMouseMacroAction.ts b/src/config-serializer/config-items/ScrollMouseMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/ScrollMouseMacroAction.ts
rename to src/config-serializer/config-items/ScrollMouseMacroAction.ts
diff --git a/config-serializer/config-items/SwitchKeymapAction.ts b/src/config-serializer/config-items/SwitchKeymapAction.ts
similarity index 100%
rename from config-serializer/config-items/SwitchKeymapAction.ts
rename to src/config-serializer/config-items/SwitchKeymapAction.ts
diff --git a/config-serializer/config-items/SwitchLayerAction.ts b/src/config-serializer/config-items/SwitchLayerAction.ts
similarity index 100%
rename from config-serializer/config-items/SwitchLayerAction.ts
rename to src/config-serializer/config-items/SwitchLayerAction.ts
diff --git a/config-serializer/config-items/TextMacroAction.ts b/src/config-serializer/config-items/TextMacroAction.ts
similarity index 100%
rename from config-serializer/config-items/TextMacroAction.ts
rename to src/config-serializer/config-items/TextMacroAction.ts
diff --git a/config-serializer/config-items/UhkConfiguration.ts b/src/config-serializer/config-items/UhkConfiguration.ts
similarity index 100%
rename from config-serializer/config-items/UhkConfiguration.ts
rename to src/config-serializer/config-items/UhkConfiguration.ts
diff --git a/config-serializer/config-schema.json b/src/config-serializer/config-schema.json
similarity index 100%
rename from config-serializer/config-schema.json
rename to src/config-serializer/config-schema.json
diff --git a/config-serializer/uhk-config.json b/src/config-serializer/uhk-config.json
similarity index 100%
rename from config-serializer/uhk-config.json
rename to src/config-serializer/uhk-config.json
diff --git a/index.html b/src/index.html
similarity index 62%
rename from index.html
rename to src/index.html
index 51dc5a41..0e89bda4 100644
--- a/index.html
+++ b/src/index.html
@@ -3,10 +3,10 @@
     <head>
         <meta charset="UTF-8">
         <title>Ultimate Hacking Keyboard Configurator</title>
-        <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-        <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+        <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+        <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
-        <script src="node_modules/jquery/dist/jquery.min.js"></script>
+        <script src="vendor/jquery/jquery.min.js"></script>
     </head>
     <body>
         <!-- Google Tag Manager -->
@@ -24,10 +24,10 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 
         <main-app></main-app>
 
-        <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script> <!-- TODO remove in near future -->
-        <script src="node_modules/sortablejs/Sortable.js"></script>
-        <script src="node_modules/select2/dist/js/select2.min.js"></script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script> <!-- TODO remove in near future -->
+        <script src="vendor/sortablejs/Sortable.min.js"></script>
+        <script src="vendor/select2/js/select2.min.js"></script>
         <script src="app.js"></script> <!-- TODO move to typescript and components -->
-        <script src="build/uhk.js"></script>
+        <script src="uhk.js"></script>
     </body>
 </html>
diff --git a/keymapLegacy.html b/src/keymapLegacy.html
similarity index 89%
rename from keymapLegacy.html
rename to src/keymapLegacy.html
index f47cde80..f54ef5a9 100644
--- a/keymapLegacy.html
+++ b/src/keymapLegacy.html
@@ -3,12 +3,12 @@
 <head>
     <meta charset="UTF-8">
     <title>Ultimate Hacking Keyboard Configurator</title>
-    <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-    <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+    <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <link href="css/app.css" rel="stylesheet">
     <link href="css/macro.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
-    <script src="node_modules/jquery/dist/jquery.min.js"></script>
+    <script src="vendor/jquery/jquery.min.js"></script>
     <script>
         // This js function is here to make sure it loads before any iframe content on the page.
         function resizeIframe(ifr) {
@@ -72,8 +72,8 @@
     </div>
 
 
-    <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-    <script src="node_modules/sortablejs/Sortable.js"></script>
-    <script src="node_modules/select2/dist/js/select2.min.js"></script>
+    <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+    <script src="vendor/sortablejs/Sortable.min.js"></script>
+    <script src="vendor/select2/js/select2.min.js"></script>
     <script src="app.js"></script>
 </body>
diff --git a/macro.html b/src/macro.html
similarity index 100%
rename from macro.html
rename to src/macro.html
diff --git a/macro.js b/src/macro.js
similarity index 100%
rename from macro.js
rename to src/macro.js
diff --git a/macroLegacy.html b/src/macroLegacy.html
similarity index 92%
rename from macroLegacy.html
rename to src/macroLegacy.html
index 603459cd..ed66a537 100644
--- a/macroLegacy.html
+++ b/src/macroLegacy.html
@@ -3,12 +3,12 @@
     <head>
         <meta charset="UTF-8">
         <title>Ultimate Hacking Keyboard Configurator</title>
-        <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-        <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+        <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+        <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
         <link href="css/app.css" rel="stylesheet">
         <link href="css/macro.css" rel="stylesheet">
         <link href="css/style.css" rel="stylesheet">
-        <script src="node_modules/jquery/dist/jquery.min.js"></script>
+        <script src="vendor/jquery/jquery.min.js"></script>
     </head>
     <body>
         <div class="macro--edit main-content__inner">
@@ -89,9 +89,9 @@
             </div>
         </div>
 
-        <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-        <script src="node_modules/sortablejs/Sortable.js"></script>
-        <script src="node_modules/select2/dist/js/select2.min.js"></script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/sortablejs/Sortable.min.js"></script>
+        <script src="vendor/select2/js/select2.min.js"></script>
         <script src="macro.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/src/main-app/index.ts b/src/main-app/index.ts
new file mode 100644
index 00000000..65b504ef
--- /dev/null
+++ b/src/main-app/index.ts
@@ -0,0 +1,2 @@
+export * from './main-app.component';
+export * from './main-app.routes';
diff --git a/src/main-app.component.html b/src/main-app/main-app.component.html
similarity index 100%
rename from src/main-app.component.html
rename to src/main-app/main-app.component.html
diff --git a/src/main-app.component.scss b/src/main-app/main-app.component.scss
similarity index 100%
rename from src/main-app.component.scss
rename to src/main-app/main-app.component.scss
diff --git a/src/main-app.component.ts b/src/main-app/main-app.component.ts
similarity index 87%
rename from src/main-app.component.ts
rename to src/main-app/main-app.component.ts
index 4f6617bc..d41cb07b 100644
--- a/src/main-app.component.ts
+++ b/src/main-app/main-app.component.ts
@@ -1,7 +1,7 @@
 import {Component, ViewEncapsulation} from '@angular/core';
 import { ROUTER_DIRECTIVES } from '@angular/router';
 
-import { SideMenuComponent } from './components/side-menu';
+import { SideMenuComponent } from '../components/side-menu';
 
 @Component({
     moduleId: module.id,
diff --git a/src/main-app.routes.ts b/src/main-app/main-app.routes.ts
similarity index 58%
rename from src/main-app.routes.ts
rename to src/main-app/main-app.routes.ts
index 59beda93..d31789b3 100644
--- a/src/main-app.routes.ts
+++ b/src/main-app/main-app.routes.ts
@@ -1,7 +1,7 @@
 import { provideRouter, RouterConfig }  from '@angular/router';
-import { keymapRoutes } from './components/keymap';
-import { macroRoutes } from './components/macro';
-import { legacyRoutes } from './components/legacy-loader';
+import { keymapRoutes } from '../components/keymap';
+import { macroRoutes } from '../components/macro';
+import { legacyRoutes } from '../components/legacy-loader';
 
 export const routes: RouterConfig = [
     ...keymapRoutes,
diff --git a/popup.html b/src/popup.html
similarity index 96%
rename from popup.html
rename to src/popup.html
index 106cd7ac..293c36e4 100644
--- a/popup.html
+++ b/src/popup.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-  <link href="node_modules/select2/dist/css/select2.min.css" rel="stylesheet">
+  <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+  <link href="vendor/select2/css/select2.min.css" rel="stylesheet">
   <link href="style.css" rel="stylesheet">
   <meta charset="utf-8">
   <title>Ultimate Hacking Keyboard - Agent mockups</title>
@@ -44,10 +44,10 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
   </div>
 </div>
 
-<script src="node_modules/jquery/dist/jquery.min.js"></script>
-<script src="node_modules/handlebars/dist/handlebars.js"></script>
-<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-<script src="node_modules/select2/dist/js/select2.min.js"></script>
+<script src="vendor/jquery/jquery.min.js"></script>
+<script src="vendor/handlebars/handlebars.js"></script>
+<script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+<script src="vendor/select2/js/select2.min.js"></script>
 <script src="script.js"></script>
 
 <!--
diff --git a/popup__iframe.html b/src/popup__iframe.html
similarity index 96%
rename from popup__iframe.html
rename to src/popup__iframe.html
index d461d20f..69e221ee 100644
--- a/popup__iframe.html
+++ b/src/popup__iframe.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-  <link href="node_modules/select2/dist/css/select2.min.css" rel="stylesheet">
+  <link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+  <link href="vendor/select2/css/select2.min.css" rel="stylesheet">
   <link href="css/style.css" rel="stylesheet">
   <meta charset="utf-8">
   <title>Ultimate Hacking Keyboard - Agent mockups</title>
@@ -28,10 +28,10 @@
   </div>
 </div>
 
-<script src="node_modules/jquery/dist/jquery.min.js"></script>
-<script src="node_modules/handlebars/dist/handlebars.js"></script>
-<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-<script src="node_modules/select2/dist/js/select2.min.js"></script>
+<script src="vendor/jquery/jquery.min.js"></script>
+<script src="vendor/handlebars/handlebars.min.js"></script>
+<script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+<script src="vendor/select2/js/select2.min.js"></script>
 <script src="script.js"></script>
 
 <!--
diff --git a/sass/app.scss b/src/sass/app.scss
similarity index 100%
rename from sass/app.scss
rename to src/sass/app.scss
diff --git a/sass/macro.scss b/src/sass/macro.scss
similarity index 100%
rename from sass/macro.scss
rename to src/sass/macro.scss
diff --git a/sass/style.scss b/src/sass/style.scss
similarity index 100%
rename from sass/style.scss
rename to src/sass/style.scss
diff --git a/script.js b/src/script.js
similarity index 100%
rename from script.js
rename to src/script.js
diff --git a/src/services/data-provider.service.ts b/src/services/data-provider.service.ts
index 29f6bd51..59a67f73 100644
--- a/src/services/data-provider.service.ts
+++ b/src/services/data-provider.service.ts
@@ -8,7 +8,7 @@ export class DataProviderService {
     constructor() { }
 
     getUHKConfig(): any {
-        return require('json!../../config-serializer/uhk-config.json');
+        return require('json!../config-serializer/uhk-config.json');
     }
 
     getKeyboardSvgAttributes(): { viewBox: string, transform: string, fill: string } {
diff --git a/src/services/mapper.service.ts b/src/services/mapper.service.ts
index eb182763..20b17c44 100644
--- a/src/services/mapper.service.ts
+++ b/src/services/mapper.service.ts
@@ -105,13 +105,13 @@ export class MapperService {
     public scanCodeToSvgImagePath(scanCode: number): string {
         let fileName: string = this.scanCodeFileName[scanCode];
         if (fileName) {
-            return 'build/compiled_sprite.svg#' + fileName;
+            return 'assets/compiled_sprite.svg#' + fileName;
         }
         return undefined;
     }
 
     public getIcon(iconName: string): string {
-        return 'build/compiled_sprite.svg#' + this.nameToFileName.get(iconName);
+        return 'assets/compiled_sprite.svg#' + this.nameToFileName.get(iconName);
     }
 
     private initScanCodeTextMap(): void {
diff --git a/src/services/uhk-configuration.service.ts b/src/services/uhk-configuration.service.ts
index 2b15e6cc..fc8e02a4 100644
--- a/src/services/uhk-configuration.service.ts
+++ b/src/services/uhk-configuration.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import {DataProviderService} from './data-provider.service';
 
-import {UhkConfiguration} from '../../config-serializer/config-items/UhkConfiguration';
+import {UhkConfiguration} from '../config-serializer/config-items/UhkConfiguration';
 
 @Injectable()
 export class UhkConfigurationService {
diff --git a/tsconfig.json b/src/tsconfig.json
similarity index 88%
rename from tsconfig.json
rename to src/tsconfig.json
index 44f364db..f9dd8f1c 100644
--- a/tsconfig.json
+++ b/src/tsconfig.json
@@ -9,7 +9,9 @@
     "removeComments": false,
     "noImplicitAny": true,
     "suppressImplicitAnyIndexErrors": true,
-    "baseUrl": "./src",
+    "typeRoots": [
+      "../node_modules/@types"
+    ],
     "types": [
       "node",
       "jquery",
diff --git a/src/webpack.config.js b/src/webpack.config.js
new file mode 100644
index 00000000..b37987ca
--- /dev/null
+++ b/src/webpack.config.js
@@ -0,0 +1,101 @@
+// var webpack = require("webpack");
+var SvgStore = require('webpack-svgstore-plugin');
+var webpackFailPlugin = require('webpack-fail-plugin');
+var CopyWebpackPlugin = require('copy-webpack-plugin');
+var path = require('path');
+
+var rootDir = path.resolve(__dirname, '../');
+
+module.exports = {
+    entry: ['es6-shim', 'zone.js', 'reflect-metadata', './src/boot.ts'],
+    output: {
+        path: rootDir + "/dist",
+        filename: "uhk.js"
+    },
+    devtool: 'source-map',
+    resolve: {
+        extensions: ['', '.webpack.js', '.web.js', '.ts', '.js'],
+        modulesDirectories: ['node_modules']
+    },
+    module: {
+        preLoaders: [
+            {
+                test: /(.js|.ts)$/,
+                loader: 'string-replace-loader',
+                query: {
+                    search: 'moduleId: module.id,',
+                    replace: '',
+                    flags: 'g'
+                }
+            }
+        ],
+        loaders: [
+            { test: /\.ts$/, loader: 'ts-loader', exclude: /node_modules/ },
+            { test: /\.html$/, loader: 'html-loader' },
+            {
+                test: /\.scss$/,
+                exclude: /node_modules/,
+                loaders: ['raw-loader', 'sass-loader']
+            }
+        ]
+    },
+    plugins: [
+        //   new webpack.optimize.UglifyJsPlugin({ minimize: true })
+        new SvgStore(
+            [
+                rootDir + '/images/icons/**/*.svg'
+            ],
+            './',
+            {
+                name: 'assets/compiled_sprite.svg',
+                chunk: 'app',
+                svgoOptions: {
+                    plugins: [
+                        { removeTitle: true }
+                    ]
+                }
+            }
+        ),
+        webpackFailPlugin,
+        new CopyWebpackPlugin([
+            { from: './src/*.html', flatten: true },
+            { from: './src/*.js', flatten: true },
+            {
+                from: 'node_modules/font-awesome/css/font-awesome.min.css',
+                to: 'vendor/font-awesome/css/font-awesome.min.css'
+            },
+            {
+                from: 'node_modules/font-awesome/fonts',
+                to: 'vendor/font-awesome/fonts'
+            },
+            {
+                from: 'node_modules/bootstrap/dist',
+                to: 'vendor/bootstrap'
+            },
+            {
+                from: 'node_modules/jquery/dist/jquery.min.*',
+                to: 'vendor/jquery',
+                flatten: true
+            },
+            {
+                from: 'node_modules/sortablejs/Sortable.min.js',
+                to: 'vendor/sortablejs/Sortable.min.js'
+            },
+            {
+                from: 'node_modules/select2/dist',
+                to: 'vendor/select2'
+            },
+            {
+                from: 'images',
+                to: 'images'
+            },
+            {
+                from: 'node_modules/handlebars/dist/handlebars.min.js',
+                to: 'vendor/handlebars/handlebars.min.js'
+            },
+        ], {
+                ignore: ['*.config.js']
+            })
+    ]
+
+}
diff --git a/config-serializer/.gitignore b/test-serializer/.gitignore
similarity index 86%
rename from config-serializer/.gitignore
rename to test-serializer/.gitignore
index 69f26d57..e95d08bb 100644
--- a/config-serializer/.gitignore
+++ b/test-serializer/.gitignore
@@ -1,6 +1,4 @@
-typings
 uhk-config.bin
 uhk-config-serialized.json
 uhk-config-serialized.bin
 test-serializer.js
-*.sw*
diff --git a/config-serializer/test-serializer.ts b/test-serializer/test-serializer.ts
similarity index 81%
rename from config-serializer/test-serializer.ts
rename to test-serializer/test-serializer.ts
index 4ecd4cc9..4e6a3c65 100644
--- a/config-serializer/test-serializer.ts
+++ b/test-serializer/test-serializer.ts
@@ -1,11 +1,11 @@
-import {Serializable} from './Serializable';
-import {UhkBuffer} from './UhkBuffer';
-import {UhkConfiguration} from './config-items/UhkConfiguration';
+import {Serializable} from '../src/config-serializer/Serializable';
+import {UhkBuffer} from '../src/config-serializer/UhkBuffer';
+import {UhkConfiguration} from '../src/config-serializer/config-items/UhkConfiguration';
 
 let assert = require('assert');
 let fs = require('fs');
 
-let uhkConfig = JSON.parse(fs.readFileSync('uhk-config.json'));
+let uhkConfig = JSON.parse(fs.readFileSync('../src/config-serializer/uhk-config.json'));
 
 let config1Js = uhkConfig;
 let config1Ts: Serializable<UhkConfiguration> = new UhkConfiguration().fromJsObject(config1Js);
diff --git a/config-serializer/tsconfig.json b/test-serializer/tsconfig.json
similarity index 100%
rename from config-serializer/tsconfig.json
rename to test-serializer/tsconfig.json
diff --git a/config-serializer/webpack.config.js b/test-serializer/webpack.config.js
similarity index 100%
rename from config-serializer/webpack.config.js
rename to test-serializer/webpack.config.js
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index dbf8fb0c..00000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// var webpack = require("webpack");
-var SvgStore = require('webpack-svgstore-plugin');
-var webpackFailPlugin = require('webpack-fail-plugin');
-
-module.exports = {
-    entry: ['es6-shim', 'zone.js', 'reflect-metadata', './src/boot.ts'],
-    output: {
-        path: __dirname + "/build",
-        publicPath: "/build/",
-        filename: "uhk.js"
-    },
-    devtool: 'source-map',
-    resolve: {
-        extensions: ['', '.webpack.js', '.web.js', '.ts', '.js'],
-        alias: {
-
-        },
-        modulesDirectories: [
-            'node_modules',
-            'bower_components'
-        ]
-    },
-    module: {
-        preLoaders: [
-            {
-                test: /(.js|.ts)$/,
-                loader: 'string-replace-loader',
-                query: {
-                    search: 'moduleId: module.id,',
-                    replace: '',
-                    flags: 'g'
-                }
-            }
-        ],
-        loaders: [
-            { test: /\.ts$/, loader: 'ts-loader', exclude: /node_modules/ },
-            { test: /\.html$/, loader: 'html-loader' },
-            {
-                test: /\.scss$/,
-                exclude: /node_modules/,
-                loaders: ['raw-loader', 'sass-loader']
-            }
-        ]
-    },
-    plugins: [
-        //   new webpack.optimize.UglifyJsPlugin({ minimize: true })
-        new SvgStore(
-            [
-                'images/icons/**/*.svg'
-            ],
-            './',
-            {
-                name: 'compiled_sprite.svg',
-                chunk: 'app',
-                svgoOptions: {
-                    plugins: [
-                        { removeTitle: true }
-                    ]
-                }
-            }
-        ),
-        webpackFailPlugin
-    ]
-
-}