diff --git a/src/SelectionManager.test.ts b/src/SelectionManager.test.ts
index f81cdcbe..d60e9d0f 100644
--- a/src/SelectionManager.test.ts
+++ b/src/SelectionManager.test.ts
@@ -6,7 +6,7 @@
 import { assert } from 'chai';
 import { SelectionManager, SelectionMode } from './SelectionManager';
 import { SelectionModel } from './SelectionModel';
-import { BufferSet } from './BufferSet';
+import { BufferSet } from './common/buffer/BufferSet';
 import { ITerminal } from './Types';
 import { IBuffer } from 'common/buffer/Types';
 import { IBufferLine } from 'common/Types';
diff --git a/src/SelectionModel.test.ts b/src/SelectionModel.test.ts
index 479e20d3..7831cbb1 100644
--- a/src/SelectionModel.test.ts
+++ b/src/SelectionModel.test.ts
@@ -6,7 +6,7 @@
 import { assert } from 'chai';
 import { ITerminal } from './Types';
 import { SelectionModel } from './SelectionModel';
-import { BufferSet } from './BufferSet';
+import { BufferSet } from './common/buffer/BufferSet';
 import { MockTerminal } from './TestUtils.test';
 import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
 import { IBufferService } from 'common/services/Services';
diff --git a/src/Terminal.ts b/src/Terminal.ts
index a15c9229..a53b65e7 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -23,7 +23,7 @@
 
 import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions, ITerminal, IBrowser, ILinkifier, ILinkMatcherOptions, CustomKeyEventHandler, LinkMatcherHandler, CharacterJoinerHandler, IMouseZoneManager } from './Types';
 import { IRenderer } from './renderer/Types';
-import { BufferSet } from './BufferSet';
+import { BufferSet } from './common/buffer/BufferSet';
 import { Buffer } from './common/buffer/Buffer';
 import { CompositionHelper } from './CompositionHelper';
 import { EventEmitter } from 'common/EventEmitter';
diff --git a/src/BufferSet.test.ts b/src/common/buffer/BufferSet.test.ts
similarity index 95%
rename from src/BufferSet.test.ts
rename to src/common/buffer/BufferSet.test.ts
index 9dab0f7a..894ebb20 100644
--- a/src/BufferSet.test.ts
+++ b/src/common/buffer/BufferSet.test.ts
@@ -4,8 +4,8 @@
  */
 
 import { assert } from 'chai';
-import { BufferSet } from './BufferSet';
-import { Buffer } from './common/buffer/Buffer';
+import { BufferSet } from 'common/buffer/BufferSet';
+import { Buffer } from 'common/buffer/Buffer';
 import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
 
 describe('BufferSet', () => {
diff --git a/src/BufferSet.ts b/src/common/buffer/BufferSet.ts
similarity index 100%
rename from src/BufferSet.ts
rename to src/common/buffer/BufferSet.ts