diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts
index 8e89ea3f..d7afad70 100644
--- a/src/SelectionManager.test.ts
+++ b/src/SelectionManager.test.ts
@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import { CharMeasure } from './utils/CharMeasure';
+import { CharMeasure } from './ui/CharMeasure';
 import { SelectionManager } from './SelectionManager';
 import { SelectionModel } from './SelectionModel';
 import { BufferSet } from './BufferSet';
diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
index 2632b6bb..6521a209 100644
--- a/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@ -6,7 +6,7 @@
 import { ITerminal, ISelectionManager, IBuffer, CharData, XtermListener } from './Types';
 import { MouseHelper } from './utils/MouseHelper';
 import * as Browser from './shared/utils/Browser';
-import { CharMeasure } from './utils/CharMeasure';
+import { CharMeasure } from './ui/CharMeasure';
 import { EventEmitter } from './EventEmitter';
 import { SelectionModel } from './SelectionModel';
 import { CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CHAR_INDEX } from './Buffer';
diff --git a/src/Terminal.ts b/src/Terminal.ts
index fb175ad0..21731b95 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -36,7 +36,7 @@ import { InputHandler } from './InputHandler';
 import { Renderer } from './renderer/Renderer';
 import { Linkifier } from './Linkifier';
 import { SelectionManager } from './SelectionManager';
-import { CharMeasure } from './utils/CharMeasure';
+import { CharMeasure } from './ui/CharMeasure';
 import * as Browser from './shared/utils/Browser';
 import { addDisposableDomListener } from './ui/Lifecycle';
 import * as Strings from './Strings';
diff --git a/src/Viewport.ts b/src/Viewport.ts
index 645d89b6..a8966d14 100644
--- a/src/Viewport.ts
+++ b/src/Viewport.ts
@@ -5,7 +5,7 @@
 
 import { IColorSet } from './renderer/Types';
 import { ITerminal, IViewport } from './Types';
-import { CharMeasure } from './utils/CharMeasure';
+import { CharMeasure } from './ui/CharMeasure';
 import { Disposable } from './common/Lifecycle';
 import { addDisposableDomListener } from './ui/Lifecycle';
 
diff --git a/src/utils/CharMeasure.test.ts b/src/ui/CharMeasure.test.ts
similarity index 100%
rename from src/utils/CharMeasure.test.ts
rename to src/ui/CharMeasure.test.ts
diff --git a/src/utils/CharMeasure.ts b/src/ui/CharMeasure.ts
similarity index 100%
rename from src/utils/CharMeasure.ts
rename to src/ui/CharMeasure.ts