diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2d3bb9..1051393 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,24 +5,21 @@ set(CMAKE_CXX_STANDARD 26)
 
 find_package(ftxui CONFIG REQUIRED)
 
-add_executable(uno-game src/main.cpp
+add_library(uno-game-lib
         src/game/Card.cpp
         src/game/CardTile.cpp
         src/game/Player.cpp
         src/game/GameState.cpp
         src/common/Utils.cpp
 )
+
+add_executable(uno-game src/main.cpp)
+target_link_libraries(uno-game
+        PRIVATE uno-game-lib)
 target_link_libraries(uno-game
         PRIVATE ftxui::screen
         PRIVATE ftxui::dom
         PRIVATE ftxui::component
 )
 
-add_library(uno-game-lib src/game/Card.cpp
-        src/game/CardTile.cpp
-        src/game/Player.cpp
-        src/game/GameState.cpp
-        src/common/Utils.cpp
-)
-
 add_subdirectory(test)
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b7f5461..b91744a 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,8 @@ set(CMAKE_CXX_STANDARD 26)
 
 project(uno-game-test)
 
-add_executable(uno-game-test unit/game/CardTest.cpp
+add_executable(uno-game-test
+        unit/game/CardTest.cpp
         unit/game/CardTileTest.cpp
         unit/game/PlayerTest.cpp
         unit/game/GameStateTest.cpp