diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..e47d9bb
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "./Cargo.toml",
+        "./Cargo.toml"
+    ]
+}
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index e7a11a9..03ed285 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
+pub mod year_2023;
+
 fn main() {
     println!("Hello, world!");
 }
diff --git a/src/year_2023/day_01_trebuchet/mod.rs b/src/year_2023/day_01_trebuchet/mod.rs
new file mode 100644
index 0000000..5109e4e
--- /dev/null
+++ b/src/year_2023/day_01_trebuchet/mod.rs
@@ -0,0 +1,2 @@
+pub mod part_one;
+pub mod part_two;
\ No newline at end of file
diff --git a/src/2023/01-trebuchet/part_one.rs b/src/year_2023/day_01_trebuchet/part_one.rs
similarity index 100%
rename from src/2023/01-trebuchet/part_one.rs
rename to src/year_2023/day_01_trebuchet/part_one.rs
diff --git a/src/2023/01-trebuchet/part_two.rs b/src/year_2023/day_01_trebuchet/part_two.rs
similarity index 100%
rename from src/2023/01-trebuchet/part_two.rs
rename to src/year_2023/day_01_trebuchet/part_two.rs
diff --git a/src/year_2023/day_02_cube_conundrum/mod.rs b/src/year_2023/day_02_cube_conundrum/mod.rs
new file mode 100644
index 0000000..5109e4e
--- /dev/null
+++ b/src/year_2023/day_02_cube_conundrum/mod.rs
@@ -0,0 +1,2 @@
+pub mod part_one;
+pub mod part_two;
\ No newline at end of file
diff --git a/src/2023/02-cube-conundrum/part_one.rs b/src/year_2023/day_02_cube_conundrum/part_one.rs
similarity index 100%
rename from src/2023/02-cube-conundrum/part_one.rs
rename to src/year_2023/day_02_cube_conundrum/part_one.rs
diff --git a/src/2023/02-cube-conundrum/part_two.rs b/src/year_2023/day_02_cube_conundrum/part_two.rs
similarity index 100%
rename from src/2023/02-cube-conundrum/part_two.rs
rename to src/year_2023/day_02_cube_conundrum/part_two.rs
diff --git a/src/year_2023/day_03_gear_ratios/mod.rs b/src/year_2023/day_03_gear_ratios/mod.rs
new file mode 100644
index 0000000..8783a16
--- /dev/null
+++ b/src/year_2023/day_03_gear_ratios/mod.rs
@@ -0,0 +1 @@
+pub mod part_one;
diff --git a/src/2023/03-gear-ratios/part_one.rs b/src/year_2023/day_03_gear_ratios/part_one.rs
similarity index 100%
rename from src/2023/03-gear-ratios/part_one.rs
rename to src/year_2023/day_03_gear_ratios/part_one.rs
diff --git a/src/year_2023/day_04_scratchcards/mod.rs b/src/year_2023/day_04_scratchcards/mod.rs
new file mode 100644
index 0000000..8783a16
--- /dev/null
+++ b/src/year_2023/day_04_scratchcards/mod.rs
@@ -0,0 +1 @@
+pub mod part_one;
diff --git a/src/2023/04-scratchcards/part_one.rs b/src/year_2023/day_04_scratchcards/part_one.rs
similarity index 100%
rename from src/2023/04-scratchcards/part_one.rs
rename to src/year_2023/day_04_scratchcards/part_one.rs
diff --git a/src/year_2023/day_06_wait_for_it/mod.rs b/src/year_2023/day_06_wait_for_it/mod.rs
new file mode 100644
index 0000000..5109e4e
--- /dev/null
+++ b/src/year_2023/day_06_wait_for_it/mod.rs
@@ -0,0 +1,2 @@
+pub mod part_one;
+pub mod part_two;
\ No newline at end of file
diff --git a/src/2023/06-wait-for-it/part_one.rs b/src/year_2023/day_06_wait_for_it/part_one.rs
similarity index 100%
rename from src/2023/06-wait-for-it/part_one.rs
rename to src/year_2023/day_06_wait_for_it/part_one.rs
diff --git a/src/2023/06-wait-for-it/part_two.rs b/src/year_2023/day_06_wait_for_it/part_two.rs
similarity index 100%
rename from src/2023/06-wait-for-it/part_two.rs
rename to src/year_2023/day_06_wait_for_it/part_two.rs
diff --git a/src/year_2023/mod.rs b/src/year_2023/mod.rs
new file mode 100644
index 0000000..4f53189
--- /dev/null
+++ b/src/year_2023/mod.rs
@@ -0,0 +1,5 @@
+pub mod day_01_trebuchet;
+pub mod day_02_cube_conundrum;
+pub mod day_03_gear_ratios;
+pub mod day_04_scratchcards;
+pub mod day_06_wait_for_it;