Rename objects module to topology

crates/fj-core/src/algorithms/approx/curve.rs

@@ -9,8 +9,8 @@ use crate::{
         CurveBoundary, GlobalPath, HalfEdgeGeometry, SurfaceGeometry,
         SurfacePath,
     },
-    objects::Curve,
     storage::Handle,
+    topology::Curve,
     Core,
 };
 
@@ -187,8 +187,8 @@ mod tests {
             CurveBoundary, GlobalPath, HalfEdgeGeometry, SurfaceGeometry,
             SurfacePath,
         },
-        objects::Curve,
         operations::insert::Insert,
+        topology::Curve,
         Core,
     };
 

crates/fj-core/src/algorithms/approx/cycle.rs

@@ -4,7 +4,7 @@
 
 use fj_math::Segment;
 
-use crate::{geometry::SurfaceGeometry, objects::Cycle, Core};
+use crate::{geometry::SurfaceGeometry, topology::Cycle, Core};
 
 use super::{
     edge::{HalfEdgeApprox, HalfEdgeApproxCache},

crates/fj-core/src/algorithms/approx/edge.rs

@@ -6,7 +6,7 @@
 //! the caller doesn't have to deal with duplicate vertices.
 
 use crate::{
-    geometry::SurfaceGeometry, objects::HalfEdge, storage::Handle, Core,
+    geometry::SurfaceGeometry, storage::Handle, topology::HalfEdge, Core,
 };
 
 use super::{

crates/fj-core/src/algorithms/approx/face.rs

@@ -7,8 +7,8 @@ use std::{collections::BTreeSet, ops::Deref};
 use fj_interop::Color;
 
 use crate::{
-    objects::{Face, Handedness, ObjectSet},
     operations::presentation::GetColor,
+    topology::{Face, Handedness, ObjectSet},
     validation::ValidationConfig,
     Core,
 };

crates/fj-core/src/algorithms/approx/shell.rs

@@ -2,7 +2,7 @@
 
 use std::collections::BTreeSet;
 
-use crate::{objects::Shell, Core};
+use crate::{topology::Shell, Core};
 
 use super::{edge::HalfEdgeApproxCache, face::FaceApprox, Approx, Tolerance};
 

crates/fj-core/src/algorithms/approx/sketch.rs

@@ -2,7 +2,7 @@
 
 use std::collections::BTreeSet;
 
-use crate::{objects::Sketch, Core};
+use crate::{topology::Sketch, Core};
 
 use super::{edge::HalfEdgeApproxCache, face::FaceApprox, Approx, Tolerance};
 

crates/fj-core/src/algorithms/approx/solid.rs

@@ -2,7 +2,7 @@
 
 use std::collections::BTreeSet;
 
-use crate::{objects::Solid, Core};
+use crate::{topology::Solid, Core};
 
 use super::{edge::HalfEdgeApproxCache, face::FaceApprox, Approx, Tolerance};
 

crates/fj-core/src/algorithms/approx/vertex.rs

@@ -4,7 +4,7 @@ use std::collections::BTreeMap;
 
 use fj_math::Point;
 
-use crate::{objects::Vertex, storage::Handle};
+use crate::{storage::Handle, topology::Vertex};
 
 /// Cache for vertex approximations
 #[derive(Default)]

crates/fj-core/src/algorithms/bounding_volume/cycle.rs

@@ -1,6 +1,6 @@
 use fj_math::Aabb;
 
-use crate::{geometry::Geometry, objects::Cycle};
+use crate::{geometry::Geometry, topology::Cycle};
 
 impl super::BoundingVolume<2> for Cycle {
     fn aabb(&self, geometry: &Geometry) -> Option<Aabb<2>> {

crates/fj-core/src/algorithms/bounding_volume/edge.rs

@@ -2,8 +2,8 @@ use fj_math::{Aabb, Vector};
 
 use crate::{
     geometry::{Geometry, SurfacePath},
-    objects::HalfEdge,
     storage::Handle,
+    topology::HalfEdge,
 };
 
 impl super::BoundingVolume<2> for Handle<HalfEdge> {

crates/fj-core/src/algorithms/bounding_volume/face.rs

@@ -2,7 +2,7 @@ use fj_math::Aabb;
 
 use crate::{
     geometry::{Geometry, GlobalPath},
-    objects::Face,
+    topology::Face,
 };
 
 impl super::BoundingVolume<3> for Face {

crates/fj-core/src/algorithms/bounding_volume/shell.rs

@@ -1,6 +1,6 @@
 use fj_math::Aabb;
 
-use crate::{geometry::Geometry, objects::Shell};
+use crate::{geometry::Geometry, topology::Shell};
 
 impl super::BoundingVolume<3> for Shell {
     fn aabb(&self, geometry: &Geometry) -> Option<Aabb<3>> {

crates/fj-core/src/algorithms/bounding_volume/solid.rs

@@ -1,6 +1,6 @@
 use fj_math::Aabb;
 
-use crate::{geometry::Geometry, objects::Solid};
+use crate::{geometry::Geometry, topology::Solid};
 
 impl super::BoundingVolume<3> for Solid {
     fn aabb(&self, geometry: &Geometry) -> Option<Aabb<3>> {

crates/fj-core/src/algorithms/triangulate/delaunay.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use fj_math::{Point, Scalar, Triangle, Winding};
 use spade::HasPosition;
 
-use crate::{algorithms::approx::cycle::CycleApprox, objects::Handedness};
+use crate::{algorithms::approx::cycle::CycleApprox, topology::Handedness};
 
 /// Create a Delaunay triangulation of all points
 pub fn triangulate(

crates/fj-core/src/algorithms/triangulate/mod.rs

@@ -85,11 +85,11 @@ mod tests {
 
     use crate::{
         algorithms::approx::{Approx, Tolerance},
-        objects::{Cycle, Face},
         operations::{
             build::{BuildCycle, BuildFace},
             update::{UpdateFace, UpdateRegion},
         },
+        topology::{Cycle, Face},
         Core,
     };
 

crates/fj-core/src/geometry/boundary.rs

@@ -5,7 +5,7 @@ use std::{
 
 use fj_math::Point;
 
-use crate::{objects::Vertex, storage::Handle};
+use crate::{storage::Handle, topology::Vertex};
 
 /// A boundary on a curve
 ///

crates/fj-core/src/geometry/geometry.rs

@@ -3,8 +3,8 @@ use std::collections::BTreeMap;
 use fj_math::Vector;
 
 use crate::{
-    objects::{HalfEdge, Objects, Surface},
     storage::Handle,
+    topology::{HalfEdge, Objects, Surface},
 };
 
 use super::{GlobalPath, HalfEdgeGeometry, SurfaceGeometry};

crates/fj-core/src/layers/geometry.rs

@@ -2,8 +2,8 @@
 
 use crate::{
     geometry::{Geometry, HalfEdgeGeometry, SurfaceGeometry},
-    objects::{HalfEdge, Surface},
     storage::Handle,
+    topology::{HalfEdge, Surface},
 };
 
 use super::{Command, Event, Layer};

crates/fj-core/src/layers/layers.rs

@@ -1,7 +1,7 @@
 use crate::{
     geometry::Geometry,
-    objects::Objects,
     presentation::Presentation,
+    topology::Objects,
     validation::{Validation, ValidationConfig},
 };
 

crates/fj-core/src/layers/objects.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     geometry::Geometry,
-    objects::{AboutToBeStored, AnyObject, Objects},
+    topology::{AboutToBeStored, AnyObject, Objects},
     validation::Validation,
 };
 

crates/fj-core/src/layers/presentation.rs

@@ -3,9 +3,9 @@
 use fj_interop::Color;
 
 use crate::{
-    objects::{AnyObject, Region, Stored},
     presentation::Presentation,
     storage::Handle,
+    topology::{AnyObject, Region, Stored},
 };
 
 use super::{Command, Event, Layer};

crates/fj-core/src/layers/validation.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     geometry::Geometry,
-    objects::{AnyObject, Stored},
+    topology::{AnyObject, Stored},
     validation::{Validation, ValidationError, ValidationErrors},
 };
 

crates/fj-core/src/lib.rs

@@ -84,11 +84,11 @@
 pub mod algorithms;
 pub mod geometry;
 pub mod layers;
-pub mod objects;
 pub mod operations;
 pub mod presentation;
 pub mod queries;
 pub mod storage;
+pub mod topology;
 pub mod validate;
 pub mod validation;
 

crates/fj-core/src/operations/build/cycle.rs

@@ -2,8 +2,8 @@ use fj_math::{Point, Scalar};
 use itertools::Itertools;
 
 use crate::{
-    objects::{Cycle, HalfEdge},
     operations::{build::BuildHalfEdge, update::UpdateCycle},
+    topology::{Cycle, HalfEdge},
     Core,
 };
 

crates/fj-core/src/operations/build/face.rs

@@ -4,12 +4,12 @@ use fj_interop::ext::ArrayExt;
 use fj_math::{Point, Scalar};
 
 use crate::{
-    objects::{Cycle, Face, HalfEdge, Region, Surface, Vertex},
     operations::{
         build::{BuildCycle, BuildRegion, BuildSurface},
         insert::{Insert, IsInserted, IsInsertedNo},
     },
     storage::Handle,
+    topology::{Cycle, Face, HalfEdge, Region, Surface, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/build/half_edge.rs

@@ -3,9 +3,9 @@ use fj_math::{Arc, Point, Scalar};
 
 use crate::{
     geometry::{HalfEdgeGeometry, SurfacePath},
-    objects::{Curve, HalfEdge, Vertex},
     operations::{geometry::UpdateHalfEdgeGeometry, insert::Insert},
     storage::Handle,
+    topology::{Curve, HalfEdge, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/build/region.rs

@@ -1,8 +1,8 @@
 use fj_math::{Point, Scalar};
 
 use crate::{
-    objects::{Cycle, Region},
     operations::{build::BuildCycle, insert::Insert},
+    topology::{Cycle, Region},
     Core,
 };
 

crates/fj-core/src/operations/build/shell.rs

@@ -5,7 +5,6 @@ use fj_math::Point;
 
 use crate::{
     geometry::CurveBoundary,
-    objects::{Curve, Face, HalfEdge, Shell, Surface, Vertex},
     operations::{
         build::{BuildFace, BuildHalfEdge, BuildSurface, Polygon},
         geometry::UpdateHalfEdgeGeometry,
@@ -16,6 +15,7 @@ use crate::{
             UpdateCycle, UpdateFace, UpdateHalfEdge, UpdateRegion, UpdateShell,
         },
     },
+    topology::{Curve, Face, HalfEdge, Shell, Surface, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/build/sketch.rs

@@ -1,4 +1,4 @@
-use crate::objects::Sketch;
+use crate::topology::Sketch;
 
 /// Build a [`Sketch`]
 ///

crates/fj-core/src/operations/build/solid.rs

@@ -1,12 +1,12 @@
 use fj_math::Point;
 
 use crate::{
-    objects::{Shell, Solid},
     operations::{
         build::{BuildShell, TetrahedronShell},
         insert::{Insert, IsInsertedYes},
         update::UpdateSolid,
     },
+    topology::{Shell, Solid},
     Core,
 };
 

crates/fj-core/src/operations/build/surface.rs

@@ -2,9 +2,9 @@ use fj_math::{Point, Scalar, Vector};
 
 use crate::{
     geometry::{GlobalPath, SurfaceGeometry},
-    objects::Surface,
     operations::insert::Insert,
     storage::Handle,
+    topology::Surface,
     Core,
 };
 

crates/fj-core/src/operations/derive.rs

@@ -3,8 +3,8 @@
 //! See [`DeriveFrom`].
 
 use crate::{
-    objects::{AnyObject, Stored},
     storage::Handle,
+    topology::{AnyObject, Stored},
     Core,
 };
 

crates/fj-core/src/operations/geometry/half_edge.rs

@@ -1,8 +1,8 @@
 use crate::{
     geometry::{Geometry, HalfEdgeGeometry},
     layers::Layer,
-    objects::HalfEdge,
     storage::Handle,
+    topology::HalfEdge,
 };
 
 /// Update the geometry of a [`HalfEdge`]

crates/fj-core/src/operations/holes.rs

@@ -3,8 +3,8 @@
 use fj_math::{Point, Scalar, Vector};
 
 use crate::{
-    objects::{Cycle, Face, HalfEdge, Region, Shell},
     storage::Handle,
+    topology::{Cycle, Face, HalfEdge, Region, Shell},
     Core,
 };
 

crates/fj-core/src/operations/insert/insert_trait.rs

@@ -1,10 +1,10 @@
 use crate::{
-    objects::{
+    operations::build::{Polygon, TetrahedronShell},
+    storage::Handle,
+    topology::{
         Curve, Cycle, Face, HalfEdge, Region, Shell, Sketch, Solid, Surface,
         Vertex,
     },
-    operations::build::{Polygon, TetrahedronShell},
-    storage::Handle,
     Core,
 };
 

crates/fj-core/src/operations/join/cycle.rs

@@ -4,7 +4,6 @@ use itertools::Itertools;
 
 use crate::{
     geometry::HalfEdgeGeometry,
-    objects::{Cycle, HalfEdge},
     operations::{
         build::BuildHalfEdge,
         geometry::UpdateHalfEdgeGeometry,
@@ -12,6 +11,7 @@ use crate::{
         update::{UpdateCycle, UpdateHalfEdge},
     },
     storage::Handle,
+    topology::{Cycle, HalfEdge},
     Core,
 };
 

crates/fj-core/src/operations/merge.rs

@@ -3,7 +3,7 @@
 //! See [`Merge`], which is currently the only trait in this module, for more
 //! information.
 
-use crate::{objects::Solid, Core};
+use crate::{topology::Solid, Core};
 
 use super::update::UpdateSolid;
 

crates/fj-core/src/operations/presentation.rs

@@ -2,7 +2,7 @@
 
 use fj_interop::Color;
 
-use crate::{objects::Region, storage::Handle, Core};
+use crate::{storage::Handle, topology::Region, Core};
 
 /// Get the color of an object
 pub trait GetColor {

crates/fj-core/src/operations/replace/curve.rs

@@ -1,11 +1,11 @@
 use std::ops::Deref;
 
 use crate::{
-    objects::{
-        Curve, Cycle, Face, HalfEdge, IsObject, Region, Shell, Sketch, Solid,
-    },
     operations::{derive::DeriveFrom, insert::Insert, update::UpdateHalfEdge},
     storage::Handle,
+    topology::{
+        Curve, Cycle, Face, HalfEdge, IsObject, Region, Shell, Sketch, Solid,
+    },
     Core,
 };
 

crates/fj-core/src/operations/replace/half_edge.rs

@@ -1,9 +1,9 @@
 use std::ops::Deref;
 
 use crate::{
-    objects::{Cycle, Face, HalfEdge, IsObject, Region, Shell, Sketch, Solid},
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Cycle, Face, HalfEdge, IsObject, Region, Shell, Sketch, Solid},
     Core,
 };
 

crates/fj-core/src/operations/replace/vertex.rs

@@ -1,11 +1,11 @@
 use std::ops::Deref;
 
 use crate::{
-    objects::{
-        Cycle, Face, HalfEdge, IsObject, Region, Shell, Sketch, Solid, Vertex,
-    },
     operations::{derive::DeriveFrom, insert::Insert, update::UpdateHalfEdge},
     storage::Handle,
+    topology::{
+        Cycle, Face, HalfEdge, IsObject, Region, Shell, Sketch, Solid, Vertex,
+    },
     Core,
 };
 

crates/fj-core/src/operations/reverse/cycle.rs

@@ -1,8 +1,8 @@
 use crate::{
-    objects::{Cycle, HalfEdge},
     operations::{
         derive::DeriveFrom, geometry::UpdateHalfEdgeGeometry, insert::Insert,
     },
+    topology::{Cycle, HalfEdge},
     Core,
 };
 

crates/fj-core/src/operations/reverse/edge.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::HalfEdge,
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::HalfEdge,
     Core,
 };
 

crates/fj-core/src/operations/reverse/face.rs

@@ -1,12 +1,12 @@
 use std::borrow::Borrow;
 
 use crate::{
-    objects::Face,
     operations::{
         build::Polygon,
         derive::DeriveFrom,
         insert::{Insert, IsInsertedNo, IsInsertedYes},
     },
+    topology::Face,
     Core,
 };
 

crates/fj-core/src/operations/reverse/region.rs

@@ -1,6 +1,6 @@
 use crate::{
-    objects::Region,
     operations::{derive::DeriveFrom, insert::Insert},
+    topology::Region,
     Core,
 };
 

crates/fj-core/src/operations/split/edge.rs

@@ -1,13 +1,13 @@
 use fj_math::Point;
 
 use crate::{
-    objects::{HalfEdge, Shell},
     operations::{
         geometry::UpdateHalfEdgeGeometry, insert::Insert,
         replace::ReplaceHalfEdge, split::SplitHalfEdge, update::UpdateHalfEdge,
     },
     queries::SiblingOfHalfEdge,
     storage::Handle,
+    topology::{HalfEdge, Shell},
     Core,
 };
 

crates/fj-core/src/operations/split/face.rs

@@ -3,7 +3,6 @@ use fj_math::Point;
 use itertools::Itertools;
 
 use crate::{
-    objects::{Cycle, Face, HalfEdge, Shell},
     operations::{
         build::{BuildCycle, BuildHalfEdge},
         derive::DeriveFrom,
@@ -15,6 +14,7 @@ use crate::{
         },
     },
     storage::Handle,
+    topology::{Cycle, Face, HalfEdge, Shell},
     Core,
 };
 
@@ -204,12 +204,12 @@ mod tests {
     use fj_interop::Color;
 
     use crate::{
-        objects::Shell,
         operations::{
             build::BuildShell,
             presentation::{GetColor, SetColor},
             split::SplitFace,
         },
+        topology::Shell,
         Core,
     };
 

crates/fj-core/src/operations/split/half_edge.rs

@@ -1,11 +1,11 @@
 use fj_math::Point;
 
 use crate::{
-    objects::{HalfEdge, Vertex},
     operations::{
         derive::DeriveFrom, geometry::UpdateHalfEdgeGeometry, insert::Insert,
     },
     storage::Handle,
+    topology::{HalfEdge, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/sweep/cycle.rs

@@ -3,10 +3,10 @@ use fj_math::Vector;
 
 use crate::{
     geometry::SurfaceGeometry,
-    objects::{Cycle, Face},
     operations::{
         build::BuildCycle, join::JoinCycle, sweep::half_edge::SweepHalfEdge,
     },
+    topology::{Cycle, Face},
     Core,
 };
 

crates/fj-core/src/operations/sweep/face.rs

@@ -1,9 +1,9 @@
 use fj_math::Vector;
 
 use crate::{
-    objects::{Face, Shell},
     operations::{insert::Insert, presentation::GetColor},
     storage::Handle,
+    topology::{Face, Shell},
     Core,
 };
 

crates/fj-core/src/operations/sweep/half_edge.rs

@@ -3,7 +3,6 @@ use fj_math::{Point, Scalar, Vector};
 
 use crate::{
     geometry::SurfaceGeometry,
-    objects::{Cycle, Face, HalfEdge, Region, Vertex},
     operations::{
         build::{BuildCycle, BuildHalfEdge},
         geometry::UpdateHalfEdgeGeometry,
@@ -12,6 +11,7 @@ use crate::{
         update::{UpdateCycle, UpdateHalfEdge},
     },
     storage::Handle,
+    topology::{Cycle, Face, HalfEdge, Region, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/sweep/mod.rs

@@ -26,8 +26,8 @@ pub use self::{
 use std::collections::BTreeMap;
 
 use crate::{
-    objects::{Curve, Vertex},
     storage::{Handle, ObjectId},
+    topology::{Curve, Vertex},
 };
 
 /// A cache used for sweeping

crates/fj-core/src/operations/sweep/path.rs

@@ -2,9 +2,9 @@ use fj_math::{Circle, Line, Vector};
 
 use crate::{
     geometry::{GlobalPath, SurfaceGeometry, SurfacePath},
-    objects::Surface,
     operations::build::BuildSurface,
     storage::Handle,
+    topology::Surface,
     Core,
 };
 

crates/fj-core/src/operations/sweep/region.rs

@@ -3,11 +3,11 @@ use fj_math::Vector;
 
 use crate::{
     geometry::SurfaceGeometry,
-    objects::{Cycle, Face, Region, Surface},
     operations::{
         insert::Insert, reverse::Reverse, transform::TransformObject,
     },
     storage::Handle,
+    topology::{Cycle, Face, Region, Surface},
     Core,
 };
 

crates/fj-core/src/operations/sweep/shell_face.rs

@@ -1,7 +1,6 @@
 use fj_math::Vector;
 
 use crate::{
-    objects::{Face, Region, Shell},
     operations::{
         derive::DeriveFrom,
         insert::Insert,
@@ -11,6 +10,7 @@ use crate::{
         update::UpdateShell,
     },
     storage::Handle,
+    topology::{Face, Region, Shell},
     Core,
 };
 

crates/fj-core/src/operations/sweep/sketch.rs

@@ -2,9 +2,9 @@ use fj_math::{Scalar, Vector};
 
 use crate::{
     geometry::GlobalPath,
-    objects::{Face, Sketch, Solid, Surface},
     operations::{derive::DeriveFrom, insert::Insert, reverse::Reverse},
     storage::Handle,
+    topology::{Face, Sketch, Solid, Surface},
     Core,
 };
 

crates/fj-core/src/operations/sweep/vertex.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Curve, Vertex},
     operations::insert::Insert,
     storage::Handle,
+    topology::{Curve, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/transform/curve.rs

@@ -1,6 +1,6 @@
 use fj_math::Transform;
 
-use crate::{objects::Curve, Core};
+use crate::{topology::Curve, Core};
 
 use super::{TransformCache, TransformObject};
 

crates/fj-core/src/operations/transform/cycle.rs

@@ -1,6 +1,6 @@
 use fj_math::Transform;
 
-use crate::{objects::Cycle, Core};
+use crate::{topology::Cycle, Core};
 
 use super::{TransformCache, TransformObject};
 

crates/fj-core/src/operations/transform/edge.rs

@@ -1,7 +1,7 @@
 use fj_math::Transform;
 
 use crate::{
-    objects::HalfEdge, operations::insert::Insert, storage::Handle, Core,
+    operations::insert::Insert, storage::Handle, topology::HalfEdge, Core,
 };
 
 use super::{TransformCache, TransformObject};

crates/fj-core/src/operations/transform/face.rs

@@ -1,6 +1,6 @@
 use fj_math::Transform;
 
-use crate::{objects::Face, Core};
+use crate::{topology::Face, Core};
 
 use super::{TransformCache, TransformObject};
 

crates/fj-core/src/operations/transform/mod.rs

@@ -16,9 +16,9 @@ use fj_math::{Transform, Vector};
 use type_map::TypeMap;
 
 use crate::{
-    objects::{AnyObject, Stored},
     operations::insert::Insert,
     storage::{Handle, ObjectId},
+    topology::{AnyObject, Stored},
     Core,
 };
 

crates/fj-core/src/operations/transform/region.rs

@@ -1,4 +1,4 @@
-use crate::{objects::Region, Core};
+use crate::{topology::Region, Core};
 
 use super::TransformObject;
 

crates/fj-core/src/operations/transform/shell.rs

@@ -1,6 +1,6 @@
 use fj_math::Transform;
 
-use crate::{objects::Shell, Core};
+use crate::{topology::Shell, Core};
 
 use super::{TransformCache, TransformObject};
 

crates/fj-core/src/operations/transform/solid.rs

@@ -1,6 +1,6 @@
 use fj_math::Transform;
 
-use crate::{objects::Solid, Core};
+use crate::{topology::Solid, Core};
 
 use super::{TransformCache, TransformObject};
 

crates/fj-core/src/operations/transform/surface.rs

@@ -1,7 +1,7 @@
 use fj_math::Transform;
 
 use crate::{
-    objects::Surface, operations::insert::Insert, storage::Handle, Core,
+    operations::insert::Insert, storage::Handle, topology::Surface, Core,
 };
 
 use super::{TransformCache, TransformObject};

crates/fj-core/src/operations/transform/vertex.rs

@@ -1,6 +1,6 @@
 use fj_math::Transform;
 
-use crate::{objects::Vertex, Core};
+use crate::{topology::Vertex, Core};
 
 use super::{TransformCache, TransformObject};
 

crates/fj-core/src/operations/update/cycle.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Cycle, HalfEdge},
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Cycle, HalfEdge},
     Core,
 };
 

crates/fj-core/src/operations/update/face.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Face, Region},
     operations::{build::Polygon, derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Face, Region},
     Core,
 };
 

crates/fj-core/src/operations/update/half_edge.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Curve, HalfEdge, Vertex},
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Curve, HalfEdge, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/update/region.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Cycle, Region},
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Cycle, Region},
     Core,
 };
 

crates/fj-core/src/operations/update/shell.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Face, Shell},
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Face, Shell},
     Core,
 };
 

crates/fj-core/src/operations/update/sketch.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Region, Sketch},
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Region, Sketch},
     Core,
 };
 

crates/fj-core/src/operations/update/solid.rs

@@ -1,7 +1,7 @@
 use crate::{
-    objects::{Shell, Solid},
     operations::{derive::DeriveFrom, insert::Insert},
     storage::Handle,
+    topology::{Shell, Solid},
     Core,
 };
 

crates/fj-core/src/presentation.rs

@@ -6,7 +6,7 @@ use std::collections::BTreeMap;
 
 use fj_interop::Color;
 
-use crate::{objects::Region, storage::Handle};
+use crate::{storage::Handle, topology::Region};
 
 /// Presentation data for the object graph
 ///

crates/fj-core/src/queries/all_half_edges_with_surface.rs

@@ -1,6 +1,6 @@
 use crate::{
-    objects::{Face, HalfEdge, Shell, Surface},
     storage::Handle,
+    topology::{Face, HalfEdge, Shell, Surface},
 };
 
 /// Access all half-edges referenced by an object, and the surface they're on

crates/fj-core/src/queries/bounding_vertices_of_half_edge.rs

@@ -1,7 +1,7 @@
 use crate::{
     geometry::CurveBoundary,
-    objects::{Cycle, Face, HalfEdge, Region, Shell, Vertex},
     storage::Handle,
+    topology::{Cycle, Face, HalfEdge, Region, Shell, Vertex},
 };
 
 /// Determine the bounding vertices of a half-edge

crates/fj-core/src/queries/sibling_of_half_edge.rs

@@ -1,7 +1,7 @@
 use crate::{
     geometry::Geometry,
-    objects::{HalfEdge, Shell},
     storage::Handle,
+    topology::{HalfEdge, Shell},
 };
 
 use super::BoundingVerticesOfHalfEdge;

crates/fj-core/src/topology/any_object.rs

@@ -1,10 +1,10 @@
 use crate::{
     geometry::Geometry,
-    objects::{
+    storage::{Handle, ObjectId},
+    topology::{
         Curve, Cycle, Face, HalfEdge, Objects, Region, Shell, Sketch, Solid,
         Surface, Vertex,
     },
-    storage::{Handle, ObjectId},
     validate::Validate,
     validation::{ValidationConfig, ValidationError},
 };

crates/fj-core/src/topology/kinds/curve.rs

@@ -20,7 +20,7 @@
 /// `Eq`/`Ord`/..., you can use `HandleWrapper<Curve>` to do that. It will use
 /// `Handle::id` to provide those `Eq`/`Ord`/... implementations.
 ///
-/// [`HalfEdge`]: crate::objects::HalfEdge
+/// [`HalfEdge`]: crate::topology::HalfEdge
 #[derive(Clone, Debug, Default)]
 pub struct Curve {}
 

crates/fj-core/src/topology/kinds/cycle.rs

@@ -2,8 +2,8 @@ use fj_math::{Scalar, Winding};
 
 use crate::{
     geometry::{Geometry, SurfacePath},
-    objects::{HalfEdge, ObjectSet},
     storage::Handle,
+    topology::{HalfEdge, ObjectSet},
 };
 
 /// A cycle of connected edges

crates/fj-core/src/topology/kinds/face.rs

@@ -2,8 +2,8 @@ use fj_math::Winding;
 
 use crate::{
     geometry::Geometry,
-    objects::{Region, Surface},
     storage::Handle,
+    topology::{Region, Surface},
 };
 
 /// A face of a shape
@@ -28,8 +28,8 @@ use crate::{
 /// means that all [`HalfEdge`]s that bound a `Face` have the interior of the
 /// face on their left side (on the face's front side).
 ///
-/// [`HalfEdge`]: crate::objects::HalfEdge
+/// [`HalfEdge`]: crate::topology::HalfEdge
-/// [`Shell`]: crate::objects::Shell
+/// [`Shell`]: crate::topology::Shell
 #[derive(Clone, Debug)]
 pub struct Face {
     surface: Handle<Surface>,

crates/fj-core/src/topology/kinds/half_edge.rs

@@ -1,6 +1,6 @@
 use crate::{
-    objects::{Curve, Vertex},
     storage::Handle,
+    topology::{Curve, Vertex},
 };
 
 /// # A directed half-edge, defined in a surface's 2D space
@@ -28,8 +28,8 @@ use crate::{
 /// their start vertices are different.
 ///
 ///
-/// [`Cycle`]: crate::objects::Cycle
+/// [`Cycle`]: crate::topology::Cycle
-/// [`Shell`]: crate::objects::Shell
+/// [`Shell`]: crate::topology::Shell
 #[derive(Clone, Debug)]
 pub struct HalfEdge {
     curve: Handle<Curve>,

crates/fj-core/src/topology/kinds/region.rs

@@ -1,8 +1,8 @@
 //! A single, continues 2d region
 
 use crate::{
-    objects::{Cycle, ObjectSet},
     storage::Handle,
+    topology::{Cycle, ObjectSet},
 };
 
 /// A single, continuous 2d region, may contain holes
@@ -12,7 +12,7 @@ use crate::{
 /// means that all [`HalfEdge`]s that bound a `Region` have the interior of the
 /// region on their left side (on the region's front side).
 ///
-/// [`HalfEdge`]: crate::objects::HalfEdge
+/// [`HalfEdge`]: crate::topology::HalfEdge
 #[derive(Clone, Debug)]
 pub struct Region {
     exterior: Handle<Cycle>,

crates/fj-core/src/topology/kinds/shell.rs

@@ -1,6 +1,6 @@
 use crate::{
-    objects::{Face, ObjectSet},
     storage::Handle,
+    topology::{Face, ObjectSet},
 };
 
 /// A 3-dimensional closed shell

crates/fj-core/src/topology/kinds/sketch.rs

@@ -1,6 +1,6 @@
 use crate::{
-    objects::{ObjectSet, Region},
     storage::Handle,
+    topology::{ObjectSet, Region},
 };
 
 /// A 2-dimensional shape

crates/fj-core/src/topology/kinds/solid.rs

@@ -1,6 +1,6 @@
 use crate::{
-    objects::{ObjectSet, Shell},
     storage::Handle,
+    topology::{ObjectSet, Shell},
 };
 
 /// A 3-dimensional shape, built from [`Shell`]s. Many Solids will contains only

crates/fj-core/src/topology/kinds/vertex.rs

@@ -78,11 +78,11 @@
 /// `Eq`/`Ord`/..., you can use `HandleWrapper<Vertex>` to do that. It will
 /// use `Handle::id` to provide those `Eq`/`Ord`/... implementations.
 ///
-/// [`HalfEdge`]: crate::objects::HalfEdge
+/// [`HalfEdge`]: crate::topology::HalfEdge
 /// [`Handle`]: crate::storage::Handle
-/// [`Sketch`]: crate::objects::Sketch
+/// [`Sketch`]: crate::topology::Sketch
-/// [`Solid`]: crate::objects::Solid
+/// [`Solid`]: crate::topology::Solid
-/// [`Surface`]: crate::objects::Surface
+/// [`Surface`]: crate::topology::Surface
 #[derive(Clone, Debug, Default)]
 pub struct Vertex {}
 

crates/fj-core/src/topology/object_set.rs

@@ -267,7 +267,7 @@ pub type ObjectSetIntoIter<T> = vec::IntoIter<Handle<T>>;
 mod tests {
     use std::collections::HashSet;
 
-    use crate::{objects::Cycle, operations::insert::Insert, Core};
+    use crate::{operations::insert::Insert, topology::Cycle, Core};
 
     use super::ObjectSet;
 

crates/fj-core/src/validate/curve.rs

@@ -1,6 +1,6 @@
 use crate::{
     geometry::Geometry,
-    objects::Curve,
+    topology::Curve,
     validation::{ValidationConfig, ValidationError},
 };
 

crates/fj-core/src/validate/cycle.rs

@@ -1,6 +1,6 @@
 use crate::{
     geometry::Geometry,
-    objects::Cycle,
+    topology::Cycle,
     validation::{
         checks::AdjacentHalfEdgesNotConnected, ValidationCheck,
         ValidationConfig, ValidationError,

crates/fj-core/src/validate/edge.rs

@@ -1,6 +1,6 @@
 use crate::{
     geometry::Geometry,
-    objects::HalfEdge,
+    topology::HalfEdge,
     validation::{ValidationConfig, ValidationError},
 };
 

crates/fj-core/src/validate/face.rs

@@ -1,6 +1,6 @@
 use crate::{
     geometry::Geometry,
-    objects::Face,
+    topology::Face,
     validation::{
         checks::{FaceHasNoBoundary, InteriorCycleHasInvalidWinding},
         ValidationCheck, ValidationConfig, ValidationError,

crates/fj-core/src/validate/references.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use crate::objects::{Cycle, Face, HalfEdge, Region, Shell};
 use crate::storage::Handle;
+use crate::topology::{Cycle, Face, HalfEdge, Region, Shell};
 
 #[derive(Default)]
 pub struct ReferenceCounter<T, U>(HashMap<Handle<T>, Vec<Handle<U>>>);

crates/fj-core/src/validate/region.rs

@@ -1,4 +1,4 @@
-use crate::{geometry::Geometry, objects::Region};
+use crate::{geometry::Geometry, topology::Region};
 
 use super::{Validate, ValidationConfig, ValidationError};