diff --git a/client/src/modes/canvas.rs b/client/src/modes/canvas.rs
new file mode 100644
index 0000000..0507814
--- /dev/null
+++ b/client/src/modes/canvas.rs
@@ -0,0 +1,4 @@
+// src/client/modes/canvas.rs
+pub mod edit;
+pub mod common;
+pub mod read_only;
diff --git a/client/src/modes/handlers/common.rs b/client/src/modes/canvas/common.rs
similarity index 99%
rename from client/src/modes/handlers/common.rs
rename to client/src/modes/canvas/common.rs
index b7786cf..984695f 100644
--- a/client/src/modes/handlers/common.rs
+++ b/client/src/modes/canvas/common.rs
@@ -1,4 +1,4 @@
-// src/modes/handlers/common.rs
+// src/modes/canvas/common.rs
 
 use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::ui::handlers::form::FormState;
diff --git a/client/src/modes/handlers/edit.rs b/client/src/modes/canvas/edit.rs
similarity index 99%
rename from client/src/modes/handlers/edit.rs
rename to client/src/modes/canvas/edit.rs
index 9a5bbe7..0c34598 100644
--- a/client/src/modes/handlers/edit.rs
+++ b/client/src/modes/canvas/edit.rs
@@ -1,4 +1,4 @@
-// src/modes/handlers/edit.rs
+// src/modes/canvas/edit.rs
 
 use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::tui::terminal::{
@@ -6,7 +6,7 @@ use crate::tui::terminal::{
 };
 use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
-use super::common;
+use crate::modes::canvas::common;
 
 pub async fn handle_edit_event_internal(
     key: KeyEvent,
diff --git a/client/src/modes/handlers/read_only.rs b/client/src/modes/canvas/read_only.rs
similarity index 100%
rename from client/src/modes/handlers/read_only.rs
rename to client/src/modes/canvas/read_only.rs
diff --git a/client/src/modes/handlers.rs b/client/src/modes/handlers.rs
index 1ff5222..46399f0 100644
--- a/client/src/modes/handlers.rs
+++ b/client/src/modes/handlers.rs
@@ -1,6 +1,3 @@
 // src/client/modes/handlers.rs
 pub mod event;
-pub mod edit;
-pub mod common;
 pub mod command_mode;
-pub mod read_only;
diff --git a/client/src/modes/handlers/command_mode.rs b/client/src/modes/handlers/command_mode.rs
index 5842464..c7195fa 100644
--- a/client/src/modes/handlers/command_mode.rs
+++ b/client/src/modes/handlers/command_mode.rs
@@ -4,7 +4,9 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::tui::terminal::grpc_client::GrpcClient;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
-use super::common;
+use crate::modes::{
+    canvas::{common},
+};
 
 pub async fn handle_command_event(
     key: KeyEvent,
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index f4ad449..8170d7a 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -9,9 +9,11 @@ use crate::tui::terminal::{
 use crate::config::binds::config::Config;
 use crate::ui::handlers::form::FormState;
 use crate::ui::handlers::rat_state::UiStateHandler;
-use crate::modes::handlers::{edit, command_mode, read_only};
+use crate::modes::{
+    handlers::{command_mode},
+    canvas::{edit, read_only, common},
+};
 use crate::config::binds::key_sequences::KeySequenceTracker;
-use super::common;
 
 pub struct EventHandler {
     pub command_mode: bool,
diff --git a/client/src/modes/mod.rs b/client/src/modes/mod.rs
index ef19ed6..5c80154 100644
--- a/client/src/modes/mod.rs
+++ b/client/src/modes/mod.rs
@@ -1,4 +1,6 @@
 // src/client/modes/mod.rs
 pub mod handlers;
+pub mod canvas;
 
 pub use handlers::*;
+pub use canvas::*;