diff --git a/Cargo.lock b/Cargo.lock
index 0ccd751..1abb253 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,3 +5,52 @@ version = 3
 [[package]]
 name = "advent-of-code-2022"
 version = "0.1.0"
+dependencies = [
+ "automod",
+]
+
+[[package]]
+name = "automod"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7feac164c18ee671e3e01be1ab9c0a362f5ef3eda26d44b06f1df897cd43c4e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
diff --git a/Cargo.toml b/Cargo.toml
index 3898996..cd7fae3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,3 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+automod = "1.0.4"
diff --git a/src/days.rs b/src/days.rs
new file mode 100644
index 0000000..9dd7135
--- /dev/null
+++ b/src/days.rs
@@ -0,0 +1 @@
+automod::dir!(pub "src/days");
diff --git a/src/d01.rs b/src/days/d01.rs
similarity index 97%
rename from src/d01.rs
rename to src/days/d01.rs
index d98a77a..fd0566a 100644
--- a/src/d01.rs
+++ b/src/days/d01.rs
@@ -1,6 +1,6 @@
 use std::fs;
 
-pub fn d01() {
+pub fn solve() {
     let path = "res/01/input.txt";
 
     let contents = fs::read_to_string(path)
diff --git a/src/d02.rs b/src/days/d02.rs
similarity index 99%
rename from src/d02.rs
rename to src/days/d02.rs
index 133bea0..3791b42 100644
--- a/src/d02.rs
+++ b/src/days/d02.rs
@@ -1,6 +1,6 @@
 use std::fs;
 
-pub fn d02() {
+pub fn solve() {
     let path = "res/02/input.txt";
 
     let contents = fs::read_to_string(path).expect("Should have been able to read the file");
diff --git a/src/d03.rs b/src/days/d03.rs
similarity index 99%
rename from src/d03.rs
rename to src/days/d03.rs
index cfcda71..58486f2 100644
--- a/src/d03.rs
+++ b/src/days/d03.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::collections::HashSet;
 use std::fs;
 
-pub fn d03() {
+pub fn solve() {
     let path = "res/03/input.txt";
 
     let contents = fs::read_to_string(path).expect("I/O error, wrong path?");
diff --git a/src/d04.rs b/src/days/d04.rs
similarity index 99%
rename from src/d04.rs
rename to src/days/d04.rs
index 64e1295..7df8c9e 100644
--- a/src/d04.rs
+++ b/src/days/d04.rs
@@ -1,6 +1,6 @@
 use std::fs;
 
-pub fn d04() {
+pub fn solve() {
     let path = "res/04/input.txt";
 
     let contents = fs::read_to_string(path).expect("I/O error, wrong path?");
diff --git a/src/d05.rs b/src/days/d05.rs
similarity index 99%
rename from src/d05.rs
rename to src/days/d05.rs
index 29eff4c..90042ba 100644
--- a/src/d05.rs
+++ b/src/days/d05.rs
@@ -1,6 +1,6 @@
 use std::fs;
 
-pub fn d05() {
+pub fn solve() {
     let path = "res/05/input.txt";
 
     let contents = fs::read_to_string(path).expect("I/O error, wrong path?");
diff --git a/src/d06.rs b/src/days/d06.rs
similarity index 98%
rename from src/d06.rs
rename to src/days/d06.rs
index 6dda269..ff3be25 100644
--- a/src/d06.rs
+++ b/src/days/d06.rs
@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::fs;
 
-pub fn d06() {
+pub fn solve() {
     let path = "res/06/input.txt";
 
     let contents = fs::read_to_string(path).expect("I/O error, wrong path?");
diff --git a/src/main.rs b/src/main.rs
index 655829f..edd2a55 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
-mod d06;
+pub mod days;
 
 fn main() {
-    d06::d06();
+    days::d06::solve();
 }