diff --git a/crates/engine/src/commands.rs b/crates/engine/src/cmd.rs
similarity index 100%
rename from crates/engine/src/commands.rs
rename to crates/engine/src/cmd.rs
diff --git a/crates/engine/src/commands/align.rs b/crates/engine/src/cmd/align.rs
similarity index 100%
rename from crates/engine/src/commands/align.rs
rename to crates/engine/src/cmd/align.rs
diff --git a/crates/engine/src/commands/align_data.rs b/crates/engine/src/cmd/align_data.rs
similarity index 100%
rename from crates/engine/src/commands/align_data.rs
rename to crates/engine/src/cmd/align_data.rs
diff --git a/crates/engine/src/commands/anim.rs b/crates/engine/src/cmd/anim.rs
similarity index 100%
rename from crates/engine/src/commands/anim.rs
rename to crates/engine/src/cmd/anim.rs
diff --git a/crates/engine/src/commands/anim_presets.rs b/crates/engine/src/cmd/anim_presets.rs
similarity index 100%
rename from crates/engine/src/commands/anim_presets.rs
rename to crates/engine/src/cmd/anim_presets.rs
diff --git a/crates/engine/src/commands/anim_tools.rs b/crates/engine/src/cmd/anim_tools.rs
similarity index 100%
rename from crates/engine/src/commands/anim_tools.rs
rename to crates/engine/src/cmd/anim_tools.rs
diff --git a/crates/engine/src/commands/animation.rs b/crates/engine/src/cmd/animation.rs
similarity index 100%
rename from crates/engine/src/commands/animation.rs
rename to crates/engine/src/cmd/animation.rs
diff --git a/crates/engine/src/commands/app_more.rs b/crates/engine/src/cmd/app_more.rs
similarity index 100%
rename from crates/engine/src/commands/app_more.rs
rename to crates/engine/src/cmd/app_more.rs
diff --git a/crates/engine/src/commands/autotrace.rs b/crates/engine/src/cmd/autotrace.rs
similarity index 100%
rename from crates/engine/src/commands/autotrace.rs
rename to crates/engine/src/cmd/autotrace.rs
diff --git a/crates/engine/src/commands/batch.rs b/crates/engine/src/cmd/batch.rs
similarity index 100%
rename from crates/engine/src/commands/batch.rs
rename to crates/engine/src/cmd/batch.rs
diff --git a/crates/engine/src/commands/camera_cmds.rs b/crates/engine/src/cmd/camera_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/camera_cmds.rs
rename to crates/engine/src/cmd/camera_cmds.rs
diff --git a/crates/engine/src/commands/comp.rs b/crates/engine/src/cmd/comp.rs
similarity index 100%
rename from crates/engine/src/commands/comp.rs
rename to crates/engine/src/cmd/comp.rs
diff --git a/crates/engine/src/commands/comp_more.rs b/crates/engine/src/cmd/comp_more.rs
similarity index 100%
rename from crates/engine/src/commands/comp_more.rs
rename to crates/engine/src/cmd/comp_more.rs
diff --git a/crates/engine/src/commands/content_fill.rs b/crates/engine/src/cmd/content_fill.rs
similarity index 100%
rename from crates/engine/src/commands/content_fill.rs
rename to crates/engine/src/cmd/content_fill.rs
diff --git a/crates/engine/src/commands/create.rs b/crates/engine/src/cmd/create.rs
similarity index 100%
rename from crates/engine/src/commands/create.rs
rename to crates/engine/src/cmd/create.rs
diff --git a/crates/engine/src/commands/edit.rs b/crates/engine/src/cmd/edit.rs
similarity index 100%
rename from crates/engine/src/commands/edit.rs
rename to crates/engine/src/cmd/edit.rs
diff --git a/crates/engine/src/commands/effect.rs b/crates/engine/src/cmd/effect.rs
similarity index 100%
rename from crates/engine/src/commands/effect.rs
rename to crates/engine/src/cmd/effect.rs
diff --git a/crates/engine/src/commands/essential.rs b/crates/engine/src/cmd/essential.rs
similarity index 100%
rename from crates/engine/src/commands/essential.rs
rename to crates/engine/src/cmd/essential.rs
diff --git a/crates/engine/src/commands/expr_tools.rs b/crates/engine/src/cmd/expr_tools.rs
similarity index 100%
rename from crates/engine/src/commands/expr_tools.rs
rename to crates/engine/src/cmd/expr_tools.rs
diff --git a/crates/engine/src/commands/file.rs b/crates/engine/src/cmd/file.rs
similarity index 100%
rename from crates/engine/src/commands/file.rs
rename to crates/engine/src/cmd/file.rs
diff --git a/crates/engine/src/commands/file_more.rs b/crates/engine/src/cmd/file_more.rs
similarity index 100%
rename from crates/engine/src/commands/file_more.rs
rename to crates/engine/src/cmd/file_more.rs
diff --git a/crates/engine/src/commands/focus.rs b/crates/engine/src/cmd/focus.rs
similarity index 100%
rename from crates/engine/src/commands/focus.rs
rename to crates/engine/src/cmd/focus.rs
diff --git a/crates/engine/src/commands/footage_panel.rs b/crates/engine/src/cmd/footage_panel.rs
similarity index 100%
rename from crates/engine/src/commands/footage_panel.rs
rename to crates/engine/src/cmd/footage_panel.rs
diff --git a/crates/engine/src/commands/frame_export.rs b/crates/engine/src/cmd/frame_export.rs
similarity index 100%
rename from crates/engine/src/commands/frame_export.rs
rename to crates/engine/src/cmd/frame_export.rs
diff --git a/crates/engine/src/commands/frontend.rs b/crates/engine/src/cmd/frontend.rs
similarity index 100%
rename from crates/engine/src/commands/frontend.rs
rename to crates/engine/src/cmd/frontend.rs
diff --git a/crates/engine/src/commands/help.rs b/crates/engine/src/cmd/help.rs
similarity index 100%
rename from crates/engine/src/commands/help.rs
rename to crates/engine/src/cmd/help.rs
diff --git a/crates/engine/src/commands/import_project.rs b/crates/engine/src/cmd/import_project.rs
similarity index 100%
rename from crates/engine/src/commands/import_project.rs
rename to crates/engine/src/cmd/import_project.rs
diff --git a/crates/engine/src/commands/key_labels.rs b/crates/engine/src/cmd/key_labels.rs
similarity index 100%
rename from crates/engine/src/commands/key_labels.rs
rename to crates/engine/src/cmd/key_labels.rs
diff --git a/crates/engine/src/commands/key_transform.rs b/crates/engine/src/cmd/key_transform.rs
similarity index 100%
rename from crates/engine/src/commands/key_transform.rs
rename to crates/engine/src/cmd/key_transform.rs
diff --git a/crates/engine/src/commands/keys_more.rs b/crates/engine/src/cmd/keys_more.rs
similarity index 100%
rename from crates/engine/src/commands/keys_more.rs
rename to crates/engine/src/cmd/keys_more.rs
diff --git a/crates/engine/src/commands/layer.rs b/crates/engine/src/cmd/layer.rs
similarity index 100%
rename from crates/engine/src/commands/layer.rs
rename to crates/engine/src/cmd/layer.rs
diff --git a/crates/engine/src/commands/layer_menu.rs b/crates/engine/src/cmd/layer_menu.rs
similarity index 100%
rename from crates/engine/src/commands/layer_menu.rs
rename to crates/engine/src/cmd/layer_menu.rs
diff --git a/crates/engine/src/commands/layer_time.rs b/crates/engine/src/cmd/layer_time.rs
similarity index 100%
rename from crates/engine/src/commands/layer_time.rs
rename to crates/engine/src/cmd/layer_time.rs
diff --git a/crates/engine/src/commands/link.rs b/crates/engine/src/cmd/link.rs
similarity index 100%
rename from crates/engine/src/commands/link.rs
rename to crates/engine/src/cmd/link.rs
diff --git a/crates/engine/src/commands/liquify.rs b/crates/engine/src/cmd/liquify.rs
similarity index 100%
rename from crates/engine/src/commands/liquify.rs
rename to crates/engine/src/cmd/liquify.rs
diff --git a/crates/engine/src/commands/lottie.rs b/crates/engine/src/cmd/lottie.rs
similarity index 100%
rename from crates/engine/src/commands/lottie.rs
rename to crates/engine/src/cmd/lottie.rs
diff --git a/crates/engine/src/commands/markers.rs b/crates/engine/src/cmd/markers.rs
similarity index 100%
rename from crates/engine/src/commands/markers.rs
rename to crates/engine/src/cmd/markers.rs
diff --git a/crates/engine/src/commands/mask.rs b/crates/engine/src/cmd/mask.rs
similarity index 100%
rename from crates/engine/src/commands/mask.rs
rename to crates/engine/src/cmd/mask.rs
diff --git a/crates/engine/src/commands/mask_interp.rs b/crates/engine/src/cmd/mask_interp.rs
similarity index 100%
rename from crates/engine/src/commands/mask_interp.rs
rename to crates/engine/src/cmd/mask_interp.rs
diff --git a/crates/engine/src/commands/model3d.rs b/crates/engine/src/cmd/model3d.rs
similarity index 100%
rename from crates/engine/src/commands/model3d.rs
rename to crates/engine/src/cmd/model3d.rs
diff --git a/crates/engine/src/commands/nav_more.rs b/crates/engine/src/cmd/nav_more.rs
similarity index 100%
rename from crates/engine/src/commands/nav_more.rs
rename to crates/engine/src/cmd/nav_more.rs
diff --git a/crates/engine/src/commands/paint.rs b/crates/engine/src/cmd/paint.rs
similarity index 100%
rename from crates/engine/src/commands/paint.rs
rename to crates/engine/src/cmd/paint.rs
diff --git a/crates/engine/src/commands/panels_cmds.rs b/crates/engine/src/cmd/panels_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/panels_cmds.rs
rename to crates/engine/src/cmd/panels_cmds.rs
diff --git a/crates/engine/src/commands/path_nulls.rs b/crates/engine/src/cmd/path_nulls.rs
similarity index 100%
rename from crates/engine/src/commands/path_nulls.rs
rename to crates/engine/src/cmd/path_nulls.rs
diff --git a/crates/engine/src/commands/paths.rs b/crates/engine/src/cmd/paths.rs
similarity index 100%
rename from crates/engine/src/commands/paths.rs
rename to crates/engine/src/cmd/paths.rs
diff --git a/crates/engine/src/commands/project_items.rs b/crates/engine/src/cmd/project_items.rs
similarity index 100%
rename from crates/engine/src/commands/project_items.rs
rename to crates/engine/src/cmd/project_items.rs
diff --git a/crates/engine/src/commands/prop.rs b/crates/engine/src/cmd/prop.rs
similarity index 100%
rename from crates/engine/src/commands/prop.rs
rename to crates/engine/src/cmd/prop.rs
diff --git a/crates/engine/src/commands/prop_groups.rs b/crates/engine/src/cmd/prop_groups.rs
similarity index 100%
rename from crates/engine/src/commands/prop_groups.rs
rename to crates/engine/src/cmd/prop_groups.rs
diff --git a/crates/engine/src/commands/proxy.rs b/crates/engine/src/cmd/proxy.rs
similarity index 100%
rename from crates/engine/src/commands/proxy.rs
rename to crates/engine/src/cmd/proxy.rs
diff --git a/crates/engine/src/commands/puppet.rs b/crates/engine/src/cmd/puppet.rs
similarity index 100%
rename from crates/engine/src/commands/puppet.rs
rename to crates/engine/src/cmd/puppet.rs
diff --git a/crates/engine/src/commands/query.rs b/crates/engine/src/cmd/query.rs
similarity index 100%
rename from crates/engine/src/commands/query.rs
rename to crates/engine/src/cmd/query.rs
diff --git a/crates/engine/src/commands/quick_offset.rs b/crates/engine/src/cmd/quick_offset.rs
similarity index 100%
rename from crates/engine/src/commands/quick_offset.rs
rename to crates/engine/src/cmd/quick_offset.rs
diff --git a/crates/engine/src/commands/relink.rs b/crates/engine/src/cmd/relink.rs
similarity index 100%
rename from crates/engine/src/commands/relink.rs
rename to crates/engine/src/cmd/relink.rs
diff --git a/crates/engine/src/commands/relink_moved.rs b/crates/engine/src/cmd/relink_moved.rs
similarity index 100%
rename from crates/engine/src/commands/relink_moved.rs
rename to crates/engine/src/cmd/relink_moved.rs
diff --git a/crates/engine/src/commands/render_queue.rs b/crates/engine/src/cmd/render_queue.rs
similarity index 100%
rename from crates/engine/src/commands/render_queue.rs
rename to crates/engine/src/cmd/render_queue.rs
diff --git a/crates/engine/src/commands/rig3d.rs b/crates/engine/src/cmd/rig3d.rs
similarity index 100%
rename from crates/engine/src/commands/rig3d.rs
rename to crates/engine/src/cmd/rig3d.rs
diff --git a/crates/engine/src/commands/roto_cmds.rs b/crates/engine/src/cmd/roto_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/roto_cmds.rs
rename to crates/engine/src/cmd/roto_cmds.rs
diff --git a/crates/engine/src/commands/scene_detect.rs b/crates/engine/src/cmd/scene_detect.rs
similarity index 100%
rename from crates/engine/src/commands/scene_detect.rs
rename to crates/engine/src/cmd/scene_detect.rs
diff --git a/crates/engine/src/commands/scripts.rs b/crates/engine/src/cmd/scripts.rs
similarity index 100%
rename from crates/engine/src/commands/scripts.rs
rename to crates/engine/src/cmd/scripts.rs
diff --git a/crates/engine/src/commands/settings.rs b/crates/engine/src/cmd/settings.rs
similarity index 100%
rename from crates/engine/src/commands/settings.rs
rename to crates/engine/src/cmd/settings.rs
diff --git a/crates/engine/src/commands/shape_stroke.rs b/crates/engine/src/cmd/shape_stroke.rs
similarity index 100%
rename from crates/engine/src/commands/shape_stroke.rs
rename to crates/engine/src/cmd/shape_stroke.rs
diff --git a/crates/engine/src/commands/shape_tool.rs b/crates/engine/src/cmd/shape_tool.rs
similarity index 100%
rename from crates/engine/src/commands/shape_tool.rs
rename to crates/engine/src/cmd/shape_tool.rs
diff --git a/crates/engine/src/commands/stubs.rs b/crates/engine/src/cmd/stubs.rs
similarity index 100%
rename from crates/engine/src/commands/stubs.rs
rename to crates/engine/src/cmd/stubs.rs
diff --git a/crates/engine/src/commands/styles.rs b/crates/engine/src/cmd/styles.rs
similarity index 100%
rename from crates/engine/src/commands/styles.rs
rename to crates/engine/src/cmd/styles.rs
diff --git a/crates/engine/src/commands/text_anim.rs b/crates/engine/src/cmd/text_anim.rs
similarity index 100%
rename from crates/engine/src/commands/text_anim.rs
rename to crates/engine/src/cmd/text_anim.rs
diff --git a/crates/engine/src/commands/text_edit.rs b/crates/engine/src/cmd/text_edit.rs
similarity index 100%
rename from crates/engine/src/commands/text_edit.rs
rename to crates/engine/src/cmd/text_edit.rs
diff --git a/crates/engine/src/commands/three_d.rs b/crates/engine/src/cmd/three_d.rs
similarity index 100%
rename from crates/engine/src/commands/three_d.rs
rename to crates/engine/src/cmd/three_d.rs
diff --git a/crates/engine/src/commands/time.rs b/crates/engine/src/cmd/time.rs
similarity index 100%
rename from crates/engine/src/commands/time.rs
rename to crates/engine/src/cmd/time.rs
diff --git a/crates/engine/src/commands/timeline.rs b/crates/engine/src/cmd/timeline.rs
similarity index 100%
rename from crates/engine/src/commands/timeline.rs
rename to crates/engine/src/cmd/timeline.rs
diff --git a/crates/engine/src/commands/track.rs b/crates/engine/src/cmd/track.rs
similarity index 100%
rename from crates/engine/src/commands/track.rs
rename to crates/engine/src/cmd/track.rs
diff --git a/crates/engine/src/commands/view.rs b/crates/engine/src/cmd/view.rs
similarity index 100%
rename from crates/engine/src/commands/view.rs
rename to crates/engine/src/cmd/view.rs
diff --git a/crates/engine/src/commands/viewer_cmds.rs b/crates/engine/src/cmd/viewer_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/viewer_cmds.rs
rename to crates/engine/src/cmd/viewer_cmds.rs
diff --git a/crates/engine/src/commands/vpe.rs b/crates/engine/src/cmd/vpe.rs
similarity index 100%
rename from crates/engine/src/commands/vpe.rs
rename to crates/engine/src/cmd/vpe.rs
diff --git a/crates/engine/src/commands/vr_editor.rs b/crates/engine/src/cmd/vr_editor.rs
similarity index 100%
rename from crates/engine/src/commands/vr_editor.rs
rename to crates/engine/src/cmd/vr_editor.rs
diff --git a/crates/engine/src/commands/warp_cmds.rs b/crates/engine/src/cmd/warp_cmds.rs
similarity index 100%
rename from crates/engine/src/commands/warp_cmds.rs
rename to crates/engine/src/cmd/warp_cmds.rs
diff --git a/crates/engine/src/commands/watch_folder.rs b/crates/engine/src/cmd/watch_folder.rs
similarity index 100%
rename from crates/engine/src/commands/watch_folder.rs
rename to crates/engine/src/cmd/watch_folder.rs
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 3c3cb868d..8aa227bc8 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -12,7 +12,7 @@
 
 pub mod autosave;
 pub mod camera_track;
