diff --git a/client/src/modes/common.rs b/client/src/modes/common.rs
new file mode 100644
index 0000000..31e1c33
--- /dev/null
+++ b/client/src/modes/common.rs
@@ -0,0 +1,3 @@
+// src/client/modes/common.rs
+pub mod command_mode;
+pub mod highlight;
diff --git a/client/src/modes/handlers/command_mode.rs b/client/src/modes/common/command_mode.rs
similarity index 100%
rename from client/src/modes/handlers/command_mode.rs
rename to client/src/modes/common/command_mode.rs
diff --git a/client/src/modes/handlers/highlight.rs b/client/src/modes/common/highlight.rs
similarity index 100%
rename from client/src/modes/handlers/highlight.rs
rename to client/src/modes/common/highlight.rs
diff --git a/client/src/modes/handlers.rs b/client/src/modes/handlers.rs
index 46399f0..09942a9 100644
--- a/client/src/modes/handlers.rs
+++ b/client/src/modes/handlers.rs
@@ -1,3 +1,2 @@
 // src/client/modes/handlers.rs
 pub mod event;
-pub mod command_mode;
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 1ab5648..e21208d 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -10,7 +10,7 @@ use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::modes::{
-    handlers::{command_mode},
+    common::{command_mode},
     canvas::{edit, read_only, common},
 };
 use crate::modes::navigation;
diff --git a/client/src/modes/mod.rs b/client/src/modes/mod.rs
index b9611f5..059f2a6 100644
--- a/client/src/modes/mod.rs
+++ b/client/src/modes/mod.rs
@@ -2,7 +2,9 @@
 pub mod handlers;
 pub mod canvas;
 pub mod general;
+pub mod common;
 
 pub use handlers::*;
 pub use canvas::*;
 pub use general::*;
+pub use common::*;