diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 8f70ea851..a5b1ad704 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -6,31 +6,22 @@
 #![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
 
 pub mod a11y;
-pub mod assets_panel;
 pub mod bidi;
 mod board_picker;
 pub mod branch_ui;
 pub mod canvas;
 pub mod cjk;
 pub mod colorpicker;
-pub mod component_panel;
 pub mod control;
 pub mod credits;
-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_presets;
 pub mod home;
 pub mod home_recents;
 pub mod i18n;
 pub mod icons;
 pub mod import_report;
-pub mod layers;
-pub mod layout_panel;
-pub mod list_drag;
 pub mod live;
 pub mod menus;
 pub mod missing_fonts;
@@ -38,25 +29,14 @@ pub mod online;
 pub mod pending_open;
 pub mod plugins_ui;
 pub mod present;
-pub mod proto_editor;
-pub mod proto_panel;
-pub mod right;
-pub mod scale_panel;
-pub mod section_panel;
-pub mod selection_colors;
 pub mod shortcuts;
-pub mod shortcuts_panel;
 pub mod style_picker;
 pub mod tabs;
 pub mod theme;
 pub mod toolbar;
-pub mod typography;
 pub mod ui_scale;
 pub mod updates_ui;
-pub mod variable_ui;
 pub mod variables_panel;
-pub mod vector_panel;
-pub mod versions;
 pub mod widgets;
 pub mod windows;
 
@@ -177,6 +157,7 @@ mod panel_remove_tests;
 mod panel_reorder_tests;
 #[cfg(test)]
 mod panel_width_tests;
+mod panels;
 #[cfg(test)]
 mod paste_image_tests;
 #[cfg(test)]
@@ -259,6 +240,26 @@ pub use canvas::proto_canvas;
 pub use canvas::render_worker;
 use canvas::selection_spacing;
 pub use canvas::widget_bar;
+pub use panels::assets_panel;
+pub use panels::component_panel;
+pub use panels::dev_compare;
+pub use panels::dev_mode;
+pub use panels::export_panel;
+pub use panels::frame_presets;
+pub use panels::layers;
+pub use panels::layout_panel;
+pub use panels::list_drag;
+pub use panels::proto_editor;
+pub use panels::proto_panel;
+pub use panels::right;
+pub use panels::scale_panel;
+pub use panels::section_panel;
+pub use panels::selection_colors;
+pub use panels::shortcuts_panel;
+pub use panels::typography;
+pub use panels::variable_ui;
+pub use panels::vector_panel;
+pub use panels::versions;
 
 use std::collections::BTreeSet;
 use std::ffi::OsStr;