-pub mod commands;
+pub mod cmd;
 pub mod config;
 pub mod demo;
 pub mod doc_path;
@@ -59,7 +59,8 @@ use effectcraft_time::Tick;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-pub use commands::{CommandSpec, command_specs, find as find_command};
+pub use cmd as commands;
+pub use cmd::{CommandSpec, command_specs, find as find_command};
 pub use effectcraft_color as color;
 pub use effectcraft_effects as effects;
 pub use effectcraft_geom as geom;
diff --git a/crates/ui-egui/src/i18n/ui.rs b/crates/ui-egui/src/i18n/ui.rs
index 3a9280a20..d83f4237b 100644
--- a/crates/ui-egui/src/i18n/ui.rs
+++ b/crates/ui-egui/src/i18n/ui.rs
@@ -5488,7 +5488,7 @@ mod tests {
         // and Fast Previews lists come from the engine as data, so their source strings live here.
         ("engine settings pages", include_str!("../../../engine/src/prefs.rs")),
         ("engine viewer channels", include_str!("../../../engine/src/viewer.rs")),
-        ("engine viewer commands", include_str!("../../../engine/src/commands/viewer_cmds.rs")),
+        ("engine viewer commands", include_str!("../../../engine/src/cmd/viewer_cmds.rs")),
     ];
 
     fn catalogs() -> Vec<(&'static str, &'static str)> {