diff --git a/day01.cpp b/2019/01.cpp
similarity index 100%
rename from day01.cpp
rename to 2019/01.cpp
diff --git a/day02.cpp b/2019/02.cpp
similarity index 100%
rename from day02.cpp
rename to 2019/02.cpp
diff --git a/day03.cpp b/2019/03.cpp
similarity index 100%
rename from day03.cpp
rename to 2019/03.cpp
diff --git a/day04.cpp b/2019/04.cpp
similarity index 100%
rename from day04.cpp
rename to 2019/04.cpp
diff --git a/day05.cpp b/2019/05.cpp
similarity index 100%
rename from day05.cpp
rename to 2019/05.cpp
diff --git a/day06.cpp b/2019/06.cpp
similarity index 100%
rename from day06.cpp
rename to 2019/06.cpp
diff --git a/day07.cpp b/2019/07.cpp
similarity index 100%
rename from day07.cpp
rename to 2019/07.cpp
diff --git a/day08.cpp b/2019/08.cpp
similarity index 100%
rename from day08.cpp
rename to 2019/08.cpp
diff --git a/day09.cpp b/2019/09.cpp
similarity index 100%
rename from day09.cpp
rename to 2019/09.cpp
diff --git a/day11.cpp b/2019/11.cpp
similarity index 100%
rename from day11.cpp
rename to 2019/11.cpp
diff --git a/day13.cpp b/2019/13.cpp
similarity index 100%
rename from day13.cpp
rename to 2019/13.cpp
diff --git a/day15.cpp b/2019/15.cpp
similarity index 100%
rename from day15.cpp
rename to 2019/15.cpp
diff --git a/day23.cpp b/2019/23.cpp
similarity index 100%
rename from day23.cpp
rename to 2019/23.cpp
diff --git a/2019/CMakeLists.txt b/2019/CMakeLists.txt
new file mode 100644
index 0000000..034eea6
--- /dev/null
+++ b/2019/CMakeLists.txt
@@ -0,0 +1,38 @@
+add_executable(01 01.cpp)
+target_link_libraries(01 aocpp)
+
+add_executable(02 02.cpp)
+target_link_libraries(02 aocpp intcode)
+
+add_executable(03 03.cpp)
+target_link_libraries(03 aocpp)
+
+add_executable(04 04.cpp)
+target_link_libraries(04 aocpp)
+
+add_executable(05 05.cpp)
+target_link_libraries(05 aocpp intcode)
+
+add_executable(06 06.cpp)
+target_link_libraries(06 aocpp)
+
+add_executable(07 07.cpp)
+target_link_libraries(07 aocpp intcode)
+
+add_executable(08 08.cpp)
+target_link_libraries(08 aocpp)
+
+add_executable(09 09.cpp)
+target_link_libraries(09 aocpp intcode)
+
+add_executable(11 11.cpp)
+target_link_libraries(11 aocpp intcode)
+
+add_executable(13 13.cpp)
+target_link_libraries(13 aocpp intcode)
+
+add_executable(15 15.cpp)
+target_link_libraries(15 aocpp intcode)
+
+add_executable(23 23.cpp)
+target_link_libraries(23 aocpp intcode)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9aa738..2600a25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,42 +16,4 @@ endif()
 
 add_subdirectory(lib)
 add_subdirectory(intcode)
-
-add_executable(day01 day01.cpp)
-target_link_libraries(day01 aocpp)
-
-add_executable(day02 day02.cpp)
-target_link_libraries(day02 aocpp intcode)
-
-add_executable(day03 day03.cpp)
-target_link_libraries(day03 aocpp)
-
-add_executable(day04 day04.cpp)
-target_link_libraries(day04 aocpp)
-
-add_executable(day05 day05.cpp)
-target_link_libraries(day05 aocpp intcode)
-
-add_executable(day06 day06.cpp)
-target_link_libraries(day06 aocpp)
-
-add_executable(day07 day07.cpp)
-target_link_libraries(day07 aocpp intcode)
-
-add_executable(day08 day08.cpp)
-target_link_libraries(day08 aocpp)
-
-add_executable(day09 day09.cpp)
-target_link_libraries(day09 aocpp intcode)
-
-add_executable(day11 day11.cpp)
-target_link_libraries(day11 aocpp intcode)
-
-add_executable(day13 day13.cpp)
-target_link_libraries(day13 aocpp intcode)
-
-add_executable(day15 day15.cpp)
-target_link_libraries(day15 aocpp intcode)
-
-add_executable(day23 day23.cpp)
-target_link_libraries(day23 aocpp intcode)
+add_subdirectory(2019)