OliverBenz · OliverBenz · Jan 31, 2026 · Jan 31, 2026 · Jan 31, 2026 · Jan 31, 2026
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -1,37 +1,40 @@
 name: CMake
 
-on: [push]
+on: [push, pull_request]
 
 env:
-  BUILD_TYPE: Release
+  BUILD_TYPE: Debug
 
 jobs:
   Build_And_Test:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Fetch git submodules
-      run: git submodule update --init --recursive
-
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build
-
-    - name: Install Dependencies
-      run: sudo apt update; sudo apt install libgtest-dev
-
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Install Nix
+      uses: cachix/install-nix-action@v27
+      with:
+        nix_path: nixpkgs=channel:nixos-unstable
+        extra_nix_config: |
+          experimental-features = nix-command flakes
+    
     - name: Configure CMake
-      shell: bash
-      working-directory: ${{runner.workspace}}/build
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+      run: |
+        nix develop --command bash -c "
+          cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TESTS=ON
+        "
 
     - name: Build
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      run: cmake --build . --config $BUILD_TYPE
+      run: |
+        nix develop --command bash -c "
+          cmake --build build --config $BUILD_TYPE
+        "
 
     - name: Run Tests
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      run: ./out/bin/Template.gtest
+      run: |
+        nix develop --command bash -c "
+          ctest --test-dir build --output-on-failure
+        "
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "cmake"]
 	path = lib/cmake
-	url = git@github.com:OliverBenz/cmake_files.git
+	url = https://github.com/OliverBenz/cmake_files.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,18 +8,15 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-option(BUILD_TESTS "Create the unit tests for the project." True)
-option(BUILD_EXAMPLES "Create examples for the project." False)
-
+option(BUILD_TESTS "Create the unit tests for the project." ON)
 
 # Add libraries to project
-add_subdirectory(lib)
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/lib")
 
 # Add source, tests and examples
-add_subdirectory(src)
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/src")
 if(BUILD_TESTS)
-    add_subdirectory(tests)
-endif()
-if(BUILD_EXAMPLES)
-    add_subdirectory(examples)
+    include(CTest)
+    enable_testing()
+    add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/tests")
 endif()
