Move OptionsService into services folder

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';

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;
 }