diff --git a/experiments/2024-12-09/src/geometry/sketch.rs b/experiments/2024-12-09/src/geometry/sketch.rs
index bde39fda2..604f561b2 100644
--- a/experiments/2024-12-09/src/geometry/sketch.rs
+++ b/experiments/2024-12-09/src/geometry/sketch.rs
@@ -1,7 +1,7 @@
 use crate::{
     math::{Plane, Point},
     storage::Store,
-    topology::{Face, Vertex},
+    topology::{face::Face, vertex::Vertex},
 };
 
 use super::Handle;
diff --git a/experiments/2024-12-09/src/model.rs b/experiments/2024-12-09/src/model.rs
index 07985d809..5c7f509ff 100644
--- a/experiments/2024-12-09/src/model.rs
+++ b/experiments/2024-12-09/src/model.rs
@@ -2,7 +2,7 @@ use crate::{
     geometry::{AnyOp, Sketch},
     math::{Bivector, Plane, Point, Vector},
     storage::Stores,
-    topology::Solid,
+    topology::solid::Solid,
 };
 
 pub fn model() -> AnyOp {
diff --git a/experiments/2024-12-09/src/storage.rs b/experiments/2024-12-09/src/storage.rs
index 786a699f2..8a9189b1f 100644
--- a/experiments/2024-12-09/src/storage.rs
+++ b/experiments/2024-12-09/src/storage.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use crate::{
     geometry::Handle,
     math::Plane,
-    topology::{Face, Vertex},
+    topology::{face::Face, vertex::Vertex},
 };
 
 #[derive(Default)]
diff --git a/experiments/2024-12-09/src/topology/face.rs b/experiments/2024-12-09/src/topology/face.rs
index 552f15c04..0c52eb4ee 100644
--- a/experiments/2024-12-09/src/topology/face.rs
+++ b/experiments/2024-12-09/src/topology/face.rs
@@ -7,7 +7,7 @@ use crate::{
     storage::Store,
 };
 
-use super::Vertex;
+use super::vertex::Vertex;
 
 #[derive(Debug)]
 pub struct Face {
diff --git a/experiments/2024-12-09/src/topology/mod.rs b/experiments/2024-12-09/src/topology/mod.rs
index ef4e45a14..5415a8925 100644
--- a/experiments/2024-12-09/src/topology/mod.rs
+++ b/experiments/2024-12-09/src/topology/mod.rs
@@ -2,5 +2,3 @@ pub mod face;
 pub mod solid;
 pub mod sweep;
 pub mod vertex;
-
-pub use self::{face::Face, solid::Solid, vertex::Vertex};
diff --git a/experiments/2024-12-09/src/topology/solid.rs b/experiments/2024-12-09/src/topology/solid.rs
index 6a18ca6b9..24a0c2fac 100644
--- a/experiments/2024-12-09/src/topology/solid.rs
+++ b/experiments/2024-12-09/src/topology/solid.rs
@@ -4,7 +4,7 @@ use crate::{
     storage::Store,
 };
 
-use super::{sweep::SweepExt, Face, Vertex};
+use super::{face::Face, sweep::SweepExt, vertex::Vertex};
 
 pub struct Solid {
     faces: Vec<Handle<Face>>,
diff --git a/experiments/2024-12-09/src/topology/sweep.rs b/experiments/2024-12-09/src/topology/sweep.rs
index b7f38af7e..81a69ffa2 100644
--- a/experiments/2024-12-09/src/topology/sweep.rs
+++ b/experiments/2024-12-09/src/topology/sweep.rs
@@ -4,7 +4,7 @@ use crate::{
     storage::Store,
 };
 
-use super::{Face, Solid, Vertex};
+use super::{face::Face, solid::Solid, vertex::Vertex};
 
 pub trait SweepExt {
     /// Sweep a face along a path, creating a solid