diff --git a/crates/engine/src/boards.rs b/crates/engine/src/boards.rs
new file mode 100644
index 000000000..685c1d70b
--- /dev/null
+++ b/crates/engine/src/boards.rs
@@ -0,0 +1,3 @@
+pub mod board;
+pub mod board_table;
+pub mod board_templates;
diff --git a/crates/engine/src/board.rs b/crates/engine/src/boards/board.rs
similarity index 100%
rename from crates/engine/src/board.rs
rename to crates/engine/src/boards/board.rs
diff --git a/crates/engine/src/board_table.rs b/crates/engine/src/boards/board_table.rs
similarity index 100%
rename from crates/engine/src/board_table.rs
rename to crates/engine/src/boards/board_table.rs
diff --git a/crates/engine/src/board_templates.rs b/crates/engine/src/boards/board_templates.rs
similarity index 100%
rename from crates/engine/src/board_templates.rs
rename to crates/engine/src/boards/board_templates.rs
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 462c184f0..bc7352993 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -14,9 +14,7 @@ pub mod annotations;
 pub mod arc_handles;
 pub mod background;
 pub mod batch;
-pub mod board;
-pub mod board_table;
-pub mod board_templates;
+mod boards;
 pub mod booleans;
 pub mod branches;
 pub mod catalog;
@@ -72,6 +70,9 @@ pub mod token_roles;
 pub mod tools;
 pub mod vectoredit;
 pub mod widgets;
+pub use boards::board;
+pub use boards::board_table;
+pub use boards::board_templates;
 
 pub use batch::{BatchScope, BatchStep};
 pub use cmd::{CommandSpec, all_commands, find_command};