diff --git a/crates/fj-core/src/geometry/mod.rs b/crates/fj-core/src/geometry/mod.rs
index d95fcd9c6..377d966ba 100644
--- a/crates/fj-core/src/geometry/mod.rs
+++ b/crates/fj-core/src/geometry/mod.rs
@@ -1,6 +1,7 @@
 //! Geometry that is applied to the topological object graph
 
 pub mod curves;
+pub mod surfaces;
 pub mod traits;
 pub mod util;
 
@@ -8,7 +9,6 @@ mod boundary;
 mod curve;
 mod geometry;
 mod path;
-mod surface;
 mod tolerance;
 mod vertex;
 
@@ -17,7 +17,7 @@ pub use self::{
     curve::{CurveGeom, CurveGeom2, LocalCurveGeom},
     geometry::Geometry,
     path::Path,
-    surface::SweptCurve,
+    surfaces::swept_curve::SweptCurve,
     tolerance::{InvalidTolerance, Tolerance},
     vertex::{LocalVertexGeom, VertexGeom},
 };
diff --git a/crates/fj-core/src/geometry/surfaces/mod.rs b/crates/fj-core/src/geometry/surfaces/mod.rs
new file mode 100644
index 000000000..956197234
--- /dev/null
+++ b/crates/fj-core/src/geometry/surfaces/mod.rs
@@ -0,0 +1,3 @@
+//! # Geometry code specific to various types of surfaces
+
+pub mod swept_curve;
diff --git a/crates/fj-core/src/geometry/surface.rs b/crates/fj-core/src/geometry/surfaces/swept_curve.rs
similarity index 98%
rename from crates/fj-core/src/geometry/surface.rs
rename to crates/fj-core/src/geometry/surfaces/swept_curve.rs
index 2754979c9..45333319b 100644
--- a/crates/fj-core/src/geometry/surface.rs
+++ b/crates/fj-core/src/geometry/surfaces/swept_curve.rs
@@ -2,7 +2,7 @@
 
 use fj_math::{Aabb, Point, Scalar, Transform, Triangle, Vector};
 
-use super::{
+use crate::geometry::{
     traits::{GenPolyline, GenTriMesh},
     Path, Tolerance,
 };