diff --git a/.scaffold/aoc/{{ .Project }}/makefile b/.scaffold/aoc/{{ .Project }}/makefile
index 49ffacb..42e5355 100644
--- a/.scaffold/aoc/{{ .Project }}/makefile	
+++ b/.scaffold/aoc/{{ .Project }}/makefile	
@@ -1,7 +1,7 @@
 program = {{ .Project }}
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 test:
 	$(GO) test ./...
diff --git a/day-01/makefile b/day-01/makefile
index f50f8b6..eefddd2 100644
--- a/day-01/makefile
+++ b/day-01/makefile
@@ -1,7 +1,7 @@
 program = day-01
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./cmd/cli/
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-02/makefile b/day-02/makefile
index 1497ad1..9066fe5 100644
--- a/day-02/makefile
+++ b/day-02/makefile
@@ -1,7 +1,7 @@
 program = day-02
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-03/makefile b/day-03/makefile
index 88e5cc7..d3429b7 100644
--- a/day-03/makefile
+++ b/day-03/makefile
@@ -1,7 +1,7 @@
 program = day-03
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-04/makefile b/day-04/makefile
index b88a799..95e7638 100644
--- a/day-04/makefile
+++ b/day-04/makefile
@@ -1,7 +1,7 @@
 program = day-04
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-05/makefile b/day-05/makefile
index 4befa5d..e0c6d73 100644
--- a/day-05/makefile
+++ b/day-05/makefile
@@ -1,7 +1,7 @@
 program = day-05
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-06/makefile b/day-06/makefile
index 6774aaa..c2e5d97 100644
--- a/day-06/makefile
+++ b/day-06/makefile
@@ -1,7 +1,7 @@
 program = day-06
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-07/makefile b/day-07/makefile
index 7741806..f91af8b 100644
--- a/day-07/makefile
+++ b/day-07/makefile
@@ -1,7 +1,7 @@
 program = day-07
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-08/makefile b/day-08/makefile
index bf7ee45..bbcd9f7 100644
--- a/day-08/makefile
+++ b/day-08/makefile
@@ -1,7 +1,7 @@
 program = day-08
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-09/makefile b/day-09/makefile
index 43e40bb..8f580ac 100644
--- a/day-09/makefile
+++ b/day-09/makefile
@@ -1,7 +1,7 @@
 program = day-09
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-10/makefile b/day-10/makefile
index d38e5fc..b3058c8 100644
--- a/day-10/makefile
+++ b/day-10/makefile
@@ -1,7 +1,7 @@
 program = day-10
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-11/makefile b/day-11/makefile
index 177cb06..a6464ec 100644
--- a/day-11/makefile
+++ b/day-11/makefile
@@ -1,7 +1,7 @@
 program = day-11
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 test:
 	$(GO) test -v ./...
diff --git a/day-12/makefile b/day-12/makefile
index 6dd94ae..bad4b4b 100644
--- a/day-12/makefile
+++ b/day-12/makefile
@@ -1,7 +1,7 @@
 program = day-12
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-13/makefile b/day-13/makefile
index 7c3f2b2..654b17d 100644
--- a/day-13/makefile
+++ b/day-13/makefile
@@ -1,7 +1,7 @@
 program = day-13
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-14/makefile b/day-14/makefile
index a135d25..2831f13 100644
--- a/day-14/makefile
+++ b/day-14/makefile
@@ -1,7 +1,7 @@
 program = day-14
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-15/makefile b/day-15/makefile
index 8a85c72..004b79f 100644
--- a/day-15/makefile
+++ b/day-15/makefile
@@ -1,7 +1,7 @@
 program = day-15
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-16/makefile b/day-16/makefile
index 4c585d9..61d4c36 100644
--- a/day-16/makefile
+++ b/day-16/makefile
@@ -1,7 +1,7 @@
 program = day-16
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-17/makefile b/day-17/makefile
index e4f8952..9e711bd 100644
--- a/day-17/makefile
+++ b/day-17/makefile
@@ -1,7 +1,7 @@
 program = day-17
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-18/makefile b/day-18/makefile
index 3d0b2a1..0b76988 100644
--- a/day-18/makefile
+++ b/day-18/makefile
@@ -1,7 +1,7 @@
 program = day-18
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-19/makefile b/day-19/makefile
index ea3d0ec..dc45c30 100644
--- a/day-19/makefile
+++ b/day-19/makefile
@@ -1,7 +1,7 @@
 program = day-19
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-20/makefile b/day-20/makefile
index 5c3fe6d..495de66 100644
--- a/day-20/makefile
+++ b/day-20/makefile
@@ -1,7 +1,7 @@
 program = day-20
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-21/makefile b/day-21/makefile
index 98796ed..cedf15d 100644
--- a/day-21/makefile
+++ b/day-21/makefile
@@ -1,7 +1,7 @@
 program = day-21
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-22/makefile b/day-22/makefile
index 1fc6528..da19a35 100644
--- a/day-22/makefile
+++ b/day-22/makefile
@@ -1,7 +1,7 @@
 program = day-22
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-23/makefile b/day-23/makefile
index dfe0c43..4792671 100644
--- a/day-23/makefile
+++ b/day-23/makefile
@@ -1,7 +1,7 @@
 program = day-23
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-24/makefile b/day-24/makefile
index 1563b5d..e07531a 100644
--- a/day-24/makefile
+++ b/day-24/makefile
@@ -1,7 +1,7 @@
 program = day-24
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark
diff --git a/day-25/makefile b/day-25/makefile
index 690da36..2d504e0 100644
--- a/day-25/makefile
+++ b/day-25/makefile
@@ -1,7 +1,7 @@
 program = day-25
 
 GO = go
-SRC_DIR := src
+CLI_DIR := cmd/cli
 BIN_DIR := bin
 
 EXE := $(BIN_DIR)/$(program)
@@ -16,7 +16,7 @@ vet: fmt
 	$(GO) vet ./...
 
 build: vet | $(BIN_DIR)
-	$(GO) build -o $(EXE) ./$(SRC_DIR)
+	$(GO) build -o $(EXE) ./$(CLI_DIR)
 
 bench:
 	$(GO) test ./internal/one/ -bench=. > internal/one/benchmark