diff --git a/1/input b/days/1/input
similarity index 100%
rename from 1/input
rename to days/1/input
diff --git a/1/puzzle.txt b/days/1/puzzle.txt
similarity index 100%
rename from 1/puzzle.txt
rename to days/1/puzzle.txt
diff --git a/1/solution.nix b/days/1/solution.nix
similarity index 90%
rename from 1/solution.nix
rename to days/1/solution.nix
index 5cca1a0..e037ca0 100644
--- a/1/solution.nix
+++ b/days/1/solution.nix
@@ -1,4 +1,4 @@
-with import ../util.nix;
+with import ../../util.nix;
 
 let
   input = readFile ./input;
diff --git a/2/input b/days/2/input
similarity index 100%
rename from 2/input
rename to days/2/input
diff --git a/2/puzzle.txt b/days/2/puzzle.txt
similarity index 100%
rename from 2/puzzle.txt
rename to days/2/puzzle.txt
diff --git a/2/solution.nix b/days/2/solution.nix
similarity index 97%
rename from 2/solution.nix
rename to days/2/solution.nix
index abfe080..1602315 100644
--- a/2/solution.nix
+++ b/days/2/solution.nix
@@ -1,4 +1,4 @@
-with import ../util.nix;
+with import ../../util.nix;
 
 let
   # read file
diff --git a/3/input b/days/3/input
similarity index 100%
rename from 3/input
rename to days/3/input
diff --git a/3/puzzle.txt b/days/3/puzzle.txt
similarity index 100%
rename from 3/puzzle.txt
rename to days/3/puzzle.txt
diff --git a/3/solution.nix b/days/3/solution.nix
similarity index 96%
rename from 3/solution.nix
rename to days/3/solution.nix
index 7875617..f4a7c49 100644
--- a/3/solution.nix
+++ b/days/3/solution.nix
@@ -1,4 +1,4 @@
-with import ../util.nix;
+with import ../../util.nix;
 
 let
   # read input
diff --git a/4/input b/days/4/input
similarity index 100%
rename from 4/input
rename to days/4/input
diff --git a/4/puzzle.txt b/days/4/puzzle.txt
similarity index 100%
rename from 4/puzzle.txt
rename to days/4/puzzle.txt
diff --git a/4/solution.nix b/days/4/solution.nix
similarity index 96%
rename from 4/solution.nix
rename to days/4/solution.nix
index 661884c..3ca8237 100644
--- a/4/solution.nix
+++ b/days/4/solution.nix
@@ -1,4 +1,4 @@
-with import ../util.nix;
+with import ../../util.nix;
 
 let
   # read input
diff --git a/5/input b/days/5/input
similarity index 100%
rename from 5/input
rename to days/5/input
diff --git a/5/puzzle.txt b/days/5/puzzle.txt
similarity index 100%
rename from 5/puzzle.txt
rename to days/5/puzzle.txt
diff --git a/5/solution.nix b/days/5/solution.nix
similarity index 98%
rename from 5/solution.nix
rename to days/5/solution.nix
index 16acabf..64967f4 100644
--- a/5/solution.nix
+++ b/days/5/solution.nix
@@ -1,4 +1,4 @@
-with import ../util.nix;
+with import ../../util.nix;
 
 let
   # read input
diff --git a/runAll.sh b/runAll.sh
index 6bbecff..d483375 100644
--- a/runAll.sh
+++ b/runAll.sh
@@ -1,7 +1,10 @@
 #! /bin/sh
 
-for i in {1..5}
+days_dir="./days"
+days_count=$(find $days_dir -maxdepth 1 -type d -not -path $days_dir | wc -l)
+
+for i in $(seq 1 $days_count);
 do
   echo "--- Day $i ---"
-  nix eval -f $i/solution.nix
+  nix eval -f $days_dir/$i/solution.nix
 done