diff --git a/src/Terminal.ts b/src/Terminal.ts
index f6e38594..0ea8a335 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -52,8 +52,8 @@ import { Attributes, DEFAULT_ATTR_DATA } from 'core/buffer/BufferLine';
 import { applyWindowsMode } from './WindowsMode';
 import { ColorManager } from 'ui/ColorManager';
 import { RenderCoordinator } from './renderer/RenderCoordinator';
-import { IOptionsService } from 'common/options/Types';
-import { OptionsService } from 'common/options/OptionsService';
+import { IOptionsService } from 'common/services/Services';
+import { OptionsService } from 'common/services/OptionsService';
 import { ICharSizeService } from 'ui/services/Services';
 import { CharSizeService } from 'ui/services/CharSizeService';
 
diff --git a/src/TestUtils.test.ts b/src/TestUtils.test.ts
index 06da0ac1..05e7fa61 100644
--- a/src/TestUtils.test.ts
+++ b/src/TestUtils.test.ts
@@ -13,7 +13,7 @@ import { IDisposable, IMarker, IEvent, ISelectionPosition } from 'xterm';
 import { Terminal } from './Terminal';
 import { AttributeData } from 'core/buffer/BufferLine';
 import { IColorManager, IColorSet } from 'ui/Types';
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 import { ICharSizeService } from 'ui/services/Services';
 
 export class TestTerminal extends Terminal {
diff --git a/src/Types.ts b/src/Types.ts
index 2225ef3f..3eca3ac4 100644
--- a/src/Types.ts
+++ b/src/Types.ts
@@ -8,7 +8,7 @@ import { ICharset, IAttributeData, ICellData, IBufferLine, CharData } from 'core
 import { ICircularList } from 'common/Types';
 import { IEvent } from 'common/EventEmitter2';
 import { IColorSet } from 'ui/Types';
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 
 export type CustomKeyEventHandler = (event: KeyboardEvent) => boolean;
 
diff --git a/src/common/options/OptionsService.ts b/src/common/services/OptionsService.ts
similarity index 99%
rename from src/common/options/OptionsService.ts
rename to src/common/services/OptionsService.ts
index 3523198c..0fce405d 100644
--- a/src/common/options/OptionsService.ts
+++ b/src/common/services/OptionsService.ts
@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/options/Types';
+import { IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/services/Services';
 import { EventEmitter2, IEvent } from 'common/EventEmitter2';
 import { isMac } from 'common/Platform';
 import { clone } from 'common/Clone';
diff --git a/src/common/options/Types.ts b/src/common/services/Services.d.ts
similarity index 99%
rename from src/common/options/Types.ts
rename to src/common/services/Services.d.ts
index 5c5c3323..651e8636 100644
--- a/src/common/options/Types.ts
+++ b/src/common/services/Services.d.ts
@@ -6,10 +6,10 @@
 import { IEvent } from 'common/EventEmitter2';
 
 export interface IOptionsService {
-  readonly onOptionChange: IEvent<string>;
-  // TODO: as const?
   readonly options: ITerminalOptions;
 
+  readonly onOptionChange: IEvent<string>;
+
   setOption<T>(key: string, value: T): void;
   getOption<T>(key: string): T | undefined;
 }
diff --git a/src/renderer/RenderCoordinator.ts b/src/renderer/RenderCoordinator.ts
index 9136b063..dc6e0694 100644
--- a/src/renderer/RenderCoordinator.ts
+++ b/src/renderer/RenderCoordinator.ts
@@ -11,7 +11,7 @@ import { ScreenDprMonitor } from 'ui/ScreenDprMonitor';
 import { addDisposableDomListener } from 'ui/Lifecycle';
 import { IColorSet } from 'ui/Types';
 import { CharacterJoinerHandler } from '../Types';
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 import { ICharSizeService } from 'ui/services/Services';
 
 export class RenderCoordinator extends Disposable {
diff --git a/src/ui/services/CharSizeService.ts b/src/ui/services/CharSizeService.ts
index 4a297fe7..61405909 100644
--- a/src/ui/services/CharSizeService.ts
+++ b/src/ui/services/CharSizeService.ts
@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { IOptionsService } from 'common/options/Types';
+import { IOptionsService } from 'common/services/Services';
 import { IEvent, EventEmitter2 } from 'common/EventEmitter2';
 import { ICharSizeService } from 'ui/services/Services';