From 97ac006ec46e238917ec8bcd32dfa9fa550424ca Mon Sep 17 00:00:00 2001
From: TimHi <timhiller@live.de>
Date: Thu, 19 Oct 2023 12:57:10 +0200
Subject: [PATCH] restructure go

---
 .DS_Store                                     | Bin 8196 -> 6148 bytes
 .github/workflows/2022.yml                    |   3 +-
 Go/{2022 => }/.gitignore                      |   0
 Go/{2022/cmd => cmd/2022}/day01/day01.go      |   0
 Go/{2022/cmd => cmd/2022}/day01/day01_test.go |   2 +-
 .../cmd => cmd/2022}/day01/export_test.go     |   0
 .../cmd => cmd/2022}/day01/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day02/day02.go      |   0
 Go/{2022/cmd => cmd/2022}/day02/day02_test.go |   2 +-
 .../cmd => cmd/2022}/day02/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day03/day03.go      |   0
 Go/{2022/cmd => cmd/2022}/day03/day03_test.go |   2 +-
 .../cmd => cmd/2022}/day03/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day04/day04.go      |   0
 Go/{2022/cmd => cmd/2022}/day04/day04_test.go |   2 +-
 .../cmd => cmd/2022}/day04/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day05/day05.go      |   0
 Go/{2022/cmd => cmd/2022}/day05/day05_test.go |   3 +-
 .../cmd => cmd/2022}/day05/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day06/day06.go      |   0
 Go/{2022/cmd => cmd/2022}/day06/day06_test.go |   3 +-
 .../cmd => cmd/2022}/day06/export_test.go     |   0
 .../cmd => cmd/2022}/day06/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day07/day07.go      |   0
 Go/{2022/cmd => cmd/2022}/day07/day07_test.go |   2 +-
 .../cmd => cmd/2022}/day07/export_test.go     |   0
 .../cmd => cmd/2022}/day07/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day08/day08.go      |   0
 Go/{2022/cmd => cmd/2022}/day08/day08_test.go |   2 +-
 .../cmd => cmd/2022}/day08/export_test.go     |   0
 .../cmd => cmd/2022}/day08/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day09/day09.go      |   0
 Go/{2022/cmd => cmd/2022}/day09/day09_test.go |   2 +-
 .../cmd => cmd/2022}/day09/export_test.go     |   0
 .../cmd => cmd/2022}/day09/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day10/day10.go      |   0
 Go/{2022/cmd => cmd/2022}/day10/day10_test.go |   0
 .../cmd => cmd/2022}/day10/export_test.go     |   0
 .../cmd => cmd/2022}/day10/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day11/day11.go      |   0
 Go/{2022/cmd => cmd/2022}/day11/day11_test.go |   2 +-
 .../cmd => cmd/2022}/day11/export_test.go     |   0
 .../cmd => cmd/2022}/day11/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day12/day12.go      |   0
 Go/{2022/cmd => cmd/2022}/day12/day12_test.go |   2 +-
 .../cmd => cmd/2022}/day12/export_test.go     |   0
 .../cmd => cmd/2022}/day12/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day13/day13.go      |   0
 Go/{2022/cmd => cmd/2022}/day13/day13_test.go |   2 +-
 .../cmd => cmd/2022}/day13/export_test.go     |   0
 .../cmd => cmd/2022}/day13/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day14/day14.go      |   0
 Go/{2022/cmd => cmd/2022}/day14/day14_test.go |   2 +-
 .../cmd => cmd/2022}/day14/export_test.go     |   0
 .../cmd => cmd/2022}/day14/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day15/day15.go      |   0
 Go/{2022/cmd => cmd/2022}/day15/day15_test.go |   2 +-
 .../cmd => cmd/2022}/day15/export_test.go     |   0
 .../cmd => cmd/2022}/day15/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day16/day16.go      |   0
 Go/{2022/cmd => cmd/2022}/day16/day16_test.go |   2 +-
 .../cmd => cmd/2022}/day16/export_test.go     |   0
 .../cmd => cmd/2022}/day16/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day17/day17.go      |   0
 Go/{2022/cmd => cmd/2022}/day17/day17_test.go |   2 +-
 .../cmd => cmd/2022}/day17/export_test.go     |   0
 .../cmd => cmd/2022}/day17/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day18/day18.go      |   0
 Go/{2022/cmd => cmd/2022}/day18/day18_test.go |   2 +-
 .../cmd => cmd/2022}/day18/export_test.go     |   0
 .../cmd => cmd/2022}/day18/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day19/day19.go      |   0
 Go/{2022/cmd => cmd/2022}/day19/day19_test.go |   2 +-
 .../cmd => cmd/2022}/day19/export_test.go     |   0
 .../cmd => cmd/2022}/day19/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day20/day20.go      |   0
 Go/{2022/cmd => cmd/2022}/day20/day20_test.go |   2 +-
 .../cmd => cmd/2022}/day20/export_test.go     |   0
 .../cmd => cmd/2022}/day20/sampleinput.txt    |   0
 Go/{2022/cmd => cmd/2022}/day21/day21.go      |   0
 Go/{2022/cmd => cmd/2022}/day21/day21_test.go |   2 +-
 .../cmd => cmd/2022}/day21/export_test.go     |   0
 .../cmd => cmd/2022}/day21/sampleinput.txt    |   0
 Go/{2022 => }/go.mod                          |   0
 Go/{2022 => }/go.sum                          |   0
 Go/{2022 => }/main.go                         |  50 ++++++++++--------
 Go/{2022 => }/pkg/distance/manhattan.go       |   0
 Go/{2022 => }/pkg/fileutil/file.go            |   0
 Go/{2022 => }/pkg/gen/interface.go            |   0
 Go/{2022 => }/pkg/numbers/numbers.go          |   0
 Go/{2022 => }/pkg/pairs/pair.go               |   0
 Go/{2022 => }/pkg/queue/queue.go              |   0
 Go/{2022 => }/pkg/sliceutil/slice.go          |   0
 Go/{2022 => }/pkg/sliceutil/slice_test.go     |   0
 Go/{2022 => }/pkg/stringutil/string.go        |   0
 95 files changed, 50 insertions(+), 45 deletions(-)
 rename Go/{2022 => }/.gitignore (100%)
 rename Go/{2022/cmd => cmd/2022}/day01/day01.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day01/day01_test.go (96%)
 rename Go/{2022/cmd => cmd/2022}/day01/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day01/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day02/day02.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day02/day02_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day02/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day03/day03.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day03/day03_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day03/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day04/day04.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day04/day04_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day04/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day05/day05.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day05/day05_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day05/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day06/day06.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day06/day06_test.go (97%)
 rename Go/{2022/cmd => cmd/2022}/day06/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day06/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day07/day07.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day07/day07_test.go (98%)
 rename Go/{2022/cmd => cmd/2022}/day07/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day07/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day08/day08.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day08/day08_test.go (95%)
 rename Go/{2022/cmd => cmd/2022}/day08/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day08/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day09/day09.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day09/day09_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day09/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day09/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day10/day10.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day10/day10_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day10/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day10/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day11/day11.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day11/day11_test.go (96%)
 rename Go/{2022/cmd => cmd/2022}/day11/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day11/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day12/day12.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day12/day12_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day12/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day12/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day13/day13.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day13/day13_test.go (92%)
 rename Go/{2022/cmd => cmd/2022}/day13/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day13/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day14/day14.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day14/day14_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day14/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day14/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day15/day15.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day15/day15_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day15/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day15/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day16/day16.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day16/day16_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day16/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day16/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day17/day17.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day17/day17_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day17/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day17/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day18/day18.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day18/day18_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day18/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day18/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day19/day19.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day19/day19_test.go (92%)
 rename Go/{2022/cmd => cmd/2022}/day19/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day19/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day20/day20.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day20/day20_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day20/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day20/sampleinput.txt (100%)
 rename Go/{2022/cmd => cmd/2022}/day21/day21.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day21/day21_test.go (93%)
 rename Go/{2022/cmd => cmd/2022}/day21/export_test.go (100%)
 rename Go/{2022/cmd => cmd/2022}/day21/sampleinput.txt (100%)
 rename Go/{2022 => }/go.mod (100%)
 rename Go/{2022 => }/go.sum (100%)
 rename Go/{2022 => }/main.go (67%)
 rename Go/{2022 => }/pkg/distance/manhattan.go (100%)
 rename Go/{2022 => }/pkg/fileutil/file.go (100%)
 rename Go/{2022 => }/pkg/gen/interface.go (100%)
 rename Go/{2022 => }/pkg/numbers/numbers.go (100%)
 rename Go/{2022 => }/pkg/pairs/pair.go (100%)
 rename Go/{2022 => }/pkg/queue/queue.go (100%)
 rename Go/{2022 => }/pkg/sliceutil/slice.go (100%)
 rename Go/{2022 => }/pkg/sliceutil/slice_test.go (100%)
 rename Go/{2022 => }/pkg/stringutil/string.go (100%)

