diff --git a/puzzle-1.lisp b/2022/puzzle-1.lisp
similarity index 92%
rename from puzzle-1.lisp
rename to 2022/puzzle-1.lisp
index 45d1921..3a1510e 100644
--- a/puzzle-1.lisp
+++ b/2022/puzzle-1.lisp
@@ -1,4 +1,4 @@
-(defvar input (uiop:read-file-string "puzzle-1-input.txt"))
+(defvar input (uiop:read-file-string "2022/1-input"))
 (defvar *sep (format nil "~%~%"))
 
 (defun get-lists (input)
diff --git a/puzzle-2.lisp b/2022/puzzle-2.lisp
similarity index 95%
rename from puzzle-2.lisp
rename to 2022/puzzle-2.lisp
index 377b6ba..b3b0155 100644
--- a/puzzle-2.lisp
+++ b/2022/puzzle-2.lisp
@@ -1,4 +1,4 @@
-(defvar input (uiop:read-file-string "puzzle-2-input.txt"))
+(defvar input (uiop:read-file-string "2022/2-input"))
 ;; Each newline represents a new round, which we should parse on the go
 
 (defun sensible-convert-input (str)
diff --git a/puzzle-3.lisp b/2022/puzzle-3.lisp
similarity index 96%
rename from puzzle-3.lisp
rename to 2022/puzzle-3.lisp
index dcb8bc3..c5ee3d3 100644
--- a/puzzle-3.lisp
+++ b/2022/puzzle-3.lisp
@@ -1,4 +1,4 @@
-(defvar input (uiop:read-file-string "puzzle-3-input.txt"))
+(defvar input (uiop:read-file-string "2022/3-input"))
 
 (defun split-string-in-two (s)
   (let ((len (length s)))
diff --git a/puzzle-4.lisp b/2022/puzzle-4.lisp
similarity index 97%
rename from puzzle-4.lisp
rename to 2022/puzzle-4.lisp
index be842d3..04c7bfb 100644
--- a/puzzle-4.lisp
+++ b/2022/puzzle-4.lisp
@@ -4,7 +4,7 @@
 ;; and since we're working with integers, it's simply checking if the
 ;; bounds are included i.e. c in [a,b] and d in [a,b]
 
-(defvar input (uiop:read-file-string "puzzle-4-input.txt"))
+(defvar input (uiop:read-file-string "2022/4-input"))
 
 (defun parse-bound (str)
   "Given STR=\"a-b\" return (a b)"