diff --git a/topola/src/board/mod.rs b/topola/src/board/mod.rs
index 8b8a63c..402563a 100644
--- a/topola/src/board/mod.rs
+++ b/topola/src/board/mod.rs
@@ -11,12 +11,14 @@ use undoredo::{ApplyDelta, Delta, FlushDelta};
 
 use crate::{
     compounds::{ComponentId, NetId, PinId},
-    layout::{Layout, LayoutHalfDelta},
-    math::Vector2,
-    primitives::{
-        JointId, JointSpec, Polygon, PolygonId, Segment, SegmentId, SegmentSpec, Via, ViaId,
-        ViaSpec,
+    layout::{
+        Layout, LayoutHalfDelta,
+        primitives::{
+            JointId, JointSpec, Polygon, PolygonId, Segment, SegmentId, SegmentSpec, Via, ViaId,
+            ViaSpec,
+        },
     },
+    math::Vector2,
 };
 
 #[derive(Clone, Debug, Getters)]
diff --git a/topola/src/layout.rs b/topola/src/layout/mod.rs
similarity index 99%
rename from topola/src/layout.rs
rename to topola/src/layout/mod.rs
index 15b371b..ae0398a 100644
--- a/topola/src/layout.rs
+++ b/topola/src/layout/mod.rs
@@ -2,6 +2,8 @@
 //
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
+pub mod primitives;
+
 use derive_getters::Getters;
 use rstar::{
     AABB, RTree,
@@ -13,11 +15,11 @@ use undoredo::{Delta, Recorder};
 
 use crate::{
     compounds::{Component, ComponentId, Pin, PinId},
-    math::Vector2,
-    primitives::{
+    layout::primitives::{
         Joint, JointId, JointSpec, Polygon, PolygonId, Segment, SegmentId, SegmentSpec, Via, ViaId,
         ViaSpec,
     },
+    math::Vector2,
 };
 
 #[derive(Clone, Debug, Delta, Getters)]
diff --git a/topola/src/primitives/joint.rs b/topola/src/layout/primitives/joint.rs
similarity index 97%
rename from topola/src/primitives/joint.rs
rename to topola/src/layout/primitives/joint.rs
index ac4d150..e899a74 100644
--- a/topola/src/primitives/joint.rs
+++ b/topola/src/layout/primitives/joint.rs
@@ -8,7 +8,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::compounds::{ComponentId, NetId, PinId};
 use crate::math::Vector2;
-use crate::primitives::{SegmentId, ViaId};
+
+use super::{SegmentId, ViaId};
 
 #[derive(
     Clone, Constructor, Copy, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize,
diff --git a/topola/src/primitives/mod.rs b/topola/src/layout/primitives/mod.rs
similarity index 100%
rename from topola/src/primitives/mod.rs
rename to topola/src/layout/primitives/mod.rs
diff --git a/topola/src/primitives/polygon.rs b/topola/src/layout/primitives/polygon.rs
similarity index 100%
rename from topola/src/primitives/polygon.rs
rename to topola/src/layout/primitives/polygon.rs
diff --git a/topola/src/primitives/segment.rs b/topola/src/layout/primitives/segment.rs
similarity index 98%
rename from topola/src/primitives/segment.rs
rename to topola/src/layout/primitives/segment.rs
index 6730c71..81ccaf4 100644
--- a/topola/src/primitives/segment.rs
+++ b/topola/src/layout/primitives/segment.rs
@@ -8,7 +8,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::compounds::{ComponentId, NetId, PinId};
 use crate::math::Vector2;
-use crate::primitives::JointId;
+
+use super::JointId;
 
 #[derive(
     Clone, Constructor, Copy, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize,
diff --git a/topola/src/primitives/via.rs b/topola/src/layout/primitives/via.rs
similarity index 97%
rename from topola/src/primitives/via.rs
rename to topola/src/layout/primitives/via.rs
index c7ae366..8bd2d56 100644
--- a/topola/src/primitives/via.rs
+++ b/topola/src/layout/primitives/via.rs
@@ -8,7 +8,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::compounds::{ComponentId, NetId, PinId};
 use crate::math::Vector2;
-use crate::primitives::JointId;
+
+use super::JointId;
 
 #[derive(
     Clone, Constructor, Copy, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Serialize,
diff --git a/topola/src/lib.rs b/topola/src/lib.rs
index 8d045fd..ab9c5a6 100644
--- a/topola/src/lib.rs
+++ b/topola/src/lib.rs
@@ -10,7 +10,6 @@ mod layout;
 mod math;
 mod navmesher;
 mod pathfinder;
-pub mod primitives;
 mod ratsnest;
 mod router;
 mod specctra;
@@ -20,5 +19,6 @@ pub use crate::board::Board;
 pub use crate::board::selections;
 pub use crate::compounds::{Pin, PinId};
 pub use crate::layout::Layout;
+pub use crate::layout::primitives;
 pub use crate::math::Vector2;
 pub use crate::ratsnest::{Ratline, Ratsnest};