diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 84276b5b..39ad6d06 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -5,12 +5,13 @@
  */
 
 import { CharData, IInputHandler, IDcsHandler, IEscapeSequenceParser, IBuffer } from './Types';
-import { C0, C1 } from './EscapeSequences';
+import { C0, C1 } from './base/data/EscapeSequences';
 import { CHARSETS, DEFAULT_CHARSET } from './core/data/Charsets';
 import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CODE_INDEX, DEFAULT_ATTR } from './Buffer';
 import { FLAGS } from './renderer/Types';
 import { wcwidth } from './CharWidth';
 import { EscapeSequenceParser } from './EscapeSequenceParser';
+import { ICharset } from './core/Types';
 
 /**
  * Map collect to glevel. Used in `selectCharset`.
diff --git a/src/Parser.ts b/src/Parser.ts
index 3675e1f0..f0ce93dc 100644
--- a/src/Parser.ts
+++ b/src/Parser.ts
@@ -4,7 +4,7 @@
  * @license MIT
  */
 
-import { C0 } from './EscapeSequences';
+import { C0 } from './base/data/EscapeSequences';
 import { IInputHandler, IInputHandlingTerminal } from './Types';
 import { CHARSETS, DEFAULT_CHARSET } from './core/data/Charsets';
 
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 02e7c3ed..bbbdad7f 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -21,7 +21,7 @@
  *   http://linux.die.net/man/7/urxvt
  */
 
-import { ICharset, IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions, ITerminal, IBrowser, ILinkifier, ILinkMatcherOptions, CustomKeyEventHandler, LinkMatcherHandler, CharData, LineData } from './Types';
+import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions, ITerminal, IBrowser, ILinkifier, ILinkMatcherOptions, CustomKeyEventHandler, LinkMatcherHandler, CharData, LineData } from './Types';
 import { IMouseZoneManager } from './input/Types';
 import { IRenderer } from './renderer/Types';
 import { BufferSet } from './BufferSet';
@@ -30,7 +30,7 @@ import { CompositionHelper } from './CompositionHelper';
 import { EventEmitter } from './EventEmitter';
 import { Viewport } from './Viewport';
 import { rightClickHandler, moveTextAreaUnderMouseCursor, pasteHandler, copyHandler } from './handlers/Clipboard';
-import { C0 } from './EscapeSequences';
+import { C0 } from './base/data/EscapeSequences';
 import { InputHandler } from './InputHandler';
 // import { Parser } from './Parser';
 import { Renderer } from './renderer/Renderer';
@@ -52,7 +52,7 @@ import { removeTerminalFromCache } from './renderer/atlas/CharAtlasCache';
 import { DomRenderer } from './renderer/dom/DomRenderer';
 import { IKeyboardEvent } from './base/Types';
 import { evaluateKeyboardEvent } from './core/input/Keyboard';
-import { KeyboardResultType } from './core/Types';
+import { KeyboardResultType, ICharset } from './core/Types';
 
 // Let it work inside Node.js for automated testing purposes.
 const document = (typeof window !== 'undefined') ? window.document : null;
diff --git a/src/EscapeSequences.ts b/src/base/data/EscapeSequences.ts
similarity index 100%
rename from src/EscapeSequences.ts
rename to src/base/data/EscapeSequences.ts
diff --git a/src/core/input/Keyboard.ts b/src/core/input/Keyboard.ts
index f4393276..a6482311 100644
--- a/src/core/input/Keyboard.ts
+++ b/src/core/input/Keyboard.ts
@@ -6,7 +6,7 @@
 
 import { IKeyboardEvent } from '../../base/Types';
 import { IKeyboardResult, KeyboardResultType } from '../Types';
-import { C0 } from '../../EscapeSequences';
+import { C0 } from '../../base/data/EscapeSequences';
 
 // reg + shift key mappings for digits and special chars
 const KEYCODE_KEY_MAPPINGS: { [key: number]: [string, string]} = {
diff --git a/src/handlers/AltClickHandler.ts b/src/handlers/AltClickHandler.ts
index 8f1cf2df..b6cb0da1 100644
--- a/src/handlers/AltClickHandler.ts
+++ b/src/handlers/AltClickHandler.ts
@@ -4,7 +4,7 @@
  */
 
 import { ITerminal, ICircularList, LineData } from '../Types';
-import { C0 } from '../EscapeSequences';
+import { C0 } from '../base/data/EscapeSequences';
 
 const enum Direction {
   UP = 'A',