diff --git a/src/controller/abr-controller.js b/src/controller/abr-controller.js
index fcb33907429..152c653e22f 100644
--- a/src/controller/abr-controller.js
+++ b/src/controller/abr-controller.js
@@ -6,7 +6,7 @@
 
 import Event from '../events';
 import EventHandler from '../event-handler';
-import { BufferHelper } from './buffer-helper';
+import { BufferHelper } from '../utils/buffer-helper';
 import { ErrorDetails } from '../errors';
 import { logger } from '../utils/logger';
 import EwmaBandWidthEstimator from '../utils/ewma-bandwidth-estimator';
diff --git a/src/controller/audio-stream-controller.js b/src/controller/audio-stream-controller.js
index 1e88253ba9e..6b44a58094b 100644
--- a/src/controller/audio-stream-controller.js
+++ b/src/controller/audio-stream-controller.js
@@ -3,7 +3,7 @@
 */
 
 import BinarySearch from '../utils/binary-search';
-import { BufferHelper } from './buffer-helper';
+import { BufferHelper } from '../utils/buffer-helper';
 import Demuxer from '../demux/demuxer';
 import Event from '../events';
 import * as LevelHelper from './level-helper';
diff --git a/src/controller/stream-controller.js b/src/controller/stream-controller.js
index 532055ffe9a..8369785fa96 100644
--- a/src/controller/stream-controller.js
+++ b/src/controller/stream-controller.js
@@ -3,7 +3,7 @@
 */
 
 import BinarySearch from '../utils/binary-search';
-import { BufferHelper } from './buffer-helper';
+import { BufferHelper } from '../utils/buffer-helper';
 import Demuxer from '../demux/demuxer';
 import Event from '../events';
 import { FragmentState } from './fragment-tracker';
diff --git a/src/controller/buffer-helper.js b/src/utils/buffer-helper.js
similarity index 100%
rename from src/controller/buffer-helper.js
rename to src/utils/buffer-helper.js
diff --git a/tests/unit/controller/buffer-helper.js b/tests/unit/utils/buffer-helper.js
similarity index 100%
rename from tests/unit/controller/buffer-helper.js
rename to tests/unit/utils/buffer-helper.js