Merge pull request #140 from dmeybohm/move-files

Reorganize includes
dmeybohm · Oct 14, 2024 · c13702e · c13702e
2 parents d87d467 + 0b5683a
commit c13702e
Show file tree

Hide file tree

Showing 259 changed files with 196 additions and 200 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -93,33 +93,33 @@ jobs:
 
     - name: Fast Tests (Ubuntu)
       if: matrix.os == 'ubuntu-latest'
-      working-directory: ${{ github.workspace }}/build/engine/test
-      run: ${{ github.workspace }}/build/engine/test/fast_tests
+      working-directory: ${{ github.workspace }}/build/src/wisdom-chess/engine/test
+      run: ${{ github.workspace }}/build/src/wisdom-chess/engine/test/fast_tests
 
     - name: Slow Tests (Ubuntu)
       if: matrix.os == 'ubuntu-latest'
-      working-directory: ${{ github.workspace }}/build/engine/test
-      run: ${{ github.workspace }}/build/engine/test/slow_tests      
+      working-directory: ${{ github.workspace }}/build/src/wisdom-chess/engine/test
+      run: ${{ github.workspace }}/build/src/wisdom-chess/engine/test/slow_tests      
 
     - name: Fast Tests (macOS)
       if: matrix.os == 'macos-latest'
-      working-directory: ${{ github.workspace }}/build/engine/test
-      run: ${{ github.workspace }}/build/engine/test/fast_tests
+      working-directory: ${{ github.workspace }}/build/src/wisdom-chess/engine/test
+      run: ${{ github.workspace }}/build/src/wisdom-chess/engine/test/fast_tests
 
     - name: Slow Tests (macOS)
       if: matrix.os == 'macos-latest'
-      working-directory: ${{ github.workspace }}/build/engine/test
-      run: ${{ github.workspace }}/build/engine/test/slow_tests      
+      working-directory: ${{ github.workspace }}/build/src/wisdom-chess/engine/test
+      run: ${{ github.workspace }}/build/src/wisdom-chess/engine/test/slow_tests      
 
     - name: Fast Tests (Windows)
       if: matrix.os == 'windows-2019' || matrix.os == 'windows-latest'
-      working-directory: ${{ github.workspace }}/build/engine/test/${{ matrix.build_type }}
-      run: ${{ github.workspace }}/build/engine/test/${{ matrix.build_type }}/fast_tests.exe
+      working-directory: ${{ github.workspace }}/build/src/wisdom-chess/engine/test/${{ matrix.build_type }}
+      run: ${{ github.workspace }}/build/src/wisdom-chess/engine/test/${{ matrix.build_type }}/fast_tests.exe
 
     - name: Slow Tests (Windows)
       if: matrix.os == 'windows-2019' || matrix.os == 'windows-latest'
-      working-directory: ${{ github.workspace }}/build/engine/test//${{ matrix.build_type }}
-      run: ${{ github.workspace }}/build/engine/test/${{ matrix.build_type }}/slow_tests.exe
+      working-directory: ${{ github.workspace }}/build/src/wisdom-chess/engine/test//${{ matrix.build_type }}
+      run: ${{ github.workspace }}/build/src/wisdom-chess/engine/test/${{ matrix.build_type }}/slow_tests.exe
 
     - name: Install (CMake)
       run: >

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -39,28 +39,28 @@ jobs:
         run: cmake --build ${{ github.workspace }}/build --config Release -j 4
 
       - name: Install Front-end Dependencies
-        working-directory: ${{ github.workspace }}/ui/react
+        working-directory: ${{ github.workspace }}/src/wisdom-chess/ui/react
         run: npm ci
 
       - name: Build Front-end
-        working-directory: ${{ github.workspace }}/ui/react
+        working-directory: ${{ github.workspace }}/src/wisdom-chess/ui/react
         run: npm run build
 
       - name: Install Netlify CLI
-        working-directory: ${{ github.workspace }}/ui/react
+        working-directory: ${{ github.workspace }}/src/wisdom-chess/ui/react
         run: npm install -g netlify-cli
 
       - name: Deploy Preview
         if: github.event.pull_request.merged != true && github.actor != 'dependabot[bot]'
-        working-directory: ${{ github.workspace }}/ui/react
+        working-directory: ${{ github.workspace }}/src/wisdom-chess/ui/react
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
         run: netlify deploy --dir dist
 
       - name: Deploy Production
         if: github.event.pull_request.merged == true && github.base_ref == 'main'
-        working-directory: ${{ github.workspace }}/ui/react
+        working-directory: ${{ github.workspace }}/src/wisdom-chess/ui/react
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}

diff --git a/.gitignore b/.gitignore
@@ -3,13 +3,13 @@ cmake-build-*
 .vs
 .vscode
 CMakeLists.txt.user
-/ui/react/public/wisdom-chess-web.wasm
-/ui/react/public/wisdom-chess-web.js
-/ui/react/public/wisdom-chess-web.ww.js
-/ui/react/public/wisdom-chess-load.js
-/ui/react/public/glue.js
-/ui/react/dist/
-/ui/react/dev-dist/
+/src/wisdom-chess/ui/react/public/wisdom-chess-web.wasm
+/src/wisdom-chess/ui/react/public/wisdom-chess-web.js
+/src/wisdom-chess/ui/react/public/wisdom-chess-web.ww.js
+/src/wisdom-chess/ui/react/public/wisdom-chess-load.js
+/src/wisdom-chess/ui/react/public/glue.js
+/src/wisdom-chess/ui/react/dist/
+/src/wisdom-chess/ui/react/dev-dist/
 
 # Local Netlify folder
 .netlify
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,5 @@ if (WISDOM_CHESS_ASAN)
     endif()
 endif()
 
