diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs
index d227940c..724b441e 100644
--- a/crates/ui-egui/src/canvas.rs
+++ b/crates/ui-egui/src/canvas.rs
@@ -13,6 +13,20 @@ use crate::FigApp;
 use crate::i18n::{tr, trf, trn};
 use crate::render_worker::{Done, Job, Worker};
 use crate::theme::{COMPONENT, Tokens, doc_c32, regular, semibold};
+pub mod board_bar;
+pub mod board_facilitate;
+pub mod comments;
+pub mod cursors;
+pub mod frame_labels;
+pub mod frame_stats;
+pub mod guides;
+pub mod handles;
+pub mod live_text;
+pub mod measure_overlay;
+pub mod proto_canvas;
+pub mod render_worker;
+pub(crate) mod selection_spacing;
+pub mod widget_bar;
 
 pub struct CanvasState {
     pub rect: Rect,
diff --git a/crates/ui-egui/src/board_bar.rs b/crates/ui-egui/src/canvas/board_bar.rs
similarity index 100%
rename from crates/ui-egui/src/board_bar.rs
rename to crates/ui-egui/src/canvas/board_bar.rs
diff --git a/crates/ui-egui/src/board_facilitate.rs b/crates/ui-egui/src/canvas/board_facilitate.rs
similarity index 100%
rename from crates/ui-egui/src/board_facilitate.rs
rename to crates/ui-egui/src/canvas/board_facilitate.rs
diff --git a/crates/ui-egui/src/comments.rs b/crates/ui-egui/src/canvas/comments.rs
similarity index 100%
rename from crates/ui-egui/src/comments.rs
rename to crates/ui-egui/src/canvas/comments.rs
diff --git a/crates/ui-egui/src/cursors.rs b/crates/ui-egui/src/canvas/cursors.rs
similarity index 100%
rename from crates/ui-egui/src/cursors.rs
rename to crates/ui-egui/src/canvas/cursors.rs
diff --git a/crates/ui-egui/src/frame_labels.rs b/crates/ui-egui/src/canvas/frame_labels.rs
similarity index 100%
rename from crates/ui-egui/src/frame_labels.rs
rename to crates/ui-egui/src/canvas/frame_labels.rs
diff --git a/crates/ui-egui/src/frame_stats.rs b/crates/ui-egui/src/canvas/frame_stats.rs
similarity index 100%
rename from crates/ui-egui/src/frame_stats.rs
rename to crates/ui-egui/src/canvas/frame_stats.rs
diff --git a/crates/ui-egui/src/guides.rs b/crates/ui-egui/src/canvas/guides.rs
similarity index 100%
rename from crates/ui-egui/src/guides.rs
rename to crates/ui-egui/src/canvas/guides.rs
diff --git a/crates/ui-egui/src/handles.rs b/crates/ui-egui/src/canvas/handles.rs
similarity index 100%
rename from crates/ui-egui/src/handles.rs
rename to crates/ui-egui/src/canvas/handles.rs
diff --git a/crates/ui-egui/src/live_text.rs b/crates/ui-egui/src/canvas/live_text.rs
similarity index 100%
rename from crates/ui-egui/src/live_text.rs
rename to crates/ui-egui/src/canvas/live_text.rs
diff --git a/crates/ui-egui/src/measure_overlay.rs b/crates/ui-egui/src/canvas/measure_overlay.rs
similarity index 100%
rename from crates/ui-egui/src/measure_overlay.rs
rename to crates/ui-egui/src/canvas/measure_overlay.rs
diff --git a/crates/ui-egui/src/proto_canvas.rs b/crates/ui-egui/src/canvas/proto_canvas.rs
similarity index 100%
rename from crates/ui-egui/src/proto_canvas.rs
rename to crates/ui-egui/src/canvas/proto_canvas.rs
diff --git a/crates/ui-egui/src/render_worker.rs b/crates/ui-egui/src/canvas/render_worker.rs
similarity index 100%
rename from crates/ui-egui/src/render_worker.rs
rename to crates/ui-egui/src/canvas/render_worker.rs
diff --git a/crates/ui-egui/src/selection_spacing.rs b/crates/ui-egui/src/canvas/selection_spacing.rs
similarity index 100%
rename from crates/ui-egui/src/selection_spacing.rs
rename to crates/ui-egui/src/canvas/selection_spacing.rs
diff --git a/crates/ui-egui/src/widget_bar.rs b/crates/ui-egui/src/canvas/widget_bar.rs
similarity index 100%
rename from crates/ui-egui/src/widget_bar.rs
rename to crates/ui-egui/src/canvas/widget_bar.rs
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index e5bc32a0..8f70ea85 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -8,29 +8,21 @@
 pub mod a11y;
 pub mod assets_panel;
 pub mod bidi;
-pub mod board_bar;
-pub mod board_facilitate;
 mod board_picker;
 pub mod branch_ui;
 pub mod canvas;
 pub mod cjk;
 pub mod colorpicker;
-pub mod comments;
 pub mod component_panel;
 pub mod control;
 pub mod credits;
-pub mod cursors;
 pub mod dev_compare;
 pub mod dev_mode;
 pub mod dialogs;
 pub mod export_panel;
 pub mod field_math;
 pub mod font_preview;
-pub mod frame_labels;
 pub mod frame_presets;
-pub mod frame_stats;
-pub mod guides;
-pub mod handles;
 pub mod home;
 pub mod home_recents;
 pub mod i18n;
@@ -40,23 +32,18 @@ pub mod layers;
 pub mod layout_panel;
 pub mod list_drag;
 pub mod live;
-pub mod live_text;
-pub mod measure_overlay;
 pub mod menus;
 pub mod missing_fonts;
 pub mod online;
 pub mod pending_open;
 pub mod plugins_ui;
 pub mod present;
-pub mod proto_canvas;
 pub mod proto_editor;
 pub mod proto_panel;
-pub mod render_worker;
 pub mod right;
 pub mod scale_panel;
 pub mod section_panel;
 pub mod selection_colors;
-mod selection_spacing;
 pub mod shortcuts;
 pub mod shortcuts_panel;
 pub mod style_picker;
@@ -70,7 +57,6 @@ pub mod variable_ui;
 pub mod variables_panel;
 pub mod vector_panel;
 pub mod versions;
-pub mod widget_bar;
 pub mod widgets;
 pub mod windows;
 
@@ -259,6 +245,20 @@ mod web_save_tests;
 mod windows_qa_tests;
 #[cfg(test)]
 mod windows_tests;
+pub use canvas::board_bar;
+pub use canvas::board_facilitate;
+pub use canvas::comments;
+pub use canvas::cursors;
+pub use canvas::frame_labels;
+pub use canvas::frame_stats;
+pub use canvas::guides;
+pub use canvas::handles;
+pub use canvas::live_text;
+pub use canvas::measure_overlay;
+pub use canvas::proto_canvas;
+pub use canvas::render_worker;
+use canvas::selection_spacing;
+pub use canvas::widget_bar;
 
 use std::collections::BTreeSet;
 use std::ffi::OsStr;