diff --git a/client/src/components1/handlers/form.rs b/client/src/components1/handlers/form.rs
index 26826f8..53b46d0 100644
--- a/client/src/components1/handlers/form.rs
+++ b/client/src/components1/handlers/form.rs
@@ -7,7 +7,7 @@ use ratatui::{
     Frame,
 };
 use crate::colors::Theme;
-use crate::client::ui::form::FormState;
+use crate::ui::form::FormState;
 
 pub fn render_form(
     f: &mut Frame,
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 399610f..515ff84 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -7,24 +7,3 @@ pub mod components1;
 
 pub use ui::run_ui;
 
-use ratatui::{backend::CrosstermBackend, Terminal};
-use crossterm::event::{self, Event, KeyCode};
-
-pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
-    let mut terminal = Terminal::new(CrosstermBackend::new(std::io::stdout()))?;
-    
-    loop {
-        terminal.draw(|f| {
-            // Your UI rendering logic here
-            ui::draw(f);
-        })?;
-
-        if let Event::Key(key) = event::read()? {
-            if key.code == KeyCode::Char('q') {
-                break;
-            }
-        }
-    }
-    
-    Ok(())
-}
diff --git a/client/src/ui/handlers/event.rs b/client/src/ui/handlers/event.rs
index 78058f9..c9ae880 100644
--- a/client/src/ui/handlers/event.rs
+++ b/client/src/ui/handlers/event.rs
@@ -3,7 +3,7 @@
 use crossterm::event::{Event, KeyCode, KeyModifiers};
 use crossterm::cursor::{SetCursorStyle};
 use crate::terminal::AppTerminal;
-use crate::client::config::Config;
+use crate::config::Config;
 use common::proto::multieko2::adresar::{PostAdresarRequest, PutAdresarRequest};
 use super::form::FormState;
 
diff --git a/client/src/ui/handlers/form.rs b/client/src/ui/handlers/form.rs
index 0e331b4..9531427 100644
--- a/client/src/ui/handlers/form.rs
+++ b/client/src/ui/handlers/form.rs
@@ -1,6 +1,6 @@
 // src/client/ui/handlers/form.rs
 
-use crate::client::components1::render_form;
+use crate::components1::render_form;
 use crate::colors::Theme;
 use ratatui::layout::Rect;
 use ratatui::Frame;
diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs
index 92d7043..d07caba 100644
--- a/client/src/ui/handlers/render.rs
+++ b/client/src/ui/handlers/render.rs
@@ -1,6 +1,6 @@
 // src/client/ui/handlers/render.rs
 
-use crate::client::components1::{render_command_line, render_preview_card, render_status_line};
+use crate::components1::{render_command_line, render_preview_card, render_status_line};
 use crate::colors::Theme;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::Frame;
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 885b951..3982e90 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -2,8 +2,8 @@
 
 use crate::terminal::AppTerminal;
 use crate::colors::Theme;
-use crate::client::config::Config;
-use crate::client::ui::handlers::{event::EventHandler, form::FormState, state::AppState, render::render_ui};
+use crate::config::Config;
+use crate::ui::handlers::{event::EventHandler, form::FormState, state::AppState, render::render_ui};
 
 pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;
diff --git a/client/src/ui/mod.rs b/client/src/ui/mod.rs
index 0a017f8..d548bc7 100644
--- a/client/src/ui/mod.rs
+++ b/client/src/ui/mod.rs
@@ -1,6 +1,5 @@
 // src/client/ui/mod.rs
 pub mod models;
 pub mod handlers;
-pub mod state;
 
 pub use handlers::*;