diff --git a/client/src/functions/common.rs b/client/src/functions/common.rs
index 5cafcb8..cd77afe 100644
--- a/client/src/functions/common.rs
+++ b/client/src/functions/common.rs
@@ -1,5 +1,2 @@
 // src/functions/common.rs
 
-pub mod commands;
-
-pub use commands::*;
diff --git a/client/src/modes/common/command_mode.rs b/client/src/modes/common/command_mode.rs
index 82c4765..1459e61 100644
--- a/client/src/modes/common/command_mode.rs
+++ b/client/src/modes/common/command_mode.rs
@@ -4,7 +4,7 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
-use crate::functions::common::commands::CommandHandler;
+use crate::tui::functions::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
 use crate::tui::functions::common::form::{save, revert};
 
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index 089ad80..b934906 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -6,7 +6,7 @@ use crate::tui::terminal::{
 };
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-use crate::functions::common::commands::CommandHandler;
+use crate::tui::functions::common::commands::CommandHandler;
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
diff --git a/client/src/tui/functions/common.rs b/client/src/tui/functions/common.rs
index 0fff862..f4a63ce 100644
--- a/client/src/tui/functions/common.rs
+++ b/client/src/tui/functions/common.rs
@@ -2,6 +2,8 @@
 
 pub mod form;
 pub mod login;
+pub mod commands;
 
 pub use form::*;
 pub use login::*;
+pub use commands::*;
diff --git a/client/src/functions/common/commands.rs b/client/src/tui/functions/common/commands.rs
similarity index 100%
rename from client/src/functions/common/commands.rs
rename to client/src/tui/functions/common/commands.rs
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 1d48434..a616d33 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -5,7 +5,7 @@ use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
 use crate::services::ui_service::UiService;  // Add this import
 use crate::tui::terminal::EventReader;
-use crate::functions::common::CommandHandler;
+use crate::tui::functions::common::CommandHandler;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::render::render_ui;