diff --git a/experiments/2025-03-18/src/app.rs b/experiments/2025-03-18/src/app.rs
index 5482e4905..7cd84944f 100644
--- a/experiments/2025-03-18/src/app.rs
+++ b/experiments/2025-03-18/src/app.rs
@@ -1,5 +1,6 @@
 use std::sync::Arc;
 
+use fj_interop::TriMesh;
 use winit::{
     application::ApplicationHandler,
     event::{KeyEvent, WindowEvent},
@@ -8,7 +9,7 @@ use winit::{
     window::{Window, WindowAttributes, WindowId},
 };
 
-use crate::{geometry::TriMesh, render::Renderer};
+use crate::render::Renderer;
 
 pub fn run(tri_mesh: TriMesh) -> anyhow::Result<()> {
     let event_loop = EventLoop::new()?;
diff --git a/experiments/2025-03-18/src/export.rs b/experiments/2025-03-18/src/export.rs
index 83497985f..ce69a1153 100644
--- a/experiments/2025-03-18/src/export.rs
+++ b/experiments/2025-03-18/src/export.rs
@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, fs::File};
 
-use crate::geometry::TriMesh;
+use fj_interop::TriMesh;
 
 pub fn export(tri_mesh: &TriMesh) -> anyhow::Result<()> {
     let mut indices_by_vertex = BTreeMap::new();
diff --git a/experiments/2025-03-18/src/extra/triangulate.rs b/experiments/2025-03-18/src/extra/triangulate.rs
index 502a724bb..347d8b10c 100644
--- a/experiments/2025-03-18/src/extra/triangulate.rs
+++ b/experiments/2025-03-18/src/extra/triangulate.rs
@@ -3,12 +3,12 @@ use std::{
     mem,
 };
 
-use fj_interop::{Color, MeshTriangle};
+use fj_interop::{Color, MeshTriangle, TriMesh};
 use fj_math::{Point, Triangle};
 use geo::{Contains, Coord, LineString, Polygon};
 use spade::Triangulation;
 
-use crate::{geometry::TriMesh, topology::face::Face};
+use crate::topology::face::Face;
 
 pub fn triangulate(face: &Face) -> TriMesh {
     let points = points(face);
diff --git a/experiments/2025-03-18/src/geometry/mod.rs b/experiments/2025-03-18/src/geometry/mod.rs
index 15764e906..1489f335b 100644
--- a/experiments/2025-03-18/src/geometry/mod.rs
+++ b/experiments/2025-03-18/src/geometry/mod.rs
@@ -3,5 +3,3 @@ mod surface;
 mod tri_mesh;
 
 pub use self::{sketch::Sketch, surface::SurfaceGeometry, tri_mesh::ToTriMesh};
-
-pub use fj_interop::TriMesh;
diff --git a/experiments/2025-03-18/src/model.rs b/experiments/2025-03-18/src/model.rs
index e4fdc2532..fa7fce8bd 100644
--- a/experiments/2025-03-18/src/model.rs
+++ b/experiments/2025-03-18/src/model.rs
@@ -1,7 +1,8 @@
+use fj_interop::TriMesh;
 use fj_math::{Point, Vector};
 
 use crate::{
-    geometry::{Sketch, ToTriMesh, TriMesh},
+    geometry::{Sketch, ToTriMesh},
     handle::Handle,
     math::{Bivector, Plane},
     operations::sweep::SweepExt,
diff --git a/experiments/2025-03-18/src/render/geometry.rs b/experiments/2025-03-18/src/render/geometry.rs
index 90fadc586..be58e3756 100644
--- a/experiments/2025-03-18/src/render/geometry.rs
+++ b/experiments/2025-03-18/src/render/geometry.rs
@@ -1,8 +1,7 @@
+use fj_interop::TriMesh;
 use glam::Vec3;
 use wgpu::util::DeviceExt;
 
-use crate::geometry::TriMesh;
-
 use super::vertex::Vertex;
 
 pub struct Geometry {
@@ -19,7 +18,10 @@ impl Geometry {
         for triangle in tri_mesh.all_triangles() {
             let triangle = triangle.points.each_ref().map(|point| {
                 Vec3::from(
-                    point.coords.components.map(|coord| coord.into_f64() as f32),
+                    point
+                        .coords
+                        .components
+                        .map(|coord| coord.into_f64() as f32),
                 )
             });
             let normal = {
diff --git a/experiments/2025-03-18/src/render/renderer.rs b/experiments/2025-03-18/src/render/renderer.rs
index 1e0353269..9879c6288 100644
--- a/experiments/2025-03-18/src/render/renderer.rs
+++ b/experiments/2025-03-18/src/render/renderer.rs
@@ -1,10 +1,9 @@
 use std::sync::Arc;
 
 use anyhow::anyhow;
+use fj_interop::TriMesh;
 use winit::window::Window;
 
-use crate::geometry::TriMesh;
-
 use super::{geometry::Geometry, pipeline::Pipeline};
 
 pub struct Renderer {
diff --git a/experiments/2025-03-18/src/topology/face.rs b/experiments/2025-03-18/src/topology/face.rs
index 3bb42a9dc..1c4ff4784 100644
--- a/experiments/2025-03-18/src/topology/face.rs
+++ b/experiments/2025-03-18/src/topology/face.rs
@@ -1,9 +1,8 @@
+use fj_interop::TriMesh;
 use itertools::Itertools;
 
 use crate::{
-    extra::triangulate::triangulate,
-    geometry::{ToTriMesh, TriMesh},
-    handle::Handle,
+    extra::triangulate::triangulate, geometry::ToTriMesh, handle::Handle,
 };
 
 use super::{half_edge::HalfEdge, surface::Surface, vertex::Vertex};
diff --git a/experiments/2025-03-18/src/topology/solid.rs b/experiments/2025-03-18/src/topology/solid.rs
index d41ebfb29..7895b90b0 100644
--- a/experiments/2025-03-18/src/topology/solid.rs
+++ b/experiments/2025-03-18/src/topology/solid.rs
@@ -1,7 +1,6 @@
-use crate::{
-    geometry::{ToTriMesh, TriMesh},
-    handle::Handle,
-};
+use fj_interop::TriMesh;
+
+use crate::{geometry::ToTriMesh, handle::Handle};
 
 use super::face::Face;