diff --git a/client/src/components/common/autocomplete.rs b/client/src/components/common/autocomplete.rs
index 3589423..48cf0b0 100644
--- a/client/src/components/common/autocomplete.rs
+++ b/client/src/components/common/autocomplete.rs
@@ -1,8 +1,8 @@
 // src/components/common/autocomplete.rs
 
 use crate::config::colors::themes::Theme;
-use crate::state::pages::form::FormState;
 use common::proto::komp_ac::search::search_response::Hit;
+use crate::pages::forms::FormState;
 use ratatui::{
     layout::Rect,
     style::{Color, Modifier, Style},
diff --git a/client/src/components/form.rs b/client/src/components/form.rs
deleted file mode 100644
index dc4a4e7..0000000
--- a/client/src/components/form.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// src/components/form.rs
-pub mod form;
-
-pub use form::*;
diff --git a/client/src/components/mod.rs b/client/src/components/mod.rs
index 3df02e3..728e404 100644
--- a/client/src/components/mod.rs
+++ b/client/src/components/mod.rs
@@ -2,13 +2,11 @@
 pub mod intro;
 pub mod admin;
 pub mod common;
-pub mod form;
 pub mod auth;
 pub mod utils;
 
 pub use intro::*;
 pub use admin::*;
 pub use common::*;
-pub use form::*;
 pub use auth::*;
 pub use utils::*;
diff --git a/client/src/modes/general/navigation.rs b/client/src/modes/general/navigation.rs
index 2be355b..ab77e02 100644
--- a/client/src/modes/general/navigation.rs
+++ b/client/src/modes/general/navigation.rs
@@ -3,8 +3,8 @@
 use crossterm::event::KeyEvent;
 use crate::config::binds::config::Config;
 use crate::state::app::state::AppState;
-use crate::state::pages::form::FormState;
 use crate::pages::routing::{Router, Page};
+use crate::pages::forms::FormState;
 use crate::ui::handlers::context::UiContext;
 use crate::modes::handlers::event::EventOutcome;
 use crate::modes::general::command_navigation::{handle_command_navigation_event, NavigationState};
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index a29a30d..5ced2e6 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -26,11 +26,11 @@ use crate::state::{
     pages::{
         admin::AdminState,
         auth::{AuthState, LoginState, RegisterState},
-        form::FormState,
         intro::IntroState,
     },
 };
 use crate::pages::routing::{Router, Page};
+use crate::pages::forms::FormState;
 use crate::search::state::SearchState;
 use crate::tui::functions::common::login::LoginResult;
 use crate::tui::functions::common::register::RegisterResult;
diff --git a/client/src/pages/forms/mod.rs b/client/src/pages/forms/mod.rs
new file mode 100644
index 0000000..52b7526
--- /dev/null
+++ b/client/src/pages/forms/mod.rs
@@ -0,0 +1,7 @@
+// src/pages/forms/mod.rs
+
+pub mod ui;
+pub mod state;
+
+pub use ui::*;
+pub use state::*;
diff --git a/client/src/state/pages/form.rs b/client/src/pages/forms/state.rs
similarity index 99%
rename from client/src/state/pages/form.rs
rename to client/src/pages/forms/state.rs
index 087251e..23d4a8c 100644
--- a/client/src/state/pages/form.rs
+++ b/client/src/pages/forms/state.rs
@@ -1,4 +1,4 @@
-// src/state/pages/form.rs
+// src/pages/forms/state.rs
 
 use canvas::{DataProvider, AppMode};
 use common::proto::komp_ac::search::search_response::Hit;
diff --git a/client/src/components/form/form.rs b/client/src/pages/forms/ui.rs
similarity index 97%
rename from client/src/components/form/form.rs
rename to client/src/pages/forms/ui.rs
index 9e3b7dd..af97e5a 100644
--- a/client/src/components/form/form.rs
+++ b/client/src/pages/forms/ui.rs
@@ -1,13 +1,13 @@
-// src/components/form/form.rs
+// src/pages/forms/ui.rs
 use crate::config::colors::themes::Theme;
 use crate::state::app::state::AppState;
-use crate::state::pages::form::FormState;
 use ratatui::{
     layout::{Alignment, Constraint, Direction, Layout, Margin, Rect},
     style::Style,
     widgets::{Block, Borders, Paragraph},
     Frame,
 };
+use crate::pages::forms::FormState;
 use canvas::{
     render_canvas, render_suggestions_dropdown, DefaultCanvasTheme,
 };
diff --git a/client/src/pages/mod.rs b/client/src/pages/mod.rs
index 9ac81f6..6e1c664 100644
--- a/client/src/pages/mod.rs
+++ b/client/src/pages/mod.rs
@@ -1,3 +1,4 @@
 // src/pages/mod.rs
 
 pub mod routing;
+pub mod forms;
diff --git a/client/src/pages/routing/router.rs b/client/src/pages/routing/router.rs
index 2d52b8e..9ae710c 100644
--- a/client/src/pages/routing/router.rs
+++ b/client/src/pages/routing/router.rs
@@ -2,11 +2,11 @@
 use crate::state::pages::{
     admin::AdminState,
     auth::{AuthState, LoginState, RegisterState},
-    form::FormState,
     intro::IntroState,
     add_logic::AddLogicState,
     add_table::AddTableState,
 };
+use crate::pages::forms::FormState;
 
 #[derive(Debug)]
 pub enum Page {
diff --git a/client/src/services/ui_service.rs b/client/src/services/ui_service.rs
index 55a3063..13de71a 100644
--- a/client/src/services/ui_service.rs
+++ b/client/src/services/ui_service.rs
@@ -3,9 +3,9 @@
 use crate::services::grpc_client::GrpcClient;
 use crate::state::app::state::AppState;
 use crate::state::pages::add_logic::AddLogicState;
-use crate::state::pages::form::{FieldDefinition, FormState};
 use crate::tui::functions::common::form::SaveOutcome;
 use crate::utils::columns::filter_user_columns;
+use crate::pages::forms::{FieldDefinition, FormState};
 use anyhow::{anyhow, Context, Result};
 use std::sync::Arc;
 
diff --git a/client/src/state/app/state.rs b/client/src/state/app/state.rs
index d26018a..6e47a18 100644
--- a/client/src/state/app/state.rs
+++ b/client/src/state/app/state.rs
@@ -7,8 +7,8 @@ use common::proto::komp_ac::table_structure::TableStructureResponse;
 use crate::modes::handlers::mode_manager::AppMode;
 use crate::search::state::SearchState;
 use crate::ui::handlers::context::DialogPurpose;
-use crate::state::pages::form::FormState;
 use crate::config::binds::Config;
+use crate::pages::forms::FormState;
 use canvas::FormEditor;
 use std::collections::HashMap;
 use std::env;
diff --git a/client/src/state/pages.rs b/client/src/state/pages.rs
index 8e0b2e6..517796e 100644
--- a/client/src/state/pages.rs
+++ b/client/src/state/pages.rs
@@ -1,6 +1,5 @@
 // src/state/pages.rs
 
-pub mod form;
 pub mod auth;
 pub mod admin;
 pub mod intro;
diff --git a/client/src/tui/functions/form.rs b/client/src/tui/functions/form.rs
index 1b1b83d..ab1b633 100644
--- a/client/src/tui/functions/form.rs
+++ b/client/src/tui/functions/form.rs
@@ -1,6 +1,6 @@
 // src/tui/functions/form.rs
-use crate::state::pages::form::FormState;
 use crate::services::grpc_client::GrpcClient;
+use crate::pages::forms::FormState;
 use anyhow::{anyhow, Result};
 
 pub async fn handle_action(
diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs
index 4cfdbc5..69b92cc 100644
--- a/client/src/ui/handlers/render.rs
+++ b/client/src/ui/handlers/render.rs
@@ -22,7 +22,7 @@ use crate::buffer::state::BufferState;
 use crate::state::app::state::AppState;
 use crate::state::pages::auth::AuthState;
 use crate::bottom_panel::layout::{bottom_panel_constraints, render_bottom_panel};
-use crate::components::render_form;
+use crate::pages::forms::render_form;
 use ratatui::{
     layout::{Constraint, Direction, Layout},
     Frame,
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 0ad7c35..1c628c5 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -8,13 +8,13 @@ use crate::config::storage::storage::load_auth_data;
 use crate::modes::common::commands::CommandHandler;
 use crate::modes::handlers::event::{EventHandler, EventOutcome};
 use crate::modes::handlers::mode_manager::{AppMode, ModeManager};
-use crate::state::pages::form::{FormState, FieldDefinition};
 use crate::state::pages::auth::AuthState;
 use crate::state::pages::auth::LoginState;
 use crate::state::pages::auth::RegisterState;
 use crate::state::pages::admin::AdminState;
 use crate::state::pages::admin::AdminFocus;
 use crate::state::pages::intro::IntroState;
+use crate::pages::forms::{FormState, FieldDefinition};
 use crate::pages::routing::{Router, Page};
 use crate::buffer::state::BufferState;
 use crate::buffer::state::AppView;