diff --git a/Cargo.lock b/Cargo.lock
index 4113f3d56..1c7ccad10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -630,8 +630,8 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap",
+ "fj-core",
  "fj-export",
- "fj-kernel",
  "fj-math",
  "fj-window",
  "itertools",
@@ -779,6 +779,23 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "fj-core"
+version = "0.46.0"
+dependencies = [
+ "anyhow",
+ "fj-interop",
+ "fj-math",
+ "iter_fixed",
+ "itertools",
+ "parking_lot",
+ "pretty_assertions",
+ "robust 1.1.0",
+ "spade",
+ "thiserror",
+ "type-map",
+]
+
 [[package]]
 name = "fj-export"
 version = "0.46.0"
@@ -798,23 +815,6 @@ dependencies = [
  "fj-math",
 ]
 
-[[package]]
-name = "fj-kernel"
-version = "0.46.0"
-dependencies = [
- "anyhow",
- "fj-interop",
- "fj-math",
- "iter_fixed",
- "itertools",
- "parking_lot",
- "pretty_assertions",
- "robust 1.1.0",
- "spade",
- "thiserror",
- "type-map",
-]
-
 [[package]]
 name = "fj-math"
 version = "0.46.0"
diff --git a/Cargo.toml b/Cargo.toml
index 60ece3407..7c7f27545 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,9 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/fj-core",
     "crates/fj-export",
     "crates/fj-interop",
-    "crates/fj-kernel",
     "crates/fj-math",
     "crates/fj-viewer",
     "crates/fj-window",
@@ -17,9 +17,9 @@ members = [
     "tools/release-operator",
 ]
 default-members = [
+    "crates/fj-core",
     "crates/fj-export",
     "crates/fj-interop",
-    "crates/fj-kernel",
     "crates/fj-math",
     "crates/fj-viewer",
 ]
@@ -42,6 +42,10 @@ categories = ["encoding", "mathematics", "rendering"]
 version = "0.46.0"
 path = "crates/fj"
 
+[workspace.dependencies.fj-core]
+version = "0.46.0"
+path = "crates/fj-core"
+
 [workspace.dependencies.fj-export]
 version = "0.46.0"
 path = "crates/fj-export"
@@ -54,10 +58,6 @@ path = "crates/fj-host"
 version = "0.46.0"
 path = "crates/fj-interop"
 
-[workspace.dependencies.fj-kernel]
-version = "0.46.0"
-path = "crates/fj-kernel"
-
 [workspace.dependencies.fj-math]
 version = "0.46.0"
 path = "crates/fj-math"
diff --git a/crates/fj-kernel/Cargo.toml b/crates/fj-core/Cargo.toml
similarity index 96%
rename from crates/fj-kernel/Cargo.toml
rename to crates/fj-core/Cargo.toml
index 57c2e55f5..18939bb91 100644
--- a/crates/fj-kernel/Cargo.toml
+++ b/crates/fj-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "fj-kernel"
+name = "fj-core"
 version.workspace = true
 edition.workspace = true
 description.workspace = true