-add_subdirectory(engine)
-add_subdirectory(ui)
+add_subdirectory(src)
 
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
diff --git a/engine/src/CMakeLists.txt b/engine/src/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(wisdom-chess)
diff --git a/src/wisdom-chess/CMakeLists.txt b/src/wisdom-chess/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(engine)
+add_subdirectory(ui)
diff --git a/engine/.editorconfig → src/wisdom-chess/engine/.editorconfig b/engine/.editorconfig → src/wisdom-chess/engine/.editorconfig
diff --git a/engine/.gitignore → src/wisdom-chess/engine/.gitignore b/engine/.gitignore → src/wisdom-chess/engine/.gitignore
diff --git a/src/wisdom-chess/engine/CMakeLists.txt b/src/wisdom-chess/engine/CMakeLists.txt
@@ -0,0 +1,105 @@
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+cmake_minimum_required(VERSION 3.20)
+
+project(WisdomEngine CXX)
+
+find_package(Threads REQUIRED)
+
+CPMAddPackage("gh:foonathan/type_safe@0.2.3")
+CPMAddPackage("gh:microsoft/GSL@4.0.0")
+CPMAddPackage(
+  NAME doctest
+  GITHUB_REPOSITORY doctest/doctest
+  GIT_TAG v2.4.11
+  OPTIONS
+     "DOCTEST_NO_INSTALL On"
+)
+
+find_package(doctest)
+
+if (ANDROID OR NOT WISDOM_CHESS_PCH_ENABLED)
+    # Disable precompile headers because there is a confict on android where it links
+    # some code as PIC and some as non-PIC and can't combine them.
+    set(PCH_ENABLED OFF)
+    message("-- wisdom-chess: precompiled headers disabled")
+else()
+    set(PCH_ENABLED ON)
+    message("-- wisdom-chess: precompiled headers enabled")
+endif()
+
+add_library(wisdom-chess-core STATIC
+        board_builder.hpp
+        board_code.hpp
+        board.hpp
+        coord.hpp
+        evaluate.hpp
+        fen_parser.hpp
+        game.hpp
+        game_status.hpp
+        generate.hpp
+        global.hpp
+        history.hpp
+        logger.hpp
+        material.hpp
+        move.hpp
+        move_list.hpp
+        move_timer.hpp
+        output_format.hpp
+        piece.hpp
+        position.hpp
+        random.hpp
+        search.hpp
+        str.hpp
+        threats.hpp
+        board.cpp
+        board_code.cpp
+        coord.cpp
+        evaluate.cpp
+        fen_parser.cpp
+        game.cpp
+        game_status.cpp
+        generate.cpp
+        history.cpp
+        logger.cpp 
+        material.cpp 
+        move.cpp
+        move_list.cpp
+        move_timer.cpp 
+        output_format.cpp
+        piece.cpp 
+        position.cpp 
+        search.cpp
+        str.cpp)
+
+if (PCH_ENABLED)
+    target_precompile_headers(wisdom-chess-core PRIVATE PRIVATE global.hpp)
+else()
+    target_sources(wisdom-chess-core PRIVATE global.hpp)
+endif()
+
+target_include_directories(wisdom-chess-core PUBLIC ../..)
+add_library(wisdom::chess ALIAS wisdom-chess-core)
+
+target_link_libraries(wisdom-chess-core PUBLIC Microsoft.GSL::GSL)
+target_link_libraries(wisdom-chess-core PUBLIC Threads::Threads)
+target_link_libraries(wisdom-chess-core PUBLIC type_safe)
+
+if (EMSCRIPTEN)
+    target_compile_options(wisdom-chess-core PUBLIC -pthread)
+endif()
+
+if (NOT WIN32 AND NOT EMSCRIPTEN)
+    message("-- wisdom-chess: stack protector disabled for performance")
+    target_compile_options(wisdom-chess-core PUBLIC -fno-stack-protector)
+endif()
+
+if (doctest_FOUND)
+    message("-- wisdom-chess: Including tests with doctest")
+    add_subdirectory(test)
+else()
+    message("-- wisdom-chess: Tests disabled (doctest not found)")
+    set(WISDOM_CHESS_SLOW_TESTS Off)
+    set(WISDOM_CHESS_FAST_TESTS Off)
+endif()
diff --git a/engine/src/board.cpp → src/wisdom-chess/engine/board.cpp b/engine/src/board.cpp → src/wisdom-chess/engine/board.cpp
diff --git a/include/wisdom-chess/engine/board.hpp → src/wisdom-chess/engine/board.hpp b/include/wisdom-chess/engine/board.hpp → src/wisdom-chess/engine/board.hpp
diff --git a/...ude/wisdom-chess/engine/board_builder.hpp → src/wisdom-chess/engine/board_builder.hpp b/...ude/wisdom-chess/engine/board_builder.hpp → src/wisdom-chess/engine/board_builder.hpp
diff --git a/engine/src/board_code.cpp → src/wisdom-chess/engine/board_code.cpp b/engine/src/board_code.cpp → src/wisdom-chess/engine/board_code.cpp
diff --git a/include/wisdom-chess/engine/board_code.hpp → src/wisdom-chess/engine/board_code.hpp b/include/wisdom-chess/engine/board_code.hpp → src/wisdom-chess/engine/board_code.hpp
diff --git a/engine/src/coord.cpp → src/wisdom-chess/engine/coord.cpp b/engine/src/coord.cpp → src/wisdom-chess/engine/coord.cpp
diff --git a/include/wisdom-chess/engine/coord.hpp → src/wisdom-chess/engine/coord.hpp b/include/wisdom-chess/engine/coord.hpp → src/wisdom-chess/engine/coord.hpp
diff --git a/engine/src/evaluate.cpp → src/wisdom-chess/engine/evaluate.cpp b/engine/src/evaluate.cpp → src/wisdom-chess/engine/evaluate.cpp
diff --git a/include/wisdom-chess/engine/evaluate.hpp → src/wisdom-chess/engine/evaluate.hpp b/include/wisdom-chess/engine/evaluate.hpp → src/wisdom-chess/engine/evaluate.hpp
diff --git a/engine/src/fen_parser.cpp → src/wisdom-chess/engine/fen_parser.cpp b/engine/src/fen_parser.cpp → src/wisdom-chess/engine/fen_parser.cpp
diff --git a/include/wisdom-chess/engine/fen_parser.hpp → src/wisdom-chess/engine/fen_parser.hpp b/include/wisdom-chess/engine/fen_parser.hpp → src/wisdom-chess/engine/fen_parser.hpp
diff --git a/engine/src/game.cpp → src/wisdom-chess/engine/game.cpp b/engine/src/game.cpp → src/wisdom-chess/engine/game.cpp
diff --git a/include/wisdom-chess/engine/game.hpp → src/wisdom-chess/engine/game.hpp b/include/wisdom-chess/engine/game.hpp → src/wisdom-chess/engine/game.hpp
diff --git a/engine/src/game_status.cpp → src/wisdom-chess/engine/game_status.cpp b/engine/src/game_status.cpp → src/wisdom-chess/engine/game_status.cpp
diff --git a/include/wisdom-chess/engine/game_status.hpp → src/wisdom-chess/engine/game_status.hpp b/include/wisdom-chess/engine/game_status.hpp → src/wisdom-chess/engine/game_status.hpp
diff --git a/engine/src/generate.cpp → src/wisdom-chess/engine/generate.cpp b/engine/src/generate.cpp → src/wisdom-chess/engine/generate.cpp
diff --git a/include/wisdom-chess/engine/generate.hpp → src/wisdom-chess/engine/generate.hpp b/include/wisdom-chess/engine/generate.hpp → src/wisdom-chess/engine/generate.hpp
diff --git a/include/wisdom-chess/engine/global.hpp → src/wisdom-chess/engine/global.hpp b/include/wisdom-chess/engine/global.hpp → src/wisdom-chess/engine/global.hpp
diff --git a/engine/src/history.cpp → src/wisdom-chess/engine/history.cpp b/engine/src/history.cpp → src/wisdom-chess/engine/history.cpp
diff --git a/include/wisdom-chess/engine/history.hpp → src/wisdom-chess/engine/history.hpp b/include/wisdom-chess/engine/history.hpp → src/wisdom-chess/engine/history.hpp
diff --git a/engine/src/logger.cpp → src/wisdom-chess/engine/logger.cpp b/engine/src/logger.cpp → src/wisdom-chess/engine/logger.cpp
diff --git a/include/wisdom-chess/engine/logger.hpp → src/wisdom-chess/engine/logger.hpp b/include/wisdom-chess/engine/logger.hpp → src/wisdom-chess/engine/logger.hpp
diff --git a/engine/src/material.cpp → src/wisdom-chess/engine/material.cpp b/engine/src/material.cpp → src/wisdom-chess/engine/material.cpp
diff --git a/include/wisdom-chess/engine/material.hpp → src/wisdom-chess/engine/material.hpp b/include/wisdom-chess/engine/material.hpp → src/wisdom-chess/engine/material.hpp
diff --git a/engine/src/move.cpp → src/wisdom-chess/engine/move.cpp b/engine/src/move.cpp → src/wisdom-chess/engine/move.cpp
diff --git a/include/wisdom-chess/engine/move.hpp → src/wisdom-chess/engine/move.hpp b/include/wisdom-chess/engine/move.hpp → src/wisdom-chess/engine/move.hpp
diff --git a/engine/src/move_list.cpp → src/wisdom-chess/engine/move_list.cpp b/engine/src/move_list.cpp → src/wisdom-chess/engine/move_list.cpp
diff --git a/include/wisdom-chess/engine/move_list.hpp → src/wisdom-chess/engine/move_list.hpp b/include/wisdom-chess/engine/move_list.hpp → src/wisdom-chess/engine/move_list.hpp
diff --git a/engine/src/move_timer.cpp → src/wisdom-chess/engine/move_timer.cpp b/engine/src/move_timer.cpp → src/wisdom-chess/engine/move_timer.cpp
diff --git a/include/wisdom-chess/engine/move_timer.hpp → src/wisdom-chess/engine/move_timer.hpp b/include/wisdom-chess/engine/move_timer.hpp → src/wisdom-chess/engine/move_timer.hpp
diff --git a/engine/src/output_format.cpp → src/wisdom-chess/engine/output_format.cpp b/engine/src/output_format.cpp → src/wisdom-chess/engine/output_format.cpp
diff --git a/...ude/wisdom-chess/engine/output_format.hpp → src/wisdom-chess/engine/output_format.hpp b/...ude/wisdom-chess/engine/output_format.hpp → src/wisdom-chess/engine/output_format.hpp
diff --git a/engine/src/piece.cpp → src/wisdom-chess/engine/piece.cpp b/engine/src/piece.cpp → src/wisdom-chess/engine/piece.cpp
diff --git a/include/wisdom-chess/engine/piece.hpp → src/wisdom-chess/engine/piece.hpp b/include/wisdom-chess/engine/piece.hpp → src/wisdom-chess/engine/piece.hpp
diff --git a/engine/src/position.cpp → src/wisdom-chess/engine/position.cpp b/engine/src/position.cpp → src/wisdom-chess/engine/position.cpp
diff --git a/include/wisdom-chess/engine/position.hpp → src/wisdom-chess/engine/position.hpp b/include/wisdom-chess/engine/position.hpp → src/wisdom-chess/engine/position.hpp
diff --git a/include/wisdom-chess/engine/random.hpp → src/wisdom-chess/engine/random.hpp b/include/wisdom-chess/engine/random.hpp → src/wisdom-chess/engine/random.hpp
diff --git a/engine/src/search.cpp → src/wisdom-chess/engine/search.cpp b/engine/src/search.cpp → src/wisdom-chess/engine/search.cpp
diff --git a/include/wisdom-chess/engine/search.hpp → src/wisdom-chess/engine/search.hpp b/include/wisdom-chess/engine/search.hpp → src/wisdom-chess/engine/search.hpp
diff --git a/engine/src/str.cpp → src/wisdom-chess/engine/str.cpp b/engine/src/str.cpp → src/wisdom-chess/engine/str.cpp
diff --git a/include/wisdom-chess/engine/str.hpp → src/wisdom-chess/engine/str.hpp b/include/wisdom-chess/engine/str.hpp → src/wisdom-chess/engine/str.hpp
diff --git a/engine/test/CMakeLists.txt → src/wisdom-chess/engine/test/CMakeLists.txt b/engine/test/CMakeLists.txt → src/wisdom-chess/engine/test/CMakeLists.txt
@@ -22,8 +22,7 @@ if (WISDOM_CHESS_FAST_TESTS)
         game_test.cpp
         test_main.cpp)
 
