diff --git a/client/src/components/admin_panel.rs b/client/src/components/admin.rs
similarity index 58%
rename from client/src/components/admin_panel.rs
rename to client/src/components/admin.rs
index c25b3ec..78c9c6f 100644
--- a/client/src/components/admin_panel.rs
+++ b/client/src/components/admin.rs
@@ -1,4 +1,4 @@
-// src/components/admin_panel.rs
+// src/components/admin.rs
 pub mod admin_panel;
 
 pub use admin_panel::*;
diff --git a/client/src/components/handlers/admin_panel.rs b/client/src/components/admin/admin_panel.rs
similarity index 96%
rename from client/src/components/handlers/admin_panel.rs
rename to client/src/components/admin/admin_panel.rs
index 955e518..eb4becc 100644
--- a/client/src/components/handlers/admin_panel.rs
+++ b/client/src/components/admin/admin_panel.rs
@@ -1,4 +1,4 @@
-// src/components/handlers/admin_panel.rs
+// src/components/admin/admin_panel.rs
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Rect},
     style::Style,
diff --git a/client/src/components/common.rs b/client/src/components/common.rs
new file mode 100644
index 0000000..be11d6a
--- /dev/null
+++ b/client/src/components/common.rs
@@ -0,0 +1,8 @@
+// src/components/common.rs
+pub mod command_line;
+pub mod status_line;
+pub mod background;
+
+pub use command_line::*;
+pub use status_line::*;
+pub use background::*;
diff --git a/client/src/components/handlers/background.rs b/client/src/components/common/background.rs
similarity index 100%
rename from client/src/components/handlers/background.rs
rename to client/src/components/common/background.rs
diff --git a/client/src/components/handlers/command_line.rs b/client/src/components/common/command_line.rs
similarity index 100%
rename from client/src/components/handlers/command_line.rs
rename to client/src/components/common/command_line.rs
diff --git a/client/src/components/handlers/status_line.rs b/client/src/components/common/status_line.rs
similarity index 100%
rename from client/src/components/handlers/status_line.rs
rename to client/src/components/common/status_line.rs
diff --git a/client/src/components/handlers.rs b/client/src/components/handlers.rs
index 6c530c5..4d11a91 100644
--- a/client/src/components/handlers.rs
+++ b/client/src/components/handlers.rs
@@ -1,16 +1,8 @@
 // src/components/handlers.rs
 pub mod form;
-pub mod command_line;
-pub mod status_line;
 pub mod canvas;
 pub mod sidebar;
-pub mod background;
-pub mod admin_panel;
 
-pub use command_line::render_command_line;
 pub use form::*;
-pub use status_line::render_status_line;
 pub use canvas::*;
 pub use sidebar::*;
-pub use background::*;
-pub use admin_panel::*;
diff --git a/client/src/components/mod.rs b/client/src/components/mod.rs
index 23ca6db..ad67c3f 100644
--- a/client/src/components/mod.rs
+++ b/client/src/components/mod.rs
@@ -1,8 +1,10 @@
 // src/components/mod.rs
 pub mod handlers;
 pub mod intro;
-pub mod admin_panel;
+pub mod admin;
+pub mod common;
 
 pub use handlers::*;
 pub use intro::*;
-pub use admin_panel::*;
+pub use admin::*;
+pub use common::*;