diff --git a/lib/logger.cmake b/lib/logger.cmake
@@ -5,7 +5,7 @@ include(FetchContent)
 FetchContent_Declare(
   Logger
   GIT_REPOSITORY https://github.com/OliverBenz/Logger.git
-  GIT_TAG        955d8c4f97b837af25c5da4ae28cb8ef1170e2ce
+  GIT_TAG        8e8f8e4a61c13ae370b5295775f92b14920bbc1a
 )
 set(LOGGER_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(LOGGER_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -5,6 +5,6 @@
 echo "Entering Development Environment"
 echo "Using configuration: $configuration"
 nix develop .. --command bash -c "
-  cmake -S .. -B ../build -DCMAKE_BUILD_TYPE=$configuration
+  cmake -S .. -B ../build -DCMAKE_BUILD_TYPE=$configuration -DBUILD_TESTS=ON
   cmake --build ../build -j
 "
diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt
@@ -0,0 +1,40 @@
+set(targetName App)
+
+# Get files to build
+set(headers
+    "${CMAKE_CURRENT_LIST_DIR}/include/app/sessionManager.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/app/IAppSignalListener.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/app/eventHub.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/app/position.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/app/gameServer.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/Logging.hpp"
+)
+
+set(sources
+    "${CMAKE_CURRENT_LIST_DIR}/sessionManager.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/eventHub.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/position.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/gameServer.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/Logging.cpp"
+)
+
+add_library(${targetName} STATIC ${headers} ${sources})
+add_library(go::app ALIAS ${targetName})
+
+target_include_directories(${targetName}
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}/include"
+)
+
+# TODO: GameNet should be private.
+target_link_libraries(${targetName}
+    PRIVATE
+        Logger::Logger
+    PUBLIC
+        go::core go::gameNet
+)
+
+# Setup project settings
+set_project_warnings(${targetName})
+set_compile_options(${targetName})
+set_output_directory(${targetName})
diff --git a/src/libApp/Logging.cpp → src/App/Logging.cpp b/src/libApp/Logging.cpp → src/App/Logging.cpp
diff --git a/src/libApp/Logging.hpp → src/App/Logging.hpp b/src/libApp/Logging.hpp → src/App/Logging.hpp
diff --git a/src/libApp/eventHub.cpp → src/App/eventHub.cpp b/src/libApp/eventHub.cpp → src/App/eventHub.cpp
diff --git a/src/libApp/gameServer.cpp → src/App/gameServer.cpp b/src/libApp/gameServer.cpp → src/App/gameServer.cpp
diff --git a/...libApp/include/app/IAppSignalListener.hpp → src/App/include/app/IAppSignalListener.hpp b/...libApp/include/app/IAppSignalListener.hpp → src/App/include/app/IAppSignalListener.hpp
diff --git a/src/libApp/include/app/eventHub.hpp → src/App/include/app/eventHub.hpp b/src/libApp/include/app/eventHub.hpp → src/App/include/app/eventHub.hpp
diff --git a/src/libApp/include/app/gameServer.hpp → src/App/include/app/gameServer.hpp b/src/libApp/include/app/gameServer.hpp → src/App/include/app/gameServer.hpp
diff --git a/src/libApp/include/app/position.hpp → src/App/include/app/position.hpp b/src/libApp/include/app/position.hpp → src/App/include/app/position.hpp
diff --git a/src/libApp/include/app/sessionManager.hpp → src/App/include/app/sessionManager.hpp b/src/libApp/include/app/sessionManager.hpp → src/App/include/app/sessionManager.hpp
diff --git a/src/libApp/position.cpp → src/App/position.cpp b/src/libApp/position.cpp → src/App/position.cpp
diff --git a/src/libApp/sessionManager.cpp → src/App/sessionManager.cpp b/src/libApp/sessionManager.cpp → src/App/sessionManager.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/libData/)     # Library:     Core data layer
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/libCore/)     # Library:     Core game logic
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/libNetwork/)  # Library:     Network layer networking
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/libGameNet/)  # Library:     Application layer networking
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/libCamera/)   # Library:     Physical board detection
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/libApp/)      # Library:     Application logic
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Data/")     # Library:     Core data layer
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Core/")     # Library:     Core game logic
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Network/")  # Library:     Network layer networking
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/GameNet/")  # Library:     Application layer networking
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Camera/")   # Library:     Physical board detection
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/App/")      # Library:     Application logic
 
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/gui/)         # Application: GUI
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/server/)      # Application: Server
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/gui/")         # Application: GUI
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/server/")      # Application: Server
diff --git a/src/libCamera/BoardDetect.cpp → src/Camera/BoardDetect.cpp b/src/libCamera/BoardDetect.cpp → src/Camera/BoardDetect.cpp
diff --git a/src/libCamera/BoardDetect.hpp → src/Camera/BoardDetect.hpp b/src/libCamera/BoardDetect.hpp → src/Camera/BoardDetect.hpp
diff --git a/src/libCamera/CMakeLists.txt → src/Camera/CMakeLists.txt b/src/libCamera/CMakeLists.txt → src/Camera/CMakeLists.txt
@@ -1,18 +1,14 @@
-# Settings
-set(targetName libCamera)
+set(targetName Camera)
 
 find_package(OpenCV REQUIRED)
 
 # Get files to build
 set(headers )
-set(sources ${CMAKE_CURRENT_LIST_DIR}/main.cpp)
+set(sources "${CMAKE_CURRENT_LIST_DIR}/main.cpp")
 
 # TODO: This core/ will be a library. Not the executable.
 # Create target
