diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index 82aa0224..316809e2 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -6,7 +6,7 @@
 import { assert } from 'chai';
 import { ITerminal } from './Types';
 import { Buffer } from './Buffer';
-import { CircularList } from './utils/CircularList';
+import { CircularList } from './common/CircularList';
 import { MockTerminal } from './utils/TestUtils.test';
 
 const INIT_COLS = 80;
diff --git a/src/Buffer.ts b/src/Buffer.ts
index f60672aa..7dc2cc7b 100644
--- a/src/Buffer.ts
+++ b/src/Buffer.ts
@@ -3,7 +3,7 @@
  * @license MIT
  */
 
-import { CircularList } from './utils/CircularList';
+import { CircularList } from './common/CircularList';
 import { LineData, CharData, ITerminal, IBuffer } from './Types';
 import { EventEmitter } from './EventEmitter';
 import { IMarker } from 'xterm';
diff --git a/src/Linkifier.test.ts b/src/Linkifier.test.ts
index 54e7e88d..7f4d5603 100644
--- a/src/Linkifier.test.ts
+++ b/src/Linkifier.test.ts
@@ -8,7 +8,7 @@ import { IMouseZoneManager, IMouseZone } from './ui/Types';
 import { ILinkMatcher, LineData, ITerminal } from './Types';
 import { Linkifier } from './Linkifier';
 import { MockBuffer, MockTerminal } from './utils/TestUtils.test';
-import { CircularList } from './utils/CircularList';
+import { CircularList } from './common/CircularList';
 
 class TestLinkifier extends Linkifier {
   constructor(terminal: ITerminal) {
diff --git a/src/utils/CircularList.test.ts b/src/common/CircularList.test.ts
similarity index 100%
rename from src/utils/CircularList.test.ts
rename to src/common/CircularList.test.ts
diff --git a/src/utils/CircularList.ts b/src/common/CircularList.ts
similarity index 100%
rename from src/utils/CircularList.ts
rename to src/common/CircularList.ts