diff --git a/crates/fj-kernel/src/algorithms/approx/cycle.rs b/crates/fj-core/src/algorithms/approx/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/cycle.rs
rename to crates/fj-core/src/algorithms/approx/cycle.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/edge.rs b/crates/fj-core/src/algorithms/approx/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/edge.rs
rename to crates/fj-core/src/algorithms/approx/edge.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/face.rs b/crates/fj-core/src/algorithms/approx/face.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/face.rs
rename to crates/fj-core/src/algorithms/approx/face.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/mod.rs b/crates/fj-core/src/algorithms/approx/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/mod.rs
rename to crates/fj-core/src/algorithms/approx/mod.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/path.rs b/crates/fj-core/src/algorithms/approx/path.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/path.rs
rename to crates/fj-core/src/algorithms/approx/path.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/shell.rs b/crates/fj-core/src/algorithms/approx/shell.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/shell.rs
rename to crates/fj-core/src/algorithms/approx/shell.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/sketch.rs b/crates/fj-core/src/algorithms/approx/sketch.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/sketch.rs
rename to crates/fj-core/src/algorithms/approx/sketch.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/solid.rs b/crates/fj-core/src/algorithms/approx/solid.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/solid.rs
rename to crates/fj-core/src/algorithms/approx/solid.rs
diff --git a/crates/fj-kernel/src/algorithms/approx/tolerance.rs b/crates/fj-core/src/algorithms/approx/tolerance.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/approx/tolerance.rs
rename to crates/fj-core/src/algorithms/approx/tolerance.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/curve_edge.rs b/crates/fj-core/src/algorithms/intersect/curve_edge.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/curve_edge.rs
rename to crates/fj-core/src/algorithms/intersect/curve_edge.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/curve_face.rs b/crates/fj-core/src/algorithms/intersect/curve_face.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/curve_face.rs
rename to crates/fj-core/src/algorithms/intersect/curve_face.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/face_face.rs b/crates/fj-core/src/algorithms/intersect/face_face.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/face_face.rs
rename to crates/fj-core/src/algorithms/intersect/face_face.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/face_point.rs b/crates/fj-core/src/algorithms/intersect/face_point.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/face_point.rs
rename to crates/fj-core/src/algorithms/intersect/face_point.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/line_segment.rs b/crates/fj-core/src/algorithms/intersect/line_segment.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/line_segment.rs
rename to crates/fj-core/src/algorithms/intersect/line_segment.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/mod.rs b/crates/fj-core/src/algorithms/intersect/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/mod.rs
rename to crates/fj-core/src/algorithms/intersect/mod.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/ray_edge.rs b/crates/fj-core/src/algorithms/intersect/ray_edge.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/ray_edge.rs
rename to crates/fj-core/src/algorithms/intersect/ray_edge.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/ray_face.rs b/crates/fj-core/src/algorithms/intersect/ray_face.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/ray_face.rs
rename to crates/fj-core/src/algorithms/intersect/ray_face.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/ray_segment.rs b/crates/fj-core/src/algorithms/intersect/ray_segment.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/ray_segment.rs
rename to crates/fj-core/src/algorithms/intersect/ray_segment.rs
diff --git a/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs b/crates/fj-core/src/algorithms/intersect/surface_surface.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/intersect/surface_surface.rs
rename to crates/fj-core/src/algorithms/intersect/surface_surface.rs
diff --git a/crates/fj-kernel/src/algorithms/mod.rs b/crates/fj-core/src/algorithms/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/mod.rs
rename to crates/fj-core/src/algorithms/mod.rs
diff --git a/crates/fj-kernel/src/algorithms/reverse/cycle.rs b/crates/fj-core/src/algorithms/reverse/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/reverse/cycle.rs
rename to crates/fj-core/src/algorithms/reverse/cycle.rs
diff --git a/crates/fj-kernel/src/algorithms/reverse/face.rs b/crates/fj-core/src/algorithms/reverse/face.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/reverse/face.rs
rename to crates/fj-core/src/algorithms/reverse/face.rs
diff --git a/crates/fj-kernel/src/algorithms/reverse/mod.rs b/crates/fj-core/src/algorithms/reverse/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/reverse/mod.rs
rename to crates/fj-core/src/algorithms/reverse/mod.rs
diff --git a/crates/fj-kernel/src/algorithms/sweep/curve.rs b/crates/fj-core/src/algorithms/sweep/curve.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/sweep/curve.rs
rename to crates/fj-core/src/algorithms/sweep/curve.rs
diff --git a/crates/fj-kernel/src/algorithms/sweep/edge.rs b/crates/fj-core/src/algorithms/sweep/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/sweep/edge.rs
rename to crates/fj-core/src/algorithms/sweep/edge.rs
diff --git a/crates/fj-kernel/src/algorithms/sweep/face.rs b/crates/fj-core/src/algorithms/sweep/face.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/sweep/face.rs
rename to crates/fj-core/src/algorithms/sweep/face.rs
diff --git a/crates/fj-kernel/src/algorithms/sweep/mod.rs b/crates/fj-core/src/algorithms/sweep/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/sweep/mod.rs
rename to crates/fj-core/src/algorithms/sweep/mod.rs
diff --git a/crates/fj-kernel/src/algorithms/sweep/sketch.rs b/crates/fj-core/src/algorithms/sweep/sketch.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/sweep/sketch.rs
rename to crates/fj-core/src/algorithms/sweep/sketch.rs
diff --git a/crates/fj-kernel/src/algorithms/sweep/vertex.rs b/crates/fj-core/src/algorithms/sweep/vertex.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/sweep/vertex.rs
rename to crates/fj-core/src/algorithms/sweep/vertex.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/cycle.rs b/crates/fj-core/src/algorithms/transform/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/cycle.rs
rename to crates/fj-core/src/algorithms/transform/cycle.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/edge.rs b/crates/fj-core/src/algorithms/transform/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/edge.rs
rename to crates/fj-core/src/algorithms/transform/edge.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/face.rs b/crates/fj-core/src/algorithms/transform/face.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/face.rs
rename to crates/fj-core/src/algorithms/transform/face.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/mod.rs b/crates/fj-core/src/algorithms/transform/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/mod.rs
rename to crates/fj-core/src/algorithms/transform/mod.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/shell.rs b/crates/fj-core/src/algorithms/transform/shell.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/shell.rs
rename to crates/fj-core/src/algorithms/transform/shell.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/solid.rs b/crates/fj-core/src/algorithms/transform/solid.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/solid.rs
rename to crates/fj-core/src/algorithms/transform/solid.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/surface.rs b/crates/fj-core/src/algorithms/transform/surface.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/surface.rs
rename to crates/fj-core/src/algorithms/transform/surface.rs
diff --git a/crates/fj-kernel/src/algorithms/transform/vertex.rs b/crates/fj-core/src/algorithms/transform/vertex.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/transform/vertex.rs
rename to crates/fj-core/src/algorithms/transform/vertex.rs
diff --git a/crates/fj-kernel/src/algorithms/triangulate/delaunay.rs b/crates/fj-core/src/algorithms/triangulate/delaunay.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/triangulate/delaunay.rs
rename to crates/fj-core/src/algorithms/triangulate/delaunay.rs
diff --git a/crates/fj-kernel/src/algorithms/triangulate/mod.rs b/crates/fj-core/src/algorithms/triangulate/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/triangulate/mod.rs
rename to crates/fj-core/src/algorithms/triangulate/mod.rs
diff --git a/crates/fj-kernel/src/algorithms/triangulate/polygon.rs b/crates/fj-core/src/algorithms/triangulate/polygon.rs
similarity index 100%
rename from crates/fj-kernel/src/algorithms/triangulate/polygon.rs
rename to crates/fj-core/src/algorithms/triangulate/polygon.rs
diff --git a/crates/fj-kernel/src/geometry/curve.rs b/crates/fj-core/src/geometry/curve.rs
similarity index 100%
rename from crates/fj-kernel/src/geometry/curve.rs
rename to crates/fj-core/src/geometry/curve.rs
diff --git a/crates/fj-kernel/src/geometry/mod.rs b/crates/fj-core/src/geometry/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/geometry/mod.rs
rename to crates/fj-core/src/geometry/mod.rs
diff --git a/crates/fj-kernel/src/geometry/region.rs b/crates/fj-core/src/geometry/region.rs
similarity index 100%
rename from crates/fj-kernel/src/geometry/region.rs
rename to crates/fj-core/src/geometry/region.rs
diff --git a/crates/fj-kernel/src/geometry/surface.rs b/crates/fj-core/src/geometry/surface.rs
similarity index 100%
rename from crates/fj-kernel/src/geometry/surface.rs
rename to crates/fj-core/src/geometry/surface.rs
diff --git a/crates/fj-kernel/src/lib.rs b/crates/fj-core/src/lib.rs
similarity index 100%
rename from crates/fj-kernel/src/lib.rs
rename to crates/fj-core/src/lib.rs
diff --git a/crates/fj-kernel/src/objects/kinds/cycle.rs b/crates/fj-core/src/objects/kinds/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/cycle.rs
rename to crates/fj-core/src/objects/kinds/cycle.rs
diff --git a/crates/fj-kernel/src/objects/kinds/edge.rs b/crates/fj-core/src/objects/kinds/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/edge.rs
rename to crates/fj-core/src/objects/kinds/edge.rs
diff --git a/crates/fj-kernel/src/objects/kinds/face.rs b/crates/fj-core/src/objects/kinds/face.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/face.rs
rename to crates/fj-core/src/objects/kinds/face.rs
diff --git a/crates/fj-kernel/src/objects/kinds/mod.rs b/crates/fj-core/src/objects/kinds/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/mod.rs
rename to crates/fj-core/src/objects/kinds/mod.rs
diff --git a/crates/fj-kernel/src/objects/kinds/shell.rs b/crates/fj-core/src/objects/kinds/shell.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/shell.rs
rename to crates/fj-core/src/objects/kinds/shell.rs
diff --git a/crates/fj-kernel/src/objects/kinds/sketch.rs b/crates/fj-core/src/objects/kinds/sketch.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/sketch.rs
rename to crates/fj-core/src/objects/kinds/sketch.rs
diff --git a/crates/fj-kernel/src/objects/kinds/solid.rs b/crates/fj-core/src/objects/kinds/solid.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/solid.rs
rename to crates/fj-core/src/objects/kinds/solid.rs
diff --git a/crates/fj-kernel/src/objects/kinds/surface.rs b/crates/fj-core/src/objects/kinds/surface.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/surface.rs
rename to crates/fj-core/src/objects/kinds/surface.rs
diff --git a/crates/fj-kernel/src/objects/kinds/vertex.rs b/crates/fj-core/src/objects/kinds/vertex.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/kinds/vertex.rs
rename to crates/fj-core/src/objects/kinds/vertex.rs
diff --git a/crates/fj-kernel/src/objects/mod.rs b/crates/fj-core/src/objects/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/mod.rs
rename to crates/fj-core/src/objects/mod.rs
diff --git a/crates/fj-kernel/src/objects/object.rs b/crates/fj-core/src/objects/object.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/object.rs
rename to crates/fj-core/src/objects/object.rs
diff --git a/crates/fj-kernel/src/objects/set.rs b/crates/fj-core/src/objects/set.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/set.rs
rename to crates/fj-core/src/objects/set.rs
diff --git a/crates/fj-kernel/src/objects/stores.rs b/crates/fj-core/src/objects/stores.rs
similarity index 100%
rename from crates/fj-kernel/src/objects/stores.rs
rename to crates/fj-core/src/objects/stores.rs
diff --git a/crates/fj-kernel/src/operations/build/cycle.rs b/crates/fj-core/src/operations/build/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/cycle.rs
rename to crates/fj-core/src/operations/build/cycle.rs
diff --git a/crates/fj-kernel/src/operations/build/edge.rs b/crates/fj-core/src/operations/build/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/edge.rs
rename to crates/fj-core/src/operations/build/edge.rs
diff --git a/crates/fj-kernel/src/operations/build/face.rs b/crates/fj-core/src/operations/build/face.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/face.rs
rename to crates/fj-core/src/operations/build/face.rs
diff --git a/crates/fj-kernel/src/operations/build/mod.rs b/crates/fj-core/src/operations/build/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/mod.rs
rename to crates/fj-core/src/operations/build/mod.rs
diff --git a/crates/fj-kernel/src/operations/build/shell.rs b/crates/fj-core/src/operations/build/shell.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/shell.rs
rename to crates/fj-core/src/operations/build/shell.rs
diff --git a/crates/fj-kernel/src/operations/build/sketch.rs b/crates/fj-core/src/operations/build/sketch.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/sketch.rs
rename to crates/fj-core/src/operations/build/sketch.rs
diff --git a/crates/fj-kernel/src/operations/build/solid.rs b/crates/fj-core/src/operations/build/solid.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/solid.rs
rename to crates/fj-core/src/operations/build/solid.rs
diff --git a/crates/fj-kernel/src/operations/build/surface.rs b/crates/fj-core/src/operations/build/surface.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/build/surface.rs
rename to crates/fj-core/src/operations/build/surface.rs
diff --git a/crates/fj-kernel/src/operations/insert.rs b/crates/fj-core/src/operations/insert.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/insert.rs
rename to crates/fj-core/src/operations/insert.rs
diff --git a/crates/fj-kernel/src/operations/join/cycle.rs b/crates/fj-core/src/operations/join/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/join/cycle.rs
rename to crates/fj-core/src/operations/join/cycle.rs
diff --git a/crates/fj-kernel/src/operations/join/mod.rs b/crates/fj-core/src/operations/join/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/join/mod.rs
rename to crates/fj-core/src/operations/join/mod.rs
diff --git a/crates/fj-kernel/src/operations/mod.rs b/crates/fj-core/src/operations/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/mod.rs
rename to crates/fj-core/src/operations/mod.rs
diff --git a/crates/fj-kernel/src/operations/update/cycle.rs b/crates/fj-core/src/operations/update/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/update/cycle.rs
rename to crates/fj-core/src/operations/update/cycle.rs
diff --git a/crates/fj-kernel/src/operations/update/edge.rs b/crates/fj-core/src/operations/update/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/update/edge.rs
rename to crates/fj-core/src/operations/update/edge.rs
diff --git a/crates/fj-kernel/src/operations/update/face.rs b/crates/fj-core/src/operations/update/face.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/update/face.rs
rename to crates/fj-core/src/operations/update/face.rs
diff --git a/crates/fj-kernel/src/operations/update/mod.rs b/crates/fj-core/src/operations/update/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/update/mod.rs
rename to crates/fj-core/src/operations/update/mod.rs
diff --git a/crates/fj-kernel/src/operations/update/shell.rs b/crates/fj-core/src/operations/update/shell.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/update/shell.rs
rename to crates/fj-core/src/operations/update/shell.rs
diff --git a/crates/fj-kernel/src/operations/update/solid.rs b/crates/fj-core/src/operations/update/solid.rs
similarity index 100%
rename from crates/fj-kernel/src/operations/update/solid.rs
rename to crates/fj-core/src/operations/update/solid.rs
diff --git a/crates/fj-kernel/src/services/mod.rs b/crates/fj-core/src/services/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/services/mod.rs
rename to crates/fj-core/src/services/mod.rs
diff --git a/crates/fj-kernel/src/services/objects.rs b/crates/fj-core/src/services/objects.rs
similarity index 100%
rename from crates/fj-kernel/src/services/objects.rs
rename to crates/fj-core/src/services/objects.rs
diff --git a/crates/fj-kernel/src/services/service.rs b/crates/fj-core/src/services/service.rs
similarity index 100%
rename from crates/fj-kernel/src/services/service.rs
rename to crates/fj-core/src/services/service.rs
diff --git a/crates/fj-kernel/src/services/validation.rs b/crates/fj-core/src/services/validation.rs
similarity index 100%
rename from crates/fj-kernel/src/services/validation.rs
rename to crates/fj-core/src/services/validation.rs
diff --git a/crates/fj-kernel/src/storage/blocks.rs b/crates/fj-core/src/storage/blocks.rs
similarity index 100%
rename from crates/fj-kernel/src/storage/blocks.rs
rename to crates/fj-core/src/storage/blocks.rs
diff --git a/crates/fj-kernel/src/storage/handle.rs b/crates/fj-core/src/storage/handle.rs
similarity index 100%
rename from crates/fj-kernel/src/storage/handle.rs
rename to crates/fj-core/src/storage/handle.rs
diff --git a/crates/fj-kernel/src/storage/mod.rs b/crates/fj-core/src/storage/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/storage/mod.rs
rename to crates/fj-core/src/storage/mod.rs
diff --git a/crates/fj-kernel/src/storage/store.rs b/crates/fj-core/src/storage/store.rs
similarity index 100%
rename from crates/fj-kernel/src/storage/store.rs
rename to crates/fj-core/src/storage/store.rs
diff --git a/crates/fj-kernel/src/validate/cycle.rs b/crates/fj-core/src/validate/cycle.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/cycle.rs
rename to crates/fj-core/src/validate/cycle.rs
diff --git a/crates/fj-kernel/src/validate/edge.rs b/crates/fj-core/src/validate/edge.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/edge.rs
rename to crates/fj-core/src/validate/edge.rs
diff --git a/crates/fj-kernel/src/validate/face.rs b/crates/fj-core/src/validate/face.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/face.rs
rename to crates/fj-core/src/validate/face.rs
diff --git a/crates/fj-kernel/src/validate/mod.rs b/crates/fj-core/src/validate/mod.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/mod.rs
rename to crates/fj-core/src/validate/mod.rs
diff --git a/crates/fj-kernel/src/validate/shell.rs b/crates/fj-core/src/validate/shell.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/shell.rs
rename to crates/fj-core/src/validate/shell.rs
diff --git a/crates/fj-kernel/src/validate/sketch.rs b/crates/fj-core/src/validate/sketch.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/sketch.rs
rename to crates/fj-core/src/validate/sketch.rs
diff --git a/crates/fj-kernel/src/validate/solid.rs b/crates/fj-core/src/validate/solid.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/solid.rs
rename to crates/fj-core/src/validate/solid.rs
diff --git a/crates/fj-kernel/src/validate/surface.rs b/crates/fj-core/src/validate/surface.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/surface.rs
rename to crates/fj-core/src/validate/surface.rs
diff --git a/crates/fj-kernel/src/validate/vertex.rs b/crates/fj-core/src/validate/vertex.rs
similarity index 100%
rename from crates/fj-kernel/src/validate/vertex.rs
rename to crates/fj-core/src/validate/vertex.rs
diff --git a/models/cuboid/Cargo.toml b/models/cuboid/Cargo.toml
index dbb1f30eb..19c66e241 100644
--- a/models/cuboid/Cargo.toml
+++ b/models/cuboid/Cargo.toml
@@ -12,12 +12,12 @@ itertools = "0.10.5"
 version = "4.3.0"
 features = ["derive"]
 