diff --git a/crates/ui-egui/src/panels.rs b/crates/ui-egui/src/panels.rs
new file mode 100644
index 000000000..8dd0df074
--- /dev/null
+++ b/crates/ui-egui/src/panels.rs
@@ -0,0 +1,20 @@
+pub mod assets_panel;
+pub mod component_panel;
+pub mod dev_compare;
+pub mod dev_mode;
+pub mod export_panel;
+pub mod frame_presets;
+pub mod layers;
+pub mod layout_panel;
+pub mod list_drag;
+pub mod proto_editor;
+pub mod proto_panel;
+pub mod right;
+pub mod scale_panel;
+pub mod section_panel;
+pub mod selection_colors;
+pub mod shortcuts_panel;
+pub mod typography;
+pub mod variable_ui;
+pub mod vector_panel;
+pub mod versions;
diff --git a/crates/ui-egui/src/assets_panel.rs b/crates/ui-egui/src/panels/assets_panel.rs
similarity index 100%
rename from crates/ui-egui/src/assets_panel.rs
rename to crates/ui-egui/src/panels/assets_panel.rs
diff --git a/crates/ui-egui/src/component_panel.rs b/crates/ui-egui/src/panels/component_panel.rs
similarity index 100%
rename from crates/ui-egui/src/component_panel.rs
rename to crates/ui-egui/src/panels/component_panel.rs
diff --git a/crates/ui-egui/src/dev_compare.rs b/crates/ui-egui/src/panels/dev_compare.rs
similarity index 100%
rename from crates/ui-egui/src/dev_compare.rs
rename to crates/ui-egui/src/panels/dev_compare.rs
diff --git a/crates/ui-egui/src/dev_mode.rs b/crates/ui-egui/src/panels/dev_mode.rs
similarity index 100%
rename from crates/ui-egui/src/dev_mode.rs
rename to crates/ui-egui/src/panels/dev_mode.rs
diff --git a/crates/ui-egui/src/export_panel.rs b/crates/ui-egui/src/panels/export_panel.rs
similarity index 100%
rename from crates/ui-egui/src/export_panel.rs
rename to crates/ui-egui/src/panels/export_panel.rs
diff --git a/crates/ui-egui/src/frame_presets.rs b/crates/ui-egui/src/panels/frame_presets.rs
similarity index 100%
rename from crates/ui-egui/src/frame_presets.rs
rename to crates/ui-egui/src/panels/frame_presets.rs
diff --git a/crates/ui-egui/src/layers.rs b/crates/ui-egui/src/panels/layers.rs
similarity index 100%
rename from crates/ui-egui/src/layers.rs
rename to crates/ui-egui/src/panels/layers.rs
diff --git a/crates/ui-egui/src/layout_panel.rs b/crates/ui-egui/src/panels/layout_panel.rs
similarity index 100%
rename from crates/ui-egui/src/layout_panel.rs
rename to crates/ui-egui/src/panels/layout_panel.rs
diff --git a/crates/ui-egui/src/list_drag.rs b/crates/ui-egui/src/panels/list_drag.rs
similarity index 100%
rename from crates/ui-egui/src/list_drag.rs
rename to crates/ui-egui/src/panels/list_drag.rs
diff --git a/crates/ui-egui/src/proto_editor.rs b/crates/ui-egui/src/panels/proto_editor.rs
similarity index 100%
rename from crates/ui-egui/src/proto_editor.rs
rename to crates/ui-egui/src/panels/proto_editor.rs
diff --git a/crates/ui-egui/src/proto_panel.rs b/crates/ui-egui/src/panels/proto_panel.rs
similarity index 100%
rename from crates/ui-egui/src/proto_panel.rs
rename to crates/ui-egui/src/panels/proto_panel.rs
diff --git a/crates/ui-egui/src/right.rs b/crates/ui-egui/src/panels/right.rs
similarity index 100%
rename from crates/ui-egui/src/right.rs
rename to crates/ui-egui/src/panels/right.rs
diff --git a/crates/ui-egui/src/scale_panel.rs b/crates/ui-egui/src/panels/scale_panel.rs
similarity index 100%
rename from crates/ui-egui/src/scale_panel.rs
rename to crates/ui-egui/src/panels/scale_panel.rs
diff --git a/crates/ui-egui/src/section_panel.rs b/crates/ui-egui/src/panels/section_panel.rs
similarity index 100%
rename from crates/ui-egui/src/section_panel.rs
rename to crates/ui-egui/src/panels/section_panel.rs
diff --git a/crates/ui-egui/src/selection_colors.rs b/crates/ui-egui/src/panels/selection_colors.rs
similarity index 100%
rename from crates/ui-egui/src/selection_colors.rs
rename to crates/ui-egui/src/panels/selection_colors.rs
diff --git a/crates/ui-egui/src/shortcuts_panel.rs b/crates/ui-egui/src/panels/shortcuts_panel.rs
similarity index 100%
rename from crates/ui-egui/src/shortcuts_panel.rs
rename to crates/ui-egui/src/panels/shortcuts_panel.rs
diff --git a/crates/ui-egui/src/typography.rs b/crates/ui-egui/src/panels/typography.rs
similarity index 100%
rename from crates/ui-egui/src/typography.rs
rename to crates/ui-egui/src/panels/typography.rs
diff --git a/crates/ui-egui/src/variable_ui.rs b/crates/ui-egui/src/panels/variable_ui.rs
similarity index 100%
rename from crates/ui-egui/src/variable_ui.rs
rename to crates/ui-egui/src/panels/variable_ui.rs
diff --git a/crates/ui-egui/src/vector_panel.rs b/crates/ui-egui/src/panels/vector_panel.rs
similarity index 100%
rename from crates/ui-egui/src/vector_panel.rs
rename to crates/ui-egui/src/panels/vector_panel.rs
diff --git a/crates/ui-egui/src/versions.rs b/crates/ui-egui/src/panels/versions.rs
similarity index 100%
rename from crates/ui-egui/src/versions.rs
rename to crates/ui-egui/src/panels/versions.rs