diff --git a/.replit b/.replit
deleted file mode 100644
index 6074353..0000000
--- a/.replit
+++ /dev/null
@@ -1 +0,0 @@
-run = "cargo run"
diff --git a/Cargo.toml b/Cargo.toml
index 894e8dd..d21bb82 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,8 +11,5 @@ include = ["src/*.rs", "Cargo.toml"]
 categories = ["text-editors"]
 keywords = ["text-editor", "editor", "terminal", "tui"]
 
-[profile.release]
-panic = abort
-
 [dependencies]
 crossterm = "0.25"
diff --git a/TODO.md b/TODO.md
index 798b9f4..05e298e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,2 +1,2 @@
-- [ ] Make components (i.e statusbar) modular
 - [ ] Modularise functions
+- [ ] Make components (i.e statusbar) modular
diff --git a/src/editor.rs b/src/core/editor.rs
similarity index 100%
rename from src/editor.rs
rename to src/core/editor.rs
diff --git a/src/core/mod.rs b/src/core/mod.rs
new file mode 100644
index 0000000..0769981
--- /dev/null
+++ b/src/core/mod.rs
@@ -0,0 +1 @@
+pub mod editor;
diff --git a/src/main.rs b/src/main.rs
index 6e25b09..108ccaa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,8 @@
-mod editor;
+mod core;
 mod terminal;
-mod tui;
 
 fn main() {
-    let lambda = editor::Editor::new();
-    let mut screen = terminal::Screen::new().unwrap();
-    tui::start(&mut screen, lambda);
+    let lambda = core::editor::Editor::new();
+    let mut screen = terminal::screen::Screen::new().unwrap();
+    terminal::tui::start(&mut screen, lambda);
 }
diff --git a/src/terminal/mod.rs b/src/terminal/mod.rs
new file mode 100644
index 0000000..a865f33
--- /dev/null
+++ b/src/terminal/mod.rs
@@ -0,0 +1,2 @@
+pub mod screen;
+pub mod tui;
diff --git a/src/terminal.rs b/src/terminal/screen.rs
similarity index 100%
rename from src/terminal.rs
rename to src/terminal/screen.rs
diff --git a/src/tui.rs b/src/terminal/tui.rs
similarity index 98%
rename from src/tui.rs
rename to src/terminal/tui.rs
index c6a5343..a939730 100644
--- a/src/tui.rs
+++ b/src/terminal/tui.rs
@@ -1,5 +1,5 @@
-use crate::editor::Editor;
-use crate::terminal::{Coords, Screen};
+use crate::core::editor::Editor;
+use crate::terminal::screen::{Coords, Screen};
 use crossterm::style::Stylize;
 use crossterm::event::{read, Event, KeyCode, KeyEvent, KeyModifiers};