diff --git a/src/tui_app/accounts/mod.rs b/src/accounts/mod.rs
similarity index 100%
rename from src/tui_app/accounts/mod.rs
rename to src/accounts/mod.rs
diff --git a/src/tui_app/app/command_interface/lua_command_manager/mod.rs b/src/app/command_interface/lua_command_manager/mod.rs
similarity index 100%
rename from src/tui_app/app/command_interface/lua_command_manager/mod.rs
rename to src/app/command_interface/lua_command_manager/mod.rs
diff --git a/src/tui_app/app/command_interface/mod.rs b/src/app/command_interface/mod.rs
similarity index 100%
rename from src/tui_app/app/command_interface/mod.rs
rename to src/app/command_interface/mod.rs
diff --git a/src/tui_app/app/events/event_types/event/handlers/command.rs b/src/app/events/event_types/event/handlers/command.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event/handlers/command.rs
rename to src/app/events/event_types/event/handlers/command.rs
diff --git a/src/tui_app/app/events/event_types/event/handlers/lua_command.rs b/src/app/events/event_types/event/handlers/lua_command.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event/handlers/lua_command.rs
rename to src/app/events/event_types/event/handlers/lua_command.rs
diff --git a/src/tui_app/app/events/event_types/event/handlers/main.rs b/src/app/events/event_types/event/handlers/main.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event/handlers/main.rs
rename to src/app/events/event_types/event/handlers/main.rs
diff --git a/src/tui_app/app/events/event_types/event/handlers/matrix.rs b/src/app/events/event_types/event/handlers/matrix.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event/handlers/matrix.rs
rename to src/app/events/event_types/event/handlers/matrix.rs
diff --git a/src/tui_app/app/events/event_types/event/handlers/mod.rs b/src/app/events/event_types/event/handlers/mod.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event/handlers/mod.rs
rename to src/app/events/event_types/event/handlers/mod.rs
diff --git a/src/tui_app/app/events/event_types/event/handlers/setup.rs b/src/app/events/event_types/event/handlers/setup.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event/handlers/setup.rs
rename to src/app/events/event_types/event/handlers/setup.rs
diff --git a/src/tui_app/app/events/event_types/event/mod.rs b/src/app/events/event_types/event/mod.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event/mod.rs
rename to src/app/events/event_types/event/mod.rs
diff --git a/src/tui_app/app/events/event_types/event_status.rs b/src/app/events/event_types/event_status.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/event_status.rs
rename to src/app/events/event_types/event_status.rs
diff --git a/src/tui_app/app/events/event_types/mod.rs b/src/app/events/event_types/mod.rs
similarity index 100%
rename from src/tui_app/app/events/event_types/mod.rs
rename to src/app/events/event_types/mod.rs
diff --git a/src/tui_app/app/events/mod.rs b/src/app/events/mod.rs
similarity index 100%
rename from src/tui_app/app/events/mod.rs
rename to src/app/events/mod.rs
diff --git a/src/tui_app/app/mod.rs b/src/app/mod.rs
similarity index 100%
rename from src/tui_app/app/mod.rs
rename to src/app/mod.rs
diff --git a/src/tui_app/app/status.rs b/src/app/status.rs
similarity index 100%
rename from src/tui_app/app/status.rs
rename to src/app/status.rs
diff --git a/src/main.rs b/src/main.rs
index b14a469..0c8e5b4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,13 +1,11 @@
-//mod app;
-//mod ui;
-//mod accounts;
+mod app;
+mod ui;
+mod accounts;
 mod cli;
-mod tui_app;
 
 use clap::Parser;
 
 use crate::cli::{Args, Command};
-pub use tui_app::*;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
diff --git a/src/tui_app/mod.rs b/src/tui_app/mod.rs
deleted file mode 100644
index 8da28d6..0000000
--- a/src/tui_app/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod app;
-pub mod ui;
-pub mod accounts;
-
-//pub use app::*;
-//pub use ui::*;
-//pub use accounts::*;
diff --git a/src/tui_app/ui/central/mod.rs b/src/ui/central/mod.rs
similarity index 100%
rename from src/tui_app/ui/central/mod.rs
rename to src/ui/central/mod.rs
diff --git a/src/tui_app/ui/central/update/mod.rs b/src/ui/central/update/mod.rs
similarity index 100%
rename from src/tui_app/ui/central/update/mod.rs
rename to src/ui/central/update/mod.rs
diff --git a/src/tui_app/ui/central/update/widgets/command_monitor.rs b/src/ui/central/update/widgets/command_monitor.rs
similarity index 100%
rename from src/tui_app/ui/central/update/widgets/command_monitor.rs
rename to src/ui/central/update/widgets/command_monitor.rs
diff --git a/src/tui_app/ui/central/update/widgets/messages.rs b/src/ui/central/update/widgets/messages.rs
similarity index 100%
rename from src/tui_app/ui/central/update/widgets/messages.rs
rename to src/ui/central/update/widgets/messages.rs
diff --git a/src/tui_app/ui/central/update/widgets/mod.rs b/src/ui/central/update/widgets/mod.rs
similarity index 100%
rename from src/tui_app/ui/central/update/widgets/mod.rs
rename to src/ui/central/update/widgets/mod.rs
diff --git a/src/tui_app/ui/central/update/widgets/room_info.rs b/src/ui/central/update/widgets/room_info.rs
similarity index 100%
rename from src/tui_app/ui/central/update/widgets/room_info.rs
rename to src/ui/central/update/widgets/room_info.rs
diff --git a/src/tui_app/ui/central/update/widgets/rooms.rs b/src/ui/central/update/widgets/rooms.rs
similarity index 100%
rename from src/tui_app/ui/central/update/widgets/rooms.rs
rename to src/ui/central/update/widgets/rooms.rs
diff --git a/src/tui_app/ui/central/update/widgets/status.rs b/src/ui/central/update/widgets/status.rs
similarity index 100%
rename from src/tui_app/ui/central/update/widgets/status.rs
rename to src/ui/central/update/widgets/status.rs
diff --git a/src/tui_app/ui/mod.rs b/src/ui/mod.rs
similarity index 100%
rename from src/tui_app/ui/mod.rs
rename to src/ui/mod.rs
diff --git a/src/tui_app/ui/setup.rs b/src/ui/setup.rs
similarity index 100%
rename from src/tui_app/ui/setup.rs
rename to src/ui/setup.rs