diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 958721c9d..fd834beca 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -14,19 +14,15 @@ mod analysis;
 mod background;
 pub mod cmd;
 mod footage;
-pub mod guard;
 pub mod history;
 mod home;
 mod interchange;
-pub mod logging;
 pub mod menus;
-pub mod perf;
 pub mod preview;
 pub mod render_queue;
 pub mod scriptui;
 mod settings;
-pub mod storage;
-pub mod sysinfo;
+mod system;
 pub mod viewer;
 
 use std::sync::Arc;
@@ -79,6 +75,11 @@ pub use settings::autosave;
 pub use settings::config;
 pub use settings::prefs;
 pub use settings::shortcuts;
+pub use system::guard;
+pub use system::logging;
+pub use system::perf;
+pub use system::storage;
+pub use system::sysinfo;
 
 #[derive(Debug, thiserror::Error)]
 pub enum EngineError {
diff --git a/crates/engine/src/system.rs b/crates/engine/src/system.rs
new file mode 100644
index 000000000..d292e1232
--- /dev/null
+++ b/crates/engine/src/system.rs
@@ -0,0 +1,5 @@
+pub mod guard;
+pub mod logging;
+pub mod perf;
+pub mod storage;
+pub mod sysinfo;
diff --git a/crates/engine/src/guard.rs b/crates/engine/src/system/guard.rs
similarity index 100%
rename from crates/engine/src/guard.rs
rename to crates/engine/src/system/guard.rs
diff --git a/crates/engine/src/logging.rs b/crates/engine/src/system/logging.rs
similarity index 100%
rename from crates/engine/src/logging.rs
rename to crates/engine/src/system/logging.rs
diff --git a/crates/engine/src/perf.rs b/crates/engine/src/system/perf.rs
similarity index 100%
rename from crates/engine/src/perf.rs
rename to crates/engine/src/system/perf.rs
diff --git a/crates/engine/src/storage.rs b/crates/engine/src/system/storage.rs
similarity index 100%
rename from crates/engine/src/storage.rs
rename to crates/engine/src/system/storage.rs
diff --git a/crates/engine/src/sysinfo.rs b/crates/engine/src/system/sysinfo.rs
similarity index 100%
rename from crates/engine/src/sysinfo.rs
rename to crates/engine/src/system/sysinfo.rs