diff --git a/CMakeLists.txt b/CMakeLists.txt
index 572de7c..f5c4b61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,15 +5,19 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wpedantic -Werror -lreadline")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 
+include_directories(
+  ${PROJECT_SOURCE_DIR}/include
+)
+
 find_package(cpr)
-FIND_PACKAGE( Boost 1.81 COMPONENTS program_options REQUIRED )
+find_package(Boost 1.81 COMPONENTS program_options REQUIRED)
 
 include_directories(.)
-INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+include_directories(${Boost_INCLUDE_DIR})
 
-add_executable(dynamic_program main.cpp game_state.h cli_interface.cpp)
+add_executable(endgame-analyzer src/main.cpp src/cli_interface.cpp)
 
-target_link_libraries(dynamic_program cpr)
-TARGET_LINK_LIBRARIES(dynamic_program Boost::program_options )
+target_link_libraries(endgame-analyzer cpr)
+target_link_libraries(endgame-analyzer Boost::program_options)
 
 #set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
diff --git a/cli_interface.h b/include/cli_interface.h
similarity index 100%
rename from cli_interface.h
rename to include/cli_interface.h
diff --git a/download.h b/include/download.h
similarity index 100%
rename from download.h
rename to include/download.h
diff --git a/game_state.h b/include/game_state.h
similarity index 100%
rename from game_state.h
rename to include/game_state.h
diff --git a/game_state.hpp b/include/game_state.hpp
similarity index 100%
rename from game_state.hpp
rename to include/game_state.hpp
diff --git a/myassert.h b/include/myassert.h
similarity index 100%
rename from myassert.h
rename to include/myassert.h
diff --git a/cli_interface.cpp b/src/cli_interface.cpp
similarity index 100%
rename from cli_interface.cpp
rename to src/cli_interface.cpp
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp