diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index 09d972b513..c98b205bd1 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -39,7 +39,6 @@ mod combine_ui;
 pub use combine_ui::{Columns as CombineColumns, CombineView, Lock as CombineLock, SortKey};
 mod commands;
 mod comment_props;
-pub mod comments;
 mod comments_panel;
 mod compare_ui;
 pub mod control;
@@ -166,6 +165,7 @@ use state::{DocumentCopyJob, GridFile};
 pub use tools::bulk_fields;
 use tools::calc_order_ui;
 use tools::camera_ui;
+pub use tools::comments;
 
 /// Files dropped on a document's page grid or its Pages panel.
 struct GridDrop {
diff --git a/crates/ui-egui/src/tools.rs b/crates/ui-egui/src/tools.rs
index 5f214663a5..076275f673 100644
--- a/crates/ui-egui/src/tools.rs
+++ b/crates/ui-egui/src/tools.rs
@@ -1,3 +1,4 @@
 pub mod bulk_fields;
 pub(super) mod calc_order_ui;
 pub(super) mod camera_ui;
+pub mod comments;
diff --git a/crates/ui-egui/src/comments.rs b/crates/ui-egui/src/tools/comments.rs
similarity index 100%
rename from crates/ui-egui/src/comments.rs
rename to crates/ui-egui/src/tools/comments.rs
diff --git a/crates/ui-egui/src/comments/composer.rs b/crates/ui-egui/src/tools/comments/composer.rs
similarity index 100%
rename from crates/ui-egui/src/comments/composer.rs
rename to crates/ui-egui/src/tools/comments/composer.rs
diff --git a/crates/ui-egui/src/comments/geometry.rs b/crates/ui-egui/src/tools/comments/geometry.rs
similarity index 100%
rename from crates/ui-egui/src/comments/geometry.rs
rename to crates/ui-egui/src/tools/comments/geometry.rs
diff --git a/crates/ui-egui/src/comments/input.rs b/crates/ui-egui/src/tools/comments/input.rs
similarity index 100%
rename from crates/ui-egui/src/comments/input.rs
rename to crates/ui-egui/src/tools/comments/input.rs
diff --git a/crates/ui-egui/src/comments/menu.rs b/crates/ui-egui/src/tools/comments/menu.rs
similarity index 100%
rename from crates/ui-egui/src/comments/menu.rs
rename to crates/ui-egui/src/tools/comments/menu.rs
diff --git a/crates/ui-egui/src/comments/paint.rs b/crates/ui-egui/src/tools/comments/paint.rs
similarity index 100%
rename from crates/ui-egui/src/comments/paint.rs
rename to crates/ui-egui/src/tools/comments/paint.rs
diff --git a/crates/ui-egui/src/comments/state.rs b/crates/ui-egui/src/tools/comments/state.rs
similarity index 100%
rename from crates/ui-egui/src/comments/state.rs
rename to crates/ui-egui/src/tools/comments/state.rs
diff --git a/crates/ui-egui/src/comments/tests.rs b/crates/ui-egui/src/tools/comments/tests.rs
similarity index 100%
rename from crates/ui-egui/src/comments/tests.rs
rename to crates/ui-egui/src/tools/comments/tests.rs