diff --git a/test_bluesky.py b/test_bluesky.py
index c378e66..e3c4217 100644
--- a/test_bluesky.py
+++ b/test_bluesky.py
@@ -12,21 +12,17 @@
 from bluesky.run_engine import RunEngine, RunEngineResult
 from genie_python import genie as g  # type: ignore
 from ibex_bluesky_core.callbacks import ISISCallbacks
-from ibex_bluesky_core.callbacks.fitting.fitting_utils import Linear
 from ibex_bluesky_core.devices.block import block_r, block_rw_rbv
-from ibex_bluesky_core.devices.simpledae import SimpleDae
-from ibex_bluesky_core.devices.simpledae.controllers import (
-    PeriodPerPointController,
-    RunPerPointController,
-)
-from ibex_bluesky_core.devices.simpledae.reducers import (
+from ibex_bluesky_core.devices.simpledae import (
     GoodFramesNormalizer,
-    PeriodGoodFramesNormalizer,
-)
-from ibex_bluesky_core.devices.simpledae.waiters import (
     GoodFramesWaiter,
+    PeriodGoodFramesNormalizer,
     PeriodGoodFramesWaiter,
+    PeriodPerPointController,
+    RunPerPointController,
+    SimpleDae,
 )
+from ibex_bluesky_core.fitting import Linear
 from ibex_bluesky_core.log import set_bluesky_log_levels
 from ibex_bluesky_core.run_engine import get_run_engine
 from ibex_bluesky_core.utils import get_pv_prefix