diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index dbf6dfb2..84276b5b 100644
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -4,9 +4,9 @@
  * @license MIT
  */
 
-import { CharData, IInputHandler, IDcsHandler, IEscapeSequenceParser, IBuffer, ICharset } from './Types';
+import { CharData, IInputHandler, IDcsHandler, IEscapeSequenceParser, IBuffer } from './Types';
 import { C0, C1 } from './EscapeSequences';
-import { CHARSETS, DEFAULT_CHARSET } from './Charsets';
+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';
diff --git a/src/Parser.ts b/src/Parser.ts
index 519b9609..3675e1f0 100644
--- a/src/Parser.ts
+++ b/src/Parser.ts
@@ -6,7 +6,7 @@
 
 import { C0 } from './EscapeSequences';
 import { IInputHandler, IInputHandlingTerminal } from './Types';
-import { CHARSETS, DEFAULT_CHARSET } from './Charsets';
+import { CHARSETS, DEFAULT_CHARSET } from './core/data/Charsets';
 
 const normalStateHandler: {[key: string]: (parser: Parser, handler: IInputHandler) => void} = {};
 normalStateHandler[C0.BEL] = (parser, handler) => handler.bell();
diff --git a/src/Types.ts b/src/Types.ts
index 96eec3c4..1de223f7 100644
--- a/src/Types.ts
+++ b/src/Types.ts
@@ -6,6 +6,7 @@
 import { Terminal as PublicTerminal, ITerminalOptions as IPublicTerminalOptions, IEventEmitter } from 'xterm';
 import { IColorSet, IRenderer } from './renderer/Types';
 import { IMouseZoneManager } from './input/Types';
+import { ICharset } from './core/Types';
 
 export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;
 
@@ -191,10 +192,6 @@ export interface ILinkMatcher {
   willLinkActivate?: (event: MouseEvent, uri: string) => boolean;
 }
 
-export interface ICharset {
-  [key: string]: string;
-}
-
 export interface ILinkHoverEvent {
   x1: number;
   y1: number;
diff --git a/src/core/Types.ts b/src/core/Types.ts
index cc5c0d1b..4001e448 100644
--- a/src/core/Types.ts
+++ b/src/core/Types.ts
@@ -15,3 +15,7 @@ export interface IKeyboardResult {
   cancel: boolean;
   key: string | undefined;
 }
+
+export interface ICharset {
+  [key: string]: string;
+}
diff --git a/src/Charsets.ts b/src/core/data/Charsets.ts
similarity index 99%
rename from src/Charsets.ts
rename to src/core/data/Charsets.ts
index fe0112ec..b49ee77f 100644
--- a/src/Charsets.ts
+++ b/src/core/data/Charsets.ts
@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { ICharset } from './Types';
+import { ICharset } from '../Types';
 
 /**
  * The character sets supported by the terminal. These enable several languages
diff --git a/src/public/Terminal.ts b/src/public/Terminal.ts
index 0d491a69..f137131b 100644
--- a/src/public/Terminal.ts
+++ b/src/public/Terminal.ts
@@ -1,3 +1,8 @@
+/**
+ * Copyright (c) 2018 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
 import { Terminal as ITerminalApi, ITerminalOptions, IMarker, IDisposable, ILinkMatcherOptions, ITheme } from 'xterm';
 import { ITerminal } from '../Types';
 import { Terminal as TerminalCore } from '../Terminal';