-    target_precompile_headers(fast_tests PRIVATE PRIVATE 
-        ../../include/wisdom-chess/engine/global.hpp)
+    target_precompile_headers(fast_tests PRIVATE PRIVATE ../global.hpp)
 
     target_link_libraries(fast_tests PRIVATE wisdom::chess)
     target_link_libraries(fast_tests PRIVATE doctest::doctest)
@@ -39,8 +38,7 @@ if (WISDOM_CHESS_SLOW_TESTS)
         move_perft_test.cpp
         test_main.cpp)
 
-    target_precompile_headers(slow_tests PRIVATE PRIVATE 
-        ../../include/wisdom-chess/engine/global.hpp)
+    target_precompile_headers(slow_tests PRIVATE PRIVATE ../global.hpp)
 
     target_link_libraries(slow_tests PRIVATE wisdom::chess)
     target_link_libraries(slow_tests PRIVATE doctest::doctest)

diff --git a/engine/test/board_builder_test.cpp → ...-chess/engine/test/board_builder_test.cpp b/engine/test/board_builder_test.cpp → ...-chess/engine/test/board_builder_test.cpp
diff --git a/engine/test/board_code_test.cpp → ...dom-chess/engine/test/board_code_test.cpp b/engine/test/board_code_test.cpp → ...dom-chess/engine/test/board_code_test.cpp
diff --git a/engine/test/board_test.cpp → src/wisdom-chess/engine/test/board_test.cpp b/engine/test/board_test.cpp → src/wisdom-chess/engine/test/board_test.cpp
diff --git a/engine/test/castle_test.cpp → src/wisdom-chess/engine/test/castle_test.cpp b/engine/test/castle_test.cpp → src/wisdom-chess/engine/test/castle_test.cpp
diff --git a/engine/test/check_test.cpp → src/wisdom-chess/engine/test/check_test.cpp b/engine/test/check_test.cpp → src/wisdom-chess/engine/test/check_test.cpp
diff --git a/engine/test/coord_test.cpp → src/wisdom-chess/engine/test/coord_test.cpp b/engine/test/coord_test.cpp → src/wisdom-chess/engine/test/coord_test.cpp
diff --git a/engine/test/en_passant_test.cpp → ...dom-chess/engine/test/en_passant_test.cpp b/engine/test/en_passant_test.cpp → ...dom-chess/engine/test/en_passant_test.cpp
diff --git a/engine/test/fen_parser_test.cpp → ...dom-chess/engine/test/fen_parser_test.cpp b/engine/test/fen_parser_test.cpp → ...dom-chess/engine/test/fen_parser_test.cpp
diff --git a/engine/test/game_test.cpp → src/wisdom-chess/engine/test/game_test.cpp b/engine/test/game_test.cpp → src/wisdom-chess/engine/test/game_test.cpp
diff --git a/engine/test/generate_test.cpp → ...isdom-chess/engine/test/generate_test.cpp b/engine/test/generate_test.cpp → ...isdom-chess/engine/test/generate_test.cpp
diff --git a/engine/test/history_test.cpp → ...wisdom-chess/engine/test/history_test.cpp b/engine/test/history_test.cpp → ...wisdom-chess/engine/test/history_test.cpp
diff --git a/engine/test/material_test.cpp → ...isdom-chess/engine/test/material_test.cpp b/engine/test/material_test.cpp → ...isdom-chess/engine/test/material_test.cpp
diff --git a/engine/test/move_list_test.cpp → ...sdom-chess/engine/test/move_list_test.cpp b/engine/test/move_list_test.cpp → ...sdom-chess/engine/test/move_list_test.cpp
diff --git a/engine/test/move_parse_test.cpp → ...dom-chess/engine/test/move_parse_test.cpp b/engine/test/move_parse_test.cpp → ...dom-chess/engine/test/move_parse_test.cpp
diff --git a/engine/test/move_perft_test.cpp → ...dom-chess/engine/test/move_perft_test.cpp b/engine/test/move_perft_test.cpp → ...dom-chess/engine/test/move_perft_test.cpp
diff --git a/engine/test/move_test.cpp → src/wisdom-chess/engine/test/move_test.cpp b/engine/test/move_test.cpp → src/wisdom-chess/engine/test/move_test.cpp
diff --git a/engine/test/pawn_promotion_test.cpp → ...chess/engine/test/pawn_promotion_test.cpp b/engine/test/pawn_promotion_test.cpp → ...chess/engine/test/pawn_promotion_test.cpp
diff --git a/engine/test/perft.cpp → src/wisdom-chess/engine/test/perft.cpp b/engine/test/perft.cpp → src/wisdom-chess/engine/test/perft.cpp
diff --git a/engine/test/perft_main.cpp → src/wisdom-chess/engine/test/perft_main.cpp b/engine/test/perft_main.cpp → src/wisdom-chess/engine/test/perft_main.cpp
diff --git a/engine/test/perft_test.cpp → src/wisdom-chess/engine/test/perft_test.cpp b/engine/test/perft_test.cpp → src/wisdom-chess/engine/test/perft_test.cpp
diff --git a/engine/test/piece_test.cpp → src/wisdom-chess/engine/test/piece_test.cpp b/engine/test/piece_test.cpp → src/wisdom-chess/engine/test/piece_test.cpp
diff --git a/engine/test/position_test.cpp → ...isdom-chess/engine/test/position_test.cpp b/engine/test/position_test.cpp → ...isdom-chess/engine/test/position_test.cpp
diff --git a/engine/test/search_test.cpp → src/wisdom-chess/engine/test/search_test.cpp b/engine/test/search_test.cpp → src/wisdom-chess/engine/test/search_test.cpp
diff --git a/engine/test/str_test.cpp → src/wisdom-chess/engine/test/str_test.cpp b/engine/test/str_test.cpp → src/wisdom-chess/engine/test/str_test.cpp
diff --git a/engine/test/test_main.cpp → src/wisdom-chess/engine/test/test_main.cpp b/engine/test/test_main.cpp → src/wisdom-chess/engine/test/test_main.cpp
diff --git a/engine/test/wisdom-chess-perft.hpp → ...-chess/engine/test/wisdom-chess-perft.hpp b/engine/test/wisdom-chess-perft.hpp → ...-chess/engine/test/wisdom-chess-perft.hpp
diff --git a/engine/test/wisdom-chess-tests.hpp → ...-chess/engine/test/wisdom-chess-tests.hpp b/engine/test/wisdom-chess-tests.hpp → ...-chess/engine/test/wisdom-chess-tests.hpp
diff --git a/include/wisdom-chess/engine/threats.hpp → src/wisdom-chess/engine/threats.hpp b/include/wisdom-chess/engine/threats.hpp → src/wisdom-chess/engine/threats.hpp
diff --git a/ui/CMakeLists.txt → src/wisdom-chess/ui/CMakeLists.txt b/ui/CMakeLists.txt → src/wisdom-chess/ui/CMakeLists.txt
diff --git a/ui/console/CMakeLists.txt → src/wisdom-chess/ui/console/CMakeLists.txt b/ui/console/CMakeLists.txt → src/wisdom-chess/ui/console/CMakeLists.txt
diff --git a/ui/console/main.cpp → src/wisdom-chess/ui/console/main.cpp b/ui/console/main.cpp → src/wisdom-chess/ui/console/main.cpp
diff --git a/ui/console/play.cpp → src/wisdom-chess/ui/console/play.cpp b/ui/console/play.cpp → src/wisdom-chess/ui/console/play.cpp
diff --git a/ui/gen-icns.sh → src/wisdom-chess/ui/gen-icns.sh b/ui/gen-icns.sh → src/wisdom-chess/ui/gen-icns.sh
diff --git a/ui/qml/.gitignore → src/wisdom-chess/ui/qml/.gitignore b/ui/qml/.gitignore → src/wisdom-chess/ui/qml/.gitignore
diff --git a/ui/qml/CMakeLists.txt → src/wisdom-chess/ui/qml/CMakeLists.txt b/ui/qml/CMakeLists.txt → src/wisdom-chess/ui/qml/CMakeLists.txt
@@ -28,19 +28,19 @@ endif ()
 
 qt_add_executable(WisdomChessQml
         main/main.cpp
-        include/wisdom-chess/qml/game_model.hpp
+        main/game_model.hpp
         main/game_model.cpp
-        include/wisdom-chess/qml/pieces_model.hpp
+        main/pieces_model.hpp
         main/pieces_model.cpp
-        include/wisdom-chess/qml/chess_game.hpp
+        main/chess_game.hpp
         main/chess_game.cpp
-        include/wisdom-chess/qml/chess_engine.hpp
+        main/chess_engine.hpp
         main/chess_engine.cpp
         main/ui_types.cpp
-        include/wisdom-chess/qml/ui_types.hpp
-        include/wisdom-chess/qml/ui_settings.hpp
+        main/ui_types.hpp
+        main/ui_settings.hpp
         main/ui_settings.cpp
-        include/wisdom-chess/qml/game_settings.hpp
+        main/game_settings.hpp
         main/game_settings.cpp
         ${app_icon_resource_windows}
         ${app_icon_macos}
@@ -133,7 +133,7 @@ target_link_libraries(WisdomChessQml
 target_compile_definitions(WisdomChessQml
     PRIVATE MAIN_QML_FILE="${MAIN_QML_FILE}")
 
-target_include_directories(WisdomChessQml PRIVATE include)
+target_include_directories(WisdomChessQml PRIVATE ../../..)
 
 install(TARGETS WisdomChessQml
     BUNDLE DESTINATION "/Applications"

diff --git a/ui/qml/Helper.js → src/wisdom-chess/ui/qml/Helper.js b/ui/qml/Helper.js → src/wisdom-chess/ui/qml/Helper.js
diff --git a/ui/qml/android/AndroidManifest.xml → ...-chess/ui/qml/android/AndroidManifest.xml b/ui/qml/android/AndroidManifest.xml → ...-chess/ui/qml/android/AndroidManifest.xml
diff --git a/ui/qml/android/build.gradle → src/wisdom-chess/ui/qml/android/build.gradle b/ui/qml/android/build.gradle → src/wisdom-chess/ui/qml/android/build.gradle
diff --git a/ui/qml/android/gradle.properties → ...om-chess/ui/qml/android/gradle.properties b/ui/qml/android/gradle.properties → ...om-chess/ui/qml/android/gradle.properties
diff --git a/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar b/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/ui/qml/android/gradlew → src/wisdom-chess/ui/qml/android/gradlew b/ui/qml/android/gradlew → src/wisdom-chess/ui/qml/android/gradlew
diff --git a/ui/qml/android/gradlew.bat → src/wisdom-chess/ui/qml/android/gradlew.bat b/ui/qml/android/gradlew.bat → src/wisdom-chess/ui/qml/android/gradlew.bat
diff --git a/ui/qml/android/res/drawable-hdpi/icon.png → ...ui/qml/android/res/drawable-hdpi/icon.png b/ui/qml/android/res/drawable-hdpi/icon.png → ...ui/qml/android/res/drawable-hdpi/icon.png
diff --git a/ui/qml/android/res/drawable-ldpi/icon.png → ...ui/qml/android/res/drawable-ldpi/icon.png b/ui/qml/android/res/drawable-ldpi/icon.png → ...ui/qml/android/res/drawable-ldpi/icon.png
diff --git a/ui/qml/android/res/drawable-mdpi/icon.png → ...ui/qml/android/res/drawable-mdpi/icon.png b/ui/qml/android/res/drawable-mdpi/icon.png → ...ui/qml/android/res/drawable-mdpi/icon.png
diff --git a/ui/qml/android/res/drawable-xhdpi/icon.png → ...i/qml/android/res/drawable-xhdpi/icon.png b/ui/qml/android/res/drawable-xhdpi/icon.png → ...i/qml/android/res/drawable-xhdpi/icon.png
diff --git a/ui/qml/android/res/drawable-xxhdpi/icon.png → .../qml/android/res/drawable-xxhdpi/icon.png b/ui/qml/android/res/drawable-xxhdpi/icon.png → .../qml/android/res/drawable-xxhdpi/icon.png
diff --git a/ui/qml/android/res/drawable-xxxhdpi/icon.png → ...qml/android/res/drawable-xxxhdpi/icon.png b/ui/qml/android/res/drawable-xxxhdpi/icon.png → ...qml/android/res/drawable-xxxhdpi/icon.png
diff --git a/ui/qml/android/res/values/libs.xml → ...-chess/ui/qml/android/res/values/libs.xml b/ui/qml/android/res/values/libs.xml → ...-chess/ui/qml/android/res/values/libs.xml
diff --git a/ui/qml/images/Chess.ico → src/wisdom-chess/ui/qml/images/Chess.ico b/ui/qml/images/Chess.ico → src/wisdom-chess/ui/qml/images/Chess.ico
diff --git a/ui/qml/images/Chess_bdt45.png → ...isdom-chess/ui/qml/images/Chess_bdt45.png b/ui/qml/images/Chess_bdt45.png → ...isdom-chess/ui/qml/images/Chess_bdt45.png
diff --git a/ui/qml/images/Chess_bdt45.svg → ...isdom-chess/ui/qml/images/Chess_bdt45.svg b/ui/qml/images/Chess_bdt45.svg → ...isdom-chess/ui/qml/images/Chess_bdt45.svg
diff --git a/ui/qml/images/Chess_blt45.svg → ...isdom-chess/ui/qml/images/Chess_blt45.svg b/ui/qml/images/Chess_blt45.svg → ...isdom-chess/ui/qml/images/Chess_blt45.svg
diff --git a/ui/qml/images/Chess_kdt45.svg → ...isdom-chess/ui/qml/images/Chess_kdt45.svg b/ui/qml/images/Chess_kdt45.svg → ...isdom-chess/ui/qml/images/Chess_kdt45.svg
diff --git a/ui/qml/images/Chess_klt45.svg → ...isdom-chess/ui/qml/images/Chess_klt45.svg b/ui/qml/images/Chess_klt45.svg → ...isdom-chess/ui/qml/images/Chess_klt45.svg
diff --git a/ui/qml/images/Chess_ndt45.png → ...isdom-chess/ui/qml/images/Chess_ndt45.png b/ui/qml/images/Chess_ndt45.png → ...isdom-chess/ui/qml/images/Chess_ndt45.png
diff --git a/ui/qml/images/Chess_ndt45.svg → ...isdom-chess/ui/qml/images/Chess_ndt45.svg b/ui/qml/images/Chess_ndt45.svg → ...isdom-chess/ui/qml/images/Chess_ndt45.svg
diff --git a/ui/qml/images/Chess_nlt45.svg → ...isdom-chess/ui/qml/images/Chess_nlt45.svg b/ui/qml/images/Chess_nlt45.svg → ...isdom-chess/ui/qml/images/Chess_nlt45.svg
diff --git a/ui/qml/images/Chess_pdt45.svg → ...isdom-chess/ui/qml/images/Chess_pdt45.svg b/ui/qml/images/Chess_pdt45.svg → ...isdom-chess/ui/qml/images/Chess_pdt45.svg
diff --git a/ui/qml/images/Chess_plt45.svg → ...isdom-chess/ui/qml/images/Chess_plt45.svg b/ui/qml/images/Chess_plt45.svg → ...isdom-chess/ui/qml/images/Chess_plt45.svg
diff --git a/ui/qml/images/Chess_qdt45.svg → ...isdom-chess/ui/qml/images/Chess_qdt45.svg b/ui/qml/images/Chess_qdt45.svg → ...isdom-chess/ui/qml/images/Chess_qdt45.svg
diff --git a/ui/qml/images/Chess_qlt45.svg → ...isdom-chess/ui/qml/images/Chess_qlt45.svg b/ui/qml/images/Chess_qlt45.svg → ...isdom-chess/ui/qml/images/Chess_qlt45.svg
diff --git a/ui/qml/images/Chess_rdt45.png → ...isdom-chess/ui/qml/images/Chess_rdt45.png b/ui/qml/images/Chess_rdt45.png → ...isdom-chess/ui/qml/images/Chess_rdt45.png
diff --git a/ui/qml/images/Chess_rdt45.svg → ...isdom-chess/ui/qml/images/Chess_rdt45.svg b/ui/qml/images/Chess_rdt45.svg → ...isdom-chess/ui/qml/images/Chess_rdt45.svg
diff --git a/ui/qml/images/Chess_rlt16.png → ...isdom-chess/ui/qml/images/Chess_rlt16.png b/ui/qml/images/Chess_rlt16.png → ...isdom-chess/ui/qml/images/Chess_rlt16.png
diff --git a/ui/qml/images/Chess_rlt256.png → ...sdom-chess/ui/qml/images/Chess_rlt256.png b/ui/qml/images/Chess_rlt256.png → ...sdom-chess/ui/qml/images/Chess_rlt256.png
diff --git a/ui/qml/images/Chess_rlt32.png → ...isdom-chess/ui/qml/images/Chess_rlt32.png b/ui/qml/images/Chess_rlt32.png → ...isdom-chess/ui/qml/images/Chess_rlt32.png
diff --git a/ui/qml/images/Chess_rlt45.svg → ...isdom-chess/ui/qml/images/Chess_rlt45.svg b/ui/qml/images/Chess_rlt45.svg → ...isdom-chess/ui/qml/images/Chess_rlt45.svg
diff --git a/ui/qml/images/README.md → src/wisdom-chess/ui/qml/images/README.md b/ui/qml/images/README.md → src/wisdom-chess/ui/qml/images/README.md
diff --git a/ui/qml/images/boxicons-LICENSE.txt → ...-chess/ui/qml/images/boxicons-LICENSE.txt b/ui/qml/images/boxicons-LICENSE.txt → ...-chess/ui/qml/images/boxicons-LICENSE.txt
diff --git a/ui/qml/images/bx-dots-vertical-rounded.svg → ...i/qml/images/bx-dots-vertical-rounded.svg b/ui/qml/images/bx-dots-vertical-rounded.svg → ...i/qml/images/bx-dots-vertical-rounded.svg
diff --git a/ui/qml/images/bx-dots-vertical.svg → ...-chess/ui/qml/images/bx-dots-vertical.svg b/ui/qml/images/bx-dots-vertical.svg → ...-chess/ui/qml/images/bx-dots-vertical.svg
diff --git a/ui/qml/images/bx-heart-circle-colored.svg → ...ui/qml/images/bx-heart-circle-colored.svg b/ui/qml/images/bx-heart-circle-colored.svg → ...ui/qml/images/bx-heart-circle-colored.svg
diff --git a/ui/qml/images/bx-heart-circle.svg → ...m-chess/ui/qml/images/bx-heart-circle.svg b/ui/qml/images/bx-heart-circle.svg → ...m-chess/ui/qml/images/bx-heart-circle.svg
diff --git a/ui/qml/images/bx-icon-menu-white.png → ...hess/ui/qml/images/bx-icon-menu-white.png b/ui/qml/images/bx-icon-menu-white.png → ...hess/ui/qml/images/bx-icon-menu-white.png
diff --git a/ui/qml/images/bx-icon-menu-white.svg → ...hess/ui/qml/images/bx-icon-menu-white.svg b/ui/qml/images/bx-icon-menu-white.svg → ...hess/ui/qml/images/bx-icon-menu-white.svg
diff --git a/ui/qml/images/bx-icon-menu.svg → ...sdom-chess/ui/qml/images/bx-icon-menu.svg b/ui/qml/images/bx-icon-menu.svg → ...sdom-chess/ui/qml/images/bx-icon-menu.svg
diff --git a/ui/qml/images/bx-list-ul.svg → ...wisdom-chess/ui/qml/images/bx-list-ul.svg b/ui/qml/images/bx-list-ul.svg → ...wisdom-chess/ui/qml/images/bx-list-ul.svg
diff --git a/ui/qml/images/bxs-down-arrow.svg → ...om-chess/ui/qml/images/bxs-down-arrow.svg b/ui/qml/images/bxs-down-arrow.svg → ...om-chess/ui/qml/images/bxs-down-arrow.svg
diff --git a/ui/qml/images/chess-icons.rc → ...wisdom-chess/ui/qml/images/chess-icons.rc b/ui/qml/images/chess-icons.rc → ...wisdom-chess/ui/qml/images/chess-icons.rc
diff --git a/ui/qml/images/windows-wisdom-chess.png → ...ss/ui/qml/images/windows-wisdom-chess.png b/ui/qml/images/windows-wisdom-chess.png → ...ss/ui/qml/images/windows-wisdom-chess.png
diff --git a/ui/qml/images/wisdom-chess-android.png → ...ss/ui/qml/images/wisdom-chess-android.png b/ui/qml/images/wisdom-chess-android.png → ...ss/ui/qml/images/wisdom-chess-android.png
diff --git a/ui/qml/images/wisdom-chess-animate.gif → ...ss/ui/qml/images/wisdom-chess-animate.gif b/ui/qml/images/wisdom-chess-animate.gif → ...ss/ui/qml/images/wisdom-chess-animate.gif
diff --git a/ui/qml/images/wisdom-chess.icns → ...dom-chess/ui/qml/images/wisdom-chess.icns b/ui/qml/images/wisdom-chess.icns → ...dom-chess/ui/qml/images/wisdom-chess.icns
diff --git a/ui/qml/main/Board.qml → src/wisdom-chess/ui/qml/main/Board.qml b/ui/qml/main/Board.qml → src/wisdom-chess/ui/qml/main/Board.qml
diff --git a/ui/qml/main/BoardDimensions.qml → ...dom-chess/ui/qml/main/BoardDimensions.qml b/ui/qml/main/BoardDimensions.qml → ...dom-chess/ui/qml/main/BoardDimensions.qml
diff --git a/ui/qml/main/ChessSquare.qml → src/wisdom-chess/ui/qml/main/ChessSquare.qml b/ui/qml/main/ChessSquare.qml → src/wisdom-chess/ui/qml/main/ChessSquare.qml
diff --git a/ui/qml/main/DesktopRoot.qml → src/wisdom-chess/ui/qml/main/DesktopRoot.qml b/ui/qml/main/DesktopRoot.qml → src/wisdom-chess/ui/qml/main/DesktopRoot.qml
diff --git a/ui/qml/main/ImageToolButton.qml → ...dom-chess/ui/qml/main/ImageToolButton.qml b/ui/qml/main/ImageToolButton.qml → ...dom-chess/ui/qml/main/ImageToolButton.qml
diff --git a/ui/qml/main/MobileRoot.qml → src/wisdom-chess/ui/qml/main/MobileRoot.qml b/ui/qml/main/MobileRoot.qml → src/wisdom-chess/ui/qml/main/MobileRoot.qml
diff --git a/ui/qml/main/Piece.qml → src/wisdom-chess/ui/qml/main/Piece.qml b/ui/qml/main/Piece.qml → src/wisdom-chess/ui/qml/main/Piece.qml
diff --git a/ui/qml/main/StatusBar.qml → src/wisdom-chess/ui/qml/main/StatusBar.qml b/ui/qml/main/StatusBar.qml → src/wisdom-chess/ui/qml/main/StatusBar.qml
diff --git a/ui/qml/main/chess_engine.cpp → ...wisdom-chess/ui/qml/main/chess_engine.cpp b/ui/qml/main/chess_engine.cpp → ...wisdom-chess/ui/qml/main/chess_engine.cpp
@@ -5,7 +5,7 @@
 #include "wisdom-chess/engine/evaluate.hpp"
 #include "wisdom-chess/engine/logger.hpp"
 
-#include "wisdom-chess/qml/chess_engine.hpp"
+#include "wisdom-chess/ui/qml/main/chess_engine.hpp"
 
 using namespace wisdom;
 using gsl::not_null;