diff --git a/client/src/components/form.rs b/client/src/components/form.rs
new file mode 100644
index 0000000..dc4a4e7
--- /dev/null
+++ b/client/src/components/form.rs
@@ -0,0 +1,4 @@
+// src/components/form.rs
+pub mod form;
+
+pub use form::*;
diff --git a/client/src/components/handlers/form.rs b/client/src/components/form/form.rs
similarity index 96%
rename from client/src/components/handlers/form.rs
rename to client/src/components/form/form.rs
index 975b842..bbf4591 100644
--- a/client/src/components/handlers/form.rs
+++ b/client/src/components/form/form.rs
@@ -7,7 +7,7 @@ use ratatui::{
 };
 use crate::config::colors::themes::Theme;
 use crate::ui::form::FormState;
-use super::canvas::render_canvas;  // Changed to canvas
+use crate::components::handlers::canvas::render_canvas;
 
 pub fn render_form(
     f: &mut Frame,
diff --git a/client/src/components/handlers.rs b/client/src/components/handlers.rs
index 4d11a91..725ffd3 100644
--- a/client/src/components/handlers.rs
+++ b/client/src/components/handlers.rs
@@ -1,8 +1,6 @@
 // src/components/handlers.rs
-pub mod form;
 pub mod canvas;
 pub mod sidebar;
 
-pub use form::*;
 pub use canvas::*;
 pub use sidebar::*;
diff --git a/client/src/components/mod.rs b/client/src/components/mod.rs
index ad67c3f..fda4b6d 100644
--- a/client/src/components/mod.rs
+++ b/client/src/components/mod.rs
@@ -3,8 +3,10 @@ pub mod handlers;
 pub mod intro;
 pub mod admin;
 pub mod common;
+pub mod form;
 
 pub use handlers::*;
 pub use intro::*;
 pub use admin::*;
 pub use common::*;
+pub use form::*;
diff --git a/client/src/ui/handlers/form.rs b/client/src/ui/handlers/form.rs
index b36d106..88d1465 100644
--- a/client/src/ui/handlers/form.rs
+++ b/client/src/ui/handlers/form.rs
@@ -38,7 +38,7 @@ impl FormState {
         let fields: Vec<&str> = self.fields.iter().map(|s| s.as_str()).collect();
         let values: Vec<&String> = self.values.iter().collect();
 
-        crate::components::handlers::form::render_form(
+        crate::components::form::form::render_form(
             f,
             area,
             self,
diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs
index 9cb5d34..5e2362d 100644
--- a/client/src/ui/handlers/render.rs
+++ b/client/src/ui/handlers/render.rs
@@ -4,7 +4,8 @@ use crate::components::{
     render_background,
     render_command_line,
     render_status_line,
-    handlers::{sidebar::{self, calculate_sidebar_layout}, form::render_form},
+    handlers::sidebar::{self, calculate_sidebar_layout},
+    form::form::render_form,
     intro::{intro},
     admin::{admin_panel::AdminPanelState},
 };