-add_executable(${targetName}
-    ${headers}
-    ${sources}
-)
+add_executable(${targetName} ${headers}${sources})
 
 target_include_directories(${targetName} PRIVATE ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(${targetName} PRIVATE ${OpenCV_LIBS})

diff --git a/src/libCamera/main.cpp → src/Camera/main.cpp b/src/libCamera/main.cpp → src/Camera/main.cpp
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
@@ -0,0 +1,45 @@
+set(targetName Core)
+
+# Get files to build
+set(headers
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/game.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/position.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/gameEvent.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/IGameStateListener.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/IGameSignalListener.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/SafeQueue.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/sgfHandler.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/moveChecker.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/core/eventHub.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/zobristHash.hpp"
+)
+set(sources
+    "${CMAKE_CURRENT_LIST_DIR}/position.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/game.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/sgfHandler.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/moveChecker.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/eventHub.cpp"
+)
+
+# Create target
+add_library(${targetName} STATIC ${headers} ${sources})
+add_library(go::core ALIAS ${targetName})
+
+target_include_directories(${targetName}
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}/include"
+)
+target_link_libraries(${targetName} 
+    PUBLIC
+        go::data    
+)
+
+# Setup project settings
+set_project_warnings(${targetName})  # Which warnings to enable
+set_compile_options(${targetName})   # Which extra compiler flags to enable
+set_output_directory(${targetName})  # Set the output directory of the library
+
+# Specify version
+target_compile_definitions(${targetName} PUBLIC VERSION_MAJOR=0)
+target_compile_definitions(${targetName} PUBLIC VERSION_MINOR=0)
+target_compile_definitions(${targetName} PUBLIC VERSION_PATCH=1)
diff --git a/src/libCore/README.md → src/Core/README.md b/src/libCore/README.md → src/Core/README.md
diff --git a/src/libCore/eventHub.cpp → src/Core/eventHub.cpp b/src/libCore/eventHub.cpp → src/Core/eventHub.cpp
diff --git a/src/libCore/game.cpp → src/Core/game.cpp b/src/libCore/game.cpp → src/Core/game.cpp
diff --git a/...Core/include/core/IGameSignalListener.hpp → ...Core/include/core/IGameSignalListener.hpp b/...Core/include/core/IGameSignalListener.hpp → ...Core/include/core/IGameSignalListener.hpp
diff --git a/...bCore/include/core/IGameStateListener.hpp → src/Core/include/core/IGameStateListener.hpp b/...bCore/include/core/IGameStateListener.hpp → src/Core/include/core/IGameStateListener.hpp
diff --git a/src/libCore/include/core/IZobristHash.hpp → src/Core/include/core/IZobristHash.hpp b/src/libCore/include/core/IZobristHash.hpp → src/Core/include/core/IZobristHash.hpp
diff --git a/src/libCore/include/core/SafeQueue.hpp → src/Core/include/core/SafeQueue.hpp b/src/libCore/include/core/SafeQueue.hpp → src/Core/include/core/SafeQueue.hpp
diff --git a/src/libCore/include/core/eventHub.hpp → src/Core/include/core/eventHub.hpp b/src/libCore/include/core/eventHub.hpp → src/Core/include/core/eventHub.hpp
diff --git a/src/libCore/include/core/game.hpp → src/Core/include/core/game.hpp b/src/libCore/include/core/game.hpp → src/Core/include/core/game.hpp
diff --git a/src/libCore/include/core/gameEvent.hpp → src/Core/include/core/gameEvent.hpp b/src/libCore/include/core/gameEvent.hpp → src/Core/include/core/gameEvent.hpp
diff --git a/src/libCore/include/core/moveChecker.hpp → src/Core/include/core/moveChecker.hpp b/src/libCore/include/core/moveChecker.hpp → src/Core/include/core/moveChecker.hpp
diff --git a/src/libCore/include/core/position.hpp → src/Core/include/core/position.hpp b/src/libCore/include/core/position.hpp → src/Core/include/core/position.hpp
diff --git a/src/libCore/include/core/sgfHandler.hpp → src/Core/include/core/sgfHandler.hpp b/src/libCore/include/core/sgfHandler.hpp → src/Core/include/core/sgfHandler.hpp
diff --git a/src/libCore/moveChecker.cpp → src/Core/moveChecker.cpp b/src/libCore/moveChecker.cpp → src/Core/moveChecker.cpp
diff --git a/src/libCore/position.cpp → src/Core/position.cpp b/src/libCore/position.cpp → src/Core/position.cpp
diff --git a/src/libCore/sgfHandler.cpp → src/Core/sgfHandler.cpp b/src/libCore/sgfHandler.cpp → src/Core/sgfHandler.cpp
diff --git a/src/libCore/zobristHash.hpp → src/Core/zobristHash.hpp b/src/libCore/zobristHash.hpp → src/Core/zobristHash.hpp
diff --git a/src/libData/CMakeLists.txt → src/Data/CMakeLists.txt b/src/libData/CMakeLists.txt → src/Data/CMakeLists.txt
@@ -1,15 +1,14 @@
-# Settings
-set(targetName libData)
+set(targetName Data)
 
 # Get files to build
 set(headers
-    ${CMAKE_CURRENT_LIST_DIR}/include/data/player.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/data/coordinate.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/data/board.hpp
-    ${CMAKE_CURRENT_LIST_DIR}/include/data/gameStatus.hpp
+    "${CMAKE_CURRENT_LIST_DIR}/include/data/player.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/data/coordinate.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/data/board.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/data/gameStatus.hpp"
 )
 set(sources
-    ${CMAKE_CURRENT_LIST_DIR}/board.cpp
+    "${CMAKE_CURRENT_LIST_DIR}/board.cpp"
 )
 
 # Create target