+[dependencies.fj-core]
+path = "../../crates/fj-core"
+
 [dependencies.fj-export]
 path = "../../crates/fj-export"
 
-[dependencies.fj-kernel]
-path = "../../crates/fj-kernel"
-
 [dependencies.fj-math]
 path = "../../crates/fj-math"
 
diff --git a/models/cuboid/src/lib.rs b/models/cuboid/src/lib.rs
index 5fbde0a80..2a2318d47 100644
--- a/models/cuboid/src/lib.rs
+++ b/models/cuboid/src/lib.rs
@@ -1,4 +1,4 @@
-use fj_kernel::{
+use fj_core::{
     algorithms::sweep::Sweep,
     objects::{Sketch, Solid},
     operations::{BuildSketch, Insert},
diff --git a/models/cuboid/src/main.rs b/models/cuboid/src/main.rs
index 5a0f7b505..7324199cb 100644
--- a/models/cuboid/src/main.rs
+++ b/models/cuboid/src/main.rs
@@ -1,6 +1,6 @@
 use std::{ops::Deref, path::PathBuf};
 
-use fj_kernel::algorithms::{approx::Tolerance, triangulate::Triangulate};
+use fj_core::algorithms::{approx::Tolerance, triangulate::Triangulate};
 
 fn main() -> anyhow::Result<()> {
     let args = Args::parse();
diff --git a/tools/cross-compiler/src/main.rs b/tools/cross-compiler/src/main.rs
index ff26c8c0f..9f40dd67d 100644
--- a/tools/cross-compiler/src/main.rs
+++ b/tools/cross-compiler/src/main.rs
@@ -13,18 +13,18 @@ fn main() -> anyhow::Result<()> {
     let targets = [
         Target {
             triple: "aarch64-apple-ios",
-            crates: &["fj-export", "fj-interop", "fj-kernel", "fj-math"],
+            crates: &["fj-core", "fj-export", "fj-interop", "fj-math"],
         },
         Target {
             triple: "aarch64-linux-android",
-            crates: &["fj-export", "fj-interop", "fj-kernel", "fj-math"],
+            crates: &["fj-core", "fj-export", "fj-interop", "fj-math"],
         },
         Target {
             triple: "wasm32-unknown-unknown",
             crates: &[
+                "fj-core",
                 "fj-export",
                 "fj-interop",
-                "fj-kernel",
                 "fj-math",
                 "fj-viewer",
             ],