diff --git a/src/app/browser/header.rs b/src/browser/header/mod.rs
similarity index 79%
rename from src/app/browser/header.rs
rename to src/browser/header/mod.rs
index ff082bbd..fa06052c 100644
--- a/src/app/browser/header.rs
+++ b/src/browser/header/mod.rs
@@ -1,6 +1,4 @@
-#[path = "header/subject.rs"]
 mod subject;
-#[path = "header/tray.rs"]
 mod tray;
 
 use gtk::HeaderBar;
diff --git a/src/app/browser/header/subject/description.rs b/src/browser/header/subject/description/mod.rs
similarity index 100%
rename from src/app/browser/header/subject/description.rs
rename to src/browser/header/subject/description/mod.rs
diff --git a/src/app/browser/header/subject.rs b/src/browser/header/subject/mod.rs
similarity index 85%
rename from src/app/browser/header/subject.rs
rename to src/browser/header/subject/mod.rs
index 7a986ac0..14d96038 100644
--- a/src/app/browser/header/subject.rs
+++ b/src/browser/header/subject/mod.rs
@@ -1,6 +1,4 @@
-#[path = "subject/description.rs"]
 mod description;
-#[path = "subject/title.rs"]
 mod title;
 
 use gtk::prelude::BoxExt;
diff --git a/src/app/browser/header/subject/title.rs b/src/browser/header/subject/title/mod.rs
similarity index 100%
rename from src/app/browser/header/subject/title.rs
rename to src/browser/header/subject/title/mod.rs
diff --git a/src/app/browser/header/tray/menu.rs b/src/browser/header/tray/menu/mod.rs
similarity index 100%
rename from src/app/browser/header/tray/menu.rs
rename to src/browser/header/tray/menu/mod.rs
diff --git a/src/app/browser/header/tray.rs b/src/browser/header/tray/mod.rs
similarity index 85%
rename from src/app/browser/header/tray.rs
rename to src/browser/header/tray/mod.rs
index ae349b78..5ae0922c 100644
--- a/src/app/browser/header/tray.rs
+++ b/src/browser/header/tray/mod.rs
@@ -1,6 +1,4 @@
-#[path = "tray/menu.rs"]
 mod menu;
-#[path = "tray/tab.rs"]
 mod tab;
 
 use gtk::prelude::BoxExt;
diff --git a/src/app/browser/header/tray/tab.rs b/src/browser/header/tray/tab/mod.rs
similarity index 100%
rename from src/app/browser/header/tray/tab.rs
rename to src/browser/header/tray/tab/mod.rs
diff --git a/src/app/browser/main.rs b/src/browser/main/mod.rs
similarity index 89%
rename from src/app/browser/main.rs
rename to src/browser/main/mod.rs
index 40f12ac9..bf690059 100644
--- a/src/app/browser/main.rs
+++ b/src/browser/main/mod.rs
@@ -1,4 +1,3 @@
-#[path = "main/tab.rs"]
 mod tab;
 
 use gtk::prelude::BoxExt;
diff --git a/src/app/browser/main/tab/label.rs b/src/browser/main/tab/label/mod.rs
similarity index 83%
rename from src/app/browser/main/tab/label.rs
rename to src/browser/main/tab/label/mod.rs
index a4573948..529da47a 100644
--- a/src/app/browser/main/tab/label.rs
+++ b/src/browser/main/tab/label/mod.rs
@@ -1,6 +1,4 @@
-#[path = "label/pin.rs"]
 mod pin;
-#[path = "label/title.rs"]
 mod title;
 
 use gtk::prelude::BoxExt;
diff --git a/src/app/browser/main/tab/label/pin.rs b/src/browser/main/tab/label/pin/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/label/pin.rs
rename to src/browser/main/tab/label/pin/mod.rs
diff --git a/src/app/browser/main/tab/label/title.rs b/src/browser/main/tab/label/title/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/label/title.rs
rename to src/browser/main/tab/label/title/mod.rs
diff --git a/src/app/browser/main/tab.rs b/src/browser/main/tab/mod.rs
similarity index 91%
rename from src/app/browser/main/tab.rs
rename to src/browser/main/tab/mod.rs
index 35a748b6..900920ac 100644
--- a/src/app/browser/main/tab.rs
+++ b/src/browser/main/tab/mod.rs
@@ -1,6 +1,4 @@
-#[path = "tab/label.rs"]
 mod label;
-#[path = "tab/page.rs"]
 mod page;
 
 use gtk::Notebook;
diff --git a/src/app/browser/main/tab/page/content.rs b/src/browser/main/tab/page/content/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/page/content.rs
rename to src/browser/main/tab/page/content/mod.rs
diff --git a/src/app/browser/main/tab/page.rs b/src/browser/main/tab/page/mod.rs
similarity index 82%
rename from src/app/browser/main/tab/page.rs
rename to src/browser/main/tab/page/mod.rs
index 62a9aa35..f09539c1 100644
--- a/src/app/browser/main/tab/page.rs
+++ b/src/browser/main/tab/page/mod.rs
@@ -1,6 +1,4 @@
-#[path = "page/content.rs"]
 mod content;
-#[path = "page/navigation.rs"]
 mod navigation;
 
 use gtk::prelude::BoxExt;
diff --git a/src/app/browser/main/tab/page/navigation/base.rs b/src/browser/main/tab/page/navigation/base/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/page/navigation/base.rs
rename to src/browser/main/tab/page/navigation/base/mod.rs
diff --git a/src/app/browser/main/tab/page/navigation/bookmark.rs b/src/browser/main/tab/page/navigation/bookmark/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/page/navigation/bookmark.rs
rename to src/browser/main/tab/page/navigation/bookmark/mod.rs
diff --git a/src/app/browser/main/tab/page/navigation/history/back.rs b/src/browser/main/tab/page/navigation/history/back/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/page/navigation/history/back.rs
rename to src/browser/main/tab/page/navigation/history/back/mod.rs
diff --git a/src/app/browser/main/tab/page/navigation/history/forward.rs b/src/browser/main/tab/page/navigation/history/forward/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/page/navigation/history/forward.rs
rename to src/browser/main/tab/page/navigation/history/forward/mod.rs
diff --git a/src/app/browser/main/tab/page/navigation/history.rs b/src/browser/main/tab/page/navigation/history/mod.rs
similarity index 86%
rename from src/app/browser/main/tab/page/navigation/history.rs
rename to src/browser/main/tab/page/navigation/history/mod.rs
index 6d9fe07e..5505989e 100644
--- a/src/app/browser/main/tab/page/navigation/history.rs
+++ b/src/browser/main/tab/page/navigation/history/mod.rs
@@ -1,6 +1,4 @@
-#[path = "history/back.rs"]
 mod back;
-#[path = "history/forward.rs"]
 mod forward;
 
 use gtk::prelude::BoxExt;
diff --git a/src/app/browser/main/tab/page/navigation.rs b/src/browser/main/tab/page/navigation/mod.rs
similarity index 78%
rename from src/app/browser/main/tab/page/navigation.rs
rename to src/browser/main/tab/page/navigation/mod.rs
index ebdb9243..2d6e1b80 100644
--- a/src/app/browser/main/tab/page/navigation.rs
+++ b/src/browser/main/tab/page/navigation/mod.rs
@@ -1,12 +1,7 @@
-#[path = "navigation/base.rs"]
 mod base;
-#[path = "navigation/bookmark.rs"]
 mod bookmark;
-#[path = "navigation/history.rs"]
 mod history;
-#[path = "navigation/reload.rs"]
 mod reload;
-#[path = "navigation/request.rs"]
 mod request;
 
 use gtk::prelude::BoxExt;
diff --git a/src/app/browser/main/tab/page/navigation/reload.rs b/src/browser/main/tab/page/navigation/reload/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/page/navigation/reload.rs
rename to src/browser/main/tab/page/navigation/reload/mod.rs
diff --git a/src/app/browser/main/tab/page/navigation/request.rs b/src/browser/main/tab/page/navigation/request/mod.rs
similarity index 100%
rename from src/app/browser/main/tab/page/navigation/request.rs
rename to src/browser/main/tab/page/navigation/request/mod.rs
diff --git a/src/app/browser.rs b/src/browser/mod.rs
similarity index 94%
rename from src/app/browser.rs
rename to src/browser/mod.rs
index 8e6afccb..fa3273b4 100644
--- a/src/app/browser.rs
+++ b/src/browser/mod.rs
@@ -1,6 +1,4 @@
-#[path = "browser/header.rs"]
 mod header;
-#[path = "browser/main.rs"]
 mod main;
 
 use gtk::{
diff --git a/src/main.rs b/src/main.rs
index be7c84bf..266610ea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-#[path = "app/browser.rs"]
 mod browser;
 
 use gtk::prelude::{ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt};