diff --git a/day1/prod.in.txt b/day01/prod.in.txt
similarity index 100%
rename from day1/prod.in.txt
rename to day01/prod.in.txt
diff --git a/day1/day1.go b/day01/solution.go
similarity index 98%
rename from day1/day1.go
rename to day01/solution.go
index fd5e436..5f06aaa 100644
--- a/day1/day1.go
+++ b/day01/solution.go
@@ -1,4 +1,4 @@
-package day1
+package day01
 
 import (
 	"sort"
diff --git a/day1/test.in.txt b/day01/test.in.txt
similarity index 100%
rename from day1/test.in.txt
rename to day01/test.in.txt
diff --git a/day2/prod.in.txt b/day02/prod.in.txt
similarity index 100%
rename from day2/prod.in.txt
rename to day02/prod.in.txt
diff --git a/day2/day2.go b/day02/solution.go
similarity index 99%
rename from day2/day2.go
rename to day02/solution.go
index 795fd7e..ec95c4d 100644
--- a/day2/day2.go
+++ b/day02/solution.go
@@ -1,4 +1,4 @@
-package day2
+package day02
 
 import (
 	"fmt"
diff --git a/day2/test.in.txt b/day02/test.in.txt
similarity index 100%
rename from day2/test.in.txt
rename to day02/test.in.txt
diff --git a/day3/prod.in.txt b/day03/prod.in.txt
similarity index 100%
rename from day3/prod.in.txt
rename to day03/prod.in.txt
diff --git a/day3/day3.go b/day03/solution.go
similarity index 99%
rename from day3/day3.go
rename to day03/solution.go
index a696d97..043235a 100644
--- a/day3/day3.go
+++ b/day03/solution.go
@@ -1,4 +1,4 @@
-package day3
+package day03
 
 type Solver struct {
 	rucksacks []Rucksack
diff --git a/day3/test.in.txt b/day03/test.in.txt
similarity index 100%
rename from day3/test.in.txt
rename to day03/test.in.txt
diff --git a/day4/prod.in.txt b/day04/prod.in.txt
similarity index 100%
rename from day4/prod.in.txt
rename to day04/prod.in.txt
diff --git a/day4/day4.go b/day04/solution.go
similarity index 98%
rename from day4/day4.go
rename to day04/solution.go
index edd233a..90133c0 100644
--- a/day4/day4.go
+++ b/day04/solution.go
@@ -1,4 +1,4 @@
-package day4
+package day04
 
 import (
 	"strconv"
diff --git a/day4/test.in.txt b/day04/test.in.txt
similarity index 100%
rename from day4/test.in.txt
rename to day04/test.in.txt
diff --git a/day5/prod.in.txt b/day05/prod.in.txt
similarity index 100%
rename from day5/prod.in.txt
rename to day05/prod.in.txt
diff --git a/day5/day5.go b/day05/solution.go
similarity index 99%
rename from day5/day5.go
rename to day05/solution.go
index 57b8069..48643c1 100644
--- a/day5/day5.go
+++ b/day05/solution.go
@@ -1,4 +1,4 @@
-package day5
+package day05
 
 import (
 	"strconv"
diff --git a/day5/test.in.txt b/day05/test.in.txt
similarity index 100%
rename from day5/test.in.txt
rename to day05/test.in.txt
diff --git a/day6/prod.in.txt b/day06/prod.in.txt
similarity index 100%
rename from day6/prod.in.txt
rename to day06/prod.in.txt
diff --git a/day6/day7.go b/day06/solution.go
similarity index 97%
rename from day6/day7.go
rename to day06/solution.go
index 518212f..5033dd6 100644
--- a/day6/day7.go
+++ b/day06/solution.go
@@ -1,4 +1,4 @@
-package day6
+package day06
 
 import "math/bits"
 
diff --git a/day6/test.in.txt b/day06/test.in.txt
similarity index 100%
rename from day6/test.in.txt
rename to day06/test.in.txt
diff --git a/day7/prod.in.txt b/day07/prod.in.txt
similarity index 100%
rename from day7/prod.in.txt
rename to day07/prod.in.txt
diff --git a/day7/day7.go b/day07/solution.go
similarity index 99%
rename from day7/day7.go
rename to day07/solution.go
index 6c4f969..dbef570 100644
--- a/day7/day7.go
+++ b/day07/solution.go
@@ -1,4 +1,4 @@
-package day7
+package day07
 
 import (
 	"fmt"
diff --git a/day7/test.in.txt b/day07/test.in.txt
similarity index 100%
rename from day7/test.in.txt
rename to day07/test.in.txt
diff --git a/day8/prod.in.txt b/day08/prod.in.txt
similarity index 100%
rename from day8/prod.in.txt
rename to day08/prod.in.txt
diff --git a/day8/solution.go b/day08/solution.go
similarity index 99%
rename from day8/solution.go
rename to day08/solution.go
index 561f766..23e9fde 100644
--- a/day8/solution.go
+++ b/day08/solution.go
@@ -1,4 +1,4 @@
-package day8
+package day08
 
 type Solver struct {
 	input             [][]byte
diff --git a/day8/test.in.txt b/day08/test.in.txt
similarity index 100%
rename from day8/test.in.txt
rename to day08/test.in.txt
diff --git a/day9/prod.in.txt b/day09/prod.in.txt
similarity index 100%
rename from day9/prod.in.txt
rename to day09/prod.in.txt
diff --git a/day9/solution.go b/day09/solution.go
similarity index 99%
rename from day9/solution.go
rename to day09/solution.go
index 11fb28a..5729cf8 100644
--- a/day9/solution.go
+++ b/day09/solution.go
@@ -1,4 +1,4 @@
-package day9
+package day09
 
 import (
 	"fmt"
diff --git a/day9/test.in.txt b/day09/test.in.txt
similarity index 100%
rename from day9/test.in.txt
rename to day09/test.in.txt
diff --git a/main.go b/main.go
index 4062d07..07cf341 100644
--- a/main.go
+++ b/main.go
@@ -6,16 +6,16 @@ import (
 	"log"
 	"time"
 
-	"snikolov.me/aoc2022/day1"
+	"snikolov.me/aoc2022/day01"
+	"snikolov.me/aoc2022/day02"
+	"snikolov.me/aoc2022/day03"
+	"snikolov.me/aoc2022/day04"
+	"snikolov.me/aoc2022/day05"
+	"snikolov.me/aoc2022/day06"
+	"snikolov.me/aoc2022/day07"
+	"snikolov.me/aoc2022/day08"
+	"snikolov.me/aoc2022/day09"
 	"snikolov.me/aoc2022/day10"
-	"snikolov.me/aoc2022/day2"
-	"snikolov.me/aoc2022/day3"
-	"snikolov.me/aoc2022/day4"
-	"snikolov.me/aoc2022/day5"
-	"snikolov.me/aoc2022/day6"
-	"snikolov.me/aoc2022/day7"
-	"snikolov.me/aoc2022/day8"
-	"snikolov.me/aoc2022/day9"
 
 	"snikolov.me/aoc2022/utils"
 )
@@ -50,15 +50,15 @@ func main() {
 
 func solve(args Args, inputFileName string) {
 	solvers := map[int]utils.Solver{
-		1:  &day1.Solver{},
-		2:  &day2.Solver{},
-		3:  &day3.Solver{},
-		4:  &day4.Solver{},
-		5:  &day5.Solver{},
-		6:  &day6.Solver{},
-		7:  &day7.Solver{},
-		8:  &day8.Solver{},
-		9:  &day9.Solver{},
+		1:  &day01.Solver{},
+		2:  &day02.Solver{},
+		3:  &day03.Solver{},
+		4:  &day04.Solver{},
+		5:  &day05.Solver{},
+		6:  &day06.Solver{},
+		7:  &day07.Solver{},
+		8:  &day08.Solver{},
+		9:  &day09.Solver{},
 		10: &day10.Solver{},
 	}
 	solver, ok := solvers[args.DayNumber]