diff --git a/crates/brk_computer/src/internal/multi/from_height/by_unit/mod.rs b/crates/brk_computer/src/internal/from_height/by_unit/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/by_unit/mod.rs
rename to crates/brk_computer/src/internal/from_height/by_unit/mod.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/by_unit/rolling_full.rs b/crates/brk_computer/src/internal/from_height/by_unit/rolling_full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/by_unit/rolling_full.rs
rename to crates/brk_computer/src/internal/from_height/by_unit/rolling_full.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/by_unit/rolling_sum.rs b/crates/brk_computer/src/internal/from_height/by_unit/rolling_sum.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/by_unit/rolling_sum.rs
rename to crates/brk_computer/src/internal/from_height/by_unit/rolling_sum.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/by_unit/windows.rs b/crates/brk_computer/src/internal/from_height/by_unit/windows.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/by_unit/windows.rs
rename to crates/brk_computer/src/internal/from_height/by_unit/windows.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/constant.rs b/crates/brk_computer/src/internal/from_height/constant.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/constant.rs
rename to crates/brk_computer/src/internal/from_height/constant.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/cumulative.rs b/crates/brk_computer/src/internal/from_height/cumulative.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/cumulative.rs
rename to crates/brk_computer/src/internal/from_height/cumulative.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/cumulative_rolling_full.rs b/crates/brk_computer/src/internal/from_height/cumulative_full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/cumulative_rolling_full.rs
rename to crates/brk_computer/src/internal/from_height/cumulative_full.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/cumulative_rolling_sum.rs b/crates/brk_computer/src/internal/from_height/cumulative_sum.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/cumulative_rolling_sum.rs
rename to crates/brk_computer/src/internal/from_height/cumulative_sum.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/distribution.rs b/crates/brk_computer/src/internal/from_height/distribution.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/distribution.rs
rename to crates/brk_computer/src/internal/from_height/distribution.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/full.rs b/crates/brk_computer/src/internal/from_height/full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/full.rs
rename to crates/brk_computer/src/internal/from_height/full.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/last.rs b/crates/brk_computer/src/internal/from_height/last.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/last.rs
rename to crates/brk_computer/src/internal/from_height/last.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/lazy_computed_full.rs b/crates/brk_computer/src/internal/from_height/lazy_computed_full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/lazy_computed_full.rs
rename to crates/brk_computer/src/internal/from_height/lazy_computed_full.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_lazy_computed_cumulative.rs b/crates/brk_computer/src/internal/from_height/lazy_computed_value_cumulative.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/value_lazy_computed_cumulative.rs
rename to crates/brk_computer/src/internal/from_height/lazy_computed_value_cumulative.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/lazy_last.rs b/crates/brk_computer/src/internal/from_height/lazy_last.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/lazy_last.rs
rename to crates/brk_computer/src/internal/from_height/lazy_last.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_lazy_last.rs b/crates/brk_computer/src/internal/from_height/lazy_value_last.rs
similarity index 83%
rename from crates/brk_computer/src/internal/multi/from_height/value_lazy_last.rs
rename to crates/brk_computer/src/internal/from_height/lazy_value_last.rs
index 287ff598f..86af294d5 100644
--- a/crates/brk_computer/src/internal/multi/from_height/value_lazy_last.rs
+++ b/crates/brk_computer/src/internal/from_height/lazy_value_last.rs
@@ -5,7 +5,7 @@ use brk_types::{Bitcoin, Dollars, Sats, Version};
 use derive_more::{Deref, DerefMut};
 use vecdb::UnaryTransform;
 
-use crate::internal::{LazyValueHeight, LazyValueHeightDerivedLast, ValueFromHeightLast};
+use crate::internal::{LazyValueFromHeight, LazyValueHeightDerivedLast, ValueFromHeightLast};
 
 const VERSION: Version = Version::ZERO;
 
