diff --git a/config-serializer/ClassArray.ts b/config-serializer/ClassArray.ts
index af514ec8..6b902950 100644
--- a/config-serializer/ClassArray.ts
+++ b/config-serializer/ClassArray.ts
@@ -1,4 +1,7 @@
-abstract class ClassArray<T> extends Serializable<T> {
+import {Serializable} from './Serializable';
+import {UhkBuffer} from './UhkBuffer';
+
+export abstract class ClassArray<T> extends Serializable<T> {
 
     elements: Serializable<T>[] = [];
 
diff --git a/config-serializer/Serializable.ts b/config-serializer/Serializable.ts
index f108db94..a5b040aa 100644
--- a/config-serializer/Serializable.ts
+++ b/config-serializer/Serializable.ts
@@ -1,4 +1,8 @@
-abstract class Serializable<T> {
+/// <references path="Function.d.ts">
+
+import {UhkBuffer} from './UhkBuffer';
+
+export abstract class Serializable<T> {
 
     private static depth = 0;
     private static maxDisplayedJsonLength = 160;
diff --git a/config-serializer/UhkBuffer.ts b/config-serializer/UhkBuffer.ts
index e1356af6..25914bcc 100644
--- a/config-serializer/UhkBuffer.ts
+++ b/config-serializer/UhkBuffer.ts
@@ -1,4 +1,4 @@
-class UhkBuffer {
+export class UhkBuffer {
 
     private static eepromSize = 32 * 1024;
     private static maxCompactLength = 0xFFFF;
diff --git a/config-serializer/config-items/DelayMacroAction.ts b/config-serializer/config-items/DelayMacroAction.ts
index 72a3253f..9f21744d 100644
--- a/config-serializer/config-items/DelayMacroAction.ts
+++ b/config-serializer/config-items/DelayMacroAction.ts
@@ -1,4 +1,7 @@
-class DelayMacroAction extends MacroAction {
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, macroActionType, MacroActionId} from './MacroAction';
+
+export class DelayMacroAction extends MacroAction {
 
     // @assertUInt16
     delay: number;
diff --git a/config-serializer/config-items/DualRoleKeystrokeAction.ts b/config-serializer/config-items/DualRoleKeystrokeAction.ts
index 2525cd4b..721c43f2 100644
--- a/config-serializer/config-items/DualRoleKeystrokeAction.ts
+++ b/config-serializer/config-items/DualRoleKeystrokeAction.ts
@@ -1,3 +1,6 @@
+import {UhkBuffer} from '../UhkBuffer';
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+
 enum LongPressAction {
     leftCtrl,
     leftShift,
@@ -12,7 +15,7 @@ enum LongPressAction {
     mouse
 }
 
-class DualRoleKeystrokeAction extends KeyAction {
+export class DualRoleKeystrokeAction extends KeyAction {
 
     // @assertUInt8
     scancode: number;
diff --git a/config-serializer/config-items/HoldKeyMacroAction.ts b/config-serializer/config-items/HoldKeyMacroAction.ts
index 29b77f33..916048b5 100644
--- a/config-serializer/config-items/HoldKeyMacroAction.ts
+++ b/config-serializer/config-items/HoldKeyMacroAction.ts
@@ -1,4 +1,7 @@
-class HoldKeyMacroAction extends MacroAction {
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+
+export class HoldKeyMacroAction extends MacroAction {
 
     // @assertUInt8
     scancode: number;
diff --git a/config-serializer/config-items/HoldModifiersMacroAction.ts b/config-serializer/config-items/HoldModifiersMacroAction.ts
index 7671fe04..fe09d42c 100644
--- a/config-serializer/config-items/HoldModifiersMacroAction.ts
+++ b/config-serializer/config-items/HoldModifiersMacroAction.ts
@@ -1,4 +1,7 @@
-class HoldModifiersMacroAction extends MacroAction {
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+
+export class HoldModifiersMacroAction extends MacroAction {
 
     // @assertUInt8
     modifierMask: number;
diff --git a/config-serializer/config-items/HoldMouseButtonsMacroAction.ts b/config-serializer/config-items/HoldMouseButtonsMacroAction.ts
index 129d129f..65e97728 100644
--- a/config-serializer/config-items/HoldMouseButtonsMacroAction.ts
+++ b/config-serializer/config-items/HoldMouseButtonsMacroAction.ts
@@ -1,4 +1,7 @@
-class HoldMouseButtonsMacroAction extends MacroAction {
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+
+export class HoldMouseButtonsMacroAction extends MacroAction {
 
     // @assertUInt8
     mouseButtonsMask: number;
diff --git a/config-serializer/config-items/KeyAction.ts b/config-serializer/config-items/KeyAction.ts
index 99fb2e04..3daa203d 100644
--- a/config-serializer/config-items/KeyAction.ts
+++ b/config-serializer/config-items/KeyAction.ts
@@ -1,4 +1,9 @@
-enum KeyActionId {
+/// <reference path="../Function.d.ts" />
+
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+
+export enum KeyActionId {
     NoneAction                   = 0,
     KeystrokeAction              = 1,
     KeystrokeModifiersAction     = 2,
@@ -10,7 +15,7 @@ enum KeyActionId {
     PlayMacroAction              = 8
 }
 
-let keyActionType = {
+export let keyActionType = {
     NoneAction                   : 'none',
     KeystrokeAction              : 'keystroke',
     KeystrokeModifiersAction     : 'keystrokeModifiers',
@@ -22,7 +27,7 @@ let keyActionType = {
     PlayMacroAction              : 'playMacro'
 };
 
-abstract class KeyAction extends Serializable<KeyAction> {
+export abstract class KeyAction extends Serializable<KeyAction> {
     assertKeyActionType(jsObject: any) {
         let keyActionClassname = this.constructor.name;
         let keyActionTypeString = keyActionType[keyActionClassname];
diff --git a/config-serializer/config-items/KeyActions.ts b/config-serializer/config-items/KeyActions.ts
index 21e19b7c..2aa543f2 100644
--- a/config-serializer/config-items/KeyActions.ts
+++ b/config-serializer/config-items/KeyActions.ts
@@ -1,4 +1,18 @@
-class KeyActions extends ClassArray<KeyAction> {
+import {ClassArray} from '../ClassArray';
+import {UhkBuffer} from '../UhkBuffer';
+import {Serializable} from '../Serializable';
+import {DualRoleKeystrokeAction} from './DualRoleKeystrokeAction';
+import {NoneAction} from './NoneAction';
+import {KeystrokeAction} from './KeystrokeAction';
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {KeystrokeModifiersAction} from './KeystrokeModifiersAction';
+import {KeystrokeWithModifiersAction} from './KeystrokeWithModifiersAction';
+import {SwitchLayerAction} from './SwitchLayerAction';
+import {SwitchKeymapAction} from './SwitchKeymapAction';
+import {MouseAction} from './MouseAction';
+import {PlayMacroAction} from './PlayMacroAction';
+
+export class KeyActions extends ClassArray<KeyAction> {
 
     jsObjectToClass(jsObject: any): Serializable<KeyAction> {
         switch (jsObject.keyActionType) {
diff --git a/config-serializer/config-items/KeyMap.ts b/config-serializer/config-items/KeyMap.ts
index 1a9d4ccf..b34287e6 100644
--- a/config-serializer/config-items/KeyMap.ts
+++ b/config-serializer/config-items/KeyMap.ts
@@ -1,4 +1,8 @@
-class KeyMap extends Serializable<KeyMap> {
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+import {Layers} from './Layers';
+
+export class KeyMap extends Serializable<KeyMap> {
 
     // @assertUInt8
     id: number;
diff --git a/config-serializer/config-items/KeyMaps.ts b/config-serializer/config-items/KeyMaps.ts
index 354ce359..817de27b 100644
--- a/config-serializer/config-items/KeyMaps.ts
+++ b/config-serializer/config-items/KeyMaps.ts
@@ -1,4 +1,9 @@
-class KeyMaps extends ClassArray<KeyMap> {
+import {ClassArray} from '../ClassArray';
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+import {KeyMap} from './KeyMap';
+
+export class KeyMaps extends ClassArray<KeyMap> {
 
     jsObjectToClass(jsObject: any): Serializable<KeyMap> {
         return new KeyMap().fromJsObject(jsObject);
diff --git a/config-serializer/config-items/KeystrokeAction.ts b/config-serializer/config-items/KeystrokeAction.ts
index 4a8a0ca7..f1c5f0b3 100644
--- a/config-serializer/config-items/KeystrokeAction.ts
+++ b/config-serializer/config-items/KeystrokeAction.ts
@@ -1,4 +1,7 @@
-class KeystrokeAction extends KeyAction {
+import {UhkBuffer} from '../UhkBuffer';
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+
+export class KeystrokeAction extends KeyAction {
 
     // @assertUInt8
     scancode: number;
diff --git a/config-serializer/config-items/KeystrokeModifiersAction.ts b/config-serializer/config-items/KeystrokeModifiersAction.ts
index 4f1b7369..103de60b 100644
--- a/config-serializer/config-items/KeystrokeModifiersAction.ts
+++ b/config-serializer/config-items/KeystrokeModifiersAction.ts
@@ -1,4 +1,7 @@
-enum KeyModifiers {
+import {UhkBuffer} from '../UhkBuffer';
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+
+export enum KeyModifiers {
     leftCtrl   = 1 << 0,
     leftShift  = 1 << 1,
     leftAlt    = 1 << 2,
@@ -9,7 +12,7 @@ enum KeyModifiers {
     rightGui   = 1 << 7
 }
 
-class KeystrokeModifiersAction extends KeyAction {
+export class KeystrokeModifiersAction extends KeyAction {
 
     // @assertUInt8
     modifierMask: number;
diff --git a/config-serializer/config-items/KeystrokeWithModifiersAction.ts b/config-serializer/config-items/KeystrokeWithModifiersAction.ts
index 6ab6d57c..c2cf60ce 100644
--- a/config-serializer/config-items/KeystrokeWithModifiersAction.ts
+++ b/config-serializer/config-items/KeystrokeWithModifiersAction.ts
@@ -1,4 +1,8 @@
-class KeystrokeWithModifiersAction extends KeyAction {
+import {UhkBuffer} from '../UhkBuffer';
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {KeyModifiers} from './KeystrokeModifiersAction';
+
+export class KeystrokeWithModifiersAction extends KeyAction {
 
     // @assertUInt8
     modifierMask: number;
diff --git a/config-serializer/config-items/Layer.ts b/config-serializer/config-items/Layer.ts
index 9c3244df..14e0fdc5 100644
--- a/config-serializer/config-items/Layer.ts
+++ b/config-serializer/config-items/Layer.ts
@@ -1,4 +1,8 @@
-class Layer extends Serializable<Layer> {
+import {Serializable} from '../Serializable';
+import {Modules} from './Modules';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class Layer extends Serializable<Layer> {
 
     modules: Serializable<Modules>;
 
diff --git a/config-serializer/config-items/Layers.ts b/config-serializer/config-items/Layers.ts
index d35b10f6..403079fe 100644
--- a/config-serializer/config-items/Layers.ts
+++ b/config-serializer/config-items/Layers.ts
@@ -1,4 +1,9 @@
-class Layers extends ClassArray<Layer> {
+import {ClassArray} from '../ClassArray';
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+import {Layer} from './Layer';
+
+export class Layers extends ClassArray<Layer> {
 
     jsObjectToClass(jsObject: any): Serializable<Layer> {
         return new Layer().fromJsObject(jsObject);
diff --git a/config-serializer/config-items/Macro.ts b/config-serializer/config-items/Macro.ts
index b31713d1..258a43f2 100644
--- a/config-serializer/config-items/Macro.ts
+++ b/config-serializer/config-items/Macro.ts
@@ -1,4 +1,8 @@
-class Macro extends Serializable<Macro> {
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+import {MacroActions} from './MacroActions';
+
+export class Macro extends Serializable<Macro> {
 
     // @assertUInt8
     id: number;
diff --git a/config-serializer/config-items/MacroAction.ts b/config-serializer/config-items/MacroAction.ts
index 138ab47f..37dfa32d 100644
--- a/config-serializer/config-items/MacroAction.ts
+++ b/config-serializer/config-items/MacroAction.ts
@@ -1,4 +1,7 @@
-enum MacroActionId {
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+
+export enum MacroActionId {
     PressKeyMacroAction              =  0,
     HoldKeyMacroAction               =  1,
     ReleaseKeyMacroAction            =  2,
@@ -14,7 +17,7 @@ enum MacroActionId {
     TextMacroAction                  = 12
 }
 
-let macroActionType = {
+export let macroActionType = {
     PressKeyMacroAction              : 'pressKey',
     HoldKeyMacroAction               : 'holdKey',
     ReleaseKeyMacroAction            : 'releaseKey',
@@ -30,7 +33,7 @@ let macroActionType = {
     TextMacroAction                  : 'text'
 };
 
-abstract class MacroAction extends Serializable<MacroAction> {
+export abstract class MacroAction extends Serializable<MacroAction> {
     assertMacroActionType(jsObject: any) {
         let macroActionClassname = this.constructor.name;
         let macroActionTypeString = macroActionType[macroActionClassname];
diff --git a/config-serializer/config-items/MacroActions.ts b/config-serializer/config-items/MacroActions.ts
index 2d71853c..9d6afa86 100644
--- a/config-serializer/config-items/MacroActions.ts
+++ b/config-serializer/config-items/MacroActions.ts
@@ -1,4 +1,22 @@
-class MacroActions extends ClassArray<MacroAction> {
+import {ClassArray} from '../ClassArray';
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+import {DelayMacroAction} from './DelayMacroAction';
+import {MacroAction, macroActionType, MacroActionId} from './MacroAction';
+import {HoldKeyMacroAction} from './HoldKeyMacroAction';
+import {HoldModifiersMacroAction} from './HoldModifiersMacroAction';
+import {HoldMouseButtonsMacroAction} from './HoldMouseButtonsMacroAction';
+import {MoveMouseMacroAction} from './MoveMouseMacroAction';
+import {PressKeyMacroAction} from './PressKeyMacroAction';
+import {PressModifiersMacroAction} from './PressModifiersMacroAction';
+import {PressMouseButtonsMacroAction} from './PressMouseButtonsMacroAction';
+import {ReleaseKeyMacroAction} from './ReleaseKeyMacroAction';
+import {ReleaseModifiersMacroAction} from './ReleaseModifiersMacroAction';
+import {ReleaseMouseButtonsMacroAction} from './ReleaseMouseButtonsMacroAction';
+import {ScrollMouseMacroAction} from './ScrollMouseMacroAction';
+import {TextMacroAction} from './TextMacroAction';
+
+export class MacroActions extends ClassArray<MacroAction> {
 
     jsObjectToClass(jsObject: any): Serializable<MacroAction> {
         switch (jsObject.macroActionType) {
diff --git a/config-serializer/config-items/Macros.ts b/config-serializer/config-items/Macros.ts
index 49fd6d4b..1b9bb615 100644
--- a/config-serializer/config-items/Macros.ts
+++ b/config-serializer/config-items/Macros.ts
@@ -1,4 +1,9 @@
-class Macros extends ClassArray<Macro> {
+import {ClassArray} from '../ClassArray';
+import {Serializable} from '../Serializable';
+import {Macro} from './Macro';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class Macros extends ClassArray<Macro> {
 
     jsObjectToClass(jsObject: any): Serializable<Macro> {
         return new Macro().fromJsObject(jsObject);
diff --git a/config-serializer/config-items/Module.ts b/config-serializer/config-items/Module.ts
index e8988b6a..c26db5e0 100644
--- a/config-serializer/config-items/Module.ts
+++ b/config-serializer/config-items/Module.ts
@@ -1,10 +1,14 @@
+import {Serializable} from '../Serializable';
+import {KeyActions} from './KeyActions';
+import {UhkBuffer} from '../UhkBuffer';
+
 enum PointerRole {
     none,
     move,
     scroll
 }
 
-class Module extends Serializable<Module> {
+export class Module extends Serializable<Module> {
 
     // @assertUInt8
     id: number;
diff --git a/config-serializer/config-items/ModuleConfiguration.ts b/config-serializer/config-items/ModuleConfiguration.ts
index efbf4342..5106b74e 100644
--- a/config-serializer/config-items/ModuleConfiguration.ts
+++ b/config-serializer/config-items/ModuleConfiguration.ts
@@ -1,4 +1,7 @@
-class ModuleConfiguration extends Serializable<ModuleConfiguration> {
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class ModuleConfiguration extends Serializable<ModuleConfiguration> {
 
     /*
      * module id enumeration is a separate story
diff --git a/config-serializer/config-items/ModuleConfigurations.ts b/config-serializer/config-items/ModuleConfigurations.ts
index b9cea760..20365a02 100644
--- a/config-serializer/config-items/ModuleConfigurations.ts
+++ b/config-serializer/config-items/ModuleConfigurations.ts
@@ -1,4 +1,9 @@
-class ModuleConfigurations extends ClassArray<ModuleConfiguration> {
+import {ClassArray} from '../ClassArray';
+import {Serializable} from '../Serializable';
+import {ModuleConfiguration} from './ModuleConfiguration';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class ModuleConfigurations extends ClassArray<ModuleConfiguration> {
 
     jsObjectToClass(jsObject: any): Serializable<ModuleConfiguration> {
         return new ModuleConfiguration().fromJsObject(jsObject);
diff --git a/config-serializer/config-items/Modules.ts b/config-serializer/config-items/Modules.ts
index 1793b611..a0c4aeec 100644
--- a/config-serializer/config-items/Modules.ts
+++ b/config-serializer/config-items/Modules.ts
@@ -1,4 +1,9 @@
-class Modules extends ClassArray<Module> {
+import {ClassArray} from '../ClassArray';
+import {Module} from './Module';
+import {Serializable} from '../Serializable';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class Modules extends ClassArray<Module> {
 
     jsObjectToClass(jsObject: any): Serializable<Module> {
         return new Module().fromJsObject(jsObject);
diff --git a/config-serializer/config-items/MouseAction.ts b/config-serializer/config-items/MouseAction.ts
index db9a6cc5..52e399bb 100644
--- a/config-serializer/config-items/MouseAction.ts
+++ b/config-serializer/config-items/MouseAction.ts
@@ -1,3 +1,6 @@
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {UhkBuffer} from '../UhkBuffer';
+
 enum MouseActionParam {
     leftClick,
     middleClick,
@@ -14,7 +17,7 @@ enum MouseActionParam {
     decelerate
 }
 
-class MouseAction extends KeyAction {
+export class MouseAction extends KeyAction {
 
     // @assertUInt8
     mouseAction: MouseActionParam;
diff --git a/config-serializer/config-items/MoveMouseMacroAction.ts b/config-serializer/config-items/MoveMouseMacroAction.ts
index 22d229a7..877c31cd 100644
--- a/config-serializer/config-items/MoveMouseMacroAction.ts
+++ b/config-serializer/config-items/MoveMouseMacroAction.ts
@@ -1,4 +1,7 @@
-class MoveMouseMacroAction extends MacroAction {
+import {MacroAction, macroActionType, MacroActionId} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class MoveMouseMacroAction extends MacroAction {
 
     // @assertInt16
     x: number;
diff --git a/config-serializer/config-items/NoneAction.ts b/config-serializer/config-items/NoneAction.ts
index 77c27286..1d9fb229 100644
--- a/config-serializer/config-items/NoneAction.ts
+++ b/config-serializer/config-items/NoneAction.ts
@@ -1,4 +1,7 @@
-class NoneAction extends KeyAction {
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class NoneAction extends KeyAction {
 
     _fromJsObject(jsObject: any): NoneAction {
         this.assertKeyActionType(jsObject);
diff --git a/config-serializer/config-items/PlayMacroAction.ts b/config-serializer/config-items/PlayMacroAction.ts
index ec12a1fb..0e863ffc 100644
--- a/config-serializer/config-items/PlayMacroAction.ts
+++ b/config-serializer/config-items/PlayMacroAction.ts
@@ -1,4 +1,7 @@
-class PlayMacroAction extends KeyAction {
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class PlayMacroAction extends KeyAction {
 
     // @assertUInt8
     macroId: number;
diff --git a/config-serializer/config-items/PressKeyMacroAction.ts b/config-serializer/config-items/PressKeyMacroAction.ts
index d73f7c2c..22eb282c 100644
--- a/config-serializer/config-items/PressKeyMacroAction.ts
+++ b/config-serializer/config-items/PressKeyMacroAction.ts
@@ -1,4 +1,7 @@
-class PressKeyMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class PressKeyMacroAction extends MacroAction {
 
     // @assertUInt8
     scancode: number;
diff --git a/config-serializer/config-items/PressModifiersMacroAction.ts b/config-serializer/config-items/PressModifiersMacroAction.ts
index cc42fe37..2d09fc99 100644
--- a/config-serializer/config-items/PressModifiersMacroAction.ts
+++ b/config-serializer/config-items/PressModifiersMacroAction.ts
@@ -1,4 +1,7 @@
-class PressModifiersMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class PressModifiersMacroAction extends MacroAction {
 
     // @assertUInt8
     modifierMask: number;
diff --git a/config-serializer/config-items/PressMouseButtonsMacroAction.ts b/config-serializer/config-items/PressMouseButtonsMacroAction.ts
index aa2593bc..4dfb6dbc 100644
--- a/config-serializer/config-items/PressMouseButtonsMacroAction.ts
+++ b/config-serializer/config-items/PressMouseButtonsMacroAction.ts
@@ -1,4 +1,7 @@
-class PressMouseButtonsMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class PressMouseButtonsMacroAction extends MacroAction {
 
     // @assertUInt8
     mouseButtonsMask: number;
diff --git a/config-serializer/config-items/ReleaseKeyMacroAction.ts b/config-serializer/config-items/ReleaseKeyMacroAction.ts
index 7648ac3e..439b43ac 100644
--- a/config-serializer/config-items/ReleaseKeyMacroAction.ts
+++ b/config-serializer/config-items/ReleaseKeyMacroAction.ts
@@ -1,4 +1,7 @@
-class ReleaseKeyMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class ReleaseKeyMacroAction extends MacroAction {
 
     // @assertUInt8
     scancode: number;
diff --git a/config-serializer/config-items/ReleaseModifiersMacroAction.ts b/config-serializer/config-items/ReleaseModifiersMacroAction.ts
index 5586fe5c..3853e6a8 100644
--- a/config-serializer/config-items/ReleaseModifiersMacroAction.ts
+++ b/config-serializer/config-items/ReleaseModifiersMacroAction.ts
@@ -1,4 +1,7 @@
-class ReleaseModifiersMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class ReleaseModifiersMacroAction extends MacroAction {
 
     // @assertUInt8
     modifierMask: number;
diff --git a/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts b/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts
index 52a897b3..d27314c7 100644
--- a/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts
+++ b/config-serializer/config-items/ReleaseMouseButtonsMacroAction.ts
@@ -1,4 +1,7 @@
-class ReleaseMouseButtonsMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class ReleaseMouseButtonsMacroAction extends MacroAction {
 
     // @assertUInt8
     mouseButtonsMask: number;
diff --git a/config-serializer/config-items/ScrollMouseMacroAction.ts b/config-serializer/config-items/ScrollMouseMacroAction.ts
index 30e754b2..2b1a0a27 100644
--- a/config-serializer/config-items/ScrollMouseMacroAction.ts
+++ b/config-serializer/config-items/ScrollMouseMacroAction.ts
@@ -1,4 +1,7 @@
-class ScrollMouseMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class ScrollMouseMacroAction extends MacroAction {
 
     // @assertInt16
     x: number;
diff --git a/config-serializer/config-items/SwitchKeymapAction.ts b/config-serializer/config-items/SwitchKeymapAction.ts
index b1f087ff..1160eb09 100644
--- a/config-serializer/config-items/SwitchKeymapAction.ts
+++ b/config-serializer/config-items/SwitchKeymapAction.ts
@@ -1,4 +1,7 @@
-class SwitchKeymapAction extends KeyAction {
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class SwitchKeymapAction extends KeyAction {
 
     // @assertUInt8
     keymapId: number;
diff --git a/config-serializer/config-items/SwitchLayerAction.ts b/config-serializer/config-items/SwitchLayerAction.ts
index 1ec30f20..69536660 100644
--- a/config-serializer/config-items/SwitchLayerAction.ts
+++ b/config-serializer/config-items/SwitchLayerAction.ts
@@ -1,10 +1,13 @@
+import {keyActionType, KeyActionId, KeyAction} from './KeyAction';
+import {UhkBuffer} from '../UhkBuffer';
+
 enum LayerName {
     mod,
     fn,
     mouse
 }
 
-class SwitchLayerAction extends KeyAction {
+export class SwitchLayerAction extends KeyAction {
 
     isLayerToggleable: boolean;
 
diff --git a/config-serializer/config-items/TextMacroAction.ts b/config-serializer/config-items/TextMacroAction.ts
index 2e48168b..98cda1fd 100644
--- a/config-serializer/config-items/TextMacroAction.ts
+++ b/config-serializer/config-items/TextMacroAction.ts
@@ -1,4 +1,7 @@
-class TextMacroAction extends MacroAction {
+import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class TextMacroAction extends MacroAction {
 
     text: string;
 
diff --git a/config-serializer/config-items/UhkConfiguration.ts b/config-serializer/config-items/UhkConfiguration.ts
index 805f93eb..0245fafe 100644
--- a/config-serializer/config-items/UhkConfiguration.ts
+++ b/config-serializer/config-items/UhkConfiguration.ts
@@ -1,4 +1,10 @@
-class UhkConfiguration extends Serializable<UhkConfiguration> {
+import {Serializable} from '../Serializable';
+import {ModuleConfigurations} from './ModuleConfigurations';
+import {KeyMaps} from './KeyMaps';
+import {Macros} from './Macros';
+import {UhkBuffer} from '../UhkBuffer';
+
+export class UhkConfiguration extends Serializable<UhkConfiguration> {
 
     signature: string;
 
diff --git a/config-serializer/config-items/config-items.ts b/config-serializer/config-items/config-items.ts
deleted file mode 100644
index c3d65d09..00000000
--- a/config-serializer/config-items/config-items.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/// <reference path="KeyAction.ts" />
-/// <reference path="KeyActions.ts" />
-/// <reference path="KeystrokeAction.ts" />
-/// <reference path="KeystrokeWithModifiersAction.ts" />
-/// <reference path="KeystrokeModifiersAction.ts" />
-/// <reference path="DualRoleKeystrokeAction.ts" />
-/// <reference path="MouseAction.ts" />
-/// <reference path="PlayMacroAction.ts" />
-/// <reference path="SwitchLayerAction.ts" />
-/// <reference path="SwitchKeymapAction.ts" />
-/// <reference path="NoneAction.ts" />
-/// <reference path="Module.ts" />
-/// <reference path="Modules.ts" />
-/// <reference path="Layer.ts" />
-/// <reference path="Layers.ts" />
-/// <reference path="KeyMap.ts" />
-/// <reference path="KeyMaps.ts" />
-/// <reference path="Macro.ts" />
-/// <reference path="Macros.ts" />
-/// <reference path="MacroAction.ts" />
-/// <reference path="MacroActions.ts" />
-/// <reference path="PressKeyMacroAction.ts" />
-/// <reference path="HoldKeyMacroAction.ts" />
-/// <reference path="ReleaseKeyMacroAction.ts" />
-/// <reference path="PressModifiersMacroAction.ts" />
-/// <reference path="HoldModifiersMacroAction.ts" />
-/// <reference path="ReleaseModifiersMacroAction.ts" />
-/// <reference path="PressMouseButtonsMacroAction.ts" />
-/// <reference path="HoldMouseButtonsMacroAction.ts" />
-/// <reference path="ReleaseMouseButtonsMacroAction.ts" />
-/// <reference path="MoveMouseMacroAction.ts" />
-/// <reference path="ScrollMouseMacroAction.ts" />
-/// <reference path="DelayMacroAction.ts" />
-/// <reference path="TextMacroAction.ts" />
-/// <reference path="ModuleConfiguration.ts" />
-/// <reference path="ModuleConfigurations.ts" />
-/// <reference path="UhkConfiguration.ts" />
diff --git a/config-serializer/test-serializer.ts b/config-serializer/test-serializer.ts
index b1a5aa23..65c3409c 100644
--- a/config-serializer/test-serializer.ts
+++ b/config-serializer/test-serializer.ts
@@ -1,9 +1,8 @@
-/// <reference path="Function.d.ts" />
-/// <reference path="assert.ts" />
-/// <reference path="Serializable.ts" />
-/// <reference path="ClassArray.ts" />
-/// <reference path="UhkBuffer.ts" />
-/// <reference path="config-items/config-items.ts" />
+/// <reference path="../typings/main/ambient/node/index.d.ts" />
+
+import {Serializable} from './Serializable';
+import {UhkBuffer} from './UhkBuffer';
+import {UhkConfiguration} from './config-items/UhkConfiguration';
 
 let assert = require('assert');
 let fs = require('fs');
diff --git a/config-serializer/tsconfig.json b/config-serializer/tsconfig.json
index bbc4f789..7f18f045 100644
--- a/config-serializer/tsconfig.json
+++ b/config-serializer/tsconfig.json
@@ -1,11 +1,13 @@
 {
     "compilerOptions": {
-        "out": "test-serializer.js",
         "target": "es5",
+        "module": "commonjs",
         "experimentalDecorators": true
     },
-    "files": [
-        "../typings/main.d.ts",
-        "test-serializer.ts"
+    "exclude": [
+        "../src",
+        "../node_modules",
+        "../typings/main",
+        "../typings/main.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/config-serializer/webpack.config.js b/config-serializer/webpack.config.js
new file mode 100644
index 00000000..7712a7f2
--- /dev/null
+++ b/config-serializer/webpack.config.js
@@ -0,0 +1,32 @@
+// var webpack = require("webpack");
+
+module.exports = {
+    entry: {
+        main: './test-serializer.ts'
+    },
+    target: 'node',
+    output: {
+        filename: "test-serializer.js"
+    },
+    resolve: {
+        extensions: ['', '.webpack.js', '.web.js', '.ts', '.js'],
+        alias: {
+
+        },
+        modulesDirectories: [
+            '../node_modules'
+        ]
+    },
+    module: {
+        loaders: [
+            { test: /\.ts$/, loader: 'ts-loader', exclude: /node_modules/ }
+        ]
+    },
+    plugins: [
+        //   new webpack.optimize.UglifyJsPlugin({ minimize: true })
+    ],
+    node: {
+        fs: "empty"
+    }
+
+}
\ No newline at end of file