diff --git a/.github/workflows/crypto3-testing-linux.yml b/.github/workflows/crypto3-testing-linux.yml
new file mode 100644
index 000000000..acd1f0100
--- /dev/null
+++ b/.github/workflows/crypto3-testing-linux.yml
@@ -0,0 +1,210 @@
+name: Crypto3 Build and Test on Linux Platforms
+
+on:
+  workflow_call:
+    inputs:
+      concurrency:
+        type: number
+        description: "Concurrency level (0 to use number of virtual cores)"
+        required: false
+        default: 0
+      targets:
+        type: string
+        description: "Make and CTest targets. If not specified, everything is tested"
+        required: false
+      test-paths:
+        type: string
+        description: "Folders from which the test must be run"
+        required: true
+      boost-version:
+        type: string
+        description: "Version of Boost to install"
+        required: false
+        default: "1.81.0"
+env:
+  TESTS_ARTIFACT_NAME: "test-results"
+  EVENT_FILE_ARTIFACT_NAME: "event-file"
+
+jobs:
+  upload-event-file:
+    # Needed to link test results with PR workflow run
+    name: "Upload Event File"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.EVENT_FILE_ARTIFACT_NAME }}
+          path: ${{ github.event_path }}
+
+  build-and-test:
+    name: "Build and Test using Matrix"
+    runs-on: [self-hosted, Linux, X64, aws_autoscaling]
+
+    env:
+      CONTAINER_TMP: /opt/
+      HOST_TMP: /home/runner/work/_temp/
+      DEBIAN_FRONTEND: noninteractive
+
+    container:
+      image: ubuntu:22.04
+      volumes:
+        - /home/runner/work/_temp/:/opt/
+
+    strategy:
+      # Set up a matrix to run the following 2 configurations:
+      # 1. <Linux, Release, latest G++ compiler toolchain on the default runner image, default generator>
+      # 2. <Linux, Release, latest Clang++ compiler toolchain on the default runner image, default generator>
+      matrix:
+        cpp_compiler: [g++, clang++-12]
+        build_type: [Release]
+
+    steps:
+      - name: Install dependencies
+        run: |
+          env && \
+          apt update && \
+          apt install -y \
+            build-essential \
+            libssl-dev \
+            cmake \
+            clang-12 \
+            git \
+            libicu-dev \
+            curl \
+            pkg-config \
+            libc-ares-dev \
+            liblz4-dev \
+            libgnutls28-dev \
+            libprotobuf-dev \
+            libyaml-cpp-dev \
+            lksctp-tools \
+            libsctp-dev \
+            ragel \
+            spd \
+            lsb-release
+
+      - name: Print toolchain information
+        run: |
+          git --version
+          cc --version
+          cmake --version
+
+      - name: Get OS version
+        # Turn input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+        id: os_version
+        shell: bash
+        run: |
+          # Get platform version
+          platform_version=$(lsb_release -rs)
+          echo "platform-version=${platform_version}" >> $GITHUB_OUTPUT
+
+      - name: Install boost
+        uses: MarkusJx/install-boost@v2.4.1
+        id: install-boost
+        with:
+          # A list of supported versions can be found here:
+          # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
+          boost_version: ${{ inputs.boost-version }}
+          platform_version: ${{ steps.os_version.outputs.platform-version }}
+          boost_install_dir: ${{ env.CONTAINER_TMP }}
+          toolset: gcc
+          arch: x86
+
+      - name: Checkout Crypto3 repository
+        # We need full history, because during CMake config stage we are finding the nearest tag
+        uses: actions/checkout@v4
+        with:
+          repository: NilFoundation/crypto3
+          fetch-depth: 1 # Fetch only the latest commit on the triggered branch/ref
+          submodules: false
+
+      # Workaround: https://github.com/actions/checkout/issues/1169
+      - name: Mark directory as safe
+        run: |
+          git config --system --add safe.directory $PWD
+
+      - name: Checkout submodules
+        run: |
+          git submodule update --init --recursive --depth=1
+
+      - name: Set usefull strings
+        # Turn input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+        id: strings
+        shell: bash
+        run: |
+          docker_workspace_path="$PWD"
+          echo "docker-workspace-path=$docker_workspace_path" >> "$GITHUB_OUTPUT"
+
+          if [ "${{ inputs.concurrency }}" = "0" ]; then
+            echo "Setting concurrency to number of logical cores"
+            proc_number=$(nproc)
+          else
+            echo "Setting concurrency to user-defined value"
+            proc_number=${{ inputs.concurrency }}
+          fi
+
+          echo "proc-number=${proc_number}" >> $GITHUB_OUTPUT
+
+      - name: Clean index.lock files if checkout step was cancelled or failed
+        if: cancelled() || failure()
+        run: |
+          find .git -name 'index.lock' -exec rm -v {} \;
+
+      - name: Configure CMake
+        run: >
+          cmake -B build
+          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          -DBUILD_TESTS=TRUE
+          -DENABLE_JUNIT_TEST_OUTPUT=TRUE -S ${{ steps.strings.outputs.docker-workspace-path }}
+
+        env:
+          BOOST_ROOT: "${{ steps.install-boost.outputs.BOOST_ROOT }}"
+
+      - name: Build tests
+        id: build
+        working-directory: ${{ steps.strings.outputs.docker-workspace-path }}/build
+        run: |
+          # Not considering failed targets bad. We will handle them as junit test result
+          build_log_path=${{ steps.strings.outputs.docker-workspace-path }}/build/build.log
+          targets_str=$(echo "${{ inputs.targets }}" | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' ' ' | sed 's/ $//')
+          make -k -j ${{ steps.strings.outputs.proc-number }} ${targets_str} 2>&1 | tee ${build_log_path}
+          echo "build-log=$build_log_path" >> "$GITHUB_OUTPUT"
+
+      - name: Generate JUnit Report from build result
+        id: make-build-report
+        uses: NilFoundation/ci-cd/actions/build-log-to-junit@v1
+        with:
+          build-log: ${{ steps.build.outputs.build-log }}
+
+      - name: Run tests
+        id: run_tests
+        working-directory: ${{ steps.strings.outputs.docker-workspace-path }}/build
+        # Not considering failed tests bad. We will compare diff instead
+        run: |
+          artifact_dir=${{ steps.strings.outputs.docker-workspace-path }}/../results_for_uploading_${{github.sha}}
+          mkdir -p $artifact_dir
+          artifact_dir=$(cd ${{ steps.strings.outputs.docker-workspace-path }}/../results_for_uploading_${{github.sha}} && pwd)
+          echo "artifact-dir=$artifact_dir" >> "$GITHUB_OUTPUT"
+
+          custom_tests_dir=$artifact_dir/ubuntu-22.04/${{ matrix.cpp_compiler }}/${{ matrix.build_type }}
+          mkdir -p $custom_tests_dir
+
+          targets_str=$(echo "${{ inputs.targets }}" | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' '|' | sed 's/|$//')
+          ctest -v -j ${{ steps.strings.outputs.proc-number }} -R "(${targets_str})" || true
+
+          test_paths="${{ inputs.test-paths }}"
+          for dir in $(echo "${test_paths}" | awk 'NF {$1=$1; print}')
+          do
+            mkdir -p $custom_tests_dir/$dir
+            mv ${{ steps.strings.outputs.docker-workspace-path }}/build/$dir/junit_results/* $custom_tests_dir/$dir
+          done
+
+          mv ${{ steps.make-build-report.outputs.build-junit-report }} $custom_tests_dir
+          
+      - name: Upload tests JUnit results
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.TESTS_ARTIFACT_NAME }}
+          path: ${{ steps.run_tests.outputs.artifact-dir }}
diff --git a/.github/workflows/crypto3-testing-mac.yml b/.github/workflows/crypto3-testing-mac.yml
new file mode 100644
index 000000000..77bed62fc
--- /dev/null
+++ b/.github/workflows/crypto3-testing-mac.yml
@@ -0,0 +1,174 @@
+name: Crypto3 Build and Test on Mac
+
+on:
+  workflow_call:
+    inputs:
+      concurrency:
+        type: number
+        description: "Concurrency level (0 to use number of virtual cores)"
+        required: false
+        default: 0
+      targets:
+        type: string
+        description: "Make and CTest targets. If not specified, everything is tested"
+        required: false
+      test-paths:
+        type: string
+        description: "Folders from which the test must be run"
+        required: true
+      boost-version:
+        type: string
+        description: "Version of Boost to install"
+        required: false
+        default: '1.81.0' # The least version supported by both matrix.os
+env:
+  TESTS_ARTIFACT_NAME: 'test-results'
+  EVENT_FILE_ARTIFACT_NAME: 'event-file'
+
+jobs:
+  upload-event-file:
+    # Needed to link test results with PR workflow run
+    name: "Upload Event File"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.EVENT_FILE_ARTIFACT_NAME }}
+          path: ${{ github.event_path }}
+
+  build-and-test:
+    name: "Build and Test using Matrix"
+    runs-on: [macos-12]
+    strategy:
+      # Set up a matrix to run the following 2 configurations:
+      # 1. <MacOS, Release, latest G++ compiler toolchain on the default runner image, default generator>
+      # 2. <MacOS, Release, latest Clang++ compiler toolchain on the default runner image, default generator>
+      matrix:
+        cpp_compiler: [g++, clang++]
+        build_type: [Release]
+    steps:
+      - name: Install homebrew
+        run: >
+          /bin/bash -c "$(curl -fsSL
+            https://raw.githubusercontent.com/Homebrew/install/master/install.sh
+          )"
+
+      - name: Run brew install
+        id: brew-install
+        run: |
+          brew install \
+            cmake \
+            icu4c \
+            bash
+
+      - name: Print toolchain information
+        run: |
+          git --version
+          cc --version
+          cmake --version
+          bash --version
+          which -a bash
+          echo PATH: $PATH
+
+      - name: Checkout Crypto3 repository
+        uses: actions/checkout@v4
+        with:
+          repository: NilFoundation/crypto3
+          submodules: 'true' # Using true fetches only the top-level submodules
+          fetch-depth: 1 # Fetch only the latest commit on the triggered branch/ref
+
+      - name: Set usefull strings
+        # Turn input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+        id: strings
+        shell: bash
+        run: |
+          # Dependencies dir location
+          echo "dependencies-dir=${{ github.workspace }}/../dependencies" >> "$GITHUB_OUTPUT"
+
+          # Get platform version
+          platform_version=$(sw_vers -productVersion | awk -F '.' '{print $1}')
+          echo "platform-version=${platform_version}" >> $GITHUB_OUTPUT
+
+          if [ "${{ inputs.concurrency }}" = "0" ]; then
+            echo "Setting concurrency to number of logical cores"
+            proc_number=$(sysctl -n hw.logicalcpu)
+          else
+            echo "Setting concurrency to user-defined value"
+            proc_number=${{ inputs.concurrency }}
+          fi
+
+          echo "proc-number=${proc_number}" >> $GITHUB_OUTPUT
+
+      - name: Set up dependencies directory
+        run: |
+          mkdir -p "${{ steps.strings.outputs.dependencies-dir }}"
+
+      - name: Install boost
+        uses: MarkusJx/install-boost@v2.4.4
+        id: install-boost
+        with:
+          boost_version: ${{ inputs.boost-version }}
+          # A list of supported versions can be found here:
+          # https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
+          platform_version: ${{ steps.strings.outputs.platform-version }}
+          boost_install_dir: ${{ steps.strings.outputs.dependencies-dir }}
+
+      - name: Configure CMake
+        run: >
+          cmake -B build
+          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+          -DBUILD_TESTS=TRUE
+          -DENABLE_JUNIT_TEST_OUTPUT=TRUE
+          -S ${{ github.workspace }}
+
+        env:
+          BOOST_ROOT: "${{ steps.install-boost.outputs.BOOST_ROOT }}"
+
+      - name: Build tests
+        id: build
+        working-directory: ${{ github.workspace }}/build
+        run: |
+          # Not considering failed targets bad. We will handle them as junit test result
+          build_log_path=${{ github.workspace }}/build/build.log
+          targets_str=$(echo "${{ inputs.targets }}" | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' ' ' | sed 's/ $//')
+          make -k -j ${{ steps.strings.outputs.proc-number }} ${targets_str} 2>&1 | tee ${build_log_path}
+          echo "build-log=$build_log_path" >> "$GITHUB_OUTPUT"
+
+      - name: Generate JUnit Report from build result
+        id: make-build-report
+        uses: NilFoundation/ci-cd/actions/build-log-to-junit@v1
+        with:
+          build-log: ${{ github.workspace }}/build/build.log
+
+      - name: Run tests
+        id: run_tests
+        working-directory: ${{ github.workspace }}/build
+        # Not considering failed tests bad. We will compare diff instead
+        run: |
+          artifact_dir=${{ github.workspace }}/../results_for_uploading_${{github.sha}}
+          mkdir -p $artifact_dir
+          artifact_dir=$(cd ${{ github.workspace }}/../results_for_uploading_${{github.sha}} && pwd)
+          echo "artifact-dir=$artifact_dir" >> "$GITHUB_OUTPUT"
+
+          custom_tests_dir=$artifact_dir/macos-12/${{ matrix.cpp_compiler }}/${{ matrix.build_type }}
+          mkdir -p $custom_tests_dir
+
+          targets_str=$(echo "${{ inputs.targets }}" | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' '|' | sed 's/|$//')
+          ctest -v -j ${{ steps.strings.outputs.proc-number }} -R "(${targets_str})" || true
+
+          test_paths="${{ inputs.test-paths }}"
+          for dir in $(echo "${test_paths}" | awk 'NF {$1=$1; print}')
+          do
+            mkdir -p $custom_tests_dir/$dir
+            mv ${{ github.workspace }}/build/$dir/junit_results/* $custom_tests_dir/$dir
+          done
+
+          mv ${{ steps.make-build-report.outputs.build-junit-report }} $custom_tests_dir
+
+      - name: Upload tests JUnit results
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.TESTS_ARTIFACT_NAME }}
+          path: ${{ steps.run_tests.outputs.artifact-dir }}
diff --git a/.github/workflows/publish-results.yml b/.github/workflows/publish-results.yml
new file mode 100644
index 000000000..fe59679b1
--- /dev/null
+++ b/.github/workflows/publish-results.yml
@@ -0,0 +1,13 @@
+# Needed to publish test results in fork
+name: Testing Callback
+
+on:
+  workflow_run:
+    workflows: ["PR Testing"]
+    types:
+      - completed
+
+jobs:
+  call-reusable-workflow:
+    name: Call Reusable Testing Callback Workflow
+    uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-publish-result.yml@v1.2.0
diff --git a/.github/workflows/pull-request-action.yml b/.github/workflows/pull-request-action.yml
new file mode 100644
index 000000000..d48465ac1
--- /dev/null
+++ b/.github/workflows/pull-request-action.yml
@@ -0,0 +1,33 @@
+name: Testing for mac and linux
+
+on:
+  workflow_call:
+    inputs:
+      targets:
+        type: string
+        description: "Make and CTest targets. If not specified, everything is tested"
+        required: false
+      test-paths:
+        type: string
+        description: "Folders from which the test must be ran"
+        required: true
+jobs:
+  matrix-test-linux:
+    name: Linux Crypto3 Testing
+    uses: ./.github/workflows/crypto3-testing-linux.yml
+
+    secrets: inherit
+    with:
+      targets: ${{ inputs.targets }} 
+      test-paths: ${{ inputs.test-paths }} 
+
+  matrix-test-mac:
+    name: Mac Crypto3 Testing
+    uses: ./.github/workflows/crypto3-testing-mac.yml
+
+    secrets: inherit
+    with:
+      # TODO(martun): fix this sometime soon. All the targets must work on mac.
+      targets: crypto3_zk_math_expression_test # ${{ inputs.targets }} 
+      test-paths: libs/zk/test # ${{ inputs.test-paths }} 
+
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
new file mode 100644
index 000000000..b5352d984
--- /dev/null
+++ b/.github/workflows/pull-request.yml
@@ -0,0 +1,72 @@
+name: PR Testing
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  run-pull-request-actions:
+    name: Crypto3 Testing
+    uses: ./.github/workflows/pull-request-action.yml
+
+    secrets: inherit
+    with:
+      targets: |
+        crypto3_zk_commitment_fold_polynomial_test
+        crypto3_zk_commitment_fri_test
+        crypto3_zk_commitment_lpc_test
+        crypto3_zk_systems_plonk_placeholder_placeholder_test
+        crypto3_zk_commitment_powers_of_tau_test
+        crypto3_zk_commitment_proof_of_knowledge_test
+        crypto3_zk_commitment_r1cs_gg_ppzksnark_mpc_test
+        crypto3_zk_math_expression_test
+        crypto3_zk_systems_plonk_plonk_constraint_test
+        marshalling_fri_commitment_test
+        marshalling_lpc_commitment_test
+        marshalling_placeholder_common_data_test
+        marshalling_placeholder_proof_test
+        marshalling_sparse_vector_test
+        marshalling_plonk_constraint_system_test
+        marshalling_r1cs_gg_ppzksnark_primary_input_test
+        marshalling_r1cs_gg_ppzksnark_proof_test
+        marshalling_r1cs_gg_ppzksnark_verification_key_test
+        algebra_curves_test
+        algebra_fields_test
+        algebra_hash_to_curve_test
+        algebra_pairing_test
+        math_expression_test
+        math_lagrange_interpolation_test
+        math_polynomial_test
+        math_polynomial_dfs_test
+        math_polynomial_arithmetic_test
+        math_polynomial_view_test
+        hash_blake2b_test
+        hash_crc_test
+        hash_find_group_hash_test
+        hash_h2c_test
+        hash_h2f_test
+        hash_keccak_test
+        hash_md4_test
+        hash_md5_test
+        hash_pack_test
+        hash_pedersen_test
+        hash_ripemd_test
+        hash_sha1_test
+        hash_sha2_test
+        hash_sha3_test
+        hash_sha_test
+        hash_static_digest_test
+        hash_tiger_test
+        hash_poseidon_test
+        pubkey_ecdsa_test
+        pubkey_bls_test
+
+      test-paths: |
+        libs/zk/test
+        libs/algebra/test
+        libs/hash/test
+        libs/math/test
+        libs/marshalling/zk/test
+       
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
deleted file mode 100644
index bf8e0b9d1..000000000
--- a/.github/workflows/run_tests.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-name: Run tests
-
-on:
-  # Let's run it on any commit
-  [pull_request]
-  # Triggers the workflow on pull request events but only for the master branch
-  #pull_request:
-  #  branches: [ master ]
-
-  # Allows you to run this workflow manually from the Actions tab
-  #workflow_dispatch:
-
-env:
-  SUITE_REPO: "NilFoundation/crypto3"
-  CACHE_NAME: "checkout-job-cache"
-
-jobs:
-  checkout:
-    runs-on: [self-hosted, tests-runner]
-    steps:
-      - name: Cleanup # TODO - move to scripts on runner
-        run: |
-          rm -rf ./* || true
-          rm -rf ./.??* || true
-
-      - name: Checkout suite
-        uses: actions/checkout@v3
-        with:
-          repository: ${{ env.SUITE_REPO }}
-          
-          submodules: recursive
-
-      - name: Cmake and build
-        env:
-          CMAKE_ARGS: "
-            -DCMAKE_BUILD_TYPE=Debug
-            -DBUILD_SHARED_LIBS=FALSE
-            -DBUILD_TESTS=TRUE
-            -DZK_PLACEHOLDER_PROFILING=TRUE
-            "
-        run: |
-          mkdir build
-          cd build
-          cmake ${{ env.CMAKE_ARGS }} ..
-
-      - name: Archive build results
-        run: |
-          touch ${{ env.CACHE_NAME }}.tar.gz
-          tar -czf ${{ env.CACHE_NAME }}.tar.gz --exclude=${{ env.CACHE_NAME }}.tar.gz .
-
-      - name: Cache archived job output
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.CACHE_NAME }}
-          path: ${{ env.CACHE_NAME }}.tar.gz
-          retention-days: 1
-
-  run_tests:
-    runs-on: [self-hosted, tests-runner]
-    needs: [checkout]
-    strategy:
-      fail-fast: false
-      matrix:
-        include: 
-          - target: crypto3_zk_commitment_fold_polynomial_test
-            path: libs/zk/test
-          - target: crypto3_zk_commitment_fri_test
-            path: libs/zk/test
-          - target: crypto3_zk_commitment_lpc_test
-            path: libs/zk/test
-          - target: crypto3_zk_systems_plonk_placeholder_placeholder_test
-            path: libs/zk/test
-          - target: crypto3_zk_commitment_powers_of_tau_test
-            path: libs/zk/test
-          - target: crypto3_zk_commitment_proof_of_knowledge_test
-            path: libs/zk/test
-          - target: crypto3_zk_commitment_r1cs_gg_ppzksnark_mpc_test
-            path: libs/zk/test
-          - target:  crypto3_zk_math_expression_test
-            path: libs/zk/test
-          - target:  crypto3_zk_systems_plonk_plonk_constraint_test
-            path: libs/zk/test
-
-          - target: marshalling_fri_commitment_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_lpc_commitment_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_placeholder_common_data_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_placeholder_proof_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_sparse_vector_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_plonk_constraint_system_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_r1cs_gg_ppzksnark_primary_input_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_r1cs_gg_ppzksnark_proof_test
-            path: libs/marshalling/zk/test
-          - target: marshalling_r1cs_gg_ppzksnark_verification_key_test
-            path: libs/marshalling/zk/test
-
-          - target: algebra_curves_test
-            path: libs/algebra/test
-          - target: algebra_fields_test
-            path: libs/algebra/test
-          - target: algebra_hash_to_curve_test
-            path: libs/algebra/test
-          - target: algebra_pairing_test
-            path: libs/algebra/test
-
-          - target: math_expression_test
-            path: libs/math/test
-          - target: math_lagrange_interpolation_test
-            path: libs/math/test
-          - target: math_polynomial_test
-            path: libs/math/test
-          - target: math_polynomial_dfs_test
-            path: libs/math/test
-          - target: math_polynomial_arithmetic_test
-            path: libs/math/test
-          - target: math_polynomial_view_test
-            path: libs/math/test
-
-          - target: hash_blake2b_test
-            path: libs/hash/test
-          - target: hash_crc_test
-            path: libs/hash/test
-          - target: hash_find_group_hash_test
-            path: libs/hash/test
-          - target: hash_h2c_test
-            path: libs/hash/test
-          - target: hash_h2f_test
-            path: libs/hash/test
-          - target: hash_keccak_test
-            path: libs/hash/test
-          - target: hash_md4_test
-            path: libs/hash/test
-          - target: hash_md5_test
-            path: libs/hash/test
-          - target: hash_pack_test
-            path: libs/hash/test
-          - target: hash_pedersen_test
-            path: libs/hash/test
-          - target: hash_ripemd_test
-            path: libs/hash/test
-          - target: hash_sha1_test
-            path: libs/hash/test
-          - target: hash_sha2_test
-            path: libs/hash/test
-          - target: hash_sha3_test
-            path: libs/hash/test
-          - target: hash_sha_test
-            path: libs/hash/test
-          - target: hash_static_digest_test
-            path: libs/hash/test
-          - target: hash_tiger_test
-            path: libs/hash/test
-
-          # https://github.com/NilFoundation/crypto3-hash/issues/100
-          # - target: hash_reinforced_concrete_test
-          #  path: libs/hash/test
-
-    steps:
-      - name: Cleanup # TODO - move to scripts on runner
-        run: |
-          rm -rf ./* || true
-          rm -rf ./.??* || true
-
-      - name: Upload checkout job cache
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.CACHE_NAME }}
-
-      - name: Extract artifacts
-        run: |
-          tar -xf ${{ env.CACHE_NAME }}.tar.gz
-          rm ${{ env.CACHE_NAME }}.tar.gz
-
-      - name: Build
-        working-directory: ./build
-        run: cmake --build . -t ${{ matrix.target }}
-
-      - name: Run test
-        working-directory: ./build
-        run: |
-          cd ${{ matrix.path }}
-          COLOR='\033[0;33m'
-          echo -e "${COLOR}${{ matrix.target }}"
-          ./${{ matrix.target }}
diff --git a/.gitmodules b/.gitmodules
index 6ff30d2f6..7ba55ec27 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = ../../NilFoundation/crypto3-algebra.git
 [submodule "crypto3-block"]
 	path = libs/block
-	url = ../../NilFoundation/crypto3-block.git
+	url = ../../GeniusVentures/crypto3-block.git
 [submodule "crypto3-codec"]
 	path = libs/codec
 	url = ../../NilFoundation/crypto3-codec.git
@@ -15,7 +15,7 @@
 	url = ../../NilFoundation/crypto3-containers.git
 [submodule "crypto3-hash"]
 	path = libs/hash
-	url = ../../NilFoundation/crypto3-hash.git
+	url = ../../GeniusVentures/crypto3-hash.git
 [submodule "crypto3-kdf"]
 	path = libs/kdf
 	url = ../../NilFoundation/crypto3-kdf.git
@@ -24,22 +24,22 @@
 	url = ../../NilFoundation/crypto3-mac.git
 [submodule "crypto3-math"]
 	path = libs/math
-	url = ../../NilFoundation/crypto3-math.git
+	url = ../../GeniusVentures/crypto3-math.git
 [submodule "crypto3-modes"]
 	path = libs/modes
 	url = ../../NilFoundation/crypto3-modes.git
 [submodule "crypto3-multiprecision"]
 	path = libs/multiprecision
-	url = ../../NilFoundation/crypto3-multiprecision.git
+	url = ../crypto3-multiprecision
 [submodule "crypto3-passhash"]
 	path = libs/passhash
-	url = ../../NilFoundation/crypto3-passhash.git
+	url = ../crypto3-passhash
 [submodule "crypto3-pbkdf"]
 	path = libs/pbkdf
-	url = ../../NilFoundation/crypto3-pbkdf.git
+	url = ../crypto3-pbkdf
 [submodule "crypto3-pkmodes"]
 	path = libs/threshold
-	url = ../../NilFoundation/crypto3-pkmodes.git
+	url = ../../GeniusVentures/crypto3-threshold.git
 [submodule "crypto3-pkpad"]
 	path = libs/pkpad
 	url = ../../NilFoundation/crypto3-pkpad.git
@@ -54,13 +54,13 @@
 	url = ../../NilFoundation/crypto3-stream.git
 [submodule "crypto3-vdf"]
 	path = libs/vdf
-	url = ../../NilFoundation/crypto3-vdf.git
+	url = ../crypto3-vdf
 [submodule "crypto3-zk"]
 	path = libs/zk
     url = ../../NilFoundation/crypto3-zk.git
 [submodule "marshalling"]
 	path = libs/marshalling/core
-	url = ../../NilFoundation/marshalling.git
+	url = ../../GeniusVentures/marshalling.git
 [submodule "crypto3-zk-marshalling"]
 	path = libs/marshalling/zk
     url = ../../NilFoundation/crypto3-zk-marshalling.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e992c33f6..6768a77f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,8 @@
 
 cmake_minimum_required(VERSION 3.2)
 
+project(crypto3)
+
 cmake_policy(SET CMP0042 NEW)
 cmake_policy(SET CMP0028 NEW)
 cmake_policy(SET CMP0057 NEW)
diff --git a/cmake/TargetArchitecture.cmake b/cmake/TargetArchitecture.cmake
index afaaa7274..569777b1a 100644
--- a/cmake/TargetArchitecture.cmake
+++ b/cmake/TargetArchitecture.cmake
@@ -103,6 +103,8 @@ function(target_architecture OUTPUT_ARCHITECTURE)
                 set(osx_arch_x86_64 TRUE)
             elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
                 set(osx_arch_ppc64 TRUE)
+            elseif("${osx_arch}" STREQUAL "arm64")
+                set(osx_arch_arm64 TRUE)
             else()
                 message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
             endif()
@@ -124,6 +126,10 @@ function(target_architecture OUTPUT_ARCHITECTURE)
         if(osx_arch_ppc64)
             list(APPEND ARCH ppc64)
         endif()
+
+        if(osx_arch_arm64)
+            list(APPEND ARCH arm64)
+        endif()
     else()
         file(WRITE "${CMAKE_BINARY_DIR}/arch.c" "${archdetect_c_code}")
 
diff --git a/cmake/modules b/cmake/modules
index 69d95b4d9..a016a4216 160000
--- a/cmake/modules
+++ b/cmake/modules
@@ -1 +1 @@
-Subproject commit 69d95b4d96d6fe7b6f4e47bcfdbc232ca1bd558d
+Subproject commit a016a42163a58ef68bbde48082d0ddafe68b8e56
diff --git a/libs/algebra b/libs/algebra
index c967e3fa0..f7c56df0e 160000
--- a/libs/algebra
+++ b/libs/algebra
@@ -1 +1 @@
-Subproject commit c967e3fa0fab188a9b971d7bb12e1dccc6158804
+Subproject commit f7c56df0e43c10663dc8c1aa0c6f80ce587676d0
diff --git a/libs/block b/libs/block
index 47540c71d..76ff5e3e1 160000
--- a/libs/block
+++ b/libs/block
@@ -1 +1 @@
-Subproject commit 47540c71d0cd4bc81d90acbd95126cb117ef9d68
+Subproject commit 76ff5e3e124f360958210ac1f46da837a346f31f
diff --git a/libs/codec b/libs/codec
index f16e5eecc..13fc348f6 160000
--- a/libs/codec
+++ b/libs/codec
@@ -1 +1 @@
-Subproject commit f16e5eecc93b62a1382e5cc5502dee10b583d7cb
+Subproject commit 13fc348f65b424fa88cb71f7479ada57de6639fd
diff --git a/libs/containers b/libs/containers
index a31da693a..ec13e92b5 160000
--- a/libs/containers
+++ b/libs/containers
@@ -1 +1 @@
-Subproject commit a31da693aaba95c584ade9bebf365b527eba93e6
+Subproject commit ec13e92b54086914dcc99feeab36d95d6545903e
diff --git a/libs/hash b/libs/hash
index 3e73a426f..995fefedc 160000
--- a/libs/hash
+++ b/libs/hash
@@ -1 +1 @@
-Subproject commit 3e73a426ffd76bbac18d20cabc401fcc4d5e49b6
+Subproject commit 995fefedc581bb8ab2d26fe05d09b300dca814f2
diff --git a/libs/mac b/libs/mac
index bbe8aba4a..6ed64b6af 160000
--- a/libs/mac
+++ b/libs/mac
@@ -1 +1 @@
-Subproject commit bbe8aba4a455572064879197a3099f8b03ef8583
+Subproject commit 6ed64b6af886cd68e7d0b0e53edc79ee3a41f0da
diff --git a/libs/marshalling/algebra b/libs/marshalling/algebra
index f20a16345..5a861667f 160000
--- a/libs/marshalling/algebra
+++ b/libs/marshalling/algebra
@@ -1 +1 @@
-Subproject commit f20a163457da731841f6c3e01e24679dd43b25f6
+Subproject commit 5a861667f75d6985516dd16ede7fe77791f643d3
diff --git a/libs/marshalling/core b/libs/marshalling/core
index 512609853..c5a00412b 160000
--- a/libs/marshalling/core
+++ b/libs/marshalling/core
@@ -1 +1 @@
-Subproject commit 51260985366a1b6b4a0bfdf5ff9dc2c6841c5780
+Subproject commit c5a00412ba13be6097b921884b424897887dd286
diff --git a/libs/marshalling/multiprecision b/libs/marshalling/multiprecision
index 8d9a839ce..2f0b73579 160000
--- a/libs/marshalling/multiprecision
+++ b/libs/marshalling/multiprecision
@@ -1 +1 @@
-Subproject commit 8d9a839ce1a423c3e78c01909f5cc71e9b5d2b5b
+Subproject commit 2f0b73579c3d2798db4c767190206386fea84779
diff --git a/libs/marshalling/zk b/libs/marshalling/zk
index 7e6b8f5de..9fac26db0 160000
--- a/libs/marshalling/zk
+++ b/libs/marshalling/zk
@@ -1 +1 @@
-Subproject commit 7e6b8f5de550c5b6654d6b6f6c686a1806e0e773
+Subproject commit 9fac26db0b58163f1e4b917376952291d451c6f5
diff --git a/libs/math b/libs/math
index dd7fb1887..474f7cae5 160000
--- a/libs/math
+++ b/libs/math
@@ -1 +1 @@
-Subproject commit dd7fb1887fca9806f018bd22ce19ce52efad910a
+Subproject commit 474f7cae58c8208ce2a84446b2d29fab7a88e320
diff --git a/libs/modes b/libs/modes
index c8d6f4bbb..04fec40c0 160000
--- a/libs/modes
+++ b/libs/modes
@@ -1 +1 @@
-Subproject commit c8d6f4bbbb7a9ac9dab7b3fdedcc0420bfc6e7ba
+Subproject commit 04fec40c028d2bdd1fc7895f8589e1a66789c2c0
diff --git a/libs/multiprecision b/libs/multiprecision
index 8d65c03c2..4e24ac80b 160000
--- a/libs/multiprecision
+++ b/libs/multiprecision
@@ -1 +1 @@
-Subproject commit 8d65c03c2c3ef0f739c774fea49dea4eace1c601
+Subproject commit 4e24ac80be6308cf520de84bce6a7f2b50cfb44b
diff --git a/libs/passhash b/libs/passhash
index 4a5d75076..6888cb9ff 160000
--- a/libs/passhash
+++ b/libs/passhash
@@ -1 +1 @@
-Subproject commit 4a5d7507642ba5d36dc7ee7746fd066a6ac108b2
+Subproject commit 6888cb9ff3a4c7a3fa069ce2ddff0ee915a2c334
diff --git a/libs/pbkdf b/libs/pbkdf
index c177b3bd0..b92152d0d 160000
--- a/libs/pbkdf
+++ b/libs/pbkdf
@@ -1 +1 @@
-Subproject commit c177b3bd0e2ea75b9d33da93cf2aa4dea283de9b
+Subproject commit b92152d0d28024a48afc95c3844bd2debc06ad86
diff --git a/libs/pubkey b/libs/pubkey
index 735a7485a..802391b8d 160000
--- a/libs/pubkey
+++ b/libs/pubkey
@@ -1 +1 @@
-Subproject commit 735a7485a89d96c6e7c7193f468a33f385bb3eec
+Subproject commit 802391b8d1c8e216c98dd7aeda2ce99fe86c6084
diff --git a/libs/stream b/libs/stream
index 10745e01f..ee71fa02d 160000
--- a/libs/stream
+++ b/libs/stream
@@ -1 +1 @@
-Subproject commit 10745e01fe8c8fc7997561185254e7d8bcce8d00
+Subproject commit ee71fa02d00424dbdc59b786566c3432e94363bd
diff --git a/libs/threshold b/libs/threshold
index 93286cd47..319907815 160000
--- a/libs/threshold
+++ b/libs/threshold
@@ -1 +1 @@
-Subproject commit 93286cd47dc6d01e468377ed0a00e19f75a8ea86
+Subproject commit 319907815672fdd6386aaf89a70f7ee0efd9dd6e
diff --git a/libs/vdf b/libs/vdf
index 867319d7e..ac994d89f 160000
--- a/libs/vdf
+++ b/libs/vdf
@@ -1 +1 @@
-Subproject commit 867319d7efb884992efead10cd296867d231c1d2
+Subproject commit ac994d89f9ad08586d853ac46639d0893de38a22
diff --git a/libs/zk b/libs/zk
index 640564769..212e837e6 160000
--- a/libs/zk
+++ b/libs/zk
@@ -1 +1 @@
-Subproject commit 64056476949708f0d5830fdb8fadf0c14906470a
+Subproject commit 212e837e6363a8228a124624f459fa5fcabdcc4b