@@ -14,7 +14,7 @@ const VERSION: Version = Version::ZERO;
 #[traversable(merge)]
 pub struct LazyValueFromHeightLast {
     #[traversable(flatten)]
-    pub height: LazyValueHeight,
+    pub height: LazyValueFromHeight,
     #[deref]
     #[deref_mut]
     #[traversable(flatten)]
@@ -35,7 +35,7 @@ impl LazyValueFromHeightLast {
         let v = version + VERSION;
 
         let height =
-            LazyValueHeight::from_block_source::<SatsTransform, BitcoinTransform, DollarsTransform>(name, source, v);
+            LazyValueFromHeight::from_block_source::<SatsTransform, BitcoinTransform, DollarsTransform>(name, source, v);
 
         let rest =
             LazyValueHeightDerivedLast::from_block_source::<SatsTransform, BitcoinTransform, DollarsTransform>(
diff --git a/crates/brk_computer/src/internal/multi/from_height/mod.rs b/crates/brk_computer/src/internal/from_height/mod.rs
similarity index 74%
rename from crates/brk_computer/src/internal/multi/from_height/mod.rs
rename to crates/brk_computer/src/internal/from_height/mod.rs
index 96d904563..81b395438 100644
--- a/crates/brk_computer/src/internal/multi/from_height/mod.rs
+++ b/crates/brk_computer/src/internal/from_height/mod.rs
@@ -1,13 +1,15 @@
 mod by_unit;
 mod constant;
 mod cumulative;
-mod cumulative_rolling_full;
-mod cumulative_rolling_sum;
+mod cumulative_full;
+mod cumulative_sum;
 mod distribution;
 mod full;
 mod last;
 mod lazy_computed_full;
+mod lazy_computed_value_cumulative;
 mod lazy_last;
+mod lazy_value_last;
 mod percentiles;
 mod price;
 mod ratio;
@@ -18,20 +20,20 @@ mod value_ema;
 mod value_full;
 mod value_last;
 mod value_last_rolling;
-mod value_lazy_computed_cumulative;
-mod value_lazy_last;
 mod value_sum_cumulative;
 
 pub use by_unit::*;
 pub use constant::*;
 pub use cumulative::*;
-pub use cumulative_rolling_full::*;
-pub use cumulative_rolling_sum::*;
+pub use cumulative_full::*;
+pub use cumulative_sum::*;
 pub use distribution::*;
 pub use full::*;
 pub use last::*;
 pub use lazy_computed_full::*;
+pub use lazy_computed_value_cumulative::*;
 pub use lazy_last::*;
+pub use lazy_value_last::*;
 pub use percentiles::*;
 pub use price::*;
 pub use ratio::*;
@@ -42,6 +44,4 @@ pub use value_ema::*;
 pub use value_full::*;
 pub use value_last::*;
 pub use value_last_rolling::*;
-pub use value_lazy_computed_cumulative::*;
-pub use value_lazy_last::*;
 pub use value_sum_cumulative::*;
diff --git a/crates/brk_computer/src/internal/multi/from_height/percentiles/mod.rs b/crates/brk_computer/src/internal/from_height/percentiles.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/percentiles/mod.rs
rename to crates/brk_computer/src/internal/from_height/percentiles.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/price.rs b/crates/brk_computer/src/internal/from_height/price.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/price.rs
rename to crates/brk_computer/src/internal/from_height/price.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/ratio/extended.rs b/crates/brk_computer/src/internal/from_height/ratio/extended.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/ratio/extended.rs
rename to crates/brk_computer/src/internal/from_height/ratio/extended.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/ratio/extension.rs b/crates/brk_computer/src/internal/from_height/ratio/extension.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/ratio/extension.rs
rename to crates/brk_computer/src/internal/from_height/ratio/extension.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/ratio/mod.rs b/crates/brk_computer/src/internal/from_height/ratio/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/ratio/mod.rs
rename to crates/brk_computer/src/internal/from_height/ratio/mod.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/ratio/price_extended.rs b/crates/brk_computer/src/internal/from_height/ratio/price_extended.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/ratio/price_extended.rs
rename to crates/brk_computer/src/internal/from_height/ratio/price_extended.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/stddev/extended.rs b/crates/brk_computer/src/internal/from_height/stddev/extended.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/stddev/extended.rs
rename to crates/brk_computer/src/internal/from_height/stddev/extended.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/stddev/mod.rs b/crates/brk_computer/src/internal/from_height/stddev/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/stddev/mod.rs
rename to crates/brk_computer/src/internal/from_height/stddev/mod.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/stored_value_last.rs b/crates/brk_computer/src/internal/from_height/stored_value_last.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/stored_value_last.rs
rename to crates/brk_computer/src/internal/from_height/stored_value_last.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_change.rs b/crates/brk_computer/src/internal/from_height/value_change.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/value_change.rs
rename to crates/brk_computer/src/internal/from_height/value_change.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_ema.rs b/crates/brk_computer/src/internal/from_height/value_ema.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/value_ema.rs
rename to crates/brk_computer/src/internal/from_height/value_ema.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_full.rs b/crates/brk_computer/src/internal/from_height/value_full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/value_full.rs
rename to crates/brk_computer/src/internal/from_height/value_full.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_last.rs b/crates/brk_computer/src/internal/from_height/value_last.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/value_last.rs
rename to crates/brk_computer/src/internal/from_height/value_last.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_last_rolling.rs b/crates/brk_computer/src/internal/from_height/value_last_rolling.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/value_last_rolling.rs
rename to crates/brk_computer/src/internal/from_height/value_last_rolling.rs
diff --git a/crates/brk_computer/src/internal/multi/from_height/value_sum_cumulative.rs b/crates/brk_computer/src/internal/from_height/value_sum_cumulative.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_height/value_sum_cumulative.rs
rename to crates/brk_computer/src/internal/from_height/value_sum_cumulative.rs
diff --git a/crates/brk_computer/src/internal/multi/from_tx/distribution.rs b/crates/brk_computer/src/internal/from_tx/distribution.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_tx/distribution.rs
rename to crates/brk_computer/src/internal/from_tx/distribution.rs
diff --git a/crates/brk_computer/src/internal/multi/from_tx/lazy_distribution.rs b/crates/brk_computer/src/internal/from_tx/lazy_distribution.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_tx/lazy_distribution.rs
rename to crates/brk_computer/src/internal/from_tx/lazy_distribution.rs
diff --git a/crates/brk_computer/src/internal/multi/from_tx/mod.rs b/crates/brk_computer/src/internal/from_tx/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/from_tx/mod.rs
rename to crates/brk_computer/src/internal/from_tx/mod.rs
diff --git a/crates/brk_computer/src/internal/single/group/distribution.rs b/crates/brk_computer/src/internal/group/distribution.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/group/distribution.rs
rename to crates/brk_computer/src/internal/group/distribution.rs
diff --git a/crates/brk_computer/src/internal/single/group/full.rs b/crates/brk_computer/src/internal/group/full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/group/full.rs
rename to crates/brk_computer/src/internal/group/full.rs
diff --git a/crates/brk_computer/src/internal/single/group/mod.rs b/crates/brk_computer/src/internal/group/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/group/mod.rs
rename to crates/brk_computer/src/internal/group/mod.rs
diff --git a/crates/brk_computer/src/internal/single/group/sum_cumulative.rs b/crates/brk_computer/src/internal/group/sum_cumulative.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/group/sum_cumulative.rs
rename to crates/brk_computer/src/internal/group/sum_cumulative.rs
diff --git a/crates/brk_computer/src/internal/single/height/lazy_value.rs b/crates/brk_computer/src/internal/height/lazy_value.rs
similarity index 96%
rename from crates/brk_computer/src/internal/single/height/lazy_value.rs
rename to crates/brk_computer/src/internal/height/lazy_value.rs
index 1b10e030f..4002641a9 100644
--- a/crates/brk_computer/src/internal/single/height/lazy_value.rs
+++ b/crates/brk_computer/src/internal/height/lazy_value.rs
@@ -12,13 +12,13 @@ const VERSION: Version = Version::ZERO;
 ///
 /// All fields are lazy transforms from existing sources - no storage.
 #[derive(Clone, Traversable)]
-pub struct LazyValueHeight {
+pub struct LazyValueFromHeight {
     pub sats: LazyVecFrom1<Height, Sats, Height, Sats>,
     pub btc: LazyVecFrom1<Height, Bitcoin, Height, Sats>,
     pub usd: LazyVecFrom1<Height, Dollars, Height, Dollars>,
 }
 
-impl LazyValueHeight {
+impl LazyValueFromHeight {
     pub(crate) fn from_block_source<SatsTransform, BitcoinTransform, DollarsTransform>(
         name: &str,
         source: &ValueFromHeightLast,
diff --git a/crates/brk_computer/src/internal/single/height/mod.rs b/crates/brk_computer/src/internal/height/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/height/mod.rs
rename to crates/brk_computer/src/internal/height/mod.rs
diff --git a/crates/brk_computer/src/internal/single/height/value.rs b/crates/brk_computer/src/internal/height/value.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/height/value.rs
rename to crates/brk_computer/src/internal/height/value.rs
diff --git a/crates/brk_computer/src/internal/multi/height_derived/cumulative_full.rs b/crates/brk_computer/src/internal/height_derived/cumulative_full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/height_derived/cumulative_full.rs
rename to crates/brk_computer/src/internal/height_derived/cumulative_full.rs
diff --git a/crates/brk_computer/src/internal/multi/height_derived/last.rs b/crates/brk_computer/src/internal/height_derived/last.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/height_derived/last.rs
rename to crates/brk_computer/src/internal/height_derived/last.rs
diff --git a/crates/brk_computer/src/internal/multi/height_derived/lazy_last.rs b/crates/brk_computer/src/internal/height_derived/lazy_last.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/height_derived/lazy_last.rs
rename to crates/brk_computer/src/internal/height_derived/lazy_last.rs
diff --git a/crates/brk_computer/src/internal/multi/height_derived/value_lazy_last.rs b/crates/brk_computer/src/internal/height_derived/lazy_value_last.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/height_derived/value_lazy_last.rs
rename to crates/brk_computer/src/internal/height_derived/lazy_value_last.rs
diff --git a/crates/brk_computer/src/internal/multi/height_derived/mod.rs b/crates/brk_computer/src/internal/height_derived/mod.rs
similarity index 69%
rename from crates/brk_computer/src/internal/multi/height_derived/mod.rs
rename to crates/brk_computer/src/internal/height_derived/mod.rs
index 49a9212aa..6da4c3752 100644
--- a/crates/brk_computer/src/internal/multi/height_derived/mod.rs
+++ b/crates/brk_computer/src/internal/height_derived/mod.rs
@@ -1,9 +1,9 @@
 mod cumulative_full;
 mod last;
 mod lazy_last;
-mod value_lazy_last;
+mod lazy_value_last;
 
 pub use cumulative_full::*;
 pub use last::*;
 pub use lazy_last::*;
-pub use value_lazy_last::*;
+pub use lazy_value_last::*;
diff --git a/crates/brk_computer/src/internal/mod.rs b/crates/brk_computer/src/internal/mod.rs
index 8363a82e4..f0b0ff69a 100644
--- a/crates/brk_computer/src/internal/mod.rs
+++ b/crates/brk_computer/src/internal/mod.rs
@@ -1,22 +1,34 @@
 mod compute;
 mod distribution_stats;
 mod eager_indexes;
+mod from_height;
+mod from_tx;
+mod group;
+mod height;
+mod height_derived;
 mod indexes;
 mod lazy_eager_indexes;
-mod multi;
-mod single;
+mod rolling;
 pub(crate) mod sliding_window;
 mod traits;
 mod transform;
+mod tx_derived;
+mod vec;
 mod windows;
 
 pub(crate) use compute::*;
 pub(crate) use distribution_stats::*;
 pub(crate) use eager_indexes::*;
+pub(crate) use from_height::*;
+pub(crate) use from_tx::*;
+pub(crate) use group::*;
+pub(crate) use height::*;
+pub(crate) use height_derived::*;
 pub(crate) use indexes::*;
 pub(crate) use lazy_eager_indexes::*;
-pub(crate) use multi::*;
-pub(crate) use single::*;
+pub(crate) use rolling::*;
 pub(crate) use traits::*;
 pub use transform::*;
+pub(crate) use tx_derived::*;
+pub(crate) use vec::*;
 pub(crate) use windows::*;
diff --git a/crates/brk_computer/src/internal/multi/mod.rs b/crates/brk_computer/src/internal/multi/mod.rs
deleted file mode 100644
index ea221528b..000000000
--- a/crates/brk_computer/src/internal/multi/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! Multi-index composite types.
-
-mod from_height;
-mod from_tx;
-mod height_derived;
-mod tx_derived;
-
-pub use from_height::*;
-pub use from_tx::*;
-pub use height_derived::*;
-pub use tx_derived::*;
diff --git a/crates/brk_computer/src/internal/single/rolling/distribution.rs b/crates/brk_computer/src/internal/rolling/distribution.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/rolling/distribution.rs
rename to crates/brk_computer/src/internal/rolling/distribution.rs
diff --git a/crates/brk_computer/src/internal/single/rolling/full.rs b/crates/brk_computer/src/internal/rolling/full.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/rolling/full.rs
rename to crates/brk_computer/src/internal/rolling/full.rs
diff --git a/crates/brk_computer/src/internal/single/rolling/mod.rs b/crates/brk_computer/src/internal/rolling/mod.rs
similarity index 76%
rename from crates/brk_computer/src/internal/single/rolling/mod.rs
rename to crates/brk_computer/src/internal/rolling/mod.rs
index 39b7bcd6c..8e62a242c 100644
--- a/crates/brk_computer/src/internal/single/rolling/mod.rs
+++ b/crates/brk_computer/src/internal/rolling/mod.rs
@@ -1,10 +1,8 @@
-mod block_windows;
 mod distribution;
 mod full;
 mod value_windows;
 mod windows;
 
-pub use block_windows::*;
 pub use distribution::*;
 pub use full::*;
 pub use value_windows::*;
diff --git a/crates/brk_computer/src/internal/single/rolling/value_windows.rs b/crates/brk_computer/src/internal/rolling/value_windows.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/rolling/value_windows.rs
rename to crates/brk_computer/src/internal/rolling/value_windows.rs
diff --git a/crates/brk_computer/src/internal/single/rolling/windows.rs b/crates/brk_computer/src/internal/rolling/windows.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/rolling/windows.rs
rename to crates/brk_computer/src/internal/rolling/windows.rs
diff --git a/crates/brk_computer/src/internal/single/mod.rs b/crates/brk_computer/src/internal/single/mod.rs
deleted file mode 100644
index fff829c2c..000000000
--- a/crates/brk_computer/src/internal/single/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-//! Single-index types and primitives.
-
-mod group;
-mod height;
-mod rolling;
-mod vec;
-
-pub use group::*;
-pub use height::*;
-pub use rolling::*;
-pub use vec::*;
diff --git a/crates/brk_computer/src/internal/single/rolling/block_windows.rs b/crates/brk_computer/src/internal/single/rolling/block_windows.rs
deleted file mode 100644
index aceee90ed..000000000
--- a/crates/brk_computer/src/internal/single/rolling/block_windows.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-//! Block-count-based rolling distribution — 6-block window.
-
-use brk_error::Result;
-use brk_traversable::Traversable;
-use brk_types::Height;
-use schemars::JsonSchema;
-use vecdb::{Database, Rw, StorageMode, Version};
-
-use crate::internal::{ComputedVecValue, Distribution, NumericValue};
-
-/// Single 6-block rolling window distribution with 8 distribution stat vecs.
-#[derive(Traversable)]
-pub struct BlockRollingDistribution<T, M: StorageMode = Rw>
-where
-    T: ComputedVecValue + PartialOrd + JsonSchema,
-{
-    #[traversable(rename = "6b")]
-    pub _6b: Distribution<Height, T, M>,
-}
-
-impl<T> BlockRollingDistribution<T>
-where
-    T: NumericValue + JsonSchema,
-{
-    pub(crate) fn forced_import(
-        db: &Database,
-        name: &str,
-        version: Version,
-    ) -> Result<Self> {
-        Ok(Self {
-            _6b: Distribution::forced_import(db, &format!("{name}_6b"), version)?,
-        })
-    }
-}
diff --git a/crates/brk_computer/src/internal/multi/tx_derived/distribution.rs b/crates/brk_computer/src/internal/tx_derived/distribution.rs
similarity index 81%
rename from crates/brk_computer/src/internal/multi/tx_derived/distribution.rs
rename to crates/brk_computer/src/internal/tx_derived/distribution.rs
index 907d7f6bf..eb5e96394 100644
--- a/crates/brk_computer/src/internal/multi/tx_derived/distribution.rs
+++ b/crates/brk_computer/src/internal/tx_derived/distribution.rs
@@ -13,11 +13,34 @@ use vecdb::{Database, Exit, ReadableVec, Rw, StorageMode, Version};
 
 use crate::{
     ComputeIndexes, indexes,
-    internal::{
-        BlockRollingDistribution, ComputedVecValue, Distribution, NumericValue,
-    },
+    internal::{ComputedVecValue, Distribution, NumericValue},
 };
 
+/// 6-block rolling window distribution with 8 distribution stat vecs.
+#[derive(Traversable)]
+pub struct BlockRollingDistribution<T, M: StorageMode = Rw>
+where
+    T: ComputedVecValue + PartialOrd + JsonSchema,
+{
+    #[traversable(rename = "6b")]
+    pub _6b: Distribution<Height, T, M>,
+}
+
+impl<T> BlockRollingDistribution<T>
+where
+    T: NumericValue + JsonSchema,
+{
+    pub(crate) fn forced_import(
+        db: &Database,
+        name: &str,
+        version: Version,
+    ) -> Result<Self> {
+        Ok(Self {
+            _6b: Distribution::forced_import(db, &format!("{name}_6b"), version)?,
+        })
+    }
+}
+
 #[derive(Traversable)]
 pub struct TxDerivedDistribution<T, M: StorageMode = Rw>
 where
diff --git a/crates/brk_computer/src/internal/multi/tx_derived/mod.rs b/crates/brk_computer/src/internal/tx_derived/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/multi/tx_derived/mod.rs
rename to crates/brk_computer/src/internal/tx_derived/mod.rs
diff --git a/crates/brk_computer/src/internal/single/vec/average.rs b/crates/brk_computer/src/internal/vec/average.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/vec/average.rs
rename to crates/brk_computer/src/internal/vec/average.rs
diff --git a/crates/brk_computer/src/internal/single/vec/cumulative.rs b/crates/brk_computer/src/internal/vec/cumulative.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/vec/cumulative.rs
rename to crates/brk_computer/src/internal/vec/cumulative.rs
diff --git a/crates/brk_computer/src/internal/single/vec/max.rs b/crates/brk_computer/src/internal/vec/max.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/vec/max.rs
rename to crates/brk_computer/src/internal/vec/max.rs
diff --git a/crates/brk_computer/src/internal/single/vec/min.rs b/crates/brk_computer/src/internal/vec/min.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/vec/min.rs
rename to crates/brk_computer/src/internal/vec/min.rs
diff --git a/crates/brk_computer/src/internal/single/vec/mod.rs b/crates/brk_computer/src/internal/vec/mod.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/vec/mod.rs
rename to crates/brk_computer/src/internal/vec/mod.rs
diff --git a/crates/brk_computer/src/internal/single/vec/percentiles.rs b/crates/brk_computer/src/internal/vec/percentiles.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/vec/percentiles.rs
rename to crates/brk_computer/src/internal/vec/percentiles.rs
diff --git a/crates/brk_computer/src/internal/single/vec/sum.rs b/crates/brk_computer/src/internal/vec/sum.rs
similarity index 100%
rename from crates/brk_computer/src/internal/single/vec/sum.rs
rename to crates/brk_computer/src/internal/vec/sum.rs