@@ -18,7 +17,7 @@ add_library(go::data ALIAS ${targetName})
 
 target_include_directories(${targetName}
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}/include
+        "${CMAKE_CURRENT_LIST_DIR}/include"
 )
 
 # Setup project settings

diff --git a/src/libData/board.cpp → src/Data/board.cpp b/src/libData/board.cpp → src/Data/board.cpp
diff --git a/src/libData/include/data/board.hpp → src/Data/include/data/board.hpp b/src/libData/include/data/board.hpp → src/Data/include/data/board.hpp
diff --git a/src/libData/include/data/coordinate.hpp → src/Data/include/data/coordinate.hpp b/src/libData/include/data/coordinate.hpp → src/Data/include/data/coordinate.hpp
diff --git a/src/libData/include/data/gameStatus.hpp → src/Data/include/data/gameStatus.hpp b/src/libData/include/data/gameStatus.hpp → src/Data/include/data/gameStatus.hpp
diff --git a/src/libData/include/data/player.hpp → src/Data/include/data/player.hpp b/src/libData/include/data/player.hpp → src/Data/include/data/player.hpp
diff --git a/src/GameNet/CMakeLists.txt b/src/GameNet/CMakeLists.txt
@@ -0,0 +1,40 @@
+set(targetName GameNet)
+
+# Get files to build
+set(headers
+    "${CMAKE_CURRENT_LIST_DIR}/include/gameNet/client.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/gameNet/server.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/gameNet/nwEvents.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/gameNet/types.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/sessionManager.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/serverEvents.hpp"
+)
+
+set(sources
+    "${CMAKE_CURRENT_LIST_DIR}/client.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/server.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/nwEvents.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/sessionManager.cpp"
+)
+
+
+add_library(${targetName} STATIC ${headers} ${sources})
+add_library(go::gameNet ALIAS ${targetName})
+
+target_include_directories(${targetName}
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}/include"
+)
+
+target_link_libraries(${targetName}
+    PUBLIC
+        go::data
+    PRIVATE
+        go::network
+        nlohmann_json::nlohmann_json
+)
+
+# Setup project settings
+set_project_warnings(${targetName})
+set_compile_options(${targetName})
+set_output_directory(${targetName})
diff --git a/src/libGameNet/README.md → src/GameNet/README.md b/src/libGameNet/README.md → src/GameNet/README.md
diff --git a/src/libGameNet/SafeQueue.hpp → src/GameNet/SafeQueue.hpp b/src/libGameNet/SafeQueue.hpp → src/GameNet/SafeQueue.hpp
diff --git a/src/libGameNet/client.cpp → src/GameNet/client.cpp b/src/libGameNet/client.cpp → src/GameNet/client.cpp
diff --git a/src/libGameNet/include/gameNet/client.hpp → src/GameNet/include/gameNet/client.hpp b/src/libGameNet/include/gameNet/client.hpp → src/GameNet/include/gameNet/client.hpp
diff --git a/src/libGameNet/include/gameNet/nwEvents.hpp → src/GameNet/include/gameNet/nwEvents.hpp b/src/libGameNet/include/gameNet/nwEvents.hpp → src/GameNet/include/gameNet/nwEvents.hpp
diff --git a/src/libGameNet/include/gameNet/server.hpp → src/GameNet/include/gameNet/server.hpp b/src/libGameNet/include/gameNet/server.hpp → src/GameNet/include/gameNet/server.hpp
diff --git a/src/libGameNet/include/gameNet/types.hpp → src/GameNet/include/gameNet/types.hpp b/src/libGameNet/include/gameNet/types.hpp → src/GameNet/include/gameNet/types.hpp
diff --git a/src/libGameNet/nwEvents.cpp → src/GameNet/nwEvents.cpp b/src/libGameNet/nwEvents.cpp → src/GameNet/nwEvents.cpp
diff --git a/src/libGameNet/server.cpp → src/GameNet/server.cpp b/src/libGameNet/server.cpp → src/GameNet/server.cpp
diff --git a/src/libGameNet/serverEvents.hpp → src/GameNet/serverEvents.hpp b/src/libGameNet/serverEvents.hpp → src/GameNet/serverEvents.hpp
diff --git a/src/libGameNet/sessionManager.cpp → src/GameNet/sessionManager.cpp b/src/libGameNet/sessionManager.cpp → src/GameNet/sessionManager.cpp
diff --git a/src/libGameNet/sessionManager.hpp → src/GameNet/sessionManager.hpp b/src/libGameNet/sessionManager.hpp → src/GameNet/sessionManager.hpp
diff --git a/src/Network/CMakeLists.txt b/src/Network/CMakeLists.txt
@@ -0,0 +1,34 @@
+set(targetName Network)
+
+# Get files to build
+set(headers
+    "${CMAKE_CURRENT_LIST_DIR}/include/network/protocol.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/network/tcpServer.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/include/network/tcpClient.hpp"
+    "${CMAKE_CURRENT_LIST_DIR}/connection.hpp"
+)
+
+set(sources
+    "${CMAKE_CURRENT_LIST_DIR}/tcpServer.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/tcpClient.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/connection.cpp"
+)
+
+
+add_library(${targetName} STATIC ${headers} ${sources})
+add_library(go::network ALIAS ${targetName})
+
+target_include_directories(${targetName}
+    PUBLIC
+        "${CMAKE_CURRENT_LIST_DIR}/include"
+)
+
+target_link_libraries(${targetName}
+    PRIVATE
+        asio
+)
+
+# Setup project settings
+set_project_warnings(${targetName})
+set_compile_options(${targetName})
+set_output_directory(${targetName})
diff --git a/src/libNetwork/README.md → src/Network/README.md b/src/libNetwork/README.md → src/Network/README.md
diff --git a/src/libNetwork/connection.cpp → src/Network/connection.cpp b/src/libNetwork/connection.cpp → src/Network/connection.cpp
diff --git a/src/libNetwork/connection.hpp → src/Network/connection.hpp b/src/libNetwork/connection.hpp → src/Network/connection.hpp
diff --git a/src/libNetwork/include/network/protocol.hpp → src/Network/include/network/protocol.hpp b/src/libNetwork/include/network/protocol.hpp → src/Network/include/network/protocol.hpp
diff --git a/src/libNetwork/include/network/tcpClient.hpp → src/Network/include/network/tcpClient.hpp b/src/libNetwork/include/network/tcpClient.hpp → src/Network/include/network/tcpClient.hpp
diff --git a/src/libNetwork/include/network/tcpServer.hpp → src/Network/include/network/tcpServer.hpp b/src/libNetwork/include/network/tcpServer.hpp → src/Network/include/network/tcpServer.hpp
diff --git a/src/libNetwork/tcpClient.cpp → src/Network/tcpClient.cpp b/src/libNetwork/tcpClient.cpp → src/Network/tcpClient.cpp
diff --git a/src/libNetwork/tcpServer.cpp → src/Network/tcpServer.cpp b/src/libNetwork/tcpServer.cpp → src/Network/tcpServer.cpp
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -1,17 +1,16 @@
-# Settings
 set(targetName goUi)
 
 find_package(Qt6 REQUIRED COMPONENTS Widgets)
 
 add_executable(${targetName}
-    ${CMAKE_CURRENT_LIST_DIR}/main.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/MainWindow.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/GameWidget.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/BoardWidget.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/boardRenderer.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/ConnectDialog.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/HostDialog.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/Logging.cpp
+    "${CMAKE_CURRENT_LIST_DIR}/main.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/MainWindow.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/GameWidget.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/BoardWidget.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/boardRenderer.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/ConnectDialog.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/HostDialog.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/Logging.cpp"
 )
 
 target_link_libraries(${targetName}