diff --git a/src/main.rs b/src/main.rs
index 108ccaa..fa97c4a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,9 @@
 mod core;
 mod terminal;
+mod tui;
 
 fn main() {
     let lambda = core::editor::Editor::new();
     let mut screen = terminal::screen::Screen::new().unwrap();
-    terminal::tui::start(&mut screen, lambda);
+    tui::ui::start(&mut screen, lambda);
 }
diff --git a/src/terminal/mod.rs b/src/terminal/mod.rs
index 14a8ff8..fdf5b6f 100644
--- a/src/terminal/mod.rs
+++ b/src/terminal/mod.rs
@@ -1,4 +1 @@
-pub mod screen;
-pub mod tui;
-pub mod utils;
-mod components;
\ No newline at end of file
+pub mod screen;
\ No newline at end of file
diff --git a/src/terminal/components/mod.rs b/src/tui/components/mod.rs
similarity index 100%
rename from src/terminal/components/mod.rs
rename to src/tui/components/mod.rs
diff --git a/src/terminal/components/statusbar.rs b/src/tui/components/statusbar.rs
similarity index 98%
rename from src/terminal/components/statusbar.rs
rename to src/tui/components/statusbar.rs
index 14ff133..add3913 100644
--- a/src/terminal/components/statusbar.rs
+++ b/src/tui/components/statusbar.rs
@@ -1,7 +1,7 @@
 use crossterm::style::Stylize;
 use crate::core::editor::Editor;
 use crate::terminal::screen::{Coords, Screen};
-use crate::terminal::utils;
+use crate::tui::utils;
 
 pub fn draw(screen: &mut Screen, editor: &Editor) -> Result<(), ()> {
     // Calculate where to draw the status bar
diff --git a/src/terminal/components/welcome.rs b/src/tui/components/welcome.rs
similarity index 98%
rename from src/terminal/components/welcome.rs
rename to src/tui/components/welcome.rs
index ac88800..0847341 100644
--- a/src/terminal/components/welcome.rs
+++ b/src/tui/components/welcome.rs
@@ -1,7 +1,7 @@
 use crossterm::style::Stylize;
 use crate::core::editor::Editor;
 use crate::terminal::screen::{Coords, Screen};
-use crate::terminal::utils;
+use crate::tui::utils;
 
 pub fn draw(screen: &mut Screen, editor: &Editor) {
     // The welcome message
diff --git a/src/tui/mod.rs b/src/tui/mod.rs
new file mode 100644
index 0000000..f3c65f4
--- /dev/null
+++ b/src/tui/mod.rs
@@ -0,0 +1,3 @@
+pub mod ui;
+pub mod utils;
+mod components;
\ No newline at end of file
diff --git a/src/terminal/tui.rs b/src/tui/ui.rs
similarity index 96%
rename from src/terminal/tui.rs
rename to src/tui/ui.rs
index 721bcda..cab9d22 100644
--- a/src/terminal/tui.rs
+++ b/src/tui/ui.rs
@@ -1,6 +1,6 @@
 use crate::core::editor::Editor;
 use crate::terminal::screen::Screen;
-use crate::terminal::components;
+use crate::tui::components;
 use crossterm::event::{read, Event, KeyCode, KeyEvent, KeyModifiers};
 
 pub fn start(screen: &mut Screen, editor: Editor) {
diff --git a/src/terminal/utils.rs b/src/tui/utils.rs
similarity index 100%
rename from src/terminal/utils.rs
rename to src/tui/utils.rs