diff --git a/lib/Catch2/.bazelrc b/lib/Catch2/.bazelrc
deleted file mode 100644
index c01cb39..0000000
--- a/lib/Catch2/.bazelrc
+++ /dev/null
@@ -1,10 +0,0 @@
-build --enable_platform_specific_config
-
-build:gcc9 --cxxopt=-std=c++2a
-build:gcc11 --cxxopt=-std=c++2a
-build:clang13 --cxxopt=-std=c++17
-build:vs2019 --cxxopt=/std:c++17
-build:vs2022 --cxxopt=/std:c++17
-
-build:windows --config=vs2022
-build:linux --config=gcc11
diff --git a/lib/Catch2/.clang-format b/lib/Catch2/.clang-format
deleted file mode 100644
index f67a586..0000000
--- a/lib/Catch2/.clang-format
+++ /dev/null
@@ -1,44 +0,0 @@
----
-Language: Cpp
-Standard: c++14
-
-# Note that we cannot use IncludeIsMainRegex functionality, because it
-# does not support includes in angle brackets (<>)
-SortIncludes: True
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex: '<catch2/.*\.hpp>'
-    Priority: 1
-  - Regex: '<.*/.*\.hpp>'
-    Priority: 2
-  - Regex: '<.*>'
-    Priority: 3
-
-
-AllowShortBlocksOnASingleLine: Always
-AllowShortEnumsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: WithoutElse
-AllowShortLambdasOnASingleLine: Inline
-
-AccessModifierOffset: '-4'
-AlignEscapedNewlines: Left
-AllowAllConstructorInitializersOnNextLine: 'true'
-BinPackArguments: 'false'
-BinPackParameters: 'false'
-BreakConstructorInitializers: AfterColon
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
-DerivePointerAlignment: 'false'
-FixNamespaceComments: 'true'
-IndentCaseLabels: 'false'
-IndentPPDirectives: AfterHash
-IndentWidth: '4'
-NamespaceIndentation: All
-PointerAlignment: Left
-SpaceBeforeCtorInitializerColon: 'false'
-SpaceInEmptyParentheses: 'false'
-SpacesInParentheses: 'true'
-TabWidth: '4'
-UseTab: Never
-
-...
diff --git a/lib/Catch2/.conan/build.py b/lib/Catch2/.conan/build.py
deleted file mode 100644
index e163d5f..0000000
--- a/lib/Catch2/.conan/build.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import re
-from cpt.packager import ConanMultiPackager
-from cpt.ci_manager import CIManager
-from cpt.printer import Printer
-
-
-class BuilderSettings(object):
-    @property
-    def username(self):
-        """ Set catchorg as package's owner
-        """
-        return os.getenv("CONAN_USERNAME", "catchorg")
-
-    @property
-    def login_username(self):
-        """ Set Bintray login username
-        """
-        return os.getenv("CONAN_LOGIN_USERNAME", "horenmar")
-
-    @property
-    def upload(self):
-        """ Set Catch2 repository to be used on upload.
-            The upload server address could be customized by env var
-            CONAN_UPLOAD. If not defined, the method will check the branch name.
-            Only devel or CONAN_STABLE_BRANCH_PATTERN will be accepted.
-            The devel branch will be pushed to testing channel, because it does
-            not match the stable pattern. Otherwise it will upload to stable
-            channel.
-        """
-        return os.getenv("CONAN_UPLOAD", "https://api.bintray.com/conan/catchorg/catch2")
-
-    @property
-    def upload_only_when_stable(self):
-        """ Force to upload when running over tag branch
-        """
-        return os.getenv("CONAN_UPLOAD_ONLY_WHEN_STABLE", "True").lower() in ["true", "1", "yes"]
-
-    @property
-    def stable_branch_pattern(self):
-        """ Only upload the package the branch name is like a tag
-        """
-        return os.getenv("CONAN_STABLE_BRANCH_PATTERN", r"v\d+\.\d+\.\d+")
-
-    @property
-    def reference(self):
-        """ Read project version from branch create Conan reference
-        """
-        return os.getenv("CONAN_REFERENCE", "catch2/{}".format(self._version))
-
-    @property
-    def channel(self):
-        """ Default Conan package channel when not stable
-        """
-        return os.getenv("CONAN_CHANNEL", "testing")
-
-    @property
-    def _version(self):
-        """ Get version name from cmake file
-        """
-        pattern = re.compile(r"project\(Catch2 LANGUAGES CXX VERSION (\d+\.\d+\.\d+)\)")
-        version = "latest"
-        with open("CMakeLists.txt") as file:
-            for line in file:
-                result = pattern.search(line)
-                if result:
-                    version = result.group(1)
-        return version
-
-    @property
-    def _branch(self):
-        """ Get branch name from CI manager
-        """
-        printer = Printer(None)
-        ci_manager = CIManager(printer)
-        return ci_manager.get_branch()
-
-
-if __name__ == "__main__":
-    settings = BuilderSettings()
-    builder = ConanMultiPackager(
-        reference=settings.reference,
-        channel=settings.channel,
-        upload=settings.upload,
-        upload_only_when_stable=False,
-        stable_branch_pattern=settings.stable_branch_pattern,
-        login_username=settings.login_username,
-        username=settings.username,
-        test_folder=os.path.join(".conan", "test_package"))
-    builder.add()
-    builder.run()
diff --git a/lib/Catch2/.conan/test_package/CMakeLists.txt b/lib/Catch2/.conan/test_package/CMakeLists.txt
deleted file mode 100644
index 6ee069c..0000000
--- a/lib/Catch2/.conan/test_package/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 3.2.0)
-project(test_package CXX)
-
-include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
-conan_basic_setup()
-
-find_package(Catch2 REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} test_package.cpp)
-
-target_link_libraries(${PROJECT_NAME} Catch2::Catch2WithMain)
-set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)
diff --git a/lib/Catch2/.conan/test_package/conanfile.py b/lib/Catch2/.conan/test_package/conanfile.py
deleted file mode 100644
index 069ace6..0000000
--- a/lib/Catch2/.conan/test_package/conanfile.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from conans import ConanFile, CMake
-import os
-
-
-class TestPackageConan(ConanFile):
-    settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake_find_package_multi", "cmake"
-
-    def build(self):
-        cmake = CMake(self)
-        cmake.configure()
-        cmake.build()
-
-    def test(self):
-        assert os.path.isfile(os.path.join(
-            self.deps_cpp_info["catch2"].rootpath, "licenses", "LICENSE.txt"))
-        bin_path = os.path.join("bin", "test_package")
-        self.run("%s -s" % bin_path, run_environment=True)
diff --git a/lib/Catch2/.conan/test_package/test_package.cpp b/lib/Catch2/.conan/test_package/test_package.cpp
deleted file mode 100644
index 3c08090..0000000
--- a/lib/Catch2/.conan/test_package/test_package.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <catch2/catch_test_macros.hpp>
-
-int Factorial( int number ) {
-    return number <= 1 ? 1 : Factorial( number - 1 ) * number;
-}
-
-TEST_CASE( "Factorial Tests", "[single-file]" ) {
-    REQUIRE( Factorial(0) == 1 );
-    REQUIRE( Factorial(1) == 1 );
-    REQUIRE( Factorial(2) == 2 );
-    REQUIRE( Factorial(3) == 6 );
-    REQUIRE( Factorial(10) == 3628800 );
-}
\ No newline at end of file
diff --git a/lib/Catch2/.gitattributes b/lib/Catch2/.gitattributes
deleted file mode 100644
index 23f98ff..0000000
--- a/lib/Catch2/.gitattributes
+++ /dev/null
@@ -1,22 +0,0 @@
-# This sets the default behaviour, overriding core.autocrlf
-* text=auto
-
-# All source files should have unix line-endings in the repository,
-# but convert to native line-endings on checkout
-*.cpp text
-*.h text
-*.hpp text
-
-# Windows specific files should retain windows line-endings
-*.sln text eol=crlf
-
-# Keep executable scripts with LFs so they can be run after being
-# checked out on Windows
-*.py text eol=lf
-
-
-# Keep the single include header with LFs to make sure it is uploaded,
-# hashed etc with LF
-single_include/**/*.hpp eol=lf
-# Also keep the LICENCE file with LFs for the same reason
-LICENCE.txt eol=lf
diff --git a/lib/Catch2/.github/FUNDING.yml b/lib/Catch2/.github/FUNDING.yml
deleted file mode 100644
index 9122aa8..0000000
--- a/lib/Catch2/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-github: "horenmar"
-custom: "https://www.paypal.me/horenmar"
diff --git a/lib/Catch2/.github/ISSUE_TEMPLATE/bug_report.md b/lib/Catch2/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dbeff11..0000000
--- a/lib/Catch2/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Bug report
-about: Create an issue that documents a bug
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Reproduction steps**
-Steps to reproduce the bug.
-<!-- Usually this means a small and self-contained piece of code that uses Catch and specifying compiler flags if relevant. -->
-
-
-**Platform information:**
-<!-- Fill in any extra information that might be important for your issue. -->
- - OS: **Windows NT**
- - Compiler+version: **GCC v2.9.5**
- - Catch version: **v1.2.3**
-
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/lib/Catch2/.github/ISSUE_TEMPLATE/feature_request.md b/lib/Catch2/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index be9b9ee..0000000
--- a/lib/Catch2/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Create an issue that requests a feature or other improvement
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Description**
-Describe the feature/change you request and why do you want it.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/lib/Catch2/.github/pull_request_template.md b/lib/Catch2/.github/pull_request_template.md
deleted file mode 100644
index ea2b7bb..0000000
--- a/lib/Catch2/.github/pull_request_template.md
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-Please do not submit pull requests changing the `version.hpp`
-or the single-include `catch.hpp` file, these are changed
-only when a new release is made.
-
-Before submitting a PR you should probably read the contributor documentation
-at docs/contributing.md. It will tell you how to properly test your changes.
--->
-
-
-## Description
-<!--
-Describe the what and the why of your pull request. Remember that these two
-are usually a bit different. As an example, if you have made various changes
-to decrease the number of new strings allocated, that's what. The why probably
-was that you have a large set of tests and found that this speeds them up.
--->
-
-## GitHub Issues
-<!-- 
-If this PR was motivated by some existing issues, reference them here.
-
-If it is a simple bug-fix, please also add a line like 'Closes #123'
-to your commit message, so that it is automatically closed.
-If it is not, don't, as it might take several iterations for a feature
-to be done properly. If in doubt, leave it open and reference it in the
-PR itself, so that maintainers can decide.
--->
diff --git a/lib/Catch2/.github/workflows/linux-bazel-builds.yml b/lib/Catch2/.github/workflows/linux-bazel-builds.yml
deleted file mode 100644
index 9006652..0000000
--- a/lib/Catch2/.github/workflows/linux-bazel-builds.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Bazel build
-
-on: [push, pull_request]
-
-jobs:
-  build_and_test_ubuntu:
-    name: Linux Ubuntu 22.04 Bazel build <GCC 11.2.0>
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compilation_mode: [fastbuild, dbg, opt]
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Mount bazel cache
-      uses: actions/cache@v3
-      with:
-        path: "/home/runner/.cache/bazel"
-        key: bazel-ubuntu22-gcc11
-
-    - name: Build Catch2
-      run: |
-        bazelisk build --compilation_mode=${{matrix.compilation_mode}} //...
diff --git a/lib/Catch2/.github/workflows/linux-meson-builds.yml b/lib/Catch2/.github/workflows/linux-meson-builds.yml
deleted file mode 100644
index dec701b..0000000
--- a/lib/Catch2/.github/workflows/linux-meson-builds.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Linux builds (meson)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: meson ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        cxx:
-          - g++-11
-          - clang++-11
-        build_type: [debug, release]
-        std: [14, 17]
-        include:
-          - cxx: clang++-11
-            other_pkgs: clang-11
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Prepare environment
-      run: sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
-
-    - name: Configure build
-      env:
-        CXX: ${{matrix.cxx}}
-        CXXFLAGS: -std=c++${{matrix.std}} ${{matrix.cxxflags}}
-      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
-      #       This is important
-      run: |
-        meson -Dbuildtype=${{matrix.build_type}} ${{runner.workspace}}/meson-build
-
-    - name: Build tests + lib
-      working-directory: ${{runner.workspace}}/meson-build
-      run: ninja
-
-    - name: Run tests
-      working-directory: ${{runner.workspace}}/meson-build
-      # Hardcode 2 cores we know are there
-      run: |
-        meson test --verbose
diff --git a/lib/Catch2/.github/workflows/linux-other-builds.yml b/lib/Catch2/.github/workflows/linux-other-builds.yml
deleted file mode 100644
index cf4e2c0..0000000
--- a/lib/Catch2/.github/workflows/linux-other-builds.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-# The builds in this file are more complex (e.g. they need custom CMake
-# configuration) and thus are unsuitable to the simple build matrix
-# approach used in simple-builds
-name: Linux builds (complex)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: ${{matrix.build_description}}, ${{matrix.cxx}}, C++${{matrix.std}} ${{matrix.build_type}}
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        # We add builds one by one in this case, because there are no
-        # dimensions that are shared across the builds
-        include:
-
-          # Single surrogate header build
-          - cxx: clang++-10
-            build_description: Surrogates build
-            build_type: Debug
-            std: 14
-            other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_SURROGATES=ON
-
-          # Extras and examples with gcc-7
-          - cxx: g++-7
-            build_description: Extras + Examples
-            build_type: Debug
-            std: 14
-            other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
-          - cxx: g++-7
-            build_description: Extras + Examples
-            build_type: Release
-            std: 14
-            other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
-
-          # Extras and examples with Clang-10
-          - cxx: clang++-10
-            build_description: Extras + Examples
-            build_type: Debug
-            std: 17
-            other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
-          - cxx: clang++-10
-            build_description: Extras + Examples
-            build_type: Release
-            std: 17
-            other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
-
-          # Configure tests with Clang-10
-          - cxx: clang++-10
-            build_description: CMake configuration tests
-            build_type: Debug
-            std: 14
-            other_pkgs: clang-10
-            cmake_configurations: -DCATCH_ENABLE_CONFIGURE_TESTS=ON
-
-          # Valgrind test Clang-10
-          - cxx: clang++-10
-            build_description: Valgrind tests
-            build_type: Debug
-            std: 14
-            other_pkgs: clang-10 valgrind
-            cmake_configurations: -DMEMORYCHECK_COMMAND=`which valgrind` -DMEMORYCHECK_COMMAND_OPTIONS="-q --track-origins=yes --leak-check=full --num-callers=50 --show-leak-kinds=definite --error-exitcode=1"
-            other_ctest_args: -T memcheck -LE uses-python
-
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Prepare environment
-      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
-
-    - name: Configure build
-      working-directory: ${{runner.workspace}}
-      env:
-        CXX: ${{matrix.cxx}}
-        CXXFLAGS: ${{matrix.cxxflags}}
-      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
-      #       This is important
-      run: |
-        cmake -Bbuild -H$GITHUB_WORKSPACE \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-              -DCMAKE_CXX_EXTENSIONS=OFF \
-              -DCATCH_DEVELOPMENT_BUILD=ON \
-              ${{matrix.cmake_configurations}} \
-              -G Ninja
-
-    - name: Build tests + lib
-      working-directory: ${{runner.workspace}}/build
-      run: ninja
-
-    - name: Run tests
-      env:
-          CTEST_OUTPUT_ON_FAILURE: 1
-      working-directory: ${{runner.workspace}}/build
-      # Hardcode 2 cores we know are there
-      run: ctest -C ${{matrix.build_type}} -j 2 ${{matrix.other_ctest_args}}
diff --git a/lib/Catch2/.github/workflows/linux-simple-builds.yml b/lib/Catch2/.github/workflows/linux-simple-builds.yml
deleted file mode 100644
index 72e3bd9..0000000
--- a/lib/Catch2/.github/workflows/linux-simple-builds.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-name: Linux builds (basic)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        cxx:
-          - g++-5
-          - g++-6
-          - g++-7
-          - g++-8
-          - g++-9
-          - g++-10
-          - clang++-6.0
-          - clang++-7
-          - clang++-8
-          - clang++-9
-          - clang++-10
-        build_type: [Debug, Release]
-        std: [14]
-        include:
-          - cxx: g++-5
-            other_pkgs: g++-5
-          - cxx: g++-6
-            other_pkgs: g++-6
-          - cxx: g++-7
-            other_pkgs: g++-7
-          - cxx: g++-8
-            other_pkgs: g++-8
-          - cxx: g++-9
-            other_pkgs: g++-9
-          - cxx: g++-10
-            other_pkgs: g++-10
-          - cxx: clang++-6.0
-            other_pkgs: clang-6.0
-          - cxx: clang++-7
-            other_pkgs: clang-7
-          - cxx: clang++-8
-            other_pkgs: clang-8
-          - cxx: clang++-9
-            other_pkgs: clang-9
-          - cxx: clang++-10
-            other_pkgs: clang-10
-          # Clang 6 + C++17
-          # does not work with the default libstdc++ version thanks
-          # to a disagreement on variant implementation.
-          # - cxx: clang++-6.0
-          #   build_type: Debug
-          #   std: 17
-          #   other_pkgs: clang-6.0
-          # - cxx: clang++-6.0
-          #   build_type: Release
-          #   std: 17
-          #   other_pkgs: clang-6.0
-          # Clang 10 + C++17
-          - cxx: clang++-10
-            build_type: Debug
-            std: 17
-            other_pkgs: clang-10
-          - cxx: clang++-10
-            build_type: Release
-            std: 17
-            other_pkgs: clang-10
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Add repositories for older GCC
-      run: |
-        sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main'
-        sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic universe'
-      if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}
-
-    - name: Prepare environment
-      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
-
-    - name: Configure build
-      working-directory: ${{runner.workspace}}
-      env:
-        CXX: ${{matrix.cxx}}
-        CXXFLAGS: ${{matrix.cxxflags}}
-      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
-      #       This is important
-      run: |
-        cmake -Bbuild -H$GITHUB_WORKSPACE \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-              -DCMAKE_CXX_EXTENSIONS=OFF \
-              -DCATCH_DEVELOPMENT_BUILD=ON \
-              -G Ninja
-
-    - name: Build tests + lib
-      working-directory: ${{runner.workspace}}/build
-      run: ninja
-
-    - name: Run tests
-      env:
-          CTEST_OUTPUT_ON_FAILURE: 1
-      working-directory: ${{runner.workspace}}/build
-      # Hardcode 2 cores we know are there
-      run: ctest -C ${{matrix.build_type}} -j 2
diff --git a/lib/Catch2/.github/workflows/mac-builds.yml b/lib/Catch2/.github/workflows/mac-builds.yml
deleted file mode 100644
index 955b81f..0000000
--- a/lib/Catch2/.github/workflows/mac-builds.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Mac builds
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    # macos-12 updated to a toolchain that crashes when linking the
-    # test binary. This seems to be a known bug in that version,
-    # and will eventually get fixed in an update. After that, we can go
-    # back to newer macos images.
-    runs-on: macos-11
-    strategy:
-      matrix:
-        cxx:
-          - g++-11
-          - clang++
-        build_type: [Debug, Release]
-        std: [14, 17]
-        include:
-          - build_type: Debug
-            examples: ON
-            extra_tests: ON
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Configure build
-      working-directory: ${{runner.workspace}}
-      env:
-        CXX: ${{matrix.cxx}}
-        CXXFLAGS: ${{matrix.cxxflags}}
-      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
-      #       This is important
-      run: |
-        cmake -Bbuild -H$GITHUB_WORKSPACE \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-              -DCATCH_DEVELOPMENT_BUILD=ON \
-              -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \
-              -DCATCH_BUILD_EXTRA_TESTS=${{matrix.examples}}
-
-    - name: Build tests + lib
-      working-directory: ${{runner.workspace}}/build
-      run: make -j 2
-
-    - name: Run tests
-      env:
-          CTEST_OUTPUT_ON_FAILURE: 1
-      working-directory: ${{runner.workspace}}/build
-      # Hardcode 2 cores we know are there
-      run: ctest -C ${{matrix.build_type}} -j 2
diff --git a/lib/Catch2/.github/workflows/validate-header-guards.yml b/lib/Catch2/.github/workflows/validate-header-guards.yml
deleted file mode 100644
index c02b5d4..0000000
--- a/lib/Catch2/.github/workflows/validate-header-guards.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Check header guards
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    # Set the type of machine to run on
-    runs-on: ubuntu-20.04
-    steps:
-
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      - name: Setup Dependencies
-        uses: actions/setup-python@v2
-        with:
-            python-version: '3.7'
-      - name: Install checkguard
-        run: pip install guardonce
-
-      - name: Check that include guards are properly named
-        run: |
-          wrong_files=$(checkguard -r src/catch2/ -p "name | append _INCLUDED | upper")
-          if [[ $wrong_files ]]; then
-            echo "Files with wrong header guard:"
-            echo $wrong_files
-            exit 1
-          fi
-
-      - name: Check that there are no duplicated filenames
-        run: |
-          ./tools/scripts/checkDuplicateFilenames.py
-
-      - name: Check that all source files have the correct license header
-        run: |
-          ./tools/scripts/checkLicense.py
diff --git a/scripts/release b/scripts/release
index cbb494b..4e66080 100755
--- a/scripts/release
+++ b/scripts/release
@@ -22,11 +22,11 @@ fi
 sudo rm -rf bin/
 docker run -it --rm -v "$(pwd):/musique" -w /musique "$Image" make os=linux CC=gcc-11 CXX=g++-11 >/dev/null
 
-cp bin/musique "$Target"/
+cp bin/musique "$Target"/musique-x86_64-linux
 
 sudo rm -rf bin/
 make os=windows >/dev/null
-cp bin/musique.exe "$Target"/
+cp bin/musique.exe "$Target"/musique-x86_64-windows
 
 cp LICENSE "$Target"/LICENSE
 cp CHANGELOG.md "$Target/CHANGELOG.md"