diff --git a/AdventOfCode/AdventOfCode.csproj b/AdventOfCode.csproj
similarity index 100%
rename from AdventOfCode/AdventOfCode.csproj
rename to AdventOfCode.csproj
diff --git a/AdventOfCode.sln b/AdventOfCode.sln
index 3062a87..8ae7a7b 100644
--- a/AdventOfCode.sln
+++ b/AdventOfCode.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdventOfCode", "AdventOfCode\AdventOfCode.csproj", "{D9E24F29-20E8-4271-89A3-4940A5A044D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdventOfCode", "AdventOfCode.csproj", "{4DCF01D7-6DE0-471B-BB3B-6E28E9B001C1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -8,9 +8,9 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D9E24F29-20E8-4271-89A3-4940A5A044D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D9E24F29-20E8-4271-89A3-4940A5A044D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D9E24F29-20E8-4271-89A3-4940A5A044D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D9E24F29-20E8-4271-89A3-4940A5A044D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DCF01D7-6DE0-471B-BB3B-6E28E9B001C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DCF01D7-6DE0-471B-BB3B-6E28E9B001C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DCF01D7-6DE0-471B-BB3B-6E28E9B001C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DCF01D7-6DE0-471B-BB3B-6E28E9B001C1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/AdventOfCode/README.md b/AdventOfCode/README.md
deleted file mode 100644
index a61e2c4..0000000
--- a/AdventOfCode/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Advent of Code
-
-## Solutions organized by year, 1 file per day.
-
-### [2022](https://github.com/TiagoRG/AdventOfCode/tree/main/AdventOfCode/Year2022)
-* [Day 1](https://github.com/TiagoRG/AdventOfCode/tree/main/AdventOfCode/Year2022/Day1.cs)
-* [Day 2](https://github.com/TiagoRG/AdventOfCode/tree/main/AdventOfCode/Year2022/Day2.cs)
-* [Day 3](https://github.com/TiagoRG/AdventOfCode/tree/main/AdventOfCode/Year2022/Day3.cs)
-* [Day 4](https://github.com/TiagoRG/AdventOfCode/tree/main/AdventOfCode/Year2022/Day4.cs)
-* [Day 6](https://github.com/TiagoRG/AdventOfCode/tree/main/AdventOfCode/Year2022/Day6.cs)
-* [Day 7](https://github.com/TiagoRG/AdventOfCode/tree/main/AdventOfCode/Year2022/Day7.cs)
\ No newline at end of file
diff --git a/Program.cs b/Program.cs
new file mode 100644
index 0000000..c9316af
--- /dev/null
+++ b/Program.cs
@@ -0,0 +1,9 @@
+using AdventOfCode.Year2022;
+
+namespace AdventOfCode;
+
+internal static class Program
+{
+    public static void Main(string[] args)
+        => Loader2022.Load();
+}
\ No newline at end of file
diff --git a/AdventOfCode/Year2022/Day1.cs b/Year2022/Day1.cs
similarity index 100%
rename from AdventOfCode/Year2022/Day1.cs
rename to Year2022/Day1.cs
diff --git a/AdventOfCode/Year2022/Day2.cs b/Year2022/Day2.cs
similarity index 100%
rename from AdventOfCode/Year2022/Day2.cs
rename to Year2022/Day2.cs
diff --git a/AdventOfCode/Year2022/Day3.cs b/Year2022/Day3.cs
similarity index 100%
rename from AdventOfCode/Year2022/Day3.cs
rename to Year2022/Day3.cs
diff --git a/AdventOfCode/Year2022/Day4.cs b/Year2022/Day4.cs
similarity index 100%
rename from AdventOfCode/Year2022/Day4.cs
rename to Year2022/Day4.cs
diff --git a/AdventOfCode/Year2022/Day6.cs b/Year2022/Day6.cs
similarity index 100%
rename from AdventOfCode/Year2022/Day6.cs
rename to Year2022/Day6.cs
diff --git a/AdventOfCode/Year2022/Day7.cs b/Year2022/Day7.cs
similarity index 100%
rename from AdventOfCode/Year2022/Day7.cs
rename to Year2022/Day7.cs
diff --git a/AdventOfCode/Program.cs b/Year2022/Loader2022.cs
similarity index 54%
rename from AdventOfCode/Program.cs
rename to Year2022/Loader2022.cs
index 5117423..13c1394 100644
--- a/AdventOfCode/Program.cs
+++ b/Year2022/Loader2022.cs
@@ -1,10 +1,8 @@
-using AdventOfCode.Year2022;
+namespace AdventOfCode.Year2022;
 
-namespace AdventOfCode;
-
-class Program
+public static class Loader2022
 {
-    public static void Main(string[] args)
+    public static void Load()
     {
         new Day1();
         new Day2();
@@ -12,5 +10,6 @@ class Program
         new Day4();
         new Day6();
         new Day7();
+        new Day8();
     }
 }
\ No newline at end of file