diff --git a/data_plane/src/query_engines/mod.rs b/data_plane/src/query_engines/mod.rs
index f1d9f70e7..a0b6dd746 100644
--- a/data_plane/src/query_engines/mod.rs
+++ b/data_plane/src/query_engines/mod.rs
@@ -23,8 +23,15 @@ pub mod no_data_archive;
 pub mod query_result;
 pub mod routing;
 pub mod thanos_query_engine;
-pub mod timeline_dispatch;
-pub mod window_merger;
+
+// Post-M2.3 reorg: timeline_dispatch + window_merger are warm-tier driver
+// primitives (they reason about reconfigure boundaries that only exist
+// inside a SketchStore). They moved into `sketch_db::query`. The
+// orchestration layer consumes them through the canonical path; these
+// aliases keep legacy `query_engines::timeline_dispatch::*` callers
+// compiling.
+pub use crate::storage_engines::sketch_db::query::timeline_dispatch;
+pub use crate::storage_engines::sketch_db::query::window_merger;
 
 pub use asap_query_engine::ASAPQueryEngine;
 pub use no_data_archive::{NoDataArchiveEngine, DATA_SOURCE_ID_NO_DATA_ARCHIVE};
diff --git a/data_plane/src/storage_engines/sketch_db/query/mod.rs b/data_plane/src/storage_engines/sketch_db/query/mod.rs
index 9f9a77c97..75278e8a2 100644
--- a/data_plane/src/storage_engines/sketch_db/query/mod.rs
+++ b/data_plane/src/storage_engines/sketch_db/query/mod.rs
@@ -68,6 +68,8 @@
 pub mod decoders;
 pub mod delta_apply;
 pub mod sketch_reducer;
+pub mod timeline_dispatch;
+pub mod window_merger;
 
 #[cfg(test)]
 pub mod tests;
diff --git a/data_plane/src/query_engines/timeline_dispatch.rs b/data_plane/src/storage_engines/sketch_db/query/timeline_dispatch.rs
similarity index 100%
rename from data_plane/src/query_engines/timeline_dispatch.rs
rename to data_plane/src/storage_engines/sketch_db/query/timeline_dispatch.rs
diff --git a/data_plane/src/query_engines/window_merger.rs b/data_plane/src/storage_engines/sketch_db/query/window_merger.rs
similarity index 100%
rename from data_plane/src/query_engines/window_merger.rs
rename to data_plane/src/storage_engines/sketch_db/query/window_merger.rs