diff --git a/client/src/functions/common.rs b/client/src/functions/common.rs
new file mode 100644
index 0000000..fdfe480
--- /dev/null
+++ b/client/src/functions/common.rs
@@ -0,0 +1,9 @@
+// src/functions/common.rs
+
+pub mod login;
+pub mod commands;
+pub mod form;
+
+pub use login::{revert as login_revert, save as login_save};
+pub use commands::*;
+pub use form::{revert as form_revert, save as form_save};
diff --git a/client/src/tui/functions/common/commands.rs b/client/src/functions/common/commands.rs
similarity index 100%
rename from client/src/tui/functions/common/commands.rs
rename to client/src/functions/common/commands.rs
diff --git a/client/src/tui/functions/common/form.rs b/client/src/functions/common/form.rs
similarity index 100%
rename from client/src/tui/functions/common/form.rs
rename to client/src/functions/common/form.rs
diff --git a/client/src/tui/functions/common/login.rs b/client/src/functions/common/login.rs
similarity index 100%
rename from client/src/tui/functions/common/login.rs
rename to client/src/functions/common/login.rs
diff --git a/client/src/functions/mod.rs b/client/src/functions/mod.rs
new file mode 100644
index 0000000..3e7d33a
--- /dev/null
+++ b/client/src/functions/mod.rs
@@ -0,0 +1,5 @@
+// src/functions/mod.rs
+
+pub mod common;
+
+pub use common::*;
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 2568a0a..41adf36 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -5,6 +5,7 @@ pub mod config;
 pub mod state;
 pub mod components;
 pub mod modes;
+pub mod functions;
 pub mod services;
 
 pub use ui::run_ui;
diff --git a/client/src/modes/canvas/common.rs b/client/src/modes/canvas/common.rs
index 985bbfd..9ca2e62 100644
--- a/client/src/modes/canvas/common.rs
+++ b/client/src/modes/canvas/common.rs
@@ -5,7 +5,7 @@ use crate::state::pages::{form::FormState, auth::AuthState};
 use crate::state::state::AppState;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-use crate::tui::functions::common::{
+use crate::functions::common::{
     form::{save as form_save, revert as form_revert},
     login::{save as login_save, revert as login_revert}
 };
diff --git a/client/src/modes/canvas/edit.rs b/client/src/modes/canvas/edit.rs
index 77003ff..0a0a4ae 100644
--- a/client/src/modes/canvas/edit.rs
+++ b/client/src/modes/canvas/edit.rs
@@ -2,7 +2,7 @@ use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
-use crate::tui::functions::common::form::{revert, save};
+use crate::functions::common::form::{revert, save};
 use crossterm::event::{KeyCode, KeyEvent};
 use std::any::Any;
 
diff --git a/client/src/modes/common/command_mode.rs b/client/src/modes/common/command_mode.rs
index 1459e61..549b638 100644
--- a/client/src/modes/common/command_mode.rs
+++ b/client/src/modes/common/command_mode.rs
@@ -4,9 +4,9 @@ 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::tui::functions::common::commands::CommandHandler;
+use crate::functions::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
-use crate::tui::functions::common::form::{save, revert};
+use crate::functions::common::form::{save, revert};
 
 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 b934906..089ad80 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::tui::functions::common::commands::CommandHandler;
+use crate::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 b4b457e..b72142c 100644
--- a/client/src/tui/functions/common.rs
+++ b/client/src/tui/functions/common.rs
@@ -1,8 +1 @@
 // src/tui/functions/common.rs
-pub mod commands;
-pub mod form;
-pub mod login;
-
-pub use commands::*;
-pub use form::{revert as form_revert, save as form_save};
-pub use login::{revert as login_revert, save as login_save};
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index a616d33..1d48434 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::tui::functions::common::CommandHandler;
+use crate::functions::common::CommandHandler;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::render::render_ui;