refactor: Create folders for key and macro actions.

src/components/popover/popover.component.ts

@@ -1,11 +1,13 @@
 import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
 
-import {KeyAction} from '../../config-serializer/config-items/KeyAction';
-import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction';
-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 {SwitchLayerAction} from '../../config-serializer/config-items/SwitchLayerAction';
+import {
+    KeyAction,
+    KeystrokeAction,
+    MouseAction,
+    PlayMacroAction,
+    SwitchKeymapAction,
+    SwitchLayerAction
+} from '../../config-serializer/config-items/key-action';
 import {Tab} from './tab/tab';
 
 enum TabName {

src/components/popover/tab/keymap/keymap-tab.component.ts

@@ -2,9 +2,8 @@ import {Component, Input, OnInit } from '@angular/core';
 
 import {Select2OptionData} from 'ng2-select2/ng2-select2';
 
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {KeyAction, SwitchKeymapAction} from '../../../../config-serializer/config-items/key-action';
 import {Keymap} from '../../../../config-serializer/config-items/Keymap';
-import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
 import {Tab} from '../tab';
 
 import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';

src/components/popover/tab/keypress/keypress-tab.component.ts

@@ -2,8 +2,7 @@ import {Component, Input, OnInit} from '@angular/core';
 
 import {Select2OptionData} from 'ng2-select2/ng2-select2';
 
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
-import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
+import {KeyAction, KeystrokeAction} from '../../../../config-serializer/config-items/key-action';
 
 import {Tab} from '../tab';
 

src/components/popover/tab/layer/layer-tab.component.ts

@@ -1,7 +1,6 @@
 import {Component, Input,  OnInit, ViewChild} from '@angular/core';
 
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
-import {LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/SwitchLayerAction';
+import {KeyAction, LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/key-action';
 
 import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
 

src/components/popover/tab/macro/macro-item.component.ts

@@ -1,15 +1,18 @@
+/// <reference path="../../../../config-serializer/Function.d.ts" />
+
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
 
-import {DelayMacroAction} from '../../../../config-serializer/config-items/DelayMacroAction';
-import {HoldModifiersMacroAction} from '../../../../config-serializer/config-items/HoldModifiersMacroAction';
-import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
-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 {KeyModifiers}  from '../../../../config-serializer/config-items/KeyModifiers';
+import {
+    DelayMacroAction,
+    HoldModifiersMacroAction,
+    MacroAction,
+    MoveMouseMacroAction,
+    PressModifiersMacroAction,
+    ReleaseModifiersMacroAction,
+    ScrollMouseMacroAction,
+    TextMacroAction
+} from '../../../../config-serializer/config-items/macro-action';
 
 @Component({
     selector: 'macro-item',

src/components/popover/tab/macro/macro-tab.component.ts

@@ -2,9 +2,8 @@ import {Component, Input, OnInit} from '@angular/core';
 
 import {Select2OptionData} from 'ng2-select2/ng2-select2';
 
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {KeyAction, PlayMacroAction} from '../../../../config-serializer/config-items/key-action';
 import {Macro} from '../../../../config-serializer/config-items/Macro';
-import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
 
 import {Tab} from '../tab';
 

src/components/popover/tab/mouse/mouse-tab.component.ts

@@ -1,7 +1,6 @@
 import {Component, Input, OnInit} from '@angular/core';
 
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
-import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction';
+import {KeyAction, MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/key-action';
 
 import {Tab} from '../tab';
 

src/components/popover/tab/none/none-tab.component.ts

@@ -1,6 +1,6 @@
 import {Component, OnInit } from '@angular/core';
 
-import {NoneAction} from '../../../../config-serializer/config-items/NoneAction';
+import {NoneAction} from '../../../../config-serializer/config-items/key-action';
 import {Tab} from '../tab';
 
 @Component({

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/key-action';
 
 export interface Tab {
     keyActionValid(): boolean;

src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts

@@ -1,11 +1,14 @@
 import { Component, Input, OnChanges, OnInit, SimpleChange } from '@angular/core';
 
-import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {
+    KeyAction,
+    KeystrokeAction,
+    LayerName,
+    PlayMacroAction,
+    SwitchKeymapAction,
+    SwitchLayerAction
+} from '../../../../config-serializer/config-items/key-action';
 import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModifiers';
-import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
-import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
-import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
-import {LayerName, SwitchLayerAction}  from '../../../../config-serializer/config-items/SwitchLayerAction';
 import {UhkConfiguration} from '../../../../config-serializer/config-items/UhkConfiguration';
 
 import {MapperService} from '../../../../services/mapper.service';

src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
 
+import { KeystrokeAction } from '../../../../config-serializer/config-items/key-action';
 import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers';
-import { KeystrokeAction } from '../../../../config-serializer/config-items/KeystrokeAction';
 import { MapperService } from '../../../../services/mapper.service';
 
 class SvgAttributes {

src/components/svg/module/svg-module.component.ts

@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 
-import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
+import { KeyAction } from '../../../config-serializer/config-items/key-action';
 
 import { SvgKeyboardKey } from '../keys';
 

src/components/svg/wrap/svg-keyboard-wrap.component.ts

@@ -3,9 +3,8 @@ import {
     state, style, transition, trigger
 } from '@angular/core';
 
-import { KeyAction } from '../../../config-serializer/config-items/KeyAction';
+import { KeyAction, NoneAction } from '../../../config-serializer/config-items/key-action';
 import { Layer } from '../../../config-serializer/config-items/Layer';
-import { NoneAction } from '../../../config-serializer/config-items/NoneAction';
 
 @Component({
     selector: 'svg-keyboard-wrap',

src/config-serializer/config-items/Macro.ts

@@ -1,7 +1,7 @@
 import {assertUInt8} from '../assert';
 import {Serializable} from '../Serializable';
 import {UhkBuffer} from '../UhkBuffer';
-import {MacroActions} from './MacroActions';
+import {MacroActions} from './macro-action';
 
 export class Macro extends Serializable<Macro> {
 

src/config-serializer/config-items/Module.ts

@@ -1,7 +1,7 @@
 import {assertEnum, assertUInt8} from '../assert';
 import {Serializable} from '../Serializable';
 import {UhkBuffer} from '../UhkBuffer';
-import {KeyActions} from './KeyActions';
+import {KeyActions} from './key-action';
 
 enum PointerRole {
     none,

src/config-serializer/config-items/key-action/KeyAction.ts

@@ -1,7 +1,7 @@
-/// <reference path="../Function.d.ts" />
+/// <reference path="../../Function.d.ts" />
 
-import {Serializable} from '../Serializable';
-import {UhkBuffer} from '../UhkBuffer';
+import {Serializable} from '../../Serializable';
+import {UhkBuffer} from '../../UhkBuffer';
 
 export enum KeyActionId {
     NoneAction                   = 0,

src/config-serializer/config-items/key-action/KeyActions.ts

@@ -1,5 +1,5 @@
-import {ClassArray} from '../ClassArray';
-import {UhkBuffer} from '../UhkBuffer';
+import {ClassArray} from '../../ClassArray';
+import {UhkBuffer} from '../../UhkBuffer';
 import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 import {KeystrokeAction} from './KeystrokeAction';
 import {MouseAction} from './MouseAction';

src/config-serializer/config-items/key-action/KeystrokeAction.ts

@@ -1,8 +1,8 @@
-import {assertEnum, assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertEnum, assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
+import {KeyModifiers} from '../KeyModifiers';
+import {LongPressAction} from '../LongPressAction';
 import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
-import {KeyModifiers} from './KeyModifiers';
-import {LongPressAction} from './LongPressAction';
 
 export enum KeystrokeActionFlag {
     scancode = 1 << 0,

src/config-serializer/config-items/key-action/MouseAction.ts

@@ -1,5 +1,5 @@
-import {assertEnum} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertEnum} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export enum MouseActionParam {

src/config-serializer/config-items/key-action/NoneAction.ts

@@ -1,4 +1,4 @@
-import {UhkBuffer} from '../UhkBuffer';
+import {UhkBuffer} from '../../UhkBuffer';
 import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export class NoneAction extends KeyAction {

src/config-serializer/config-items/key-action/PlayMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export class PlayMacroAction extends KeyAction {

src/config-serializer/config-items/key-action/SwitchKeymapAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export class SwitchKeymapAction extends KeyAction {

src/config-serializer/config-items/key-action/SwitchLayerAction.ts

@@ -1,5 +1,5 @@
-import {assertEnum} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertEnum} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
 
 export enum LayerName {

src/config-serializer/config-items/key-action/index.ts

@@ -0,0 +1,8 @@
+export * from './KeyAction';
+export * from './KeyActions';
+export * from './KeystrokeAction';
+export * from './MouseAction';
+export * from './NoneAction';
+export * from './PlayMacroAction';
+export * from './SwitchKeymapAction';
+export * from './SwitchLayerAction';

src/config-serializer/config-items/macro-action/DelayMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt16} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt16} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class DelayMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/HoldKeyMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class HoldKeyMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/HoldModifiersMacroAction.ts

@@ -1,6 +1,6 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
-import {KeyModifiers} from './KeyModifiers';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
+import {KeyModifiers} from '../KeyModifiers';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class HoldModifiersMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/HoldMouseButtonsMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class HoldMouseButtonsMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/MacroAction.ts

@@ -1,5 +1,5 @@
-import {Serializable} from '../Serializable';
-import {UhkBuffer} from '../UhkBuffer';
+import {Serializable} from '../../Serializable';
+import {UhkBuffer} from '../../UhkBuffer';
 
 export enum MacroActionId {
     PressKeyMacroAction              =  0,

src/config-serializer/config-items/macro-action/MacroActions.ts

@@ -1,5 +1,5 @@
-import {ClassArray} from '../ClassArray';
-import {UhkBuffer} from '../UhkBuffer';
+import {ClassArray} from '../../ClassArray';
+import {UhkBuffer} from '../../UhkBuffer';
 import {DelayMacroAction} from './DelayMacroAction';
 import {HoldKeyMacroAction} from './HoldKeyMacroAction';
 import {HoldModifiersMacroAction} from './HoldModifiersMacroAction';

src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertInt16} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertInt16} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId,  macroActionType} from './MacroAction';
 
 export class MoveMouseMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/PressKeyMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class PressKeyMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/PressModifiersMacroAction.ts

@@ -1,6 +1,6 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
-import {KeyModifiers} from './KeyModifiers';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
+import {KeyModifiers} from '../KeyModifiers';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class PressModifiersMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/PressMouseButtonsMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class PressMouseButtonsMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/ReleaseKeyMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ReleaseKeyMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/ReleaseModifiersMacroAction.ts

@@ -1,6 +1,6 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
-import {KeyModifiers} from './KeyModifiers';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
+import {KeyModifiers} from '../KeyModifiers';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ReleaseModifiersMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/ReleaseMouseButtonsMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertUInt8} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertUInt8} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ReleaseMouseButtonsMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts

@@ -1,5 +1,5 @@
-import {assertInt16} from '../assert';
-import {UhkBuffer} from '../UhkBuffer';
+import {assertInt16} from '../../assert';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class ScrollMouseMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/TextMacroAction.ts

@@ -1,4 +1,4 @@
-import {UhkBuffer} from '../UhkBuffer';
+import {UhkBuffer} from '../../UhkBuffer';
 import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
 
 export class TextMacroAction extends MacroAction {

src/config-serializer/config-items/macro-action/index.ts

@@ -0,0 +1,15 @@
+export * from './DelayMacroAction';
+export * from './HoldKeyMacroAction';
+export * from './HoldModifiersMacroAction';
+export * from './HoldMouseButtonsMacroAction';
+export * from './MacroAction';
+export * from './MacroActions';
+export * from './MoveMouseMacroAction';
+export * from './PressKeyMacroAction';
+export * from './PressModifiersMacroAction';
+export * from './PressMouseButtonsMacroAction';
+export * from './ReleaseKeyMacroAction';
+export * from './ReleaseModifiersMacroAction';
+export * from './ReleaseMouseButtonsMacroAction';
+export * from './ScrollMouseMacroAction';
+export * from './TextMacroAction';