diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index 39ad6d06..9df24c7d 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -5,7 +5,7 @@
  */
 
 import { CharData, IInputHandler, IDcsHandler, IEscapeSequenceParser, IBuffer } from './Types';
-import { C0, C1 } from './base/data/EscapeSequences';
+import { C0, C1 } from './common/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';
diff --git a/src/Parser.ts b/src/Parser.ts
index f0ce93dc..4086de19 100644
--- a/src/Parser.ts
+++ b/src/Parser.ts
@@ -4,7 +4,7 @@
  * @license MIT
  */
 
-import { C0 } from './base/data/EscapeSequences';
+import { C0 } from './common/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 bbbdad7f..cd3f886d 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -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 './base/data/EscapeSequences';
+import { C0 } from './common/data/EscapeSequences';
 import { InputHandler } from './InputHandler';
 // import { Parser } from './Parser';
 import { Renderer } from './renderer/Renderer';
@@ -50,7 +50,7 @@ import { ScreenDprMonitor } from './utils/ScreenDprMonitor';
 import { ITheme, ILocalizableStrings, IMarker, IDisposable } from 'xterm';
 import { removeTerminalFromCache } from './renderer/atlas/CharAtlasCache';
 import { DomRenderer } from './renderer/dom/DomRenderer';
-import { IKeyboardEvent } from './base/Types';
+import { IKeyboardEvent } from './common/Types';
 import { evaluateKeyboardEvent } from './core/input/Keyboard';
 import { KeyboardResultType, ICharset } from './core/Types';
 
diff --git a/src/base/Types.ts b/src/common/Types.ts
similarity index 100%
rename from src/base/Types.ts
rename to src/common/Types.ts
diff --git a/src/base/data/EscapeSequences.ts b/src/common/data/EscapeSequences.ts
similarity index 100%
rename from src/base/data/EscapeSequences.ts
rename to src/common/data/EscapeSequences.ts
diff --git a/src/core/input/Keyboard.ts b/src/core/input/Keyboard.ts
index a6482311..cf290275 100644
--- a/src/core/input/Keyboard.ts
+++ b/src/core/input/Keyboard.ts
@@ -4,9 +4,9 @@
  * @license MIT
  */
 
-import { IKeyboardEvent } from '../../base/Types';
+import { IKeyboardEvent } from '../../common/Types';
 import { IKeyboardResult, KeyboardResultType } from '../Types';
-import { C0 } from '../../base/data/EscapeSequences';
+import { C0 } from '../../common/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 b6cb0da1..344a5543 100644
--- a/src/handlers/AltClickHandler.ts
+++ b/src/handlers/AltClickHandler.ts
@@ -4,7 +4,7 @@
  */
 
 import { ITerminal, ICircularList, LineData } from '../Types';
-import { C0 } from '../base/data/EscapeSequences';
+import { C0 } from '../common/data/EscapeSequences';
 
 const enum Direction {
   UP = 'A',