diff --git a/client/src/components/admin_panel.rs b/client/src/components/admin_panel.rs
new file mode 100644
index 0000000..c25b3ec
--- /dev/null
+++ b/client/src/components/admin_panel.rs
@@ -0,0 +1,4 @@
+// src/components/admin_panel.rs
+pub mod admin_panel;
+
+pub use admin_panel::*;
diff --git a/client/src/components/handlers.rs b/client/src/components/handlers.rs
index b0084fd..6c530c5 100644
--- a/client/src/components/handlers.rs
+++ b/client/src/components/handlers.rs
@@ -5,7 +5,6 @@ pub mod status_line;
 pub mod canvas;
 pub mod sidebar;
 pub mod background;
-pub mod intro;
 pub mod admin_panel;
 
 pub use command_line::render_command_line;
@@ -14,5 +13,4 @@ pub use status_line::render_status_line;
 pub use canvas::*;
 pub use sidebar::*;
 pub use background::*;
-pub use intro::*;
 pub use admin_panel::*;
diff --git a/client/src/components/intro.rs b/client/src/components/intro.rs
new file mode 100644
index 0000000..ebac46c
--- /dev/null
+++ b/client/src/components/intro.rs
@@ -0,0 +1,4 @@
+// src/components/intro.rs
+pub mod intro;
+
+pub use intro::*;
diff --git a/client/src/components/handlers/intro.rs b/client/src/components/intro/intro.rs
similarity index 100%
rename from client/src/components/handlers/intro.rs
rename to client/src/components/intro/intro.rs
diff --git a/client/src/components/mod.rs b/client/src/components/mod.rs
index cbb0d2a..23ca6db 100644
--- a/client/src/components/mod.rs
+++ b/client/src/components/mod.rs
@@ -1,5 +1,8 @@
 // src/components/mod.rs
-pub mod models;
 pub mod handlers;
+pub mod intro;
+pub mod admin_panel;
 
 pub use handlers::*;
+pub use intro::*;
+pub use admin_panel::*;
diff --git a/client/src/components/models.rs b/client/src/components/models.rs
deleted file mode 100644
index e69de29..0000000
diff --git a/client/src/modes/handlers/event.rs b/client/src/modes/handlers/event.rs
index d8fdcdf..84532b1 100644
--- a/client/src/modes/handlers/event.rs
+++ b/client/src/modes/handlers/event.rs
@@ -47,7 +47,7 @@ impl EventHandler {
         app_state: &mut crate::state::state::AppState,
         total_count: u64,
         current_position: &mut u64,
-        intro_state: &mut crate::components::handlers::intro::IntroState,
+        intro_state: &mut crate::components::intro::intro::IntroState,
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         if app_state.ui.show_intro {
             if let Event::Key(key) = event {
diff --git a/client/src/ui/handlers/render.rs b/client/src/ui/handlers/render.rs
index cbe9560..fa89037 100644
--- a/client/src/ui/handlers/render.rs
+++ b/client/src/ui/handlers/render.rs
@@ -4,7 +4,8 @@ use crate::components::{
     render_background,
     render_command_line,
     render_status_line,
-    handlers::{sidebar::{self, calculate_sidebar_layout}, intro, admin_panel::AdminPanelState, form::render_form},
+    handlers::{sidebar::{self, calculate_sidebar_layout}, admin_panel::AdminPanelState, form::render_form},
+    intro::{intro},
 };
 use crate::config::colors::Theme;
 use ratatui::layout::{Constraint, Direction, Layout};
diff --git a/client/src/ui/handlers/ui.rs b/client/src/ui/handlers/ui.rs
index 7bf8165..fccbf70 100644
--- a/client/src/ui/handlers/ui.rs
+++ b/client/src/ui/handlers/ui.rs
@@ -9,7 +9,8 @@ use crate::config::config::Config;
 use crate::ui::handlers::{form::FormState, render::render_ui};
 use crate::modes::handlers::event::EventHandler;
 use crate::state::state::AppState;
-use crate::components::handlers::{intro::IntroState, admin_panel::AdminPanelState};
+use crate::components::handlers::{admin_panel::AdminPanelState};
+use crate::components::intro::{intro::IntroState};
 
 pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;