diff --git a/.DS_Store b/.DS_Store
index e95ba692a6306f013d89a97fa4e74b68e88b5821..14c8f30cca9be9c9307779a51349ec6dc40cdd10 100644
GIT binary patch
delta 257
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5sJ6q~50$jG-bU^g=(-)0_x*^EX^4DJm1
zN#(@_NjdpRKvg@F3UV@wOAHLIF)}f;u(Gjpuyb&8#0F>Nmj{<5mXsDdO@1xtoyf_-
z880ANU2SAwXr!ZHVqsdVqfl*WWB_Cvo7L8Ga)>JHTL;Bw=j7()cLR+D0!Bs%&A<z#
zVN?&00d_`Na8X`PeqK6|&$uzMiE%MI2ZtatM413Lkah+6Vq@ZW=E?jro*+K~^@05d
M@-oBbc%C`T0Buk&=Kufz

delta 647
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8FDWo2aMAD77(QH}hr%jz7$c**Q2S7O*f%
zZRTN_&FI3yV8mbm!b#=D1xY#iNkCnvlL~S&i%Sd)t}`+*v#_!Ob#QTT@p8omXXKX$
zmn4>y7CR*tMT2+&i6t3HlW($m*K=@kaK;NrRafg8TbLN=D43Yl>L^qjnwSCEmgbhV
zwVWK{s)n|n3AvS3)it$svw;=?0V5-XX5fd?Flr8v0e4(Zx?yl~er^F+lJUqBWVzgY
z7nh`*da%nmj&<z$_2lUhM^ptVKn1wv3o?)lXSx8g18#9ya8X`PeqK6I4CGLlxFL#z
zq^v(N)FVkkTm-RDZ0iAZ2N~w(BOHWH9>qcO2Y~j%EjB{2m^BzK7YvL;BV>!`?7|2M
zpgh82Z1N};b8VQIsJL03=Q%T%1UJwgS5R`=EXeVlc{0C<=VX5#4h~?DfKnR6=6Iet
F%mBt~lEwf4

diff --git a/.github/workflows/2022.yml b/.github/workflows/2022.yml
index 066bdf3..76ed50a 100644
--- a/.github/workflows/2022.yml
+++ b/.github/workflows/2022.yml
@@ -4,7 +4,6 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -15,5 +14,5 @@ jobs:
           go-version: 1.19
 
       - name: Test
-        working-directory: ./2022
+        working-directory: ./Go
         run: go test -v ./...
diff --git a/Go/2022/.gitignore b/Go/.gitignore
similarity index 100%
rename from Go/2022/.gitignore
rename to Go/.gitignore
diff --git a/Go/2022/cmd/day01/day01.go b/Go/cmd/2022/day01/day01.go
similarity index 100%
rename from Go/2022/cmd/day01/day01.go
rename to Go/cmd/2022/day01/day01.go
diff --git a/Go/2022/cmd/day01/day01_test.go b/Go/cmd/2022/day01/day01_test.go
similarity index 96%
rename from Go/2022/cmd/day01/day01_test.go
rename to Go/cmd/2022/day01/day01_test.go
index 52ae963..0228ccb 100644
--- a/Go/2022/cmd/day01/day01_test.go
+++ b/Go/cmd/2022/day01/day01_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day01"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day01"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/pairs"
 	"github.com/stretchr/testify/assert"
diff --git a/Go/2022/cmd/day01/export_test.go b/Go/cmd/2022/day01/export_test.go
similarity index 100%
rename from Go/2022/cmd/day01/export_test.go
rename to Go/cmd/2022/day01/export_test.go
diff --git a/Go/2022/cmd/day01/sampleinput.txt b/Go/cmd/2022/day01/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day01/sampleinput.txt
rename to Go/cmd/2022/day01/sampleinput.txt
diff --git a/Go/2022/cmd/day02/day02.go b/Go/cmd/2022/day02/day02.go
similarity index 100%
rename from Go/2022/cmd/day02/day02.go
rename to Go/cmd/2022/day02/day02.go
diff --git a/Go/2022/cmd/day02/day02_test.go b/Go/cmd/2022/day02/day02_test.go
similarity index 93%
rename from Go/2022/cmd/day02/day02_test.go
rename to Go/cmd/2022/day02/day02_test.go
index 5c3eba4..02a39f6 100644
--- a/Go/2022/cmd/day02/day02_test.go
+++ b/Go/cmd/2022/day02/day02_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day02"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day02"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day02/sampleinput.txt b/Go/cmd/2022/day02/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day02/sampleinput.txt
rename to Go/cmd/2022/day02/sampleinput.txt
diff --git a/Go/2022/cmd/day03/day03.go b/Go/cmd/2022/day03/day03.go
similarity index 100%
rename from Go/2022/cmd/day03/day03.go
rename to Go/cmd/2022/day03/day03.go
diff --git a/Go/2022/cmd/day03/day03_test.go b/Go/cmd/2022/day03/day03_test.go
similarity index 93%
rename from Go/2022/cmd/day03/day03_test.go
rename to Go/cmd/2022/day03/day03_test.go
index 6907295..e1a0c9a 100644
--- a/Go/2022/cmd/day03/day03_test.go
+++ b/Go/cmd/2022/day03/day03_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day03"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day03"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day03/sampleinput.txt b/Go/cmd/2022/day03/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day03/sampleinput.txt
rename to Go/cmd/2022/day03/sampleinput.txt
diff --git a/Go/2022/cmd/day04/day04.go b/Go/cmd/2022/day04/day04.go
similarity index 100%
rename from Go/2022/cmd/day04/day04.go
rename to Go/cmd/2022/day04/day04.go
diff --git a/Go/2022/cmd/day04/day04_test.go b/Go/cmd/2022/day04/day04_test.go
similarity index 93%
rename from Go/2022/cmd/day04/day04_test.go
rename to Go/cmd/2022/day04/day04_test.go
index cc3e5b4..1683e42 100644
--- a/Go/2022/cmd/day04/day04_test.go
+++ b/Go/cmd/2022/day04/day04_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day04"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day04"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day04/sampleinput.txt b/Go/cmd/2022/day04/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day04/sampleinput.txt
rename to Go/cmd/2022/day04/sampleinput.txt
diff --git a/Go/2022/cmd/day05/day05.go b/Go/cmd/2022/day05/day05.go
similarity index 100%
rename from Go/2022/cmd/day05/day05.go
rename to Go/cmd/2022/day05/day05.go
diff --git a/Go/2022/cmd/day05/day05_test.go b/Go/cmd/2022/day05/day05_test.go
similarity index 93%
rename from Go/2022/cmd/day05/day05_test.go
rename to Go/cmd/2022/day05/day05_test.go
index c987850..143ab67 100644
--- a/Go/2022/cmd/day05/day05_test.go
+++ b/Go/cmd/2022/day05/day05_test.go
@@ -6,8 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day05"
-
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day05"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day05/sampleinput.txt b/Go/cmd/2022/day05/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day05/sampleinput.txt
rename to Go/cmd/2022/day05/sampleinput.txt
diff --git a/Go/2022/cmd/day06/day06.go b/Go/cmd/2022/day06/day06.go
similarity index 100%
rename from Go/2022/cmd/day06/day06.go
rename to Go/cmd/2022/day06/day06.go
diff --git a/Go/2022/cmd/day06/day06_test.go b/Go/cmd/2022/day06/day06_test.go
similarity index 97%
rename from Go/2022/cmd/day06/day06_test.go
rename to Go/cmd/2022/day06/day06_test.go
index 04cd566..dd634ce 100644
--- a/Go/2022/cmd/day06/day06_test.go
+++ b/Go/cmd/2022/day06/day06_test.go
@@ -6,8 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day06"
-
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day06"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day06/export_test.go b/Go/cmd/2022/day06/export_test.go
similarity index 100%
rename from Go/2022/cmd/day06/export_test.go
rename to Go/cmd/2022/day06/export_test.go
diff --git a/Go/2022/cmd/day06/sampleinput.txt b/Go/cmd/2022/day06/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day06/sampleinput.txt
rename to Go/cmd/2022/day06/sampleinput.txt
diff --git a/Go/2022/cmd/day07/day07.go b/Go/cmd/2022/day07/day07.go
similarity index 100%
rename from Go/2022/cmd/day07/day07.go
rename to Go/cmd/2022/day07/day07.go
diff --git a/Go/2022/cmd/day07/day07_test.go b/Go/cmd/2022/day07/day07_test.go
similarity index 98%
rename from Go/2022/cmd/day07/day07_test.go
rename to Go/cmd/2022/day07/day07_test.go
index c779b42..5921e11 100644
--- a/Go/2022/cmd/day07/day07_test.go
+++ b/Go/cmd/2022/day07/day07_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day07"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day07"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day07/export_test.go b/Go/cmd/2022/day07/export_test.go
similarity index 100%
rename from Go/2022/cmd/day07/export_test.go
rename to Go/cmd/2022/day07/export_test.go
diff --git a/Go/2022/cmd/day07/sampleinput.txt b/Go/cmd/2022/day07/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day07/sampleinput.txt
rename to Go/cmd/2022/day07/sampleinput.txt
diff --git a/Go/2022/cmd/day08/day08.go b/Go/cmd/2022/day08/day08.go
similarity index 100%
rename from Go/2022/cmd/day08/day08.go
rename to Go/cmd/2022/day08/day08.go
diff --git a/Go/2022/cmd/day08/day08_test.go b/Go/cmd/2022/day08/day08_test.go
similarity index 95%
rename from Go/2022/cmd/day08/day08_test.go
rename to Go/cmd/2022/day08/day08_test.go
index 63cbede..ca567fe 100644
--- a/Go/2022/cmd/day08/day08_test.go
+++ b/Go/cmd/2022/day08/day08_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day08"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day08"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day08/export_test.go b/Go/cmd/2022/day08/export_test.go
similarity index 100%
rename from Go/2022/cmd/day08/export_test.go
rename to Go/cmd/2022/day08/export_test.go
diff --git a/Go/2022/cmd/day08/sampleinput.txt b/Go/cmd/2022/day08/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day08/sampleinput.txt
rename to Go/cmd/2022/day08/sampleinput.txt
diff --git a/Go/2022/cmd/day09/day09.go b/Go/cmd/2022/day09/day09.go
similarity index 100%
rename from Go/2022/cmd/day09/day09.go
rename to Go/cmd/2022/day09/day09.go
diff --git a/Go/2022/cmd/day09/day09_test.go b/Go/cmd/2022/day09/day09_test.go
similarity index 93%
rename from Go/2022/cmd/day09/day09_test.go
rename to Go/cmd/2022/day09/day09_test.go
index aa7af8b..66d2158 100644
--- a/Go/2022/cmd/day09/day09_test.go
+++ b/Go/cmd/2022/day09/day09_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day09"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day09"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day09/export_test.go b/Go/cmd/2022/day09/export_test.go
similarity index 100%
rename from Go/2022/cmd/day09/export_test.go
rename to Go/cmd/2022/day09/export_test.go
diff --git a/Go/2022/cmd/day09/sampleinput.txt b/Go/cmd/2022/day09/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day09/sampleinput.txt
rename to Go/cmd/2022/day09/sampleinput.txt
diff --git a/Go/2022/cmd/day10/day10.go b/Go/cmd/2022/day10/day10.go
similarity index 100%
rename from Go/2022/cmd/day10/day10.go
rename to Go/cmd/2022/day10/day10.go
diff --git a/Go/2022/cmd/day10/day10_test.go b/Go/cmd/2022/day10/day10_test.go
similarity index 100%
rename from Go/2022/cmd/day10/day10_test.go
rename to Go/cmd/2022/day10/day10_test.go
diff --git a/Go/2022/cmd/day10/export_test.go b/Go/cmd/2022/day10/export_test.go
similarity index 100%
rename from Go/2022/cmd/day10/export_test.go
rename to Go/cmd/2022/day10/export_test.go
diff --git a/Go/2022/cmd/day10/sampleinput.txt b/Go/cmd/2022/day10/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day10/sampleinput.txt
rename to Go/cmd/2022/day10/sampleinput.txt
diff --git a/Go/2022/cmd/day11/day11.go b/Go/cmd/2022/day11/day11.go
similarity index 100%
rename from Go/2022/cmd/day11/day11.go
rename to Go/cmd/2022/day11/day11.go
diff --git a/Go/2022/cmd/day11/day11_test.go b/Go/cmd/2022/day11/day11_test.go
similarity index 96%
rename from Go/2022/cmd/day11/day11_test.go
rename to Go/cmd/2022/day11/day11_test.go
index ce82258..2860824 100644
--- a/Go/2022/cmd/day11/day11_test.go
+++ b/Go/cmd/2022/day11/day11_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day11"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day11"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day11/export_test.go b/Go/cmd/2022/day11/export_test.go
similarity index 100%
rename from Go/2022/cmd/day11/export_test.go
rename to Go/cmd/2022/day11/export_test.go
diff --git a/Go/2022/cmd/day11/sampleinput.txt b/Go/cmd/2022/day11/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day11/sampleinput.txt
rename to Go/cmd/2022/day11/sampleinput.txt
diff --git a/Go/2022/cmd/day12/day12.go b/Go/cmd/2022/day12/day12.go
similarity index 100%
rename from Go/2022/cmd/day12/day12.go
rename to Go/cmd/2022/day12/day12.go
diff --git a/Go/2022/cmd/day12/day12_test.go b/Go/cmd/2022/day12/day12_test.go
similarity index 93%
rename from Go/2022/cmd/day12/day12_test.go
rename to Go/cmd/2022/day12/day12_test.go
index 0bf254d..a6b3adf 100644
--- a/Go/2022/cmd/day12/day12_test.go
+++ b/Go/cmd/2022/day12/day12_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day12"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day12"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day12/export_test.go b/Go/cmd/2022/day12/export_test.go
similarity index 100%
rename from Go/2022/cmd/day12/export_test.go
rename to Go/cmd/2022/day12/export_test.go
diff --git a/Go/2022/cmd/day12/sampleinput.txt b/Go/cmd/2022/day12/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day12/sampleinput.txt
rename to Go/cmd/2022/day12/sampleinput.txt
diff --git a/Go/2022/cmd/day13/day13.go b/Go/cmd/2022/day13/day13.go
similarity index 100%
rename from Go/2022/cmd/day13/day13.go
rename to Go/cmd/2022/day13/day13.go
diff --git a/Go/2022/cmd/day13/day13_test.go b/Go/cmd/2022/day13/day13_test.go
similarity index 92%
rename from Go/2022/cmd/day13/day13_test.go
rename to Go/cmd/2022/day13/day13_test.go
index ac539bd..31fba44 100644
--- a/Go/2022/cmd/day13/day13_test.go
+++ b/Go/cmd/2022/day13/day13_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day13"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day13"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 )
 
diff --git a/Go/2022/cmd/day13/export_test.go b/Go/cmd/2022/day13/export_test.go
similarity index 100%
rename from Go/2022/cmd/day13/export_test.go
rename to Go/cmd/2022/day13/export_test.go
diff --git a/Go/2022/cmd/day13/sampleinput.txt b/Go/cmd/2022/day13/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day13/sampleinput.txt
rename to Go/cmd/2022/day13/sampleinput.txt
diff --git a/Go/2022/cmd/day14/day14.go b/Go/cmd/2022/day14/day14.go
similarity index 100%
rename from Go/2022/cmd/day14/day14.go
rename to Go/cmd/2022/day14/day14.go
diff --git a/Go/2022/cmd/day14/day14_test.go b/Go/cmd/2022/day14/day14_test.go
similarity index 93%
rename from Go/2022/cmd/day14/day14_test.go
rename to Go/cmd/2022/day14/day14_test.go
index f0671a8..f5219b7 100644
--- a/Go/2022/cmd/day14/day14_test.go
+++ b/Go/cmd/2022/day14/day14_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day14"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day14"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day14/export_test.go b/Go/cmd/2022/day14/export_test.go
similarity index 100%
rename from Go/2022/cmd/day14/export_test.go
rename to Go/cmd/2022/day14/export_test.go
diff --git a/Go/2022/cmd/day14/sampleinput.txt b/Go/cmd/2022/day14/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day14/sampleinput.txt
rename to Go/cmd/2022/day14/sampleinput.txt
diff --git a/Go/2022/cmd/day15/day15.go b/Go/cmd/2022/day15/day15.go
similarity index 100%
rename from Go/2022/cmd/day15/day15.go
rename to Go/cmd/2022/day15/day15.go
diff --git a/Go/2022/cmd/day15/day15_test.go b/Go/cmd/2022/day15/day15_test.go
similarity index 93%
rename from Go/2022/cmd/day15/day15_test.go
rename to Go/cmd/2022/day15/day15_test.go
index 5c7b6ae..72ea0c6 100644
--- a/Go/2022/cmd/day15/day15_test.go
+++ b/Go/cmd/2022/day15/day15_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day15"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day15"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day15/export_test.go b/Go/cmd/2022/day15/export_test.go
similarity index 100%
rename from Go/2022/cmd/day15/export_test.go
rename to Go/cmd/2022/day15/export_test.go
diff --git a/Go/2022/cmd/day15/sampleinput.txt b/Go/cmd/2022/day15/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day15/sampleinput.txt
rename to Go/cmd/2022/day15/sampleinput.txt
diff --git a/Go/2022/cmd/day16/day16.go b/Go/cmd/2022/day16/day16.go
similarity index 100%
rename from Go/2022/cmd/day16/day16.go
rename to Go/cmd/2022/day16/day16.go
diff --git a/Go/2022/cmd/day16/day16_test.go b/Go/cmd/2022/day16/day16_test.go
similarity index 93%
rename from Go/2022/cmd/day16/day16_test.go
rename to Go/cmd/2022/day16/day16_test.go
index a4240a5..d730d01 100644
--- a/Go/2022/cmd/day16/day16_test.go
+++ b/Go/cmd/2022/day16/day16_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day16"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day16"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day16/export_test.go b/Go/cmd/2022/day16/export_test.go
similarity index 100%
rename from Go/2022/cmd/day16/export_test.go
rename to Go/cmd/2022/day16/export_test.go
diff --git a/Go/2022/cmd/day16/sampleinput.txt b/Go/cmd/2022/day16/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day16/sampleinput.txt
rename to Go/cmd/2022/day16/sampleinput.txt
diff --git a/Go/2022/cmd/day17/day17.go b/Go/cmd/2022/day17/day17.go
similarity index 100%
rename from Go/2022/cmd/day17/day17.go
rename to Go/cmd/2022/day17/day17.go
diff --git a/Go/2022/cmd/day17/day17_test.go b/Go/cmd/2022/day17/day17_test.go
similarity index 93%
rename from Go/2022/cmd/day17/day17_test.go
rename to Go/cmd/2022/day17/day17_test.go
index c297735..1f6d706 100644
--- a/Go/2022/cmd/day17/day17_test.go
+++ b/Go/cmd/2022/day17/day17_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day17"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day17"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day17/export_test.go b/Go/cmd/2022/day17/export_test.go
similarity index 100%
rename from Go/2022/cmd/day17/export_test.go
rename to Go/cmd/2022/day17/export_test.go
diff --git a/Go/2022/cmd/day17/sampleinput.txt b/Go/cmd/2022/day17/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day17/sampleinput.txt
rename to Go/cmd/2022/day17/sampleinput.txt
diff --git a/Go/2022/cmd/day18/day18.go b/Go/cmd/2022/day18/day18.go
similarity index 100%
rename from Go/2022/cmd/day18/day18.go
rename to Go/cmd/2022/day18/day18.go
diff --git a/Go/2022/cmd/day18/day18_test.go b/Go/cmd/2022/day18/day18_test.go
similarity index 93%
rename from Go/2022/cmd/day18/day18_test.go
rename to Go/cmd/2022/day18/day18_test.go
index 7ffa024..3151ab3 100644
--- a/Go/2022/cmd/day18/day18_test.go
+++ b/Go/cmd/2022/day18/day18_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day18"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day18"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day18/export_test.go b/Go/cmd/2022/day18/export_test.go
similarity index 100%
rename from Go/2022/cmd/day18/export_test.go
rename to Go/cmd/2022/day18/export_test.go
diff --git a/Go/2022/cmd/day18/sampleinput.txt b/Go/cmd/2022/day18/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day18/sampleinput.txt
rename to Go/cmd/2022/day18/sampleinput.txt
diff --git a/Go/2022/cmd/day19/day19.go b/Go/cmd/2022/day19/day19.go
similarity index 100%
rename from Go/2022/cmd/day19/day19.go
rename to Go/cmd/2022/day19/day19.go
diff --git a/Go/2022/cmd/day19/day19_test.go b/Go/cmd/2022/day19/day19_test.go
similarity index 92%
rename from Go/2022/cmd/day19/day19_test.go
rename to Go/cmd/2022/day19/day19_test.go
index 8244b37..dea3d84 100644
--- a/Go/2022/cmd/day19/day19_test.go
+++ b/Go/cmd/2022/day19/day19_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day19"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day19"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 )
 
diff --git a/Go/2022/cmd/day19/export_test.go b/Go/cmd/2022/day19/export_test.go
similarity index 100%
rename from Go/2022/cmd/day19/export_test.go
rename to Go/cmd/2022/day19/export_test.go
diff --git a/Go/2022/cmd/day19/sampleinput.txt b/Go/cmd/2022/day19/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day19/sampleinput.txt
rename to Go/cmd/2022/day19/sampleinput.txt
diff --git a/Go/2022/cmd/day20/day20.go b/Go/cmd/2022/day20/day20.go
similarity index 100%
rename from Go/2022/cmd/day20/day20.go
rename to Go/cmd/2022/day20/day20.go
diff --git a/Go/2022/cmd/day20/day20_test.go b/Go/cmd/2022/day20/day20_test.go
similarity index 93%
rename from Go/2022/cmd/day20/day20_test.go
rename to Go/cmd/2022/day20/day20_test.go
index 117a058..e70efdf 100644
--- a/Go/2022/cmd/day20/day20_test.go
+++ b/Go/cmd/2022/day20/day20_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day20"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day20"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day20/export_test.go b/Go/cmd/2022/day20/export_test.go
similarity index 100%
rename from Go/2022/cmd/day20/export_test.go
rename to Go/cmd/2022/day20/export_test.go
diff --git a/Go/2022/cmd/day20/sampleinput.txt b/Go/cmd/2022/day20/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day20/sampleinput.txt
rename to Go/cmd/2022/day20/sampleinput.txt
diff --git a/Go/2022/cmd/day21/day21.go b/Go/cmd/2022/day21/day21.go
similarity index 100%
rename from Go/2022/cmd/day21/day21.go
rename to Go/cmd/2022/day21/day21.go
diff --git a/Go/2022/cmd/day21/day21_test.go b/Go/cmd/2022/day21/day21_test.go
similarity index 93%
rename from Go/2022/cmd/day21/day21_test.go
rename to Go/cmd/2022/day21/day21_test.go
index 6d5ee05..4424926 100644
--- a/Go/2022/cmd/day21/day21_test.go
+++ b/Go/cmd/2022/day21/day21_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day21"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day21"
 	"github.com/TimHi/AdventOfCode/m/v2/pkg/fileutil"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/Go/2022/cmd/day21/export_test.go b/Go/cmd/2022/day21/export_test.go
similarity index 100%
rename from Go/2022/cmd/day21/export_test.go
rename to Go/cmd/2022/day21/export_test.go
diff --git a/Go/2022/cmd/day21/sampleinput.txt b/Go/cmd/2022/day21/sampleinput.txt
similarity index 100%
rename from Go/2022/cmd/day21/sampleinput.txt
rename to Go/cmd/2022/day21/sampleinput.txt
diff --git a/Go/2022/go.mod b/Go/go.mod
similarity index 100%
rename from Go/2022/go.mod
rename to Go/go.mod
diff --git a/Go/2022/go.sum b/Go/go.sum
similarity index 100%
rename from Go/2022/go.sum
rename to Go/go.sum
diff --git a/Go/2022/main.go b/Go/main.go
similarity index 67%
rename from Go/2022/main.go
rename to Go/main.go
index 370d4b2..c9547c4 100644
--- a/Go/2022/main.go
+++ b/Go/main.go
@@ -5,39 +5,47 @@ import (
 	"log"
 	"time"
 
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day01"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day02"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day03"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day04"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day05"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day06"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day07"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day08"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day09"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day10"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day11"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day12"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day13"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day14"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day15"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day16"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day17"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day18"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day19"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day20"
-	"github.com/TimHi/AdventOfCode/m/v2/cmd/day21"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day01"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day02"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day03"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day04"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day05"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day06"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day07"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day08"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day09"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day10"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day11"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day12"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day13"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day14"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day15"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day16"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day17"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day18"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day19"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day20"
+	"github.com/TimHi/AdventOfCode/m/v2/cmd/2022/day21"
 )
 
 var dayFlag int
+var yearFlag int
 var useSampleFlag bool
 
 func init() {
+	flag.IntVar(&yearFlag, "year", -1, "Specify the year you want to solve")
 	flag.IntVar(&dayFlag, "day", -1, "Specify the day you want to solve")
 	flag.BoolVar(&useSampleFlag, "sample", true, "Specify wether you want to use sample [true] or the full [false] input")
 }
 
 func main() {
 	flag.Parse()
+	if yearFlag == 2022 {
+		run2022()
+	}
+}
+
+func run2022() {
 	start := time.Now()
 	switch dayFlag {
 	case 1:
diff --git a/Go/2022/pkg/distance/manhattan.go b/Go/pkg/distance/manhattan.go
similarity index 100%
rename from Go/2022/pkg/distance/manhattan.go
rename to Go/pkg/distance/manhattan.go
diff --git a/Go/2022/pkg/fileutil/file.go b/Go/pkg/fileutil/file.go
similarity index 100%
rename from Go/2022/pkg/fileutil/file.go
rename to Go/pkg/fileutil/file.go
diff --git a/Go/2022/pkg/gen/interface.go b/Go/pkg/gen/interface.go
similarity index 100%
rename from Go/2022/pkg/gen/interface.go
rename to Go/pkg/gen/interface.go
diff --git a/Go/2022/pkg/numbers/numbers.go b/Go/pkg/numbers/numbers.go
similarity index 100%
rename from Go/2022/pkg/numbers/numbers.go
rename to Go/pkg/numbers/numbers.go
diff --git a/Go/2022/pkg/pairs/pair.go b/Go/pkg/pairs/pair.go
similarity index 100%
rename from Go/2022/pkg/pairs/pair.go
rename to Go/pkg/pairs/pair.go
diff --git a/Go/2022/pkg/queue/queue.go b/Go/pkg/queue/queue.go
similarity index 100%
rename from Go/2022/pkg/queue/queue.go
rename to Go/pkg/queue/queue.go
diff --git a/Go/2022/pkg/sliceutil/slice.go b/Go/pkg/sliceutil/slice.go
similarity index 100%
rename from Go/2022/pkg/sliceutil/slice.go
rename to Go/pkg/sliceutil/slice.go
diff --git a/Go/2022/pkg/sliceutil/slice_test.go b/Go/pkg/sliceutil/slice_test.go
similarity index 100%
rename from Go/2022/pkg/sliceutil/slice_test.go
rename to Go/pkg/sliceutil/slice_test.go
diff --git a/Go/2022/pkg/stringutil/string.go b/Go/pkg/stringutil/string.go
similarity index 100%
rename from Go/2022/pkg/stringutil/string.go
rename to Go/pkg/stringutil/string.go