diff --git a/crates/tek/src/layout.rs b/crates/tek/src/layout.rs
deleted file mode 100644
index 89f4db97..00000000
--- a/crates/tek/src/layout.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-pub(crate) mod align;        pub(crate) use align::*;
-pub(crate) mod bsp;          pub(crate) use bsp::*;
-pub(crate) mod cond;         pub(crate) use cond::*;
-pub(crate) mod fill;         pub(crate) use fill::*;
-pub(crate) mod fixed;        pub(crate) use fixed::*;
-pub(crate) mod inset_outset; pub(crate) use inset_outset::*;
-pub(crate) mod layers;       pub(crate) use layers::*;
-pub(crate) mod measure;      pub(crate) use measure::*;
-pub(crate) mod min_max;      pub(crate) use min_max::*;
-pub(crate) mod push_pull;    pub(crate) use push_pull::*;
-pub(crate) mod scroll;       pub(crate) use scroll::*;
-pub(crate) mod shrink_grow;  pub(crate) use shrink_grow::*;
-pub(crate) mod split;        pub(crate) use split::*;
-pub(crate) mod stack;        pub(crate) use stack::*;
-
-pub use self::{
-    align::*,
-    bsp::*,
-    fill::*,
-};
diff --git a/crates/tek/src/lib.rs b/crates/tek/src/lib.rs
index f63205e5..73455b36 100644
--- a/crates/tek/src/lib.rs
+++ b/crates/tek/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod core;   pub(crate) use self::core::*;
-pub mod layout; pub(crate) use self::layout::*;
 pub mod api;    pub(crate) use self::api::*;
 pub mod tui;    pub(crate) use self::tui::*;
 pub mod edn;    pub(crate) use self::edn::*;
diff --git a/crates/tek/src/space.rs b/crates/tek/src/space.rs
index bb2ca859..bdad4973 100644
--- a/crates/tek/src/space.rs
+++ b/crates/tek/src/space.rs
@@ -5,3 +5,26 @@ pub(crate) mod direction; pub(crate) use direction::*;
 
 // TODO: return impl Point and impl Size instead of [N;x]
 // to disambiguate between usage of 2-"tuple"s
+
+//////////////////////////////////////////////////////
+
+pub(crate) mod align;        pub(crate) use align::*;
+pub(crate) mod bsp;          pub(crate) use bsp::*;
+pub(crate) mod cond;         pub(crate) use cond::*;
+pub(crate) mod fill;         pub(crate) use fill::*;
+pub(crate) mod fixed;        pub(crate) use fixed::*;
+pub(crate) mod inset_outset; pub(crate) use inset_outset::*;
+pub(crate) mod layers;       pub(crate) use layers::*;
+pub(crate) mod measure;      pub(crate) use measure::*;
+pub(crate) mod min_max;      pub(crate) use min_max::*;
+pub(crate) mod push_pull;    pub(crate) use push_pull::*;
+pub(crate) mod scroll;       pub(crate) use scroll::*;
+pub(crate) mod shrink_grow;  pub(crate) use shrink_grow::*;
+pub(crate) mod split;        pub(crate) use split::*;
+pub(crate) mod stack;        pub(crate) use stack::*;
+
+pub use self::{
+    align::*,
+    bsp::*,
+    fill::*,
+};
diff --git a/crates/tek/src/layout/align.rs b/crates/tek/src/space/align.rs
similarity index 100%
rename from crates/tek/src/layout/align.rs
rename to crates/tek/src/space/align.rs
diff --git a/crates/tek/src/layout/bsp.rs b/crates/tek/src/space/bsp.rs
similarity index 100%
rename from crates/tek/src/layout/bsp.rs
rename to crates/tek/src/space/bsp.rs
diff --git a/crates/tek/src/layout/collect.rs b/crates/tek/src/space/collect.rs
similarity index 100%
rename from crates/tek/src/layout/collect.rs
rename to crates/tek/src/space/collect.rs
diff --git a/crates/tek/src/layout/cond.rs b/crates/tek/src/space/cond.rs
similarity index 100%
rename from crates/tek/src/layout/cond.rs
rename to crates/tek/src/space/cond.rs
diff --git a/crates/tek/src/layout/fill.rs b/crates/tek/src/space/fill.rs
similarity index 100%
rename from crates/tek/src/layout/fill.rs
rename to crates/tek/src/space/fill.rs
diff --git a/crates/tek/src/layout/fixed.rs b/crates/tek/src/space/fixed.rs
similarity index 100%
rename from crates/tek/src/layout/fixed.rs
rename to crates/tek/src/space/fixed.rs
diff --git a/crates/tek/src/layout/inset_outset.rs b/crates/tek/src/space/inset_outset.rs
similarity index 100%
rename from crates/tek/src/layout/inset_outset.rs
rename to crates/tek/src/space/inset_outset.rs
diff --git a/crates/tek/src/layout/layers.rs b/crates/tek/src/space/layers.rs
similarity index 100%
rename from crates/tek/src/layout/layers.rs
rename to crates/tek/src/space/layers.rs
diff --git a/crates/tek/src/layout/map_reduce.rs b/crates/tek/src/space/map_reduce.rs
similarity index 100%
rename from crates/tek/src/layout/map_reduce.rs
rename to crates/tek/src/space/map_reduce.rs
diff --git a/crates/tek/src/layout/measure.rs b/crates/tek/src/space/measure.rs
similarity index 100%
rename from crates/tek/src/layout/measure.rs
rename to crates/tek/src/space/measure.rs
diff --git a/crates/tek/src/layout/min_max.rs b/crates/tek/src/space/min_max.rs
similarity index 100%
rename from crates/tek/src/layout/min_max.rs
rename to crates/tek/src/space/min_max.rs
diff --git a/crates/tek/src/layout/push_pull.rs b/crates/tek/src/space/push_pull.rs
similarity index 100%
rename from crates/tek/src/layout/push_pull.rs
rename to crates/tek/src/space/push_pull.rs
diff --git a/crates/tek/src/layout/scroll.rs b/crates/tek/src/space/scroll.rs
similarity index 100%
rename from crates/tek/src/layout/scroll.rs
rename to crates/tek/src/space/scroll.rs
diff --git a/crates/tek/src/layout/shrink_grow.rs b/crates/tek/src/space/shrink_grow.rs
similarity index 100%
rename from crates/tek/src/layout/shrink_grow.rs
rename to crates/tek/src/space/shrink_grow.rs
diff --git a/crates/tek/src/layout/split.rs b/crates/tek/src/space/split.rs
similarity index 100%
rename from crates/tek/src/layout/split.rs
rename to crates/tek/src/space/split.rs
diff --git a/crates/tek/src/layout/stack.rs b/crates/tek/src/space/stack.rs
similarity index 100%
rename from crates/tek/src/layout/stack.rs
rename to crates/tek/src/space/stack.rs