diff --git a/src/app/mod.rs b/src/app.rs
similarity index 93%
rename from src/app/mod.rs
rename to src/app.rs
index 9316024..69a8611 100644
--- a/src/app/mod.rs
+++ b/src/app.rs
@@ -1,4 +1,7 @@
-use rfd::{AsyncFileDialog, FileHandle};
+use crate::lyrics::Lyrics;
+use crate::file_select::FileSelector;
+use crate::styles::Theme;
+use rfd::AsyncFileDialog;
 use std::path::PathBuf;
 use core::time::Duration;
 use iced::Subscription;
@@ -17,19 +20,12 @@ use iced_native::keyboard;
 use iced_native::window;
 use iced_native::event::Event;
 
-mod lyrics;
-mod styles;
-mod file_select;
-
-use styles::Theme;
-use file_select::FileSelector;
-
 #[derive(Clone, Debug)]
 pub struct DelyriumApp {
-	lyrics_component: lyrics::Lyrics,
+	lyrics_component: Lyrics,
 	theme: Theme,
 	mode: AppMode,
-	file_selector: file_select::FileSelector,
+	file_selector: FileSelector,
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
@@ -59,7 +55,7 @@ impl Application for DelyriumApp {
 	fn new(_: Self::Flags) -> (Self, Command<Message>) {
 		(
 			DelyriumApp {
-				lyrics_component: lyrics::Lyrics::new(),
+				lyrics_component: Lyrics::new(),
 				theme: Theme::default(),
 				mode: AppMode::FileSelect,
 				file_selector: FileSelector::default(),
diff --git a/src/app/file_select.rs b/src/file_select.rs
similarity index 98%
rename from src/app/file_select.rs
rename to src/file_select.rs
index 5e9da53..0c5d06a 100644
--- a/src/app/file_select.rs
+++ b/src/file_select.rs
@@ -41,7 +41,7 @@ const MAX_TICKS: usize = 900;
 
 const FONT_MR_PIXEL: Font = Font::External {
 	name: "Mister Pixel",
-	bytes: include_bytes!("../../fonts/mister-pixel/mister-pixel.otf"),
+	bytes: include_bytes!("../fonts/mister-pixel/mister-pixel.otf"),
 };
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
diff --git a/src/app/lyrics.rs b/src/lyrics.rs
similarity index 98%
rename from src/app/lyrics.rs
rename to src/lyrics.rs
index 334515f..bb8f5cd 100644
--- a/src/app/lyrics.rs
+++ b/src/lyrics.rs
@@ -1,6 +1,6 @@
-use crate::app::Theme;
+use iced::Element;
+use crate::styles::Theme;
 use crate::app::Message;
-use crate::app::Element;
 
 use iced::Align;
 use iced::Length;
diff --git a/src/main.rs b/src/main.rs
index ebbf474..f030b1d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,6 +3,9 @@ use iced::settings::Settings;
 
 mod palette;
 mod app;
+mod lyrics;
+mod styles;
+mod file_select;
 
 fn main() {
 	app::DelyriumApp::run(Settings::default()).unwrap();
diff --git a/src/app/styles.rs b/src/styles.rs
similarity index 100%
rename from src/app/styles.rs
rename to src/styles.rs