diff --git a/src/common.rs b/src/common.rs
new file mode 100644
index 0000000..70589ba
--- /dev/null
+++ b/src/common.rs
@@ -0,0 +1 @@
+pub mod interval;
\ No newline at end of file
diff --git a/src/interval.rs b/src/common/interval.rs
similarity index 100%
rename from src/interval.rs
rename to src/common/interval.rs
diff --git a/src/main.rs b/src/main.rs
index c712e2a..6661c30 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,8 @@
-mod cafeteria;
-mod interval;
-mod printing_department;
+mod solvers;
+mod common;
 
 fn main() {
     println!("### Advent of Code 2025 ###\n");
-    printing_department::PrintingDepartment::new().run();
-    cafeteria::Cafeteria::new().run();
+    solvers::printing_department::PrintingDepartment::new().run();
+    solvers::cafeteria::Cafeteria::new().run();
 }
diff --git a/src/solvers.rs b/src/solvers.rs
new file mode 100644
index 0000000..3cd2977
--- /dev/null
+++ b/src/solvers.rs
@@ -0,0 +1,2 @@
+pub mod cafeteria;
+pub mod printing_department;
diff --git a/src/cafeteria.rs b/src/solvers/cafeteria.rs
similarity index 98%
rename from src/cafeteria.rs
rename to src/solvers/cafeteria.rs
index be21421..c928e61 100644
--- a/src/cafeteria.rs
+++ b/src/solvers/cafeteria.rs
@@ -1,4 +1,4 @@
-use crate::interval::Interval;
+use crate::common::interval::Interval;
 use std::collections::BTreeSet;
 use std::fs::File;
 use std::io;
diff --git a/src/printing_department.rs b/src/solvers/printing_department.rs
similarity index 100%
rename from src/printing_department.rs
rename to src/solvers/printing_department.rs