diff --git a/.circleci/config.yml b/.circleci/config.yml
index a68aec2bd9f..4a29a9c7703 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,7 @@ checkout: &checkout
       echo $GIT_CHECKOUT_KEY | base64 -d > .ssh/id_rsa
 
       chmod 0600 .ssh/id_rsa
-      # IF YOU'RE CHANGING THIS, YOU ALSO WANT TO CHANGE: build-system/remote_build/remote_build
+      # IF YOU'RE CHANGING THIS, YOU ALSO WANT TO CHANGE: build-system/scripts/remote_runner
       # Shallow checkout this commit.
       mkdir -p project
       cd project
@@ -140,7 +140,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 1 stdlib-tests
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 stdlib-tests
       - *save_logs
 
   barretenberg-dsl-tests:
@@ -152,7 +152,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 1 dsl_tests
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 dsl_tests
       - *save_logs
 
   barretenberg-tests:
@@ -164,7 +164,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_test_script ./scripts/bb-tests.sh barretenberg-x86_64-linux-clang-assert
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/bb-tests.sh
       - *save_logs
 
   barretenberg-honk-tests:
@@ -176,7 +176,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 1 honk_tests
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 honk_tests
       - *save_logs
 
   barretenberg-proof-system-tests:
@@ -188,7 +188,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 1 proof_system_tests
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 proof_system_tests
       - *save_logs
 
   barretenberg-stdlib-recursion-turbo-tests:
@@ -200,7 +200,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 1 stdlib_recursion_tests --gtest_filter=*turbo*
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 stdlib_recursion_tests --gtest_filter=*turbo*
       - *save_logs
 
   barretenberg-stdlib-recursion-ultra-tests:
@@ -212,7 +212,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 3 stdlib_recursion_tests --gtest_filter=-*turbo*
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_recursion_tests --gtest_filter=-*turbo*
       - *save_logs
 
   barretenberg-join-split-tests:
@@ -224,7 +224,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 3 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof*
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof*
       - *save_logs
 
   # barretenberg-benchmark-aggregator:
@@ -271,7 +271,7 @@ jobs:
       - *setup_env
       - run:
           name: "Build and test"
-          command: cond_spot_run_tests bb.js
+          command: cond_spot_run_test bb.js 32 ./scripts/run_tests
 
   bb-js-acir-tests:
     docker:
@@ -348,7 +348,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests circuits-wasm-linux-clang-assert 1 wasm scripts/a3-tests -*.skip*:*.circuit*
+          command: cond_spot_run_test circuits-wasm-linux-clang-assert 32 ./scripts/run_tests 1 wasm scripts/a3-tests -*.skip*:*.circuit*
       - *save_logs
 
   circuits-x86_64-tests:
@@ -360,18 +360,9 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_tests circuits-x86_64-linux-clang-assert 1 x86_64 scripts/a3-tests -*.skip*
+          command: cond_spot_run_test circuits-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 x86_64 scripts/a3-tests -*.skip*
       - *save_logs
 
-  circuits-end:
-    docker:
-      - image: cimg/base:current
-    resource_class: small
-    steps:
-      - run:
-          name: "Noop"
-          command: echo Noop
-
   l1-contracts:
     machine:
       image: ubuntu-2004:202010-01
@@ -390,12 +381,6 @@ jobs:
     steps:
       - *checkout
       - *setup_env
-      # We make the build_manifest in the root available to yarn-project. We should be injecting another
-      # build context to docker instead, but that requires modifying the build script from build-system
-      # to accept arbitrary arguments to be passed to docker build, so we avoid it for now.
-      - run:
-          name: "Make build manifest available"
-          command: cp build_manifest.json yarn-project/
       - run:
           name: "Build"
           command: build yarn-project-base
@@ -673,8 +658,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_2_rpc_servers.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_2_rpc_servers.test.ts
 
   e2e-multiple-accounts-1-enc-key:
     machine:
@@ -685,8 +669,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_multiple_accounts_1_enc_key.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_multiple_accounts_1_enc_key.test.ts
 
   e2e-deploy-contract:
     machine:
@@ -697,8 +680,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_deploy_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_deploy_contract.test.ts
 
   e2e-lending-contract:
     machine:
@@ -709,8 +691,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_lending_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_lending_contract.test.ts
 
   e2e-token-contract:
     machine:
@@ -734,8 +715,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_private_token_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_private_token_contract.test.ts
 
   e2e-sandbox-example:
     machine:
@@ -745,8 +725,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_sandbox_example.test.ts ./scripts/docker-compose-e2e-sandbox.yml
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_sandbox_example.test.ts ./scripts/docker-compose-e2e-sandbox.yml
 
   e2e-multi-transfer-contract:
     machine:
@@ -756,8 +735,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_multi_transfer.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_multi_transfer.test.ts
 
   e2e-block-building:
     machine:
@@ -768,8 +746,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_block_building.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_block_building.test.ts
 
   e2e-nested-contract:
     machine:
@@ -780,8 +757,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_nested_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_nested_contract.test.ts
 
   e2e-non-contract-account:
     machine:
@@ -792,8 +768,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_non_contract_account.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_non_contract_account.test.ts
 
   e2e-cross-chain-messaging:
     machine:
@@ -804,8 +779,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_cross_chain_messaging.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_cross_chain_messaging.test.ts
 
   e2e-public-cross-chain-messaging:
     machine:
@@ -816,8 +790,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_public_cross_chain_messaging.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_public_cross_chain_messaging.test.ts
 
   e2e-public-to-private-messaging:
     machine:
@@ -828,8 +801,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_public_to_private_messaging.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_public_to_private_messaging.test.ts
 
   e2e-account-contracts:
     machine:
@@ -840,8 +812,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_account_contracts.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_account_contracts.test.ts
 
   e2e-escrow-contract:
     machine:
@@ -851,8 +822,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_escrow_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_escrow_contract.test.ts
 
   e2e-pending-commitments-contract:
     machine:
@@ -863,8 +833,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_pending_commitments_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_pending_commitments_contract.test.ts
 
   e2e-ordering:
     machine:
@@ -875,8 +844,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_ordering.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_ordering.test.ts
 
   uniswap-trade-on-l1-from-l2:
     machine:
@@ -887,8 +855,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local uniswap_trade_on_l1_from_l2.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local uniswap_trade_on_l1_from_l2.test.ts
 
   integration-archiver-l1-to-l2:
     machine:
@@ -899,8 +866,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local integration_archiver_l1_to_l2.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local integration_archiver_l1_to_l2.test.ts
 
   integration-l1-publisher:
     machine:
@@ -911,8 +877,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local integration_l1_publisher.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local integration_l1_publisher.test.ts
 
   e2e-public-token-contract:
     machine:
@@ -923,8 +888,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_public_token_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_public_token_contract.test.ts
 
   e2e-cli:
     machine:
@@ -935,8 +899,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_cli.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_cli.test.ts
 
   e2e-p2p:
     machine:
@@ -946,8 +909,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_p2p_network.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_p2p_network.test.ts
 
   e2e-browser-sandbox:
     machine:
@@ -957,8 +919,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_aztec_js_browser.test.ts ./scripts/docker-compose-e2e-sandbox.yml
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_aztec_js_browser.test.ts ./scripts/docker-compose-e2e-sandbox.yml
 
   e2e-card-game:
     machine:
@@ -968,8 +929,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_card_game.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local e2e_card_game.test.ts
 
   aztec-rpc-sandbox:
     machine:
@@ -979,8 +939,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local aztec_rpc_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local aztec_rpc_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
 
   cli-docs-sandbox:
     machine:
@@ -990,8 +949,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local cli_docs_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local cli_docs_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
 
   guides-writing-an-account-contract:
     machine:
@@ -1002,8 +960,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/writing_an_account_contract.test.ts
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local guides/writing_an_account_contract.test.ts
 
   guides-dapp-testing:
     machine:
@@ -1013,9 +970,8 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts ./scripts/docker-compose-e2e-sandbox.yml
-          working_directory: yarn-project/end-to-end
-        
+          command: cond_run_script end-to-end ./scripts/run_tests_local guides/dapp_testing.test.ts ./scripts/docker-compose-e2e-sandbox.yml
+
   guides-sample-dapp:
     machine:
       image: ubuntu-2004:202010-01
@@ -1024,8 +980,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local sample-dapp ./scripts/docker-compose-e2e-sandbox.yml
-          working_directory: yarn-project/end-to-end
+          command: cond_run_script end-to-end ./scripts/run_tests_local sample-dapp ./scripts/docker-compose-e2e-sandbox.yml
 
   e2e-canary-test:
     machine:
@@ -1035,8 +990,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: ./scripts/cond_run_script canary-build $JOB_NAME ./scripts/run_tests uniswap_trade_on_l1_from_l2.test.ts canary-build ./scripts/docker-compose-e2e-sandbox.yml
-          working_directory: yarn-project/canary
+          command: cond_run_script canary-build ./scripts/run_tests uniswap_trade_on_l1_from_l2.test.ts canary-build ./scripts/docker-compose-e2e-sandbox.yml
 
   build-docs:
     machine:
@@ -1299,14 +1253,6 @@ bb_test: &bb_test
   requires:
     - barretenberg-x86_64-linux-clang-assert
   <<: *defaults
-circuits-wasm-test: &circuits-wasm-test
-  requires:
-    - circuits-wasm-linux-clang-assert
-  <<: *defaults
-circuits-x86_64-test: &circuits-x86_64-test
-  requires:
-    - circuits-x86_64-linux-clang-assert
-  <<: *defaults
 
 workflows:
   system:
@@ -1314,6 +1260,8 @@ workflows:
       equal: [system, << pipeline.parameters.workflow >>]
     jobs:
       - build-docs: *defaults
+
+      # Barretenberg
       - barretenberg-x86_64-linux-gcc: *defaults
       - barretenberg-x86_64-linux-clang: *defaults
       - barretenberg-x86_64-linux-clang-assert: *defaults
@@ -1339,6 +1287,10 @@ workflows:
       #         only:
       #           - master
       #     <<: *defaults
+      - barretenberg-acir-tests-bb:
+          requires:
+            - barretenberg-x86_64-linux-clang-assert
+          <<: *defaults
       - bb-js:
           requires:
             - barretenberg-wasm-linux-clang
@@ -1347,38 +1299,54 @@ workflows:
           requires:
             - bb-js
           <<: *defaults
-      - barretenberg-acir-tests-bb:
-          requires:
-            - barretenberg-x86_64-linux-clang-assert
-          <<: *defaults
       - bb-js-acir-tests:
           requires:
             - bb-js
           <<: *defaults
-      - circuits-wasm-linux-clang: *defaults
-      - circuits-wasm-linux-clang-assert: *defaults
-      - circuits-x86_64-linux-clang-tidy: *defaults
-      - circuits-x86_64-linux-clang: *defaults
-      - circuits-x86_64-linux-clang-assert: *defaults
-      - circuits-wasm-tests:
-          <<: *circuits-wasm-test
-      - circuits-x86_64-tests:
-          <<: *circuits-x86_64-test
 
-      - circuits-end:
+      # Circuits
+      - circuits-wasm-linux-clang:
+          requires:
+            - barretenberg-wasm-linux-clang
+          <<: *defaults
+      - circuits-wasm-linux-clang-assert:
+          requires:
+            - barretenberg-wasm-linux-clang
+          <<: *defaults
+      - circuits-x86_64-linux-clang-tidy:
+          requires:
+            - barretenberg-x86_64-linux-clang
+          <<: *defaults
+      - circuits-x86_64-linux-clang:
+          requires:
+            - barretenberg-x86_64-linux-clang
+          <<: *defaults
+      - circuits-x86_64-linux-clang-assert:
+          requires:
+            - barretenberg-x86_64-linux-clang
+          <<: *defaults
+      - circuits-wasm-tests:
           requires:
-            - circuits-wasm-linux-clang
             - circuits-wasm-linux-clang-assert
-            - circuits-x86_64-linux-clang-tidy
-            - circuits-x86_64-linux-clang
+          <<: *defaults
+      - circuits-x86_64-tests:
+          requires:
             - circuits-x86_64-linux-clang-assert
-            - circuits-wasm-tests
-            - circuits-x86_64-tests
           <<: *defaults
 
+      # - circuits-end:
+      #     requires:
+      #       - circuits-wasm-linux-clang
+      #       - circuits-x86_64-linux-clang-tidy
+      #       - circuits-x86_64-linux-clang
+      #       - circuits-wasm-tests
+      #       - circuits-x86_64-tests
+      #     <<: *defaults
+
       - l1-contracts: *defaults
       - noir-contracts-build: *defaults
 
+      # Yarn Project
       - yarn-project-base:
           requires:
             - circuits-wasm-linux-clang
@@ -1506,6 +1474,7 @@ workflows:
             - guides-sample-dapp
           <<: *defaults
 
+      # Deployment and Canary tests
       - deploy-dockerhub:
           requires:
             - e2e-end
diff --git a/.github/workflows/mirror_barretenberg_repo.yml b/.github/workflows/mirror_barretenberg_repo.yml
index b83c95e0f2a..d4ab13d76e1 100644
--- a/.github/workflows/mirror_barretenberg_repo.yml
+++ b/.github/workflows/mirror_barretenberg_repo.yml
@@ -5,8 +5,8 @@ on:
     branches:
       - master
     paths:
-      - 'circuits/cpp/barretenberg/**'
-      - '!circuits/cpp/barretenberg/.gitrepo'
+      - "barretenberg/**"
+      - "!barretenberg/.gitrepo"
 
 jobs:
   build:
@@ -23,7 +23,7 @@ jobs:
         run: |
           # we push using git subrepo (https://github.com/ingydotnet/git-subrepo)
           # with some logic to recover from squashed parent commits
-          SUBREPO_PATH=circuits/cpp/barretenberg
+          SUBREPO_PATH=barretenberg
           # identify ourselves, needed to commit
           git config --global user.name AztecBot
           git config --global user.email tech@aztecprotocol.com
diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml
index 2df722abf3d..5895d5ab9ca 100644
--- a/.github/workflows/publish-bb.yml
+++ b/.github/workflows/publish-bb.yml
@@ -49,13 +49,13 @@ jobs:
 
       - name: Compile Barretenberg
         run: |
-          cd circuits/cpp/barretenberg/cpp
+          cd barretenberg/cpp
 
           cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Tar and GZip bb Binary (Ubuntu)
-        working-directory: circuits/cpp/barretenberg/cpp/build/bin
+        working-directory: barretenberg/cpp/build/bin
         run: tar -cvzf barretenberg-x86_64-linux-gnu.tar.gz bb
 
       - name: Upload artifacts
@@ -63,7 +63,7 @@ jobs:
         with:
           name: release-linux
           path: |
-            ./circuits/cpp/barretenberg/cpp/build/bin/barretenberg-x86_64-linux-gnu.tar.gz
+            ./barretenberg/cpp/build/bin/barretenberg-x86_64-linux-gnu.tar.gz
 
   build-wasm-ts:
     name: Build WASM and deploy to TS
@@ -100,21 +100,21 @@ jobs:
           sudo apt -y update && sudo apt -y install yarn
       - name: Install WASI-SDK
         run: |
-          cd circuits/cpp/barretenberg/cpp
+          cd barretenberg/cpp
 
           ./scripts/install-wasi-sdk.sh
 
       - name: Compile Typescript
         run: |
-          cd circuits/cpp/barretenberg/ts
+          cd barretenberg/ts
           yarn install && yarn && yarn build
 
       - name: Tar and GZip barretenberg.wasm
-        working-directory: circuits/cpp/barretenberg/cpp/build-wasm/bin
+        working-directory: barretenberg/cpp/build-wasm/bin
         run: tar -cvzf barretenberg.wasm.tar.gz barretenberg.wasm
 
       - name: Tar and GZip acvm_backend.wasm
-        working-directory: circuits/cpp/barretenberg/cpp/build-wasm/bin
+        working-directory: barretenberg/cpp/build-wasm/bin
         run: tar -cvzf acvm_backend.wasm.tar.gz acvm_backend.wasm
 
       - name: Setup Node.js
@@ -126,7 +126,7 @@ jobs:
       - name: Deploy Typescript to NPM
         if: github.event.inputs.tag != 'nightly' && github.event.inputs.tag != '' # Do not deploy to npm if it is a nightly build
         run: |
-          cd circuits/cpp/barretenberg/ts
+          cd barretenberg/ts
           yarn deploy
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -136,8 +136,8 @@ jobs:
         with:
           name: release-wasm
           path: |
-            ./circuits/cpp/barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz
-            ./circuits/cpp/barretenberg/cpp/build-wasm/bin/acvm_backend.wasm.tar.gz
+            ./barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz
+            ./barretenberg/cpp/build-wasm/bin/acvm_backend.wasm.tar.gz
 
   build-mac:
     name: Build on Mac (${{ matrix.target }})
@@ -163,20 +163,20 @@ jobs:
 
       - name: Compile Barretenberg (x86_64)
         if: matrix.target == 'x86_64-apple-darwin'
-        working-directory: circuits/cpp/barretenberg/cpp
+        working-directory: barretenberg/cpp
         run: |
           cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Compile Barretenberg (ARM)
         if: matrix.target == 'aarch64-apple-darwin'
-        working-directory: circuits/cpp/barretenberg/cpp
+        working-directory: barretenberg/cpp
         run: |
           cmake --toolchain ./cmake/toolchains/aarch64-darwin.cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Package barretenberg artifact
-        working-directory: circuits/cpp/barretenberg/cpp/build/bin
+        working-directory: barretenberg/cpp/build/bin
         run: |
           mkdir dist
           cp ./bb ./dist/bb
@@ -186,7 +186,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: barretenberg-${{ matrix.target }}
-          path: ./circuits/cpp/barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
+          path: ./barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
           retention-days: 3
 
   release:
diff --git a/.gitmodules b/.gitmodules
index 64ffb023e53..e355139eb3d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "legacy-barretenberg-build-system"]
-	path = circuits/cpp/barretenberg/build-system
+	path = barretenberg/build-system
 	url = https://github.com/AztecProtocol/build-system
 [submodule "l1-contracts/lib/openzeppelin-contracts"]
 	path = l1-contracts/lib/openzeppelin-contracts
@@ -7,12 +7,12 @@
 [submodule "l1-contracts/lib/forge-std"]
 	path = l1-contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "circuits/cpp/barretenberg/sol/lib/forge-std"]
-	path = circuits/cpp/barretenberg/sol/lib/forge-std
+[submodule "barretenberg/sol/lib/forge-std"]
+	path = barretenberg/sol/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "circuits/cpp/barretenberg/sol/lib/solidity-stringutils"]
-	path = circuits/cpp/barretenberg/sol/lib/solidity-stringutils
+[submodule "barretenberg/sol/lib/solidity-stringutils"]
+	path = barretenberg/sol/lib/solidity-stringutils
 	url = https://github.com/Arachnid/solidity-stringutils
-[submodule "circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts"]
-	path = circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts
+[submodule "barretenberg/sol/lib/openzeppelin-contracts"]
+	path = barretenberg/sol/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/.ignore b/.ignore
index c1c1645a0e7..d263d2fa829 100644
--- a/.ignore
+++ b/.ignore
@@ -1,2 +1,2 @@
-/circuits/cpp/barretenberg/ts
-/circuits/cpp/barretenberg/foundation
\ No newline at end of file
+/barretenberg/ts
+/barretenberg/foundation
\ No newline at end of file
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index dd67659ac5b..a1a9e85c860 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,5 +1,5 @@
 {
   ".": "0.7.0",
-  "circuits/cpp/barretenberg": "0.7.0",
-  "circuits/cpp/barretenberg/ts": "0.7.0"
+  "barretenberg": "0.7.0",
+  "barretenberg/ts": "0.7.0"
 }
diff --git a/README.md b/README.md
index 31c7191b864..a229197bb96 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ All packages need to be included in the [build manifest](`build_manifest.json`),
 
 ## Debugging
 
-Logging goes through the [`info` and `debug`](circuits/cpp/barretenberg/cpp/src/barretenberg/common/log.hpp) functions in C++, and through the [DebugLogger](yarn-project/foundation/src/log/debug.ts) module in Typescript. To see the log output, set a `DEBUG` environment variable to the name of the module you want to debug, to `aztec:*`, or to `*` to see all logs.
+Logging goes through the [`info` and `debug`](barretenberg/cpp/src/barretenberg/common/log.hpp) functions in C++, and through the [DebugLogger](yarn-project/foundation/src/log/debug.ts) module in Typescript. To see the log output, set a `DEBUG` environment variable to the name of the module you want to debug, to `aztec:*`, or to `*` to see all logs.
 
 ## Releases
 
diff --git a/circuits/cpp/barretenberg/.circleci/config.yml b/barretenberg/.circleci/config.yml
similarity index 100%
rename from circuits/cpp/barretenberg/.circleci/config.yml
rename to barretenberg/.circleci/config.yml
diff --git a/circuits/cpp/barretenberg/.dockerignore b/barretenberg/.dockerignore
similarity index 100%
rename from circuits/cpp/barretenberg/.dockerignore
rename to barretenberg/.dockerignore
diff --git a/circuits/cpp/barretenberg/.github/pull_request_template.md b/barretenberg/.github/pull_request_template.md
similarity index 100%
rename from circuits/cpp/barretenberg/.github/pull_request_template.md
rename to barretenberg/.github/pull_request_template.md
diff --git a/circuits/cpp/barretenberg/.github/workflows/benchmarks.yml b/barretenberg/.github/workflows/benchmarks.yml
similarity index 100%
rename from circuits/cpp/barretenberg/.github/workflows/benchmarks.yml
rename to barretenberg/.github/workflows/benchmarks.yml
diff --git a/circuits/cpp/barretenberg/.github/workflows/nix.yml b/barretenberg/.github/workflows/nix.yml
similarity index 100%
rename from circuits/cpp/barretenberg/.github/workflows/nix.yml
rename to barretenberg/.github/workflows/nix.yml
diff --git a/circuits/cpp/barretenberg/.github/workflows/noir.yml b/barretenberg/.github/workflows/noir.yml
similarity index 100%
rename from circuits/cpp/barretenberg/.github/workflows/noir.yml
rename to barretenberg/.github/workflows/noir.yml
diff --git a/circuits/cpp/barretenberg/.github/workflows/pull-request.yml b/barretenberg/.github/workflows/pull-request.yml
similarity index 100%
rename from circuits/cpp/barretenberg/.github/workflows/pull-request.yml
rename to barretenberg/.github/workflows/pull-request.yml
diff --git a/circuits/cpp/barretenberg/.gitignore b/barretenberg/.gitignore
similarity index 100%
rename from circuits/cpp/barretenberg/.gitignore
rename to barretenberg/.gitignore
diff --git a/circuits/cpp/barretenberg/.gitmodules b/barretenberg/.gitmodules
similarity index 100%
rename from circuits/cpp/barretenberg/.gitmodules
rename to barretenberg/.gitmodules
diff --git a/circuits/cpp/barretenberg/.gitrepo b/barretenberg/.gitrepo
similarity index 100%
rename from circuits/cpp/barretenberg/.gitrepo
rename to barretenberg/.gitrepo
diff --git a/circuits/cpp/barretenberg/.vscode/c_cpp_properties.json b/barretenberg/.vscode/c_cpp_properties.json
similarity index 100%
rename from circuits/cpp/barretenberg/.vscode/c_cpp_properties.json
rename to barretenberg/.vscode/c_cpp_properties.json
diff --git a/circuits/cpp/barretenberg/.vscode/settings.json b/barretenberg/.vscode/settings.json
similarity index 100%
rename from circuits/cpp/barretenberg/.vscode/settings.json
rename to barretenberg/.vscode/settings.json
diff --git a/barretenberg/CHANGELOG.md b/barretenberg/CHANGELOG.md
index f043d40ff40..8291740c03b 100644
--- a/barretenberg/CHANGELOG.md
+++ b/barretenberg/CHANGELOG.md
@@ -1,15 +1,473 @@
 # Changelog
 
-## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.1...barretenberg-v0.5.2) (2023-09-08)
+## [0.7.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.7...barretenberg-v0.7.0) (2023-09-13)
+
+
+### ⚠ BREAKING CHANGES
+
+* **aztec-noir:** rename noir-aztec to aztec-noir ([#2071](https://github.com/AztecProtocol/aztec-packages/issues/2071))
+
+### Features
+
+* **build:** Use LTS version of ubuntu ([#2239](https://github.com/AztecProtocol/aztec-packages/issues/2239)) ([ce6671e](https://github.com/AztecProtocol/aztec-packages/commit/ce6671e6ab72fcdc8114df5b6a45f81c0086b19d))
+
+
+### Bug Fixes
+
+* **build:** Update ubuntu version used in Docker builds ([#2236](https://github.com/AztecProtocol/aztec-packages/issues/2236)) ([dbe80b7](https://github.com/AztecProtocol/aztec-packages/commit/dbe80b739e97474b29e6a4125ac0d2f16e248b32))
+* Format barretenberg ([#2209](https://github.com/AztecProtocol/aztec-packages/issues/2209)) ([0801372](https://github.com/AztecProtocol/aztec-packages/commit/08013725091c7e80c1e83145ffbf3983cf1e7fe3))
+* Msgpack blowup with bigger objects ([#2207](https://github.com/AztecProtocol/aztec-packages/issues/2207)) ([b909937](https://github.com/AztecProtocol/aztec-packages/commit/b909937ba53b896e11e6b65db08b8f2bb83218d5))
+* Refactor constraints in scalar mul to use the high limb ([#2161](https://github.com/AztecProtocol/aztec-packages/issues/2161)) ([1d0e25d](https://github.com/AztecProtocol/aztec-packages/commit/1d0e25d9fad69aebccacf9f646e3291ea89716ca))
+
+
+### Miscellaneous
+
+* Add debugging to run_tests ([#2212](https://github.com/AztecProtocol/aztec-packages/issues/2212)) ([1c5e78a](https://github.com/AztecProtocol/aztec-packages/commit/1c5e78a4ac01bee4b785857447efdb02d8d9cb35))
+* **aztec-noir:** Rename noir-aztec to aztec-noir ([#2071](https://github.com/AztecProtocol/aztec-packages/issues/2071)) ([e1e14d2](https://github.com/AztecProtocol/aztec-packages/commit/e1e14d2c7fb44d56b9a10a645676d3551830bb10))
+* Update url for acir artifacts ([#2231](https://github.com/AztecProtocol/aztec-packages/issues/2231)) ([5e0abd3](https://github.com/AztecProtocol/aztec-packages/commit/5e0abd35dec449a665760e5ee51eeff89c76532c))
+
+## [0.6.7](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.6...barretenberg-v0.6.7) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.5...barretenberg-v0.6.6) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.4...barretenberg-v0.6.5) (2023-09-08)
 
 
 ### Miscellaneous
 
-* **master:** Release 0.6.0 ([#2121](https://github.com/AztecProtocol/aztec-packages/issues/2121)) ([9bc8e11](https://github.com/AztecProtocol/aztec-packages/commit/9bc8e11ec4598c54d2c8f37c9f1a38ad90148f12))
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.3...barretenberg-v0.6.4) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
 
-## [0.6.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.1...barretenberg-v0.6.0) (2023-09-08)
+## [0.6.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.2...barretenberg-v0.6.3) (2023-09-08)
 
 
 ### Miscellaneous
 
 * **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.1...barretenberg-v0.6.2) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.2...barretenberg-v0.6.1) (2023-09-08)
+
+
+### Bug Fixes
+
+* Work around intermittent wasm webkit issue ([#2140](https://github.com/AztecProtocol/aztec-packages/issues/2140)) ([a9b0934](https://github.com/AztecProtocol/aztec-packages/commit/a9b09344c80d8628f95f859d4e2d455d61f9e7c6))
+
+
+### Miscellaneous
+
+* **master:** Release 0.5.2 ([#2141](https://github.com/AztecProtocol/aztec-packages/issues/2141)) ([451aad6](https://github.com/AztecProtocol/aztec-packages/commit/451aad6ea92ebced9839ca14baae10cee327be35))
+* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
+* Release 0.6.1 ([1bd1a79](https://github.com/AztecProtocol/aztec-packages/commit/1bd1a79b0cefcd90306133aab141d992e8ea5fc3))
+
+## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.2...barretenberg-v0.5.2) (2023-09-08)
+
+
+### Bug Fixes
+
+* Work around intermittent wasm webkit issue ([#2140](https://github.com/AztecProtocol/aztec-packages/issues/2140)) ([a9b0934](https://github.com/AztecProtocol/aztec-packages/commit/a9b09344c80d8628f95f859d4e2d455d61f9e7c6))
+
+
+### Miscellaneous
+
+* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
+
+## [0.5.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.5.0...barretenberg-v0.5.1) (2023-09-05)
+
+
+### Features
+
+* Add `info` command to bb ([#2010](https://github.com/AztecProtocol/barretenberg/issues/2010)) ([2882d97](https://github.com/AztecProtocol/barretenberg/commit/2882d97f5165239badb328be80568e7d683c0465))
+* **ci:** Use content hash in build system, restrict docs build to *.ts or *.cpp ([#1953](https://github.com/AztecProtocol/barretenberg/issues/1953)) ([297a20d](https://github.com/AztecProtocol/barretenberg/commit/297a20d7878a4aabab1cabf2cc5d2d67f9e969c5))
+
+
+### Bug Fixes
+
+* Adds Mac cross compile flags into barretenberg ([#1954](https://github.com/AztecProtocol/barretenberg/issues/1954)) ([0e17d97](https://github.com/AztecProtocol/barretenberg/commit/0e17d978a0cc6805b72646a8e36fd5267cbd6bcd))
+* **bb.js:** (breaking change) bundles bb.js properly so that it works in the browser and in node ([#1855](https://github.com/AztecProtocol/barretenberg/issues/1855)) ([bc93a5f](https://github.com/AztecProtocol/barretenberg/commit/bc93a5f8510d0dc600343e7e613ab84380d3c225))
+* **ci:** Incorrect content hash in some build targets ([#1973](https://github.com/AztecProtocol/barretenberg/issues/1973)) ([c6c469a](https://github.com/AztecProtocol/barretenberg/commit/c6c469aa5da7c6973f656ddf8af4fb20c3e8e4f6))
+* Compilation on homebrew clang 16.06 ([#1937](https://github.com/AztecProtocol/barretenberg/issues/1937)) ([79c29ee](https://github.com/AztecProtocol/barretenberg/commit/79c29eebbdb78c1e9aa5b4a3da6207fbf93bdd10))
+* Master ([#1981](https://github.com/AztecProtocol/barretenberg/issues/1981)) ([59a454e](https://github.com/AztecProtocol/barretenberg/commit/59a454ecf1611424893e1cb093774a23dde39310))
+* Unify base64 interface between mac and linux (cherry-picked) ([#1968](https://github.com/AztecProtocol/barretenberg/issues/1968)) ([37ee120](https://github.com/AztecProtocol/barretenberg/commit/37ee1204eba280442b6941eff448d6ff15eb9f04))
+
+## [0.5.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.6...barretenberg-v0.5.0) (2023-09-01)
+
+
+### ⚠ BREAKING CHANGES
+
+* update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925))
+
+### Bug Fixes
+
+* Benchmark preset uses clang16 ([#1902](https://github.com/AztecProtocol/barretenberg/issues/1902)) ([cd0ff0e](https://github.com/AztecProtocol/barretenberg/commit/cd0ff0e2c049917ec47a110b45d76bed4c00ae2a))
+* Reset keccak var inputs to 0 ([#1881](https://github.com/AztecProtocol/barretenberg/issues/1881)) ([23011ee](https://github.com/AztecProtocol/barretenberg/commit/23011ee1ea7f1b00b0f4194ebceedc75ea01c157))
+
+
+### Miscellaneous Chores
+
+* Update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) ([5d8db8e](https://github.com/AztecProtocol/barretenberg/commit/5d8db8eb993334b43e24a51efba9c59e123320ab))
+
+## [0.4.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.5...barretenberg-v0.4.6) (2023-08-29)
+
+
+### Bug Fixes
+
+* Truncate SRS size to the amount of points that we have downloaded ([#1862](https://github.com/AztecProtocol/barretenberg/issues/1862)) ([3bcf12b](https://github.com/AztecProtocol/barretenberg/commit/3bcf12b1a302280d5112475c5993b125e130209e))
+
+## [0.4.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.4...barretenberg-v0.4.5) (2023-08-28)
+
+
+### Bug Fixes
+
+* Conditionally compile base64 command for bb binary ([#1851](https://github.com/AztecProtocol/barretenberg/issues/1851)) ([8f8b9f4](https://github.com/AztecProtocol/barretenberg/commit/8f8b9f46028a08342a3337db633782e5313e2763))
+
+## [0.4.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.3...barretenberg-v0.4.4) (2023-08-28)
+
+
+### Features
+
+* Add ARM build for Mac + cleanup artifacts ([#1837](https://github.com/AztecProtocol/barretenberg/issues/1837)) ([2d2d5ea](https://github.com/AztecProtocol/barretenberg/commit/2d2d5ea33c512ab36c1214fb5bb90f80d8247469))
+
+## [0.4.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.2...barretenberg-v0.4.3) (2023-08-23)
+
+
+### Features
+
+* **bb:** Use an environment variable to set the transcript URL ([#1750](https://github.com/AztecProtocol/barretenberg/issues/1750)) ([41d362e](https://github.com/AztecProtocol/barretenberg/commit/41d362e9c9ffeb763cd56ca8a9f8c4512b86c80c))
+
+
+### Bug Fixes
+
+* Clang version in README and subrepo edge case ([#1730](https://github.com/AztecProtocol/barretenberg/issues/1730)) ([74158c4](https://github.com/AztecProtocol/barretenberg/commit/74158c4e467d4b6ab90e7d5aeb9a28f04adc1d66))
+* Download SRS using one canonical URL across the codebase ([#1748](https://github.com/AztecProtocol/barretenberg/issues/1748)) ([5c91de7](https://github.com/AztecProtocol/barretenberg/commit/5c91de7296e054f6d5ac3dca94ca85e06d496048))
+* Proving fails when circuit has size &gt; ~500K ([#1739](https://github.com/AztecProtocol/barretenberg/issues/1739)) ([6d32383](https://github.com/AztecProtocol/barretenberg/commit/6d323838a525190618d608598357ee4608c46699))
+* Revert clang check bootstrap.sh ([#1734](https://github.com/AztecProtocol/barretenberg/issues/1734)) ([65a38bc](https://github.com/AztecProtocol/barretenberg/commit/65a38bc045c66c5f64e87ba8c6e446945f2f0a24))
+* Update barretenberg bootstrap.sh for mac ([#1732](https://github.com/AztecProtocol/barretenberg/issues/1732)) ([f21ac3e](https://github.com/AztecProtocol/barretenberg/commit/f21ac3e893b5d30f7a4ba8ca10e6fd70f5c617b4))
+
+## [0.4.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.1...barretenberg-v0.4.2) (2023-08-21)
+
+
+### Bug Fixes
+
+* Remove automatic update to `AztecProtocol/dev-bb.js` ([#1712](https://github.com/AztecProtocol/barretenberg/issues/1712)) ([d883900](https://github.com/AztecProtocol/barretenberg/commit/d883900f9b297f659d14583ac93eede5160f9aae))
+
+## [0.4.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.0...barretenberg-v0.4.1) (2023-08-21)
+
+
+### Bug Fixes
+
+* **bb:** Fix Typo ([#1709](https://github.com/AztecProtocol/barretenberg/issues/1709)) ([286d64e](https://github.com/AztecProtocol/barretenberg/commit/286d64e6036336314114f1d2a25273f4dabe36f4))
+
+## [0.4.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.6...barretenberg-v0.4.0) (2023-08-21)
+
+
+### ⚠ BREAKING CHANGES
+
+* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618))
+
+### Features
+
+* Add msgpack defs to remaining circuit types ([#1538](https://github.com/AztecProtocol/barretenberg/issues/1538)) ([e560e39](https://github.com/AztecProtocol/barretenberg/commit/e560e3955d039a93e2ed157c684ea36abd178d4b))
+* Add workflow to output to dev-bb.js ([#1299](https://github.com/AztecProtocol/barretenberg/issues/1299)) ([25a54f1](https://github.com/AztecProtocol/barretenberg/commit/25a54f123e6f98dafef4cd882839106eadf6ab8d))
+* Celer benchmark ([#1369](https://github.com/AztecProtocol/barretenberg/issues/1369)) ([8fd364a](https://github.com/AztecProtocol/barretenberg/commit/8fd364a3ff6e7b5f377ef5ec37649b47fe0a3e44))
+* Honk recursive verifier Pt. 1 ([#1488](https://github.com/AztecProtocol/barretenberg/issues/1488)) ([030dace](https://github.com/AztecProtocol/barretenberg/commit/030dacebd9831ed938b546133373cad63e17ecd8))
+* New stdlib Transcript  ([#1219](https://github.com/AztecProtocol/barretenberg/issues/1219)) ([1b9e077](https://github.com/AztecProtocol/barretenberg/commit/1b9e0770e7e470f2708eb6f96cd5ee831b84f4f4))
+
+
+### Bug Fixes
+
+* **acir:** When retrying failed ACIR tests it should not use the default CLI argument ([#1673](https://github.com/AztecProtocol/barretenberg/issues/1673)) ([ea4792d](https://github.com/AztecProtocol/barretenberg/commit/ea4792ddc9c23f7390f47cf78d4939cce6458a46))
+* Align bbmalloc implementations ([#1513](https://github.com/AztecProtocol/barretenberg/issues/1513)) ([b92338d](https://github.com/AztecProtocol/barretenberg/commit/b92338d3c9de9d21a6933747a3f1479266d16f9e))
+* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618)) ([180cdc9](https://github.com/AztecProtocol/barretenberg/commit/180cdc9ac7cf9aa793d9774dc866ceb4e6ec3fbc))
+* Bb sync take 2 ([#1669](https://github.com/AztecProtocol/barretenberg/issues/1669)) ([d3eebe4](https://github.com/AztecProtocol/barretenberg/commit/d3eebe46e5b702801c866d7dd073a0eeb9f475b7))
+* Bin reference when installing package ([#678](https://github.com/AztecProtocol/barretenberg/issues/678)) ([c734295](https://github.com/AztecProtocol/barretenberg/commit/c734295a10d2c40ede773519664170880f28b2b7))
+* Fix paths in `barretenberg` bootstrap.sh script ([#1662](https://github.com/AztecProtocol/barretenberg/issues/1662)) ([c8917cd](https://github.com/AztecProtocol/barretenberg/commit/c8917cd8ec415dafe5309ec0e90aba28184d8294))
+* Fixed a failing test and added a small fuzzer ([#1384](https://github.com/AztecProtocol/barretenberg/issues/1384)) ([441e972](https://github.com/AztecProtocol/barretenberg/commit/441e972c88c5c314b4958e158f977f60a8c9e32d))
+* Sync aztec master ([#680](https://github.com/AztecProtocol/barretenberg/issues/680)) ([3afc243](https://github.com/AztecProtocol/barretenberg/commit/3afc2438053f530e49fbebbdbadd8db8a630bb8c))
+
+## [0.3.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.5...barretenberg-v0.3.6) (2023-08-08)
+
+
+### Features
+
+* Update release-please.yml ([#651](https://github.com/AztecProtocol/barretenberg/issues/651)) ([2795df6](https://github.com/AztecProtocol/barretenberg/commit/2795df6b705175a32fe2a6f18b3c572e297e277e))
+
+## [0.3.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.4...barretenberg-v0.3.5) (2023-08-07)
+
+
+### Features
+
+* Celer benchmark ([#1369](https://github.com/AztecProtocol/barretenberg/issues/1369)) ([d4ade2a](https://github.com/AztecProtocol/barretenberg/commit/d4ade2a5f06a3abf3c9c2635946d7121cc2f64b4))
+* Goblin Honk Composer/Prover/Verifier ([#1220](https://github.com/AztecProtocol/barretenberg/issues/1220)) ([970bb07](https://github.com/AztecProtocol/barretenberg/commit/970bb073763cc59552cd05dccf7f8fc63f58cef9))
+* Goblin translator prototype ([#1249](https://github.com/AztecProtocol/barretenberg/issues/1249)) ([7738d74](https://github.com/AztecProtocol/barretenberg/commit/7738d74791acc0fa8b1b1d8bb2a77783ca900123))
+* Internal keyword + lending contract and tests ([#978](https://github.com/AztecProtocol/barretenberg/issues/978)) ([e58ca4b](https://github.com/AztecProtocol/barretenberg/commit/e58ca4b332272fc57b2a5358bb5003bac79a8f5a))
+* Minimal barretenberg .circleci ([#1352](https://github.com/AztecProtocol/barretenberg/issues/1352)) ([708e2e2](https://github.com/AztecProtocol/barretenberg/commit/708e2e2786de5dce5bfc770c54734e5862a436e5))
+
+
+### Bug Fixes
+
+* Bootstrap.sh git hook for monorepo ([#1256](https://github.com/AztecProtocol/barretenberg/issues/1256)) ([b22b8d5](https://github.com/AztecProtocol/barretenberg/commit/b22b8d5f42ddfae140068c3ce8b3053d4c8d1874))
+* Build-system spot request cancellation ([#1339](https://github.com/AztecProtocol/barretenberg/issues/1339)) ([fc1d96a](https://github.com/AztecProtocol/barretenberg/commit/fc1d96a744a8d5a6cae06c408546c3638408551d))
+* Fixing external benchmarks ([#1250](https://github.com/AztecProtocol/barretenberg/issues/1250)) ([0ea6a39](https://github.com/AztecProtocol/barretenberg/commit/0ea6a39950e8cd5ff7765031457c162d03ebae06))
+* Fixing fuzzing build after composer splitting ([#1317](https://github.com/AztecProtocol/barretenberg/issues/1317)) ([946c23c](https://github.com/AztecProtocol/barretenberg/commit/946c23c52d45ddce973e453c40c048734e7f6937))
+* Reinstate barretenberg-benchmark-aggregator ([#1330](https://github.com/AztecProtocol/barretenberg/issues/1330)) ([407a915](https://github.com/AztecProtocol/barretenberg/commit/407a915a94c7d83dec9e14a11ad0e3461fd2906d))
+* Retry git submodule fetch ([#1371](https://github.com/AztecProtocol/barretenberg/issues/1371)) ([037dda3](https://github.com/AztecProtocol/barretenberg/commit/037dda3d254d56a20292d2bed5a9582d36c08427))
+
+## [0.3.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.3...barretenberg-v0.3.4) (2023-07-25)
+
+
+### Features
+
+* Add Goblin Ultra Circuit builder ([#587](https://github.com/AztecProtocol/barretenberg/issues/587)) ([2d38c25](https://github.com/AztecProtocol/barretenberg/commit/2d38c252de8b867955da661181e51f1a5f28cbc6))
+* Modify bb.js to be compatible with next.js ([#544](https://github.com/AztecProtocol/barretenberg/issues/544)) ([d384089](https://github.com/AztecProtocol/barretenberg/commit/d384089f60d1a6d5baeb0d3459556a310b790366))
+* Support public inputs in Ultra Honk ([#581](https://github.com/AztecProtocol/barretenberg/issues/581)) ([9cd0a06](https://github.com/AztecProtocol/barretenberg/commit/9cd0a064b8258bf4f72dd9e1c5e8f85b074d1bbc))
+
+## [0.3.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.2...barretenberg-v0.3.3) (2023-07-17)
+
+
+### Features
+
+* Bb and bb.js directly parse nargo bincode format. ([#610](https://github.com/AztecProtocol/barretenberg/issues/610)) ([d25e37a](https://github.com/AztecProtocol/barretenberg/commit/d25e37ad74b88dc45337b2a529ede3136dd4a699))
+* Goblin work done in Valencia ([#569](https://github.com/AztecProtocol/barretenberg/issues/569)) ([57af751](https://github.com/AztecProtocol/barretenberg/commit/57af751646dc3c038fea24ada4e160f6d422845f))
+
+## [0.3.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.1...barretenberg-v0.3.2) (2023-07-12)
+
+
+### Features
+
+* **msgpack:** Ability to specify NOSCHEMA for cbinds ([#605](https://github.com/AztecProtocol/barretenberg/issues/605)) ([8a4f5f1](https://github.com/AztecProtocol/barretenberg/commit/8a4f5f1d31e1d631c1cd3ed49c100858b58c56b2))
+
+## [0.3.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.0...barretenberg-v0.3.1) (2023-07-11)
+
+
+### Features
+
+* Sentence case changelog titles ([#598](https://github.com/AztecProtocol/barretenberg/issues/598)) ([1466108](https://github.com/AztecProtocol/barretenberg/commit/146610857ae511e9cfb27f873f49cec2dd19ddad))
+
+## 0.3.0 (2023-07-11)
+
+
+### ⚠ BREAKING CHANGES
+
+* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501))
+* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436))
+* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417))
+* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385))
+* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162))
+
+### Features
+
+* Add `get_sibling_path` method in MerkleTree ([#584](https://github.com/AztecProtocol/barretenberg/issues/584)) ([b3db9f8](https://github.com/AztecProtocol/barretenberg/commit/b3db9f8944e546cd9da9a1529e2562ee75e62369))
+* Add `signature_verification_result` to schnorr stdlib ([#173](https://github.com/AztecProtocol/barretenberg/issues/173)) ([7ae381e](https://github.com/AztecProtocol/barretenberg/commit/7ae381e4c5a084efde18917569518c7d4040b653))
+* Add equality and serialization to poly_triple ([#172](https://github.com/AztecProtocol/barretenberg/issues/172)) ([142b041](https://github.com/AztecProtocol/barretenberg/commit/142b041b2d3d090785f0e6f319fbf7504c751098))
+* Add installation targets for libbarretenberg, wasm & headers ([#185](https://github.com/AztecProtocol/barretenberg/issues/185)) ([f2fdebe](https://github.com/AztecProtocol/barretenberg/commit/f2fdebe037d4d2d90761f98e28b4b0d3af9a0f63))
+* Add Noir DSL with acir_format and turbo_proofs namespaces ([#198](https://github.com/AztecProtocol/barretenberg/issues/198)) ([54fab22](https://github.com/AztecProtocol/barretenberg/commit/54fab2217f437bb04a5e9fb71b271cf91b90c6e5))
+* Add pkgconfig output for installed target ([#208](https://github.com/AztecProtocol/barretenberg/issues/208)) ([d85a365](https://github.com/AztecProtocol/barretenberg/commit/d85a365180ac2672bbd33bd8b799a1f154716ab3))
+* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417)) ([697fabb](https://github.com/AztecProtocol/barretenberg/commit/697fabb7cbeadb9264db5047e7fd36565dad8790))
+* Allow bootstrap to work with linux + clang on ARM ([#131](https://github.com/AztecProtocol/barretenberg/issues/131)) ([52cb06b](https://github.com/AztecProtocol/barretenberg/commit/52cb06b445c73f2f324af6595af70ce9c130eb09))
+* **api:** external cpp header for circuits ([#489](https://github.com/AztecProtocol/barretenberg/issues/489)) ([fbbb342](https://github.com/AztecProtocol/barretenberg/commit/fbbb34287fdef0e8fedb2e25c5431f17501ad653))
+* **bb.js:** initial API ([#232](https://github.com/AztecProtocol/barretenberg/issues/232)) ([c860b02](https://github.com/AztecProtocol/barretenberg/commit/c860b02d80425de161af50acf33e94d94eb0659c))
+* Benchmark suite update ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
+* Benchmark suite update ([#508](https://github.com/AztecProtocol/barretenberg/issues/508)) ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
+* CI to test aztec circuits with current commit of bberg ([#418](https://github.com/AztecProtocol/barretenberg/issues/418)) ([20a0873](https://github.com/AztecProtocol/barretenberg/commit/20a0873dcbfe4a862ad53a9c137030689a521a04))
+* **dsl:** Add ECDSA secp256r1 verification ([#582](https://github.com/AztecProtocol/barretenberg/issues/582)) ([adc4c7b](https://github.com/AztecProtocol/barretenberg/commit/adc4c7b4eb634eae28dd28e25b94b93a5b49c80e))
+* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436)) ([e0b8804](https://github.com/AztecProtocol/barretenberg/commit/e0b8804b9418c7aa39e29e800fecb4ed15d73b80))
+* **github:** add pull request template ([65f3e33](https://github.com/AztecProtocol/barretenberg/commit/65f3e3312061e7284c0dd0f0f89fa92ee92f9eac))
+* **honk:** Shared relation arithmetic ([#514](https://github.com/AztecProtocol/barretenberg/issues/514)) ([0838474](https://github.com/AztecProtocol/barretenberg/commit/0838474e67469a6d91d6595d1ee23e1dea53863c))
+* Improve barretenberg headers ([#201](https://github.com/AztecProtocol/barretenberg/issues/201)) ([4e03839](https://github.com/AztecProtocol/barretenberg/commit/4e03839a970a5d07dab7f86cd2b7166a09f5045a))
+* Initial native version of bb binary. ([#524](https://github.com/AztecProtocol/barretenberg/issues/524)) ([4a1b532](https://github.com/AztecProtocol/barretenberg/commit/4a1b5322dc78921d253e6a374eba0b616ab788df))
+* Make the circuit constructors field agnostic so we can check circuits on grumpkin ([#534](https://github.com/AztecProtocol/barretenberg/issues/534)) ([656d794](https://github.com/AztecProtocol/barretenberg/commit/656d7944f94f3da88250f3140838f3e32e9d0174))
+* Multithreaded Sumcheck ([#556](https://github.com/AztecProtocol/barretenberg/issues/556)) ([c4094b1](https://github.com/AztecProtocol/barretenberg/commit/c4094b155ba9d8e914c3e6a5b0d7808945b1eeed))
+* **nullifier_tree:** make empty nullifier tree leaves hash be 0 ([#360](https://github.com/AztecProtocol/barretenberg/issues/360)) ([#382](https://github.com/AztecProtocol/barretenberg/issues/382)) ([b85ab8d](https://github.com/AztecProtocol/barretenberg/commit/b85ab8d587b3e93db2aa0f1c4f012e58e5d97915))
+* Optimize memory consumption of pedersen generators ([#413](https://github.com/AztecProtocol/barretenberg/issues/413)) ([d60b16a](https://github.com/AztecProtocol/barretenberg/commit/d60b16a14219fd4bd130ce4537c3e94bfa10128f))
+* Parallelised folding in Gemini ([#550](https://github.com/AztecProtocol/barretenberg/issues/550)) ([3b962d3](https://github.com/AztecProtocol/barretenberg/commit/3b962d372491430871443fd1b95fd9e049e233c8))
+* **pkg-config:** Add a bindir variable ([#239](https://github.com/AztecProtocol/barretenberg/issues/239)) ([611bf34](https://github.com/AztecProtocol/barretenberg/commit/611bf34bcc6f82969a6fe546bf0a7cbecda6d36d))
+* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162)) ([09db0be](https://github.com/AztecProtocol/barretenberg/commit/09db0be3d09ee12b4b73b03abe8fa4565cdb6660))
+* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385)) ([74dbce5](https://github.com/AztecProtocol/barretenberg/commit/74dbce5dfa126ecd6dbda7b758581752f7b6a389))
+* Sort includes ([#571](https://github.com/AztecProtocol/barretenberg/issues/571)) ([dfa8736](https://github.com/AztecProtocol/barretenberg/commit/dfa8736136323e62a705066d25bef962a6a0b82d))
+* Split plonk and honk tests ([#529](https://github.com/AztecProtocol/barretenberg/issues/529)) ([ba583ff](https://github.com/AztecProtocol/barretenberg/commit/ba583ff00509f636feae7b78304b115e34fc2357))
+* Support nix package manager ([#234](https://github.com/AztecProtocol/barretenberg/issues/234)) ([19a72fe](https://github.com/AztecProtocol/barretenberg/commit/19a72fec0ff8d451fc94a9f5563202867a5f8147))
+* **ts:** allow passing srs via env functions ([#260](https://github.com/AztecProtocol/barretenberg/issues/260)) ([ac78353](https://github.com/AztecProtocol/barretenberg/commit/ac7835304f4524039abf0a0df9ae85d905f55c86))
+* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
+* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([#531](https://github.com/AztecProtocol/barretenberg/issues/531)) ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
+* Utilize globally installed benchmark if available ([#152](https://github.com/AztecProtocol/barretenberg/issues/152)) ([fbc5027](https://github.com/AztecProtocol/barretenberg/commit/fbc502794e9bbdfda797b11ac71eba996d649722))
+* Utilize globally installed gtest if available ([#151](https://github.com/AztecProtocol/barretenberg/issues/151)) ([efa18a6](https://github.com/AztecProtocol/barretenberg/commit/efa18a621917dc6c38f453825cadc76eb793a73c))
+* Utilize globally installed leveldb if available ([#134](https://github.com/AztecProtocol/barretenberg/issues/134)) ([255dfb5](https://github.com/AztecProtocol/barretenberg/commit/255dfb52adca885b0a4e4380769a279922af49ff))
+* Working UltraPlonk for Noir ([#299](https://github.com/AztecProtocol/barretenberg/issues/299)) ([d56dfbd](https://github.com/AztecProtocol/barretenberg/commit/d56dfbdfd74b438b3c8652e1ae8740de99f93ae5))
+
+
+### Bug Fixes
+
+* add NUM_RESERVED_GATES before fetching subgroup size in composer ([#539](https://github.com/AztecProtocol/barretenberg/issues/539)) ([fa11abf](https://github.com/AztecProtocol/barretenberg/commit/fa11abf0877314b03420d6f7ace1312df41cd50b))
+* Adds `VERSION` file to release-please ([#542](https://github.com/AztecProtocol/barretenberg/issues/542)) ([31fb34c](https://github.com/AztecProtocol/barretenberg/commit/31fb34c307a4336414b1fd2076d96105a29b0e7b))
+* Align native library object library with wasm ([#238](https://github.com/AztecProtocol/barretenberg/issues/238)) ([4fa6c0d](https://github.com/AztecProtocol/barretenberg/commit/4fa6c0d2d8c6309d53757ad54d3433d1d662de5f))
+* Avoid bb.js memory issues. ([#578](https://github.com/AztecProtocol/barretenberg/issues/578)) ([96891de](https://github.com/AztecProtocol/barretenberg/commit/96891de21fd74ca33ea75ae97f73cada39a5d337))
+* Avoid targeting honk test files when testing is disabled ([#125](https://github.com/AztecProtocol/barretenberg/issues/125)) ([e4a70ed](https://github.com/AztecProtocol/barretenberg/commit/e4a70edf2bb39d67095cbe21fff310372369a92d))
+* BarycentricData instantiation time and unused code in secp curves ([#572](https://github.com/AztecProtocol/barretenberg/issues/572)) ([bc78bb0](https://github.com/AztecProtocol/barretenberg/commit/bc78bb00d273c756fa4f02967d219cd3fd788890))
+* bbmalloc linker error ([#459](https://github.com/AztecProtocol/barretenberg/issues/459)) ([d4761c1](https://github.com/AztecProtocol/barretenberg/commit/d4761c11f30eeecbcb2485f50516bee71809bab1))
+* Build on stock apple clang. ([#592](https://github.com/AztecProtocol/barretenberg/issues/592)) ([0ac4bc3](https://github.com/AztecProtocol/barretenberg/commit/0ac4bc36619f85c1b3a65d3f825ba5683cbbe30c))
+* **build:** git add -f .yalc ([#265](https://github.com/AztecProtocol/barretenberg/issues/265)) ([7671192](https://github.com/AztecProtocol/barretenberg/commit/7671192c8a60ff0bc0f8ad3e14ac299ff780cc25))
+* bump timeout on common test. ([c9bc87d](https://github.com/AztecProtocol/barretenberg/commit/c9bc87d29fa1325162cb1e7bf2db7cc85747fd9e))
+* Check for wasm-opt during configure & run on post_build ([#175](https://github.com/AztecProtocol/barretenberg/issues/175)) ([1ff6af3](https://github.com/AztecProtocol/barretenberg/commit/1ff6af3cb6b7b4d3bb53bfbdcbf1c3a568e0fa86))
+* check_circuit bug fix ([#510](https://github.com/AztecProtocol/barretenberg/issues/510)) ([4b156a3](https://github.com/AztecProtocol/barretenberg/commit/4b156a3648e6da9dfe292e354da9a27185d2aa9d))
+* cleanup of include statements and dependencies ([#527](https://github.com/AztecProtocol/barretenberg/issues/527)) ([b288c24](https://github.com/AztecProtocol/barretenberg/commit/b288c2420bdc350658cd3776bad1eb087cc28d63))
+* **cmake:** Remove leveldb dependency that was accidentally re-added ([#335](https://github.com/AztecProtocol/barretenberg/issues/335)) ([3534e2b](https://github.com/AztecProtocol/barretenberg/commit/3534e2bfcca46dbca30573286f43425dab6bc810))
+* **dsl:** Use info instead of std::cout to log ([#323](https://github.com/AztecProtocol/barretenberg/issues/323)) ([486d738](https://github.com/AztecProtocol/barretenberg/commit/486d73842b4b7d6aa84fa12d7462fe52e892d416))
+* Ecdsa Malleability Bug ([#512](https://github.com/AztecProtocol/barretenberg/issues/512)) ([5cf856c](https://github.com/AztecProtocol/barretenberg/commit/5cf856c5c29c9f9b8abb87d7bde23b4932711350))
+* **ecdsa:** correct short weierstrass curve eqn  ([#567](https://github.com/AztecProtocol/barretenberg/issues/567)) ([386ec63](https://github.com/AztecProtocol/barretenberg/commit/386ec6372156d604e37e58490f1c7396077f84c4))
+* Ensure barretenberg provides headers that Noir needs ([#200](https://github.com/AztecProtocol/barretenberg/issues/200)) ([0171a49](https://github.com/AztecProtocol/barretenberg/commit/0171a499a175f88a0ee3fcfd4de0f43ad0ebff85))
+* Ensure TBB is optional using OPTIONAL_COMPONENTS ([#127](https://github.com/AztecProtocol/barretenberg/issues/127)) ([e3039b2](https://github.com/AztecProtocol/barretenberg/commit/e3039b26ea8aca4b8fdc4b2cbac6716ace261c76))
+* Fixed the memory issue ([#509](https://github.com/AztecProtocol/barretenberg/issues/509)) ([107d438](https://github.com/AztecProtocol/barretenberg/commit/107d438ad96847e40f8e5374749b8cba820b2007))
+* Increment CMakeList version on releases ([#536](https://github.com/AztecProtocol/barretenberg/issues/536)) ([b571411](https://github.com/AztecProtocol/barretenberg/commit/b571411a6d58f79e3e2553c3b1c81b4f186f2245))
+* msgpack error ([#456](https://github.com/AztecProtocol/barretenberg/issues/456)) ([943d6d0](https://github.com/AztecProtocol/barretenberg/commit/943d6d07c57bea521c2593e892e839f25f82b289))
+* msgpack variant_impl.hpp ([#462](https://github.com/AztecProtocol/barretenberg/issues/462)) ([b5838a6](https://github.com/AztecProtocol/barretenberg/commit/b5838a6c9fe456e832776da21379e41c0a2bbd5d))
+* **nix:** Disable ASM & ADX when building in Nix ([#327](https://github.com/AztecProtocol/barretenberg/issues/327)) ([3bc724d](https://github.com/AztecProtocol/barretenberg/commit/3bc724d2163d29041bfa29a1e49625bab77289a2))
+* **nix:** Use wasi-sdk 12 to provide barretenberg-wasm in overlay ([#315](https://github.com/AztecProtocol/barretenberg/issues/315)) ([4a06992](https://github.com/AztecProtocol/barretenberg/commit/4a069923f4a869f8c2315e6d3f738db6e66dcdfa))
+* Pass brew omp location via LDFLAGS and CPPFLAGS ([#126](https://github.com/AztecProtocol/barretenberg/issues/126)) ([54141f1](https://github.com/AztecProtocol/barretenberg/commit/54141f12de9eee86220003b1f80d39a41795cedc))
+* Remove leveldb_store from stdlib_merkle_tree ([#149](https://github.com/AztecProtocol/barretenberg/issues/149)) ([3ce5e7e](https://github.com/AztecProtocol/barretenberg/commit/3ce5e7e17ca7bb806373be833a44d55a8e584bda))
+* Revert "fix: add NUM_RESERVED_GATES before fetching subgroup size in composer" ([#540](https://github.com/AztecProtocol/barretenberg/issues/540)) ([a9fbc39](https://github.com/AztecProtocol/barretenberg/commit/a9fbc3973f24680f676682d15c3a4cef0a1ab798))
+* Revert generator changes that cause memory OOB access ([#338](https://github.com/AztecProtocol/barretenberg/issues/338)) ([500daf1](https://github.com/AztecProtocol/barretenberg/commit/500daf1ceb03771d2c01eaf1a86139a7ac1d814f))
+* Soundness issue in bigfield's `evaluate_multiply_add` method ([#558](https://github.com/AztecProtocol/barretenberg/issues/558)) ([1a98ac6](https://github.com/AztecProtocol/barretenberg/commit/1a98ac64787a0e2904fd22043497a8d11afe5e6c))
+* **srs:** Detect shasum utility when downloading lagrange ([#143](https://github.com/AztecProtocol/barretenberg/issues/143)) ([515604d](https://github.com/AztecProtocol/barretenberg/commit/515604dff83648e00106f35511aa567921599a78))
+* Store lagrange forms of selector polys w/ Ultra ([#255](https://github.com/AztecProtocol/barretenberg/issues/255)) ([b121963](https://github.com/AztecProtocol/barretenberg/commit/b12196362497c8dfb3a64284d28de2d8ee7d730c))
+* throw -&gt; throw_or_abort in sol gen ([#388](https://github.com/AztecProtocol/barretenberg/issues/388)) ([7cfe3f0](https://github.com/AztecProtocol/barretenberg/commit/7cfe3f055815e333ff8a8f1f30e8377c83d2182a))
+* Trigger release-please ([#594](https://github.com/AztecProtocol/barretenberg/issues/594)) ([5042861](https://github.com/AztecProtocol/barretenberg/commit/5042861405df6b5659c0c32418720d8bdea81081))
+* Update versioning in nix files when a release is made ([#549](https://github.com/AztecProtocol/barretenberg/issues/549)) ([1b3ff93](https://github.com/AztecProtocol/barretenberg/commit/1b3ff93e7ed8873583cdade95a860adb8823f1cd))
+* **wasm:** Remove the CMAKE_STAGING_PREFIX variable from wasm preset ([#240](https://github.com/AztecProtocol/barretenberg/issues/240)) ([f2f8d1f](https://github.com/AztecProtocol/barretenberg/commit/f2f8d1f7a24ca73e30c981fd245c86f7f964abb7))
+* Wrap each use of filesystem library in ifndef __wasm__ ([#181](https://github.com/AztecProtocol/barretenberg/issues/181)) ([0eae962](https://github.com/AztecProtocol/barretenberg/commit/0eae96293b4d2da6b6b23ae80ac132fb49f90915))
+
+
+### Code Refactoring
+
+* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501)) ([709a29c](https://github.com/AztecProtocol/barretenberg/commit/709a29c89a305be017270361780995353188035a))
+
+## [0.2.0](https://github.com/AztecProtocol/barretenberg/compare/v0.1.0...v0.2.0) (2023-07-11)
+
+
+### ⚠ BREAKING CHANGES
+
+* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501))
+
+### Features
+
+* Add `get_sibling_path` method in MerkleTree ([#584](https://github.com/AztecProtocol/barretenberg/issues/584)) ([b3db9f8](https://github.com/AztecProtocol/barretenberg/commit/b3db9f8944e546cd9da9a1529e2562ee75e62369))
+* **dsl:** Add ECDSA secp256r1 verification ([#582](https://github.com/AztecProtocol/barretenberg/issues/582)) ([adc4c7b](https://github.com/AztecProtocol/barretenberg/commit/adc4c7b4eb634eae28dd28e25b94b93a5b49c80e))
+* Initial native version of bb binary. ([#524](https://github.com/AztecProtocol/barretenberg/issues/524)) ([4a1b532](https://github.com/AztecProtocol/barretenberg/commit/4a1b5322dc78921d253e6a374eba0b616ab788df))
+* Make the circuit constructors field agnostic so we can check circuits on grumpkin ([#534](https://github.com/AztecProtocol/barretenberg/issues/534)) ([656d794](https://github.com/AztecProtocol/barretenberg/commit/656d7944f94f3da88250f3140838f3e32e9d0174))
+* Multithreaded Sumcheck ([#556](https://github.com/AztecProtocol/barretenberg/issues/556)) ([c4094b1](https://github.com/AztecProtocol/barretenberg/commit/c4094b155ba9d8e914c3e6a5b0d7808945b1eeed))
+* Optimize memory consumption of pedersen generators ([#413](https://github.com/AztecProtocol/barretenberg/issues/413)) ([d60b16a](https://github.com/AztecProtocol/barretenberg/commit/d60b16a14219fd4bd130ce4537c3e94bfa10128f))
+* Parallelised folding in Gemini ([#550](https://github.com/AztecProtocol/barretenberg/issues/550)) ([3b962d3](https://github.com/AztecProtocol/barretenberg/commit/3b962d372491430871443fd1b95fd9e049e233c8))
+* Sort includes ([#571](https://github.com/AztecProtocol/barretenberg/issues/571)) ([dfa8736](https://github.com/AztecProtocol/barretenberg/commit/dfa8736136323e62a705066d25bef962a6a0b82d))
+* Split plonk and honk tests ([#529](https://github.com/AztecProtocol/barretenberg/issues/529)) ([ba583ff](https://github.com/AztecProtocol/barretenberg/commit/ba583ff00509f636feae7b78304b115e34fc2357))
+
+
+### Bug Fixes
+
+* add NUM_RESERVED_GATES before fetching subgroup size in composer ([#539](https://github.com/AztecProtocol/barretenberg/issues/539)) ([fa11abf](https://github.com/AztecProtocol/barretenberg/commit/fa11abf0877314b03420d6f7ace1312df41cd50b))
+* Adds `VERSION` file to release-please ([#542](https://github.com/AztecProtocol/barretenberg/issues/542)) ([31fb34c](https://github.com/AztecProtocol/barretenberg/commit/31fb34c307a4336414b1fd2076d96105a29b0e7b))
+* Avoid bb.js memory issues. ([#578](https://github.com/AztecProtocol/barretenberg/issues/578)) ([96891de](https://github.com/AztecProtocol/barretenberg/commit/96891de21fd74ca33ea75ae97f73cada39a5d337))
+* BarycentricData instantiation time and unused code in secp curves ([#572](https://github.com/AztecProtocol/barretenberg/issues/572)) ([bc78bb0](https://github.com/AztecProtocol/barretenberg/commit/bc78bb00d273c756fa4f02967d219cd3fd788890))
+* Build on stock apple clang. ([#592](https://github.com/AztecProtocol/barretenberg/issues/592)) ([0ac4bc3](https://github.com/AztecProtocol/barretenberg/commit/0ac4bc36619f85c1b3a65d3f825ba5683cbbe30c))
+* bump timeout on common test. ([c9bc87d](https://github.com/AztecProtocol/barretenberg/commit/c9bc87d29fa1325162cb1e7bf2db7cc85747fd9e))
+* check_circuit bug fix ([#510](https://github.com/AztecProtocol/barretenberg/issues/510)) ([4b156a3](https://github.com/AztecProtocol/barretenberg/commit/4b156a3648e6da9dfe292e354da9a27185d2aa9d))
+* cleanup of include statements and dependencies ([#527](https://github.com/AztecProtocol/barretenberg/issues/527)) ([b288c24](https://github.com/AztecProtocol/barretenberg/commit/b288c2420bdc350658cd3776bad1eb087cc28d63))
+* Ecdsa Malleability Bug ([#512](https://github.com/AztecProtocol/barretenberg/issues/512)) ([5cf856c](https://github.com/AztecProtocol/barretenberg/commit/5cf856c5c29c9f9b8abb87d7bde23b4932711350))
+* **ecdsa:** correct short weierstrass curve eqn  ([#567](https://github.com/AztecProtocol/barretenberg/issues/567)) ([386ec63](https://github.com/AztecProtocol/barretenberg/commit/386ec6372156d604e37e58490f1c7396077f84c4))
+* Increment CMakeList version on releases ([#536](https://github.com/AztecProtocol/barretenberg/issues/536)) ([b571411](https://github.com/AztecProtocol/barretenberg/commit/b571411a6d58f79e3e2553c3b1c81b4f186f2245))
+* Revert "fix: add NUM_RESERVED_GATES before fetching subgroup size in composer" ([#540](https://github.com/AztecProtocol/barretenberg/issues/540)) ([a9fbc39](https://github.com/AztecProtocol/barretenberg/commit/a9fbc3973f24680f676682d15c3a4cef0a1ab798))
+* Soundness issue in bigfield's `evaluate_multiply_add` method ([#558](https://github.com/AztecProtocol/barretenberg/issues/558)) ([1a98ac6](https://github.com/AztecProtocol/barretenberg/commit/1a98ac64787a0e2904fd22043497a8d11afe5e6c))
+* Update versioning in nix files when a release is made ([#549](https://github.com/AztecProtocol/barretenberg/issues/549)) ([1b3ff93](https://github.com/AztecProtocol/barretenberg/commit/1b3ff93e7ed8873583cdade95a860adb8823f1cd))
+
+
+### Code Refactoring
+
+* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501)) ([709a29c](https://github.com/AztecProtocol/barretenberg/commit/709a29c89a305be017270361780995353188035a))
+
+## 0.1.0 (2023-06-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436))
+* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417))
+* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385))
+* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162))
+
+### Features
+
+* Add `signature_verification_result` to schnorr stdlib ([#173](https://github.com/AztecProtocol/barretenberg/issues/173)) ([7ae381e](https://github.com/AztecProtocol/barretenberg/commit/7ae381e4c5a084efde18917569518c7d4040b653))
+* Add equality and serialization to poly_triple ([#172](https://github.com/AztecProtocol/barretenberg/issues/172)) ([142b041](https://github.com/AztecProtocol/barretenberg/commit/142b041b2d3d090785f0e6f319fbf7504c751098))
+* Add installation targets for libbarretenberg, wasm & headers ([#185](https://github.com/AztecProtocol/barretenberg/issues/185)) ([f2fdebe](https://github.com/AztecProtocol/barretenberg/commit/f2fdebe037d4d2d90761f98e28b4b0d3af9a0f63))
+* Add Noir DSL with acir_format and turbo_proofs namespaces ([#198](https://github.com/AztecProtocol/barretenberg/issues/198)) ([54fab22](https://github.com/AztecProtocol/barretenberg/commit/54fab2217f437bb04a5e9fb71b271cf91b90c6e5))
+* Add pkgconfig output for installed target ([#208](https://github.com/AztecProtocol/barretenberg/issues/208)) ([d85a365](https://github.com/AztecProtocol/barretenberg/commit/d85a365180ac2672bbd33bd8b799a1f154716ab3))
+* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417)) ([697fabb](https://github.com/AztecProtocol/barretenberg/commit/697fabb7cbeadb9264db5047e7fd36565dad8790))
+* Allow bootstrap to work with linux + clang on ARM ([#131](https://github.com/AztecProtocol/barretenberg/issues/131)) ([52cb06b](https://github.com/AztecProtocol/barretenberg/commit/52cb06b445c73f2f324af6595af70ce9c130eb09))
+* **api:** external cpp header for circuits ([#489](https://github.com/AztecProtocol/barretenberg/issues/489)) ([fbbb342](https://github.com/AztecProtocol/barretenberg/commit/fbbb34287fdef0e8fedb2e25c5431f17501ad653))
+* **bb.js:** initial API ([#232](https://github.com/AztecProtocol/barretenberg/issues/232)) ([c860b02](https://github.com/AztecProtocol/barretenberg/commit/c860b02d80425de161af50acf33e94d94eb0659c))
+* Benchmark suite update ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
+* Benchmark suite update ([#508](https://github.com/AztecProtocol/barretenberg/issues/508)) ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
+* CI to test aztec circuits with current commit of bberg ([#418](https://github.com/AztecProtocol/barretenberg/issues/418)) ([20a0873](https://github.com/AztecProtocol/barretenberg/commit/20a0873dcbfe4a862ad53a9c137030689a521a04))
+* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436)) ([e0b8804](https://github.com/AztecProtocol/barretenberg/commit/e0b8804b9418c7aa39e29e800fecb4ed15d73b80))
+* **github:** add pull request template ([65f3e33](https://github.com/AztecProtocol/barretenberg/commit/65f3e3312061e7284c0dd0f0f89fa92ee92f9eac))
+* **honk:** Shared relation arithmetic ([#514](https://github.com/AztecProtocol/barretenberg/issues/514)) ([0838474](https://github.com/AztecProtocol/barretenberg/commit/0838474e67469a6d91d6595d1ee23e1dea53863c))
+* Improve barretenberg headers ([#201](https://github.com/AztecProtocol/barretenberg/issues/201)) ([4e03839](https://github.com/AztecProtocol/barretenberg/commit/4e03839a970a5d07dab7f86cd2b7166a09f5045a))
+* **nullifier_tree:** make empty nullifier tree leaves hash be 0 ([#360](https://github.com/AztecProtocol/barretenberg/issues/360)) ([#382](https://github.com/AztecProtocol/barretenberg/issues/382)) ([b85ab8d](https://github.com/AztecProtocol/barretenberg/commit/b85ab8d587b3e93db2aa0f1c4f012e58e5d97915))
+* **pkg-config:** Add a bindir variable ([#239](https://github.com/AztecProtocol/barretenberg/issues/239)) ([611bf34](https://github.com/AztecProtocol/barretenberg/commit/611bf34bcc6f82969a6fe546bf0a7cbecda6d36d))
+* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162)) ([09db0be](https://github.com/AztecProtocol/barretenberg/commit/09db0be3d09ee12b4b73b03abe8fa4565cdb6660))
+* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385)) ([74dbce5](https://github.com/AztecProtocol/barretenberg/commit/74dbce5dfa126ecd6dbda7b758581752f7b6a389))
+* Support nix package manager ([#234](https://github.com/AztecProtocol/barretenberg/issues/234)) ([19a72fe](https://github.com/AztecProtocol/barretenberg/commit/19a72fec0ff8d451fc94a9f5563202867a5f8147))
+* **ts:** allow passing srs via env functions ([#260](https://github.com/AztecProtocol/barretenberg/issues/260)) ([ac78353](https://github.com/AztecProtocol/barretenberg/commit/ac7835304f4524039abf0a0df9ae85d905f55c86))
+* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
+* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([#531](https://github.com/AztecProtocol/barretenberg/issues/531)) ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
+* Utilize globally installed benchmark if available ([#152](https://github.com/AztecProtocol/barretenberg/issues/152)) ([fbc5027](https://github.com/AztecProtocol/barretenberg/commit/fbc502794e9bbdfda797b11ac71eba996d649722))
+* Utilize globally installed gtest if available ([#151](https://github.com/AztecProtocol/barretenberg/issues/151)) ([efa18a6](https://github.com/AztecProtocol/barretenberg/commit/efa18a621917dc6c38f453825cadc76eb793a73c))
+* Utilize globally installed leveldb if available ([#134](https://github.com/AztecProtocol/barretenberg/issues/134)) ([255dfb5](https://github.com/AztecProtocol/barretenberg/commit/255dfb52adca885b0a4e4380769a279922af49ff))
+* Working UltraPlonk for Noir ([#299](https://github.com/AztecProtocol/barretenberg/issues/299)) ([d56dfbd](https://github.com/AztecProtocol/barretenberg/commit/d56dfbdfd74b438b3c8652e1ae8740de99f93ae5))
+
+
+### Bug Fixes
+
+* Align native library object library with wasm ([#238](https://github.com/AztecProtocol/barretenberg/issues/238)) ([4fa6c0d](https://github.com/AztecProtocol/barretenberg/commit/4fa6c0d2d8c6309d53757ad54d3433d1d662de5f))
+* Avoid targeting honk test files when testing is disabled ([#125](https://github.com/AztecProtocol/barretenberg/issues/125)) ([e4a70ed](https://github.com/AztecProtocol/barretenberg/commit/e4a70edf2bb39d67095cbe21fff310372369a92d))
+* bbmalloc linker error ([#459](https://github.com/AztecProtocol/barretenberg/issues/459)) ([d4761c1](https://github.com/AztecProtocol/barretenberg/commit/d4761c11f30eeecbcb2485f50516bee71809bab1))
+* **build:** git add -f .yalc ([#265](https://github.com/AztecProtocol/barretenberg/issues/265)) ([7671192](https://github.com/AztecProtocol/barretenberg/commit/7671192c8a60ff0bc0f8ad3e14ac299ff780cc25))
+* Check for wasm-opt during configure & run on post_build ([#175](https://github.com/AztecProtocol/barretenberg/issues/175)) ([1ff6af3](https://github.com/AztecProtocol/barretenberg/commit/1ff6af3cb6b7b4d3bb53bfbdcbf1c3a568e0fa86))
+* **cmake:** Remove leveldb dependency that was accidentally re-added ([#335](https://github.com/AztecProtocol/barretenberg/issues/335)) ([3534e2b](https://github.com/AztecProtocol/barretenberg/commit/3534e2bfcca46dbca30573286f43425dab6bc810))
+* **dsl:** Use info instead of std::cout to log ([#323](https://github.com/AztecProtocol/barretenberg/issues/323)) ([486d738](https://github.com/AztecProtocol/barretenberg/commit/486d73842b4b7d6aa84fa12d7462fe52e892d416))
+* Ensure barretenberg provides headers that Noir needs ([#200](https://github.com/AztecProtocol/barretenberg/issues/200)) ([0171a49](https://github.com/AztecProtocol/barretenberg/commit/0171a499a175f88a0ee3fcfd4de0f43ad0ebff85))
+* Ensure TBB is optional using OPTIONAL_COMPONENTS ([#127](https://github.com/AztecProtocol/barretenberg/issues/127)) ([e3039b2](https://github.com/AztecProtocol/barretenberg/commit/e3039b26ea8aca4b8fdc4b2cbac6716ace261c76))
+* Fixed the memory issue ([#509](https://github.com/AztecProtocol/barretenberg/issues/509)) ([107d438](https://github.com/AztecProtocol/barretenberg/commit/107d438ad96847e40f8e5374749b8cba820b2007))
+* msgpack error ([#456](https://github.com/AztecProtocol/barretenberg/issues/456)) ([943d6d0](https://github.com/AztecProtocol/barretenberg/commit/943d6d07c57bea521c2593e892e839f25f82b289))
+* msgpack variant_impl.hpp ([#462](https://github.com/AztecProtocol/barretenberg/issues/462)) ([b5838a6](https://github.com/AztecProtocol/barretenberg/commit/b5838a6c9fe456e832776da21379e41c0a2bbd5d))
+* **nix:** Disable ASM & ADX when building in Nix ([#327](https://github.com/AztecProtocol/barretenberg/issues/327)) ([3bc724d](https://github.com/AztecProtocol/barretenberg/commit/3bc724d2163d29041bfa29a1e49625bab77289a2))
+* **nix:** Use wasi-sdk 12 to provide barretenberg-wasm in overlay ([#315](https://github.com/AztecProtocol/barretenberg/issues/315)) ([4a06992](https://github.com/AztecProtocol/barretenberg/commit/4a069923f4a869f8c2315e6d3f738db6e66dcdfa))
+* Pass brew omp location via LDFLAGS and CPPFLAGS ([#126](https://github.com/AztecProtocol/barretenberg/issues/126)) ([54141f1](https://github.com/AztecProtocol/barretenberg/commit/54141f12de9eee86220003b1f80d39a41795cedc))
+* Remove leveldb_store from stdlib_merkle_tree ([#149](https://github.com/AztecProtocol/barretenberg/issues/149)) ([3ce5e7e](https://github.com/AztecProtocol/barretenberg/commit/3ce5e7e17ca7bb806373be833a44d55a8e584bda))
+* Revert generator changes that cause memory OOB access ([#338](https://github.com/AztecProtocol/barretenberg/issues/338)) ([500daf1](https://github.com/AztecProtocol/barretenberg/commit/500daf1ceb03771d2c01eaf1a86139a7ac1d814f))
+* **srs:** Detect shasum utility when downloading lagrange ([#143](https://github.com/AztecProtocol/barretenberg/issues/143)) ([515604d](https://github.com/AztecProtocol/barretenberg/commit/515604dff83648e00106f35511aa567921599a78))
+* Store lagrange forms of selector polys w/ Ultra ([#255](https://github.com/AztecProtocol/barretenberg/issues/255)) ([b121963](https://github.com/AztecProtocol/barretenberg/commit/b12196362497c8dfb3a64284d28de2d8ee7d730c))
+* throw -&gt; throw_or_abort in sol gen ([#388](https://github.com/AztecProtocol/barretenberg/issues/388)) ([7cfe3f0](https://github.com/AztecProtocol/barretenberg/commit/7cfe3f055815e333ff8a8f1f30e8377c83d2182a))
+* **wasm:** Remove the CMAKE_STAGING_PREFIX variable from wasm preset ([#240](https://github.com/AztecProtocol/barretenberg/issues/240)) ([f2f8d1f](https://github.com/AztecProtocol/barretenberg/commit/f2f8d1f7a24ca73e30c981fd245c86f7f964abb7))
+* Wrap each use of filesystem library in ifndef __wasm__ ([#181](https://github.com/AztecProtocol/barretenberg/issues/181)) ([0eae962](https://github.com/AztecProtocol/barretenberg/commit/0eae96293b4d2da6b6b23ae80ac132fb49f90915))
diff --git a/circuits/cpp/barretenberg/LICENSE b/barretenberg/LICENSE
similarity index 100%
rename from circuits/cpp/barretenberg/LICENSE
rename to barretenberg/LICENSE
diff --git a/circuits/cpp/barretenberg/PROJECT b/barretenberg/PROJECT
similarity index 100%
rename from circuits/cpp/barretenberg/PROJECT
rename to barretenberg/PROJECT
diff --git a/circuits/cpp/barretenberg/README.md b/barretenberg/README.md
similarity index 98%
rename from circuits/cpp/barretenberg/README.md
rename to barretenberg/README.md
index bdc96b95d29..a6487a68e6d 100644
--- a/circuits/cpp/barretenberg/README.md
+++ b/barretenberg/README.md
@@ -1,7 +1,7 @@
 ## Barretenberg, an optimized elliptic curve library for the bn128 curve, and PLONK SNARK prover
 
-Barretenberg aims to be a stand-alone and well-specified library, but please see https://github.com/AztecProtocol/aztec-packages/edit/master/circuits/cpp/barretenberg for the authoritative source of this code. 
-The separate repository https://github.com/AztecProtocol/barretenberg is available if working on barretenberg independently of Aztec, however it is encouraged to develop in the context of Aztec to see if it will cause issues for Aztec end-to-end tests. 
+Barretenberg aims to be a stand-alone and well-specified library, but please see https://github.com/AztecProtocol/aztec-packages/edit/master/barretenberg for the authoritative source of this code.
+The separate repository https://github.com/AztecProtocol/barretenberg is available if working on barretenberg independently of Aztec, however it is encouraged to develop in the context of Aztec to see if it will cause issues for Aztec end-to-end tests.
 **Currently, merging only occurs in aztec-packages. This is a mirror-only repository until it matures. Legacy release merges need an admin**
 As the spec solidifies, this should be less of an issue. Aztec and Barretenberg are currently under heavy development.
 
diff --git a/circuits/cpp/barretenberg/VERSION b/barretenberg/VERSION
similarity index 100%
rename from circuits/cpp/barretenberg/VERSION
rename to barretenberg/VERSION
diff --git a/circuits/cpp/barretenberg/acir_tests/.dockerignore b/barretenberg/acir_tests/.dockerignore
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/.dockerignore
rename to barretenberg/acir_tests/.dockerignore
diff --git a/circuits/cpp/barretenberg/acir_tests/.gitignore b/barretenberg/acir_tests/.gitignore
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/.gitignore
rename to barretenberg/acir_tests/.gitignore
diff --git a/circuits/cpp/barretenberg/acir_tests/Dockerfile.bb b/barretenberg/acir_tests/Dockerfile.bb
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/Dockerfile.bb
rename to barretenberg/acir_tests/Dockerfile.bb
diff --git a/circuits/cpp/barretenberg/acir_tests/Dockerfile.bb.js b/barretenberg/acir_tests/Dockerfile.bb.js
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/Dockerfile.bb.js
rename to barretenberg/acir_tests/Dockerfile.bb.js
diff --git a/circuits/cpp/barretenberg/acir_tests/README.md b/barretenberg/acir_tests/README.md
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/README.md
rename to barretenberg/acir_tests/README.md
diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/package.json b/barretenberg/acir_tests/browser-test-app/package.json
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/package.json
rename to barretenberg/acir_tests/browser-test-app/package.json
diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/serve.mt.json b/barretenberg/acir_tests/browser-test-app/serve.mt.json
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/serve.mt.json
rename to barretenberg/acir_tests/browser-test-app/serve.mt.json
diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.html b/barretenberg/acir_tests/browser-test-app/src/index.html
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.html
rename to barretenberg/acir_tests/browser-test-app/src/index.html
diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.ts b/barretenberg/acir_tests/browser-test-app/src/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.ts
rename to barretenberg/acir_tests/browser-test-app/src/index.ts
diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/tsconfig.json b/barretenberg/acir_tests/browser-test-app/tsconfig.json
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/tsconfig.json
rename to barretenberg/acir_tests/browser-test-app/tsconfig.json
diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/webpack.config.js b/barretenberg/acir_tests/browser-test-app/webpack.config.js
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/webpack.config.js
rename to barretenberg/acir_tests/browser-test-app/webpack.config.js
diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/yarn.lock b/barretenberg/acir_tests/browser-test-app/yarn.lock
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/yarn.lock
rename to barretenberg/acir_tests/browser-test-app/yarn.lock
diff --git a/circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh b/barretenberg/acir_tests/flows/all_cmds.sh
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh
rename to barretenberg/acir_tests/flows/all_cmds.sh
diff --git a/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh b/barretenberg/acir_tests/flows/prove_and_verify.sh
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh
rename to barretenberg/acir_tests/flows/prove_and_verify.sh
diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/bb.js.browser b/barretenberg/acir_tests/headless-test/bb.js.browser
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/headless-test/bb.js.browser
rename to barretenberg/acir_tests/headless-test/bb.js.browser
diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/package.json b/barretenberg/acir_tests/headless-test/package.json
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/headless-test/package.json
rename to barretenberg/acir_tests/headless-test/package.json
diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts b/barretenberg/acir_tests/headless-test/src/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts
rename to barretenberg/acir_tests/headless-test/src/index.ts
diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/tsconfig.json b/barretenberg/acir_tests/headless-test/tsconfig.json
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/headless-test/tsconfig.json
rename to barretenberg/acir_tests/headless-test/tsconfig.json
diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/yarn.lock b/barretenberg/acir_tests/headless-test/yarn.lock
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/headless-test/yarn.lock
rename to barretenberg/acir_tests/headless-test/yarn.lock
diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/barretenberg/acir_tests/run_acir_tests.sh
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh
rename to barretenberg/acir_tests/run_acir_tests.sh
diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests_browser.sh b/barretenberg/acir_tests/run_acir_tests_browser.sh
similarity index 100%
rename from circuits/cpp/barretenberg/acir_tests/run_acir_tests_browser.sh
rename to barretenberg/acir_tests/run_acir_tests_browser.sh
diff --git a/circuits/cpp/barretenberg/barretenberg-wasm.nix b/barretenberg/barretenberg-wasm.nix
similarity index 100%
rename from circuits/cpp/barretenberg/barretenberg-wasm.nix
rename to barretenberg/barretenberg-wasm.nix
diff --git a/circuits/cpp/barretenberg/barretenberg.code-workspace b/barretenberg/barretenberg.code-workspace
similarity index 100%
rename from circuits/cpp/barretenberg/barretenberg.code-workspace
rename to barretenberg/barretenberg.code-workspace
diff --git a/circuits/cpp/barretenberg/barretenberg.nix b/barretenberg/barretenberg.nix
similarity index 100%
rename from circuits/cpp/barretenberg/barretenberg.nix
rename to barretenberg/barretenberg.nix
diff --git a/circuits/cpp/barretenberg/bootstrap.sh b/barretenberg/bootstrap.sh
similarity index 100%
rename from circuits/cpp/barretenberg/bootstrap.sh
rename to barretenberg/bootstrap.sh
diff --git a/circuits/cpp/barretenberg/bootstrap_docker.sh b/barretenberg/bootstrap_docker.sh
similarity index 100%
rename from circuits/cpp/barretenberg/bootstrap_docker.sh
rename to barretenberg/bootstrap_docker.sh
diff --git a/circuits/cpp/barretenberg/build-system b/barretenberg/build-system
similarity index 100%
rename from circuits/cpp/barretenberg/build-system
rename to barretenberg/build-system
diff --git a/circuits/cpp/barretenberg/build_manifest.json b/barretenberg/build_manifest.json
similarity index 100%
rename from circuits/cpp/barretenberg/build_manifest.json
rename to barretenberg/build_manifest.json
diff --git a/circuits/cpp/barretenberg/build_manifest.sh b/barretenberg/build_manifest.sh
similarity index 100%
rename from circuits/cpp/barretenberg/build_manifest.sh
rename to barretenberg/build_manifest.sh
diff --git a/circuits/cpp/barretenberg/cpp/.aztec-packages-commit b/barretenberg/cpp/.aztec-packages-commit
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/.aztec-packages-commit
rename to barretenberg/cpp/.aztec-packages-commit
diff --git a/circuits/cpp/barretenberg/cpp/.clang-format b/barretenberg/cpp/.clang-format
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/.clang-format
rename to barretenberg/cpp/.clang-format
diff --git a/circuits/cpp/barretenberg/cpp/.clangd b/barretenberg/cpp/.clangd
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/.clangd
rename to barretenberg/cpp/.clangd
diff --git a/circuits/cpp/barretenberg/cpp/.dockerignore b/barretenberg/cpp/.dockerignore
similarity index 92%
rename from circuits/cpp/barretenberg/cpp/.dockerignore
rename to barretenberg/cpp/.dockerignore
index f426dc2cbd6..0f7ce6f5134 100644
--- a/circuits/cpp/barretenberg/cpp/.dockerignore
+++ b/barretenberg/cpp/.dockerignore
@@ -17,3 +17,5 @@
 
 # Needed scripts.
 !scripts/install-wasi-sdk.sh
+!./.clang-format
+!./format.sh
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/.gitignore b/barretenberg/cpp/.gitignore
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/.gitignore
rename to barretenberg/cpp/.gitignore
diff --git a/barretenberg/cpp/.rebuild_patterns b/barretenberg/cpp/.rebuild_patterns
new file mode 100644
index 00000000000..0c13870647a
--- /dev/null
+++ b/barretenberg/cpp/.rebuild_patterns
@@ -0,0 +1,3 @@
+^barretenberg/.*\\.(cpp|cc|cxx|c\\+\\+|h|hpp|hxx|h\\+\\+|c|h|inl|inc|ipp|tpp|cmake)$
+^barretenberg/.*CMakeLists\\.txt$
+^barretenberg/.*Dockerfile.*$
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt
similarity index 96%
rename from circuits/cpp/barretenberg/cpp/CMakeLists.txt
rename to barretenberg/cpp/CMakeLists.txt
index 7df5f20ad7a..515ccee5241 100644
--- a/circuits/cpp/barretenberg/cpp/CMakeLists.txt
+++ b/barretenberg/cpp/CMakeLists.txt
@@ -21,7 +21,6 @@ option(DISABLE_TBB "Intel Thread Building Blocks" ON)
 option(COVERAGE "Enable collecting coverage from tests" OFF)
 option(ENABLE_ASAN "Address sanitizer for debugging tricky memory corruption" OFF)
 option(ENABLE_HEAVY_TESTS "Enable heavy tests when collecting coverage" OFF)
-option(INSTALL_BARRETENBERG "Enable installation of barretenberg. (Projects embedding barretenberg may want to turn this OFF.)" ON)
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
     message(STATUS "Compiling for ARM.")
diff --git a/circuits/cpp/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json
similarity index 97%
rename from circuits/cpp/barretenberg/cpp/CMakePresets.json
rename to barretenberg/cpp/CMakePresets.json
index cd785ecf5ed..6ac7fd933f6 100644
--- a/circuits/cpp/barretenberg/cpp/CMakePresets.json
+++ b/barretenberg/cpp/CMakePresets.json
@@ -215,7 +215,14 @@
       "configurePreset": "wasm",
       "inheritConfigureEnvironment": true,
       "jobs": 0,
-      "targets": ["barretenberg.wasm", "acvm_backend.wasm"]
+      "targets": [
+        "barretenberg.wasm",
+        "acvm_backend.wasm",
+        "barretenberg",
+        "wasi",
+        "env",
+        "honk_tests"
+      ]
     },
     {
       "name": "wasm-dbg",
diff --git a/circuits/cpp/barretenberg/cpp/bootstrap.sh b/barretenberg/cpp/bootstrap.sh
similarity index 72%
rename from circuits/cpp/barretenberg/cpp/bootstrap.sh
rename to barretenberg/cpp/bootstrap.sh
index 4cc41dfb740..b1b1c27cb01 100755
--- a/circuits/cpp/barretenberg/cpp/bootstrap.sh
+++ b/barretenberg/cpp/bootstrap.sh
@@ -1,19 +1,13 @@
 #!/bin/bash
 set -eu
 
+# Navigate to script folder
+cd "$(dirname "$0")"
+
 # Clean.
 rm -rf ./build
 rm -rf ./build-wasm
 
-# Install formatting git hook.
-HOOKS_DIR=$(git rev-parse --git-path hooks)
-# The pre-commit script will live in a barretenberg-specific hooks directory
-# Find it based on the script directory.
-# TODO(AD) it is a bit unintuitive that bootstrap sets one up for a barretenberg-oriented workflow
-SCRIPT_PWD=`pwd` # fix: capture pwd instead of writing into script
-echo "cd $SCRIPT_PWD && ./format.sh staged" > $HOOKS_DIR/pre-commit
-chmod +x $HOOKS_DIR/pre-commit
-
 # Determine system.
 if [[ "$OSTYPE" == "darwin"* ]]; then
   OS=macos
@@ -25,9 +19,7 @@ else
 fi
 
 # Download ignition transcripts.
-cd ./srs_db
-./download_ignition.sh 3
-cd ..
+(cd ./srs_db && ./download_ignition.sh 3)
 
 # Pick native toolchain file.
 ARCH=$(uname -m)
diff --git a/circuits/cpp/barretenberg/cpp/cmake/arch.cmake b/barretenberg/cpp/cmake/arch.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/arch.cmake
rename to barretenberg/cpp/cmake/arch.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/barretenberg.pc.in b/barretenberg/cpp/cmake/barretenberg.pc.in
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/barretenberg.pc.in
rename to barretenberg/cpp/cmake/barretenberg.pc.in
diff --git a/circuits/cpp/barretenberg/cpp/cmake/benchmark.cmake b/barretenberg/cpp/cmake/benchmark.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/benchmark.cmake
rename to barretenberg/cpp/cmake/benchmark.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/build.cmake b/barretenberg/cpp/cmake/build.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/build.cmake
rename to barretenberg/cpp/cmake/build.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/gtest.cmake b/barretenberg/cpp/cmake/gtest.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/gtest.cmake
rename to barretenberg/cpp/cmake/gtest.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/module.cmake b/barretenberg/cpp/cmake/module.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/module.cmake
rename to barretenberg/cpp/cmake/module.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/threading.cmake b/barretenberg/cpp/cmake/threading.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/threading.cmake
rename to barretenberg/cpp/cmake/threading.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake b/barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake
rename to barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake b/barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake
rename to barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/i386-linux.cmake b/barretenberg/cpp/cmake/toolchains/i386-linux.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/i386-linux.cmake
rename to barretenberg/cpp/cmake/toolchains/i386-linux.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake b/barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake
rename to barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake b/barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake
rename to barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake
diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake b/barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake
rename to barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake
diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
similarity index 50%
rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
rename to barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
index 48e54f5b97a..c642b4a9a66 100644
--- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang
@@ -5,11 +5,17 @@ WORKDIR /usr/src/barretenberg/cpp
 COPY ./scripts/install-wasi-sdk.sh ./scripts/install-wasi-sdk.sh
 RUN ./scripts/install-wasi-sdk.sh
 COPY . .
-# Build both honk_tests barretenberg.wasm
-# This ensures that we aren't using features that would be incompatible with WASM for Honk
-RUN cmake --preset wasm && cmake --build --preset wasm --target honk_tests --target barretenberg.wasm
-RUN cmake --preset wasm-threads && cmake --build --preset wasm-threads --target barretenberg.wasm
+RUN cmake --preset wasm && cmake --build --preset wasm
+RUN cmake --preset wasm-threads && cmake --build --preset wasm-threads
 
-FROM alpine:3.18
+FROM scratch
+WORKDIR /usr/src/barretenberg/cpp
+COPY . .
 COPY --from=builder /usr/src/barretenberg/cpp/build-wasm/bin/barretenberg.wasm /usr/src/barretenberg/cpp/build-wasm/bin/barretenberg.wasm
 COPY --from=builder /usr/src/barretenberg/cpp/build-wasm-threads/bin/barretenberg.wasm /usr/src/barretenberg/cpp/build-wasm-threads/bin/barretenberg.wasm
+# Copy libs for consuming projects.
+COPY --from=builder /usr/src/barretenberg/cpp/build-wasm/lib/libbarretenberg.a /usr/src/barretenberg/cpp/build-wasm/lib/libbarretenberg.a
+COPY --from=builder /usr/src/barretenberg/cpp/build-wasm/lib/libwasi.a /usr/src/barretenberg/cpp/build-wasm/lib/libwasi.a
+COPY --from=builder /usr/src/barretenberg/cpp/build-wasm/lib/libenv.a /usr/src/barretenberg/cpp/build-wasm/lib/libenv.a
+# Copy wasi-sdk so that consuming projects have the toolchain available.
+COPY --from=builder /usr/src/barretenberg/cpp/src/wasi-sdk-20.0 /usr/src/barretenberg/cpp/src/wasi-sdk-20.0
\ No newline at end of file
diff --git a/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
new file mode 100644
index 00000000000..79ce703bf62
--- /dev/null
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
@@ -0,0 +1,23 @@
+FROM alpine:3.18 AS builder
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache \
+        build-base \
+        clang16 \
+        cmake \
+        ninja \
+        git \
+        curl \
+        perl
+WORKDIR /usr/src/barretenberg/cpp
+COPY . .
+# Build bb binary. Everything else is built as part linux-clang-assert.
+RUN cmake --preset default && cmake --build --preset default --target bb
+
+FROM alpine:3.18
+WORKDIR /usr/src/barretenberg/cpp
+COPY . .
+COPY --from=builder /usr/src/barretenberg/cpp/build/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
+# Copy libs for consuming projects.
+COPY --from=builder /usr/src/barretenberg/cpp/build/lib/libbarretenberg.a /usr/src/barretenberg/cpp/build/lib/libbarretenberg.a
+COPY --from=builder /usr/src/barretenberg/cpp/build/lib/libenv.a /usr/src/barretenberg/cpp/build/lib/libenv.a
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
similarity index 55%
rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
index c80a62e3118..a44442d0bf4 100644
--- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
@@ -1,23 +1,23 @@
-FROM alpine:3.18 AS builder
+# We have to stay on 3.17 for now, to get clang-format 15, as code is not yet formatted to 16.
+FROM alpine:3.17 AS builder
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache \
         build-base \
-        clang16 \
-        openmp-dev \
+        clang15 \
         cmake \
         ninja \
         git \
         curl \
-        perl
-
+        perl \
+        clang-extra-tools \
+        bash
 WORKDIR /usr/src/barretenberg/cpp
-
 COPY . .
 # Build everything to ensure everything builds. All tests will be run from the result of this build.
-RUN cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON && cmake --build --preset default
+RUN ./format.sh check && cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON && cmake --build --preset default
 
-FROM alpine:3.18
-RUN apk update && apk add curl openmp
+FROM alpine:3.17
+RUN apk update && apk add curl libstdc++
 COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
 COPY --from=builder /usr/src/barretenberg/cpp/build/bin /usr/src/barretenberg/cpp/build/bin
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks
rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks
diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing
rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing
diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
similarity index 73%
rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
index 9953c1b003c..4b27ba18a5f 100644
--- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
+++ b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
@@ -13,5 +13,5 @@ COPY . .
 RUN cmake --preset gcc -DCI=ON && cmake --build --preset gcc
 
 FROM alpine:3.18
-RUN apk update && apk add libstdc++ libgomp
-COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
+RUN apk update && apk add libstdc++
+COPY --from=builder /usr/src/barretenberg/cpp/build/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
diff --git a/circuits/cpp/barretenberg/cpp/docs/Fuzzing.md b/barretenberg/cpp/docs/Fuzzing.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/docs/Fuzzing.md
rename to barretenberg/cpp/docs/Fuzzing.md
diff --git a/circuits/cpp/barretenberg/cpp/format.sh b/barretenberg/cpp/format.sh
similarity index 69%
rename from circuits/cpp/barretenberg/cpp/format.sh
rename to barretenberg/cpp/format.sh
index 48315e39621..0bf8bca805c 100755
--- a/circuits/cpp/barretenberg/cpp/format.sh
+++ b/barretenberg/cpp/format.sh
@@ -1,20 +1,24 @@
 #!/bin/bash
-set -eu
+set -e
 
 if [ "$1" == "staged" ]; then
-  echo Formatting staged files...
+  echo Formatting barretenberg staged files...
   for FILE in $(git diff-index --diff-filter=d --relative --cached --name-only HEAD | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
     clang-format -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
     git add $FILE
   done
+elif [ "$1" == "check" ]; then
+  for FILE in $(find ./src -iname *.hpp -o -iname *.cpp -o -iname *.tcc | grep -v src/msgpack-c); do
+    clang-format --dry-run --Werror $FILE
+  done
 elif [ -n "$1" ]; then
   for FILE in $(git diff-index --relative --name-only $1 | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
     clang-format -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
   done
 else
-  for FILE in $(find ./src -iname *.hpp -o -iname *.cpp -o -iname *.tcc | grep -v src/boost); do
+  for FILE in $(find ./src -iname *.hpp -o -iname *.cpp -o -iname *.tcc | grep -v src/msgpack-c); do
     clang-format -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
   done
diff --git a/circuits/cpp/barretenberg/cpp/notebook.ipynb b/barretenberg/cpp/notebook.ipynb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/notebook.ipynb
rename to barretenberg/cpp/notebook.ipynb
diff --git a/circuits/cpp/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/scripts/bb-tests.sh
rename to barretenberg/cpp/scripts/bb-tests.sh
diff --git a/circuits/cpp/barretenberg/cpp/scripts/collect_coverage_information.sh b/barretenberg/cpp/scripts/collect_coverage_information.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/scripts/collect_coverage_information.sh
rename to barretenberg/cpp/scripts/collect_coverage_information.sh
diff --git a/circuits/cpp/barretenberg/cpp/scripts/install-wasi-sdk.sh b/barretenberg/cpp/scripts/install-wasi-sdk.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/scripts/install-wasi-sdk.sh
rename to barretenberg/cpp/scripts/install-wasi-sdk.sh
diff --git a/circuits/cpp/barretenberg/cpp/scripts/run_tests b/barretenberg/cpp/scripts/run_tests
similarity index 85%
rename from circuits/cpp/barretenberg/cpp/scripts/run_tests
rename to barretenberg/cpp/scripts/run_tests
index b3b7ba69cd7..427a34531b0 100755
--- a/circuits/cpp/barretenberg/cpp/scripts/run_tests
+++ b/barretenberg/cpp/scripts/run_tests
@@ -18,7 +18,8 @@ export PATH="$PATH:$(git rev-parse --show-toplevel)/build-system/scripts"
 IMAGE_URI=$(calculate_image_uri $REPOSITORY)
 retry docker pull $IMAGE_URI
 
-if [ -f "$TESTS" ]; then
+# If there is a file in the scripts directory named $TESTS, those are the tests to run.
+if [ -f "$(query_manifest projectDir $REPOSITORY)/scripts/$TESTS" ]; then
   TESTS=$(cat $TESTS | tr '\n' ' ')
 fi
 
diff --git a/circuits/cpp/barretenberg/cpp/scripts/stdlib-tests b/barretenberg/cpp/scripts/stdlib-tests
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/scripts/stdlib-tests
rename to barretenberg/cpp/scripts/stdlib-tests
diff --git a/circuits/cpp/barretenberg/cpp/scripts/strip-wasm.sh b/barretenberg/cpp/scripts/strip-wasm.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/scripts/strip-wasm.sh
rename to barretenberg/cpp/scripts/strip-wasm.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt
similarity index 83%
rename from circuits/cpp/barretenberg/cpp/src/CMakeLists.txt
rename to barretenberg/cpp/src/CMakeLists.txt
index 797035bcfe1..51ecf4fabbd 100644
--- a/circuits/cpp/barretenberg/cpp/src/CMakeLists.txt
+++ b/barretenberg/cpp/src/CMakeLists.txt
@@ -190,49 +190,10 @@ if(WASM)
         PRIVATE
         -nostartfiles -Wl,--no-entry,--export-dynamic,--allow-undefined
     )
+
     target_link_options(
         acvm_backend.wasm
         PRIVATE
         -nostartfiles -Wl,--no-entry,--export-dynamic,--allow-undefined
     )
-
-    if(INSTALL_BARRETENBERG)
-        install(TARGETS barretenberg.wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
-        install(TARGETS acvm_backend.wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
-    endif()
-
-else()
-    if(INSTALL_BARRETENBERG)
-        # The `install` function takes targets to install in different destinations on the system.
-        install(
-
-            # TODO(dbanks12): should only need to install API headers
-            TARGETS barretenberg barretenberg_headers
-
-            # We also give it an optional export name in case something wants to target the install.
-            EXPORT barretenbergTargets
-
-            # The ARCHIVE output signifies static libraries that should be installed
-            # and we use the GNUInstallDirs location to install into the standard system library location
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-
-            # The FILE_SET output is used instead of PUBLIC_HEADER & PRIVATE_HEADER outputs because
-            # our headers don't have a clear delineation between public & private, but we still use
-            # the GNUInstallDirs location to install into the standard system header location
-            FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        )
-
-        set(pkg_config "${PROJECT_BINARY_DIR}/barretenberg.pc")
-
-        configure_file(
-            "${PROJECT_SOURCE_DIR}/cmake/barretenberg.pc.in"
-            "${pkg_config}"
-            @ONLY
-        )
-
-        install(
-            FILES "${pkg_config}"
-            DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-        )
-    endif()
 endif()
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/barretenberg.hpp b/barretenberg/cpp/src/barretenberg/barretenberg.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/barretenberg.hpp
rename to barretenberg/cpp/src/barretenberg/barretenberg.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp b/barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp
rename to barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/file_io.hpp b/barretenberg/cpp/src/barretenberg/bb/file_io.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/file_io.hpp
rename to barretenberg/cpp/src/barretenberg/bb/file_io.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp b/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp
rename to barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp b/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp
rename to barretenberg/cpp/src/barretenberg/bb/get_crs.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_witness.hpp b/barretenberg/cpp/src/barretenberg/bb/get_witness.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_witness.hpp
rename to barretenberg/cpp/src/barretenberg/bb/get_witness.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/log.hpp b/barretenberg/cpp/src/barretenberg/bb/log.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/log.hpp
rename to barretenberg/cpp/src/barretenberg/bb/log.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp
rename to barretenberg/cpp/src/barretenberg/bb/main.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/readme.md b/barretenberg/cpp/src/barretenberg/bb/readme.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/readme.md
rename to barretenberg/cpp/src/barretenberg/bb/readme.md
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh b/barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh
rename to barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp b/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/common/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/common/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/assert.hpp b/barretenberg/cpp/src/barretenberg/common/assert.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/assert.hpp
rename to barretenberg/cpp/src/barretenberg/common/assert.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.cpp b/barretenberg/cpp/src/barretenberg/common/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/common/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.hpp b/barretenberg/cpp/src/barretenberg/common/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/common/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp b/barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp
rename to barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/container.hpp b/barretenberg/cpp/src/barretenberg/common/container.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/container.hpp
rename to barretenberg/cpp/src/barretenberg/common/container.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/common/fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp b/barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp
rename to barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/inline.hpp b/barretenberg/cpp/src/barretenberg/common/inline.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/inline.hpp
rename to barretenberg/cpp/src/barretenberg/common/inline.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/log.hpp b/barretenberg/cpp/src/barretenberg/common/log.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/log.hpp
rename to barretenberg/cpp/src/barretenberg/common/log.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/map.hpp b/barretenberg/cpp/src/barretenberg/common/map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/map.hpp
rename to barretenberg/cpp/src/barretenberg/common/map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.cpp b/barretenberg/cpp/src/barretenberg/common/mem.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.cpp
rename to barretenberg/cpp/src/barretenberg/common/mem.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.hpp b/barretenberg/cpp/src/barretenberg/common/mem.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.hpp
rename to barretenberg/cpp/src/barretenberg/common/mem.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h b/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h
rename to barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h b/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h
rename to barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h b/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h
rename to barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/net.hpp b/barretenberg/cpp/src/barretenberg/common/net.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/net.hpp
rename to barretenberg/cpp/src/barretenberg/common/net.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp
rename to barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp
rename to barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp
rename to barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp
rename to barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp
rename to barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp
rename to barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/printf.hpp b/barretenberg/cpp/src/barretenberg/common/printf.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/printf.hpp
rename to barretenberg/cpp/src/barretenberg/common/printf.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/serialize.hpp b/barretenberg/cpp/src/barretenberg/common/serialize.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/serialize.hpp
rename to barretenberg/cpp/src/barretenberg/common/serialize.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp b/barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp
rename to barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp b/barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp
rename to barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/streams.hpp b/barretenberg/cpp/src/barretenberg/common/streams.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/streams.hpp
rename to barretenberg/cpp/src/barretenberg/common/streams.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/test.hpp b/barretenberg/cpp/src/barretenberg/common/test.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/test.hpp
rename to barretenberg/cpp/src/barretenberg/common/test.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.cpp b/barretenberg/cpp/src/barretenberg/common/thread.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.cpp
rename to barretenberg/cpp/src/barretenberg/common/thread.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.hpp b/barretenberg/cpp/src/barretenberg/common/thread.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.hpp
rename to barretenberg/cpp/src/barretenberg/common/thread.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp b/barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp
rename to barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/timer.hpp b/barretenberg/cpp/src/barretenberg/common/timer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/timer.hpp
rename to barretenberg/cpp/src/barretenberg/common/timer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/wasm_export.hpp b/barretenberg/cpp/src/barretenberg/common/wasm_export.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/wasm_export.hpp
rename to barretenberg/cpp/src/barretenberg/common/wasm_export.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h
rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp b/barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp b/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp b/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp b/barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp b/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp
rename to barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp
rename to barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/types.hpp b/barretenberg/cpp/src/barretenberg/dsl/types.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/types.hpp
rename to barretenberg/cpp/src/barretenberg/dsl/types.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py b/barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py
rename to barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc b/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc
rename to barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc b/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc
rename to barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/pippenger.md b/barretenberg/cpp/src/barretenberg/ecc/pippenger.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/pippenger.md
rename to barretenberg/cpp/src/barretenberg/ecc/pippenger.md
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp
rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp
rename to barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/env/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/env/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.cpp b/barretenberg/cpp/src/barretenberg/env/data_store.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.cpp
rename to barretenberg/cpp/src/barretenberg/env/data_store.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.hpp b/barretenberg/cpp/src/barretenberg/env/data_store.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.hpp
rename to barretenberg/cpp/src/barretenberg/env/data_store.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp b/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp
rename to barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp b/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp
rename to barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.cpp b/barretenberg/cpp/src/barretenberg/env/logstr.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.cpp
rename to barretenberg/cpp/src/barretenberg/env/logstr.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.hpp b/barretenberg/cpp/src/barretenberg/env/logstr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.hpp
rename to barretenberg/cpp/src/barretenberg/env/logstr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp b/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/examples/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp b/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/examples/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp
rename to barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
rename to barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp
rename to barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp b/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp
rename to barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp
rename to barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp b/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp
rename to barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp
rename to barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp
rename to barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp b/barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
rename to barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
rename to barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
rename to barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
rename to barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
rename to barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
rename to barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp
rename to barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp
rename to barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp
rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp
rename to barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp b/barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp
rename to barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp b/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp
rename to barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp b/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp
rename to barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
rename to barretenberg/cpp/src/barretenberg/join_split_example/types.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp b/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp b/barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp
rename to barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp
rename to barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp
rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp b/barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp b/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp b/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp b/barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.hpp b/barretenberg/cpp/src/barretenberg/polynomials/pow.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/pow.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp b/barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp b/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
rename to barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp
rename to barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
similarity index 98%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
index 94c251449a7..285eed8283c 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
+++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp
@@ -520,17 +520,16 @@ template <typename FF> msgpack::sbuffer StandardCircuitBuilder_<FF>::export_circ
 {
     using base = CircuitBuilderBase<arithmetization::Standard<FF>>;
     CircuitSchema cir;
-    
-    uint64_t modulus[4] = {FF::Params::modulus_0, FF::Params::modulus_1, FF::Params::modulus_2, FF::Params::modulus_3};
+
+    uint64_t modulus[4] = {
+        FF::Params::modulus_0, FF::Params::modulus_1, FF::Params::modulus_2, FF::Params::modulus_3
+    };
     std::stringstream buf;
-    buf << std::hex << std::setfill('0') 
-        << std::setw(16) << modulus[3] 
-        << std::setw(16) << modulus[2] 
-        << std::setw(16) << modulus[1] 
-        << std::setw(16) << modulus[0];
+    buf << std::hex << std::setfill('0') << std::setw(16) << modulus[3] << std::setw(16) << modulus[2] << std::setw(16)
+        << modulus[1] << std::setw(16) << modulus[0];
 
     cir.modulus = buf.str();
-    
+
     for (uint32_t i = 0; i < this->get_num_public_inputs(); i++) {
         cir.public_inps.push_back(this->real_variable_index[this->public_inputs[i]]);
     }
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp b/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp
rename to barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp
rename to barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind.hpp b/barretenberg/cpp/src/barretenberg/serialize/cbind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/cbind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp b/barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp
rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp b/barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp b/barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp
rename to barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/README.md b/barretenberg/cpp/src/barretenberg/smt_verification/README.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/README.md
rename to barretenberg/cpp/src/barretenberg/smt_verification/README.md
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
similarity index 67%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
index 035711a51ac..7ff95288576 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp
@@ -6,9 +6,9 @@ namespace smt_circuit {
  * @brief Get the CircuitSchema object
  * @details Initialize the CircuitSchmea from the binary file
  * that contains an msgpack compatible buffer.
- * 
- * @param filename 
- * @return CircuitSchema 
+ *
+ * @param filename
+ * @return CircuitSchema
  */
 CircuitSchema unpack_from_file(const std::string& filename)
 {
@@ -37,9 +37,9 @@ CircuitSchema unpack_from_file(const std::string& filename)
 /**
  * @brief Get the CircuitSchema object
  * @details Initialize the CircuitSchmea from the msgpack compatible buffer.
- * 
- * @param buf 
- * @return CircuitSchema 
+ *
+ * @param buf
+ * @return CircuitSchema
  */
 CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf)
 {
@@ -50,12 +50,12 @@ CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf)
 
 /**
  * @brief Check your circuit for witness uniqness
- * 
+ *
  * @details Creates two Circuit objects that represent the same
  * circuit, however you can choose which variables should be (not) equal in both cases,
  * and also the variables that should (not) be equal at the same time.
- *  
- * @param circuit_info 
+ *
+ * @param circuit_info
  * @param s pointer to the global solver
  * @param equal all the variables that should be equal in both circuits
  * @param nequal all the variables that should be different in both circuits
@@ -65,11 +65,11 @@ CircuitSchema unpack_from_buffer(const msgpack::sbuffer& buf)
  */
 template <typename FF>
 std::pair<Circuit<FF>, Circuit<FF>> unique_witness(CircuitSchema& circuit_info,
-                                           Solver* s,
-                                           const std::vector<std::string>& equal,
-                                           const std::vector<std::string>& not_equal,
-                                           const std::vector<std::string>& equal_at_the_same_time,
-                                           const std::vector<std::string>& not_equal_at_the_same_time)
+                                                   Solver* s,
+                                                   const std::vector<std::string>& equal,
+                                                   const std::vector<std::string>& not_equal,
+                                                   const std::vector<std::string>& equal_at_the_same_time,
+                                                   const std::vector<std::string>& not_equal_at_the_same_time)
 {
     Circuit<FF> c1(circuit_info, s, "circuit1");
     Circuit<FF> c2(circuit_info, s, "circuit2");
@@ -107,18 +107,20 @@ std::pair<Circuit<FF>, Circuit<FF>> unique_witness(CircuitSchema& circuit_info,
     return { c1, c2 };
 }
 
-template std::pair<Circuit<FFTerm>, Circuit<FFTerm>> unique_witness(CircuitSchema& circuit_info,
-                                           Solver* s,
-                                           const std::vector<std::string>& equal = {},
-                                           const std::vector<std::string>& not_equal = {},
-                                           const std::vector<std::string>& equal_at_the_same_time = {},
-                                           const std::vector<std::string>& not_eqaul_at_the_same_time = {});
+template std::pair<Circuit<FFTerm>, Circuit<FFTerm>> unique_witness(
+    CircuitSchema& circuit_info,
+    Solver* s,
+    const std::vector<std::string>& equal = {},
+    const std::vector<std::string>& not_equal = {},
+    const std::vector<std::string>& equal_at_the_same_time = {},
+    const std::vector<std::string>& not_eqaul_at_the_same_time = {});
 
-template std::pair<Circuit<FFITerm>, Circuit<FFITerm>> unique_witness(CircuitSchema& circuit_info,
-                                           Solver* s,
-                                           const std::vector<std::string>& equal = {},
-                                           const std::vector<std::string>& not_equal = {},
-                                           const std::vector<std::string>& equal_at_the_same_time = {},
-                                           const std::vector<std::string>& not_eqaul_at_the_same_time = {});
+template std::pair<Circuit<FFITerm>, Circuit<FFITerm>> unique_witness(
+    CircuitSchema& circuit_info,
+    Solver* s,
+    const std::vector<std::string>& equal = {},
+    const std::vector<std::string>& not_equal = {},
+    const std::vector<std::string>& equal_at_the_same_time = {},
+    const std::vector<std::string>& not_eqaul_at_the_same_time = {});
 
 }; // namespace smt_circuit
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
similarity index 76%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
index 5fa1d6b9645..9765e5233b8 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp
@@ -34,8 +34,7 @@ struct CircuitSchema {
  *
  * @tparam FF FFTerm or FFITerm
  */
-template<typename FF>
-class Circuit {
+template <typename FF> class Circuit {
   private:
     void init();
     void add_gates();
@@ -64,7 +63,7 @@ class Circuit {
 
 /**
  * @brief Construct a new Circuit::Circuit object
- * 
+ *
  * @param circuit_info CircuitShema object
  * @param solver pointer to the global solver
  * @param tag tag of the circuit. Empty by default.
@@ -119,10 +118,9 @@ Circuit<FF>::Circuit(CircuitSchema& circuit_info, Solver* solver, const std::str
 /**
  * Creates all the needed symbolic variables and constants
  * which are used in circuit.
- * 
+ *
  */
-template <typename FF>
-void Circuit<FF>::init()
+template <typename FF> void Circuit<FF>::init()
 {
     size_t num_vars = variables.size();
 
@@ -148,10 +146,9 @@ void Circuit<FF>::init()
 
 /**
  * @brief Adds all the gate constraints to the solver.
- * 
+ *
  */
-template <typename FF>
-void Circuit<FF>::add_gates()
+template <typename FF> void Circuit<FF>::add_gates()
 {
     for (size_t i = 0; i < get_num_gates(); i++) {
         FF q_m = FF::Const(selectors[i][0], this->solver);
@@ -164,13 +161,15 @@ void Circuit<FF>::add_gates()
         uint32_t w_r = wires_idxs[i][1];
         uint32_t w_o = wires_idxs[i][2];
 
-        // Binary gate. Relaxes the solver. 
+        // Binary gate. Relaxes the solver.
         // TODO(alex): Probably we can add other basic gates here too to relax the stuff.
         // TODO(alex): Theoretically this can be applyed after we ensure that the block of polynomial equations holds
-        // and then simplify that block in future to relax the solver constraint system. Seems like a hard one to implement or actually to automate, but I'll think on it for a while.
-        // it will probably require to split add_gates and init methods into more complex/generalized parts.
-        if(w_l == w_r && w_r == w_o){
-            if(std::string(q_m) == "1" && std::string(q_1) == "0" && std::string(q_2) == "0" && std::string(q_3) == "-1" && std::string(q_c) == "0"){ // squaring gate
+        // and then simplify that block in future to relax the solver constraint system. Seems like a hard one to
+        // implement or actually to automate, but I'll think on it for a while. it will probably require to split
+        // add_gates and init methods into more complex/generalized parts.
+        if (w_l == w_r && w_r == w_o) {
+            if (std::string(q_m) == "1" && std::string(q_1) == "0" && std::string(q_2) == "0" &&
+                std::string(q_3) == "-1" && std::string(q_c) == "0") { // squaring gate
                 (Bool(vars[w_l]) == Bool(vars[0]) | Bool(vars[w_l]) == Bool(vars[1])).assert_term();
             }
         }
@@ -203,12 +202,11 @@ void Circuit<FF>::add_gates()
 
 /**
  * @brief Returns a previously named symbolic variable.
- * 
- * @param name 
- * @return FF 
+ *
+ * @param name
+ * @return FF
  */
-template <typename FF>
-FF Circuit<FF>::operator[](const std::string& name)
+template <typename FF> FF Circuit<FF>::operator[](const std::string& name)
 {
     if (!this->terms.contains(name)) {
         throw std::length_error("No such an item " + name + " in vars or it vas not declared as interesting");
@@ -222,24 +220,26 @@ CircuitSchema unpack_from_file(const std::string& fname);
 
 template <typename FF>
 std::pair<Circuit<FF>, Circuit<FF>> unique_witness(CircuitSchema& circuit_info,
-                                           Solver* s,
-                                           const std::vector<std::string>& equal = {},
-                                           const std::vector<std::string>& not_equal = {},
-                                           const std::vector<std::string>& equal_at_the_same_time = {},
-                                           const std::vector<std::string>& not_eqaul_at_the_same_time = {});
-
-extern template std::pair<Circuit<FFTerm>, Circuit<FFTerm>> unique_witness(CircuitSchema& circuit_info,
-                                           Solver* s,
-                                           const std::vector<std::string>& equal = {},
-                                           const std::vector<std::string>& not_equal = {},
-                                           const std::vector<std::string>& equal_at_the_same_time = {},
-                                           const std::vector<std::string>& not_eqaul_at_the_same_time = {});
-
-extern template std::pair<Circuit<FFITerm>, Circuit<FFITerm>> unique_witness(CircuitSchema& circuit_info,
-                                           Solver* s,
-                                           const std::vector<std::string>& equal = {},
-                                           const std::vector<std::string>& not_equal = {},
-                                           const std::vector<std::string>& equal_at_the_same_time = {},
-                                           const std::vector<std::string>& not_eqaul_at_the_same_time = {});
+                                                   Solver* s,
+                                                   const std::vector<std::string>& equal = {},
+                                                   const std::vector<std::string>& not_equal = {},
+                                                   const std::vector<std::string>& equal_at_the_same_time = {},
+                                                   const std::vector<std::string>& not_eqaul_at_the_same_time = {});
+
+extern template std::pair<Circuit<FFTerm>, Circuit<FFTerm>> unique_witness(
+    CircuitSchema& circuit_info,
+    Solver* s,
+    const std::vector<std::string>& equal = {},
+    const std::vector<std::string>& not_equal = {},
+    const std::vector<std::string>& equal_at_the_same_time = {},
+    const std::vector<std::string>& not_eqaul_at_the_same_time = {});
+
+extern template std::pair<Circuit<FFITerm>, Circuit<FFITerm>> unique_witness(
+    CircuitSchema& circuit_info,
+    Solver* s,
+    const std::vector<std::string>& equal = {},
+    const std::vector<std::string>& not_equal = {},
+    const std::vector<std::string>& equal_at_the_same_time = {},
+    const std::vector<std::string>& not_eqaul_at_the_same_time = {});
 
 }; // namespace smt_circuit
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
similarity index 95%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
index dcb9a900969..3747c980e65 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp
@@ -41,7 +41,7 @@ using fq_ct = bn254::BaseField;
 using public_witness_ct = bn254::public_witness_ct;
 using witness_ct = bn254::witness_ct;
 
-SolverConfiguration config = {true, 0};
+SolverConfiguration config = { true, 0 };
 
 msgpack::sbuffer create_circuit(bool pub_ab, bool ab)
 {
@@ -209,10 +209,11 @@ TEST(bigfield, unique_square)
 
     Solver s(circuit_info.modulus, config);
 
-    std::pair<Circuit<FFTerm>, Circuit<FFTerm>> cs = unique_witness<FFTerm>(circuit_info,
-                                                    &s,
-                                                    { "a_limb_0", "a_limb_1", "a_limb_2", "a_limb_3" },
-                                                    { "c_limb_0", "c_limb_1", "c_limb_2", "c_limb_3" });
+    std::pair<Circuit<FFTerm>, Circuit<FFTerm>> cs =
+        unique_witness<FFTerm>(circuit_info,
+                               &s,
+                               { "a_limb_0", "a_limb_1", "a_limb_2", "a_limb_3" },
+                               { "c_limb_0", "c_limb_1", "c_limb_2", "c_limb_3" });
 
     auto start = std::chrono::high_resolution_clock::now();
     bool res = s.check();
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
similarity index 92%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
index 0a9a74c4791..5aa84f4c24d 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp
@@ -35,7 +35,7 @@ TEST(circuit_verification, multiplication_true)
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, {true, 0});
+    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
     smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
     smt_terms::FFTerm a1 = circuit["a"];
     smt_terms::FFTerm b1 = circuit["b"];
@@ -66,7 +66,7 @@ TEST(circuit_verification, multiplication_true_kind)
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, {true, 0});
+    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
     smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
     smt_terms::FFTerm a1 = circuit["a"];
     smt_terms::FFTerm b1 = circuit["b"];
@@ -74,7 +74,7 @@ TEST(circuit_verification, multiplication_true_kind)
     smt_terms::FFTerm two = smt_terms::FFTerm::Const("2", &s, 10);
     smt_terms::FFTerm thr = smt_terms::FFTerm::Const("3", &s, 10);
     smt_terms::FFTerm cr = smt_terms::FFTerm::Var("cr", &s);
-    cr * thr * b1 == two * a1;
+    cr* thr* b1 == two* a1;
     c1 != cr;
 
     bool res = s.check();
@@ -97,7 +97,7 @@ TEST(circuit_verification, multiplication_false)
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, {true, 0});
+    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
     smt_circuit::Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
 
     smt_terms::FFTerm a1 = circuit["a"];
@@ -140,7 +140,7 @@ TEST(circuit_verifiaction, unique_witness)
     auto buf = builder.export_circuit();
 
     smt_circuit::CircuitSchema circuit_info = smt_circuit::unpack_from_buffer(buf);
-    smt_solver::Solver s(circuit_info.modulus, {true, 0});
+    smt_solver::Solver s(circuit_info.modulus, { true, 0 });
 
     std::pair<smt_circuit::Circuit<smt_terms::FFTerm>, smt_circuit::Circuit<smt_terms::FFTerm>> cirs =
         smt_circuit::unique_witness<smt_terms::FFTerm>(circuit_info, &s, { "ev" }, { "z" });
@@ -155,8 +155,9 @@ TEST(circuit_verifiaction, unique_witness)
 
 using namespace smt_terms;
 
-TEST(solver_use_case, solver){
-    Solver s("11", {true, 0}, 10);
+TEST(solver_use_case, solver)
+{
+    Solver s("11", { true, 0 }, 10);
     FFTerm x = FFTerm::Var("x", &s);
     FFTerm y = FFTerm::Var("y", &s);
 
@@ -169,11 +170,12 @@ TEST(solver_use_case, solver){
     bool res = s.check();
     ASSERT_TRUE(res);
 
-    std::unordered_map<std::string, cvc5::Term> vars = {{"x", x}, {"y", y}};
+    std::unordered_map<std::string, cvc5::Term> vars = { { "x", x }, { "y", y } };
     std::unordered_map<std::string, std::string> mvars = s.model(vars);
 
     info("x = ", mvars["x"]);
     info("y = ", mvars["y"]);
 }
 
-// TODO(alex): Try setting the whole witness to be not equal at the same time, while setting inputs and outputs to be equal  
\ No newline at end of file
+// TODO(alex): Try setting the whole witness to be not equal at the same time, while setting inputs and outputs to be
+// equal
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp
similarity index 85%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp
index 1429c977735..7c98768ea89 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp
@@ -2,11 +2,11 @@
 #include <gtest/gtest.h>
 #include <unordered_map>
 
-
 // TODO(alex): more tests
 
-TEST(integer_mod, basic_arithmetic){
-    smt_solver::Solver s("101", {true, 0}, 10);
+TEST(integer_mod, basic_arithmetic)
+{
+    smt_solver::Solver s("101", { true, 0 }, 10);
 
     smt_terms::FFITerm x = smt_terms::FFITerm::Var("x", &s);
     smt_terms::FFITerm y = smt_terms::FFITerm::Var("y", &s);
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
similarity index 97%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
index ee0cf237ec6..1570c0dec4d 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp
@@ -121,7 +121,7 @@ TEST(polynomial_evaluation, correct)
 
     CircuitSchema circuit_info = unpack_from_buffer(buf);
 
-    Solver s(circuit_info.modulus, {true, 0});
+    Solver s(circuit_info.modulus, { true, 0 });
     Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
     FFTerm ev = polynomial_evaluation(circuit, n, true);
 
@@ -144,7 +144,7 @@ TEST(polynomial_evaluation, incorrect)
 
     CircuitSchema circuit_info = unpack_from_buffer(buf);
 
-    Solver s(circuit_info.modulus, {true, 0});
+    Solver s(circuit_info.modulus, { true, 0 });
     Circuit<smt_terms::FFTerm> circuit(circuit_info, &s);
     FFTerm ev = polynomial_evaluation(circuit, n, false);
 
@@ -164,4 +164,4 @@ TEST(polynomial_evaluation, incorrect)
     }
 }
 
-// TODO(alex) try with arbitrary coefficients 
\ No newline at end of file
+// TODO(alex) try with arbitrary coefficients
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
similarity index 97%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
index 0360e4e317b..4eca2d5c3ce 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp
@@ -24,7 +24,7 @@ bool Solver::check()
  * */
 std::unordered_map<std::string, std::string> Solver::model(std::unordered_map<std::string, cvc5::Term>& terms) const
 {
-    if (!this->checked){
+    if (!this->checked) {
         throw std::length_error("Haven't checked yet");
     }
     if (!this->res) {
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
similarity index 95%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
index 27cbec90026..508f79042ca 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp
@@ -7,13 +7,13 @@ namespace smt_solver {
 
 /**
  * @brief Solver configuration
- * 
+ *
  * @param produce_model tells the solver to actually compute the values of the variables in SAT case.
  * @param timeout tells the solver to stop trying after `timeout` msecs.
  *
  * @todo TODO(alex): more cvc5 options.
  */
-struct SolverConfiguration{
+struct SolverConfiguration {
     bool produce_model;
     uint64_t timeout;
 };
@@ -33,7 +33,7 @@ class Solver {
     bool res = false;
     bool checked = false;
 
-    explicit Solver(const std::string& modulus, const SolverConfiguration& config = {false, 0}, uint32_t base = 16)
+    explicit Solver(const std::string& modulus, const SolverConfiguration& config = { false, 0 }, uint32_t base = 16)
     {
         this->fp = s.mkFiniteFieldSort(modulus, base);
         this->modulus = fp.getFiniteFieldSize();
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp
similarity index 90%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp
index 97230865e5e..d2a1a6c2670 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp
@@ -39,9 +39,9 @@ FFITerm::FFITerm(const std::string& t, Solver* slv, bool isconst, uint32_t base)
         slv->s.assertFormula(lt);
     } else {
         std::string tmp = slv->s.mkFiniteFieldElem(t, slv->fp, base).getFiniteFieldValue(); // dumb but works
-        if(tmp[0] == '-'){
-            this->term = slv->s.mkTerm(cvc5::Kind::ADD, {slv->s.mkInteger(tmp), this->modulus});
-        }else{
+        if (tmp[0] == '-') {
+            this->term = slv->s.mkTerm(cvc5::Kind::ADD, { slv->s.mkInteger(tmp), this->modulus });
+        } else {
             this->term = slv->s.mkInteger(tmp);
         }
         // this->term = slv->s.mkInteger(tmp); won't work for now since the assertion will definitely fail
@@ -102,8 +102,8 @@ void FFITerm::operator*=(const FFITerm& other)
  */
 FFITerm FFITerm::operator/(const FFITerm& other) const
 {
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {other.term, this->solver->s.mkInteger("0")});
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {nz, this->solver->s.mkBoolean(false)});
+    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { other.term, this->solver->s.mkInteger("0") });
+    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
     this->solver->s.assertFormula(nz);
 
     cvc5::Term res = this->solver->s.mkConst(this->solver->s.getIntegerSort(),
@@ -118,10 +118,10 @@ FFITerm FFITerm::operator/(const FFITerm& other) const
 
 void FFITerm::operator/=(const FFITerm& other)
 {
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {other.term, this->solver->s.mkInteger("0")});
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {nz, this->solver->s.mkBoolean(false)});
+    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { other.term, this->solver->s.mkInteger("0") });
+    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
     this->solver->s.assertFormula(nz);
-    
+
     cvc5::Term res = this->solver->s.mkConst(this->solver->fp,
                                              "fe0f65a52067384116dc1137d798e0ca00a7ed46950e4eab7db51e08481535f2_div_" +
                                                  std::string(*this) + "__" + std::string(other));
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp
similarity index 93%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp
index 319ec1736ec..6bb1239557b 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp
@@ -28,7 +28,8 @@ class FFITerm {
     FFITerm(cvc5::Term& term, Solver* s)
         : solver(s)
         , term(term)
-        , modulus(s->s.mkInteger(s->modulus)){}
+        , modulus(s->s.mkInteger(s->modulus))
+    {}
 
     FFITerm(const FFITerm& other) = default;
     FFITerm(FFITerm&& other) = default;
@@ -51,10 +52,7 @@ class FFITerm {
     void operator==(const FFITerm& other) const;
     void operator!=(const FFITerm& other) const;
 
-    operator std::string() const
-    {
-        return term.isIntegerValue() ? term.getIntegerValue() : term.toString();
-    };
+    operator std::string() const { return term.isIntegerValue() ? term.getIntegerValue() : term.toString(); };
     operator cvc5::Term() const { return term; };
 
     ~FFITerm() = default;
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp
similarity index 88%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp
index 2e8cb249b34..4b96f68b8da 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp
@@ -84,8 +84,9 @@ void FFTerm::operator*=(const FFTerm& other)
  */
 FFTerm FFTerm::operator/(const FFTerm& other) const
 {
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {other.term, this->solver->s.mkFiniteFieldElem("0", this->solver->fp)});
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {nz, this->solver->s.mkBoolean(false)});
+    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL,
+                                           { other.term, this->solver->s.mkFiniteFieldElem("0", this->solver->fp) });
+    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
     this->solver->s.assertFormula(nz);
 
     cvc5::Term res = this->solver->s.mkConst(this->solver->fp,
@@ -99,8 +100,9 @@ FFTerm FFTerm::operator/(const FFTerm& other) const
 
 void FFTerm::operator/=(const FFTerm& other)
 {
-    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {other.term, this->solver->s.mkFiniteFieldElem("0", this->solver->fp)});
-    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, {nz, this->solver->s.mkBoolean(false)});
+    cvc5::Term nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL,
+                                           { other.term, this->solver->s.mkFiniteFieldElem("0", this->solver->fp) });
+    nz = this->solver->s.mkTerm(cvc5::Kind::EQUAL, { nz, this->solver->s.mkBoolean(false) });
     this->solver->s.assertFormula(nz);
 
     cvc5::Term res = this->solver->s.mkConst(this->solver->fp,
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp
similarity index 99%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp
rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp
index a213464854a..581b185bcb3 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp
+++ b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp
@@ -48,7 +48,7 @@ class FFTerm {
 
     operator std::string() const { return term.isFiniteFieldValue() ? term.getFiniteFieldValue() : term.toString(); };
     operator cvc5::Term() const { return term; };
-    
+
     ~FFTerm() = default;
     friend std::ostream& operator<<(std::ostream& out, const FFTerm& k) { return out << k.term; }
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp
rename to barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.cpp b/barretenberg/cpp/src/barretenberg/srs/c_bind.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.cpp
rename to barretenberg/cpp/src/barretenberg/srs/c_bind.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.hpp b/barretenberg/cpp/src/barretenberg/srs/c_bind.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.hpp
rename to barretenberg/cpp/src/barretenberg/srs/c_bind.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp
rename to barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp
rename to barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp
rename to barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp
rename to barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp
rename to barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
rename to barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.cpp b/barretenberg/cpp/src/barretenberg/srs/global_crs.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.cpp
rename to barretenberg/cpp/src/barretenberg/srs/global_crs.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.hpp b/barretenberg/cpp/src/barretenberg/srs/global_crs.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.hpp
rename to barretenberg/cpp/src/barretenberg/srs/global_crs.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.hpp b/barretenberg/cpp/src/barretenberg/srs/io.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.hpp
rename to barretenberg/cpp/src/barretenberg/srs/io.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.test.cpp b/barretenberg/cpp/src/barretenberg/srs/io.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.test.cpp
rename to barretenberg/cpp/src/barretenberg/srs/io.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp b/barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp
rename to barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp
rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp b/barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp b/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp b/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
rename to barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/manifest.hpp b/barretenberg/cpp/src/barretenberg/transcript/manifest.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/manifest.hpp
rename to barretenberg/cpp/src/barretenberg/transcript/manifest.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.cpp
rename to barretenberg/cpp/src/barretenberg/transcript/transcript.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
rename to barretenberg/cpp/src/barretenberg/transcript/transcript.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
rename to barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp
rename to barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp b/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp
rename to barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt
rename to barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp b/barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp
rename to barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp b/barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp
rename to barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.clang-format b/barretenberg/cpp/src/msgpack-c/.clang-format
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.clang-format
rename to barretenberg/cpp/src/msgpack-c/.clang-format
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh b/barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh
rename to barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh b/barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh
rename to barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml b/barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml
rename to barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml b/barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml
rename to barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.gitignore b/barretenberg/cpp/src/msgpack-c/.gitignore
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.gitignore
rename to barretenberg/cpp/src/msgpack-c/.gitignore
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/CHANGELOG.md b/barretenberg/cpp/src/msgpack-c/CHANGELOG.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/CHANGELOG.md
rename to barretenberg/cpp/src/msgpack-c/CHANGELOG.md
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/COPYING b/barretenberg/cpp/src/msgpack-c/COPYING
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/COPYING
rename to barretenberg/cpp/src/msgpack-c/COPYING
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/Doxyfile b/barretenberg/cpp/src/msgpack-c/Doxyfile
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/Doxyfile
rename to barretenberg/cpp/src/msgpack-c/Doxyfile
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/Files.cmake b/barretenberg/cpp/src/msgpack-c/Files.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/Files.cmake
rename to barretenberg/cpp/src/msgpack-c/Files.cmake
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt b/barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt
rename to barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/NOTICE b/barretenberg/cpp/src/msgpack-c/NOTICE
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/NOTICE
rename to barretenberg/cpp/src/msgpack-c/NOTICE
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md b/barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md
rename to barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/README.md b/barretenberg/cpp/src/msgpack-c/README.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/README.md
rename to barretenberg/cpp/src/msgpack-c/README.md
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/appveyor.yml b/barretenberg/cpp/src/msgpack-c/appveyor.yml
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/appveyor.yml
rename to barretenberg/cpp/src/msgpack-c/appveyor.yml
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh b/barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh
rename to barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_regression.sh b/barretenberg/cpp/src/msgpack-c/ci/build_regression.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_regression.sh
rename to barretenberg/cpp/src/msgpack-c/ci/build_regression.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh b/barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh
rename to barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake b/barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake
rename to barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/codecov.yml b/barretenberg/cpp/src/msgpack-c/codecov.yml
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/codecov.yml
rename to barretenberg/cpp/src/msgpack-c/codecov.yml
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb
rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp
rename to barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp
rename to barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp
rename to barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp
rename to barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp
rename to barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp b/barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp
rename to barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp b/barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp
rename to barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp b/barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp
rename to barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp b/barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp
rename to barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608 b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464 b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground
rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp
rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/make_file_list.sh b/barretenberg/cpp/src/msgpack-c/make_file_list.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/make_file_list.sh
rename to barretenberg/cpp/src/msgpack-c/make_file_list.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/makedist.sh b/barretenberg/cpp/src/msgpack-c/makedist.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/makedist.sh
rename to barretenberg/cpp/src/msgpack-c/makedist.sh
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in b/barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in
rename to barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/preprocess b/barretenberg/cpp/src/msgpack-c/preprocess
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/preprocess
rename to barretenberg/cpp/src/msgpack-c/preprocess
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/simple.cpp b/barretenberg/cpp/src/msgpack-c/test-install/simple.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/simple.cpp
rename to barretenberg/cpp/src/msgpack-c/test-install/simple.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt
rename to barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/array_ref.cpp b/barretenberg/cpp/src/msgpack-c/test/array_ref.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/array_ref.cpp
rename to barretenberg/cpp/src/msgpack-c/test/array_ref.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp
rename to barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp
rename to barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp
rename to barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp
rename to barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp
rename to barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer.cpp b/barretenberg/cpp/src/msgpack-c/test/buffer.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer.cpp
rename to barretenberg/cpp/src/msgpack-c/test/buffer.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp b/barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp
rename to barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/carray.cpp b/barretenberg/cpp/src/msgpack-c/test/carray.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/carray.cpp
rename to barretenberg/cpp/src/msgpack-c/test/carray.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.cpp b/barretenberg/cpp/src/msgpack-c/test/cases.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.cpp
rename to barretenberg/cpp/src/msgpack-c/test/cases.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.mpac b/barretenberg/cpp/src/msgpack-c/test/cases.mpac
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.mpac
rename to barretenberg/cpp/src/msgpack-c/test/cases.mpac
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac b/barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac
rename to barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/convert.cpp b/barretenberg/cpp/src/msgpack-c/test/convert.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/convert.cpp
rename to barretenberg/cpp/src/msgpack-c/test/convert.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fixint.cpp b/barretenberg/cpp/src/msgpack-c/test/fixint.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fixint.cpp
rename to barretenberg/cpp/src/msgpack-c/test/fixint.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp
rename to barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp b/barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp
rename to barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp
rename to barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/json.cpp b/barretenberg/cpp/src/msgpack-c/test/json.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/json.cpp
rename to barretenberg/cpp/src/msgpack-c/test/json.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/limit.cpp b/barretenberg/cpp/src/msgpack-c/test/limit.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/limit.cpp
rename to barretenberg/cpp/src/msgpack-c/test/limit.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp
rename to barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp b/barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp
rename to barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp b/barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp
rename to barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object.cpp b/barretenberg/cpp/src/msgpack-c/test/object.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object.cpp
rename to barretenberg/cpp/src/msgpack-c/test/object.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp b/barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp
rename to barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp b/barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp
rename to barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/raw.cpp b/barretenberg/cpp/src/msgpack-c/test/raw.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/raw.cpp
rename to barretenberg/cpp/src/msgpack-c/test/raw.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference.cpp b/barretenberg/cpp/src/msgpack-c/test/reference.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference.cpp
rename to barretenberg/cpp/src/msgpack-c/test/reference.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp
rename to barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp
rename to barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp
rename to barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp b/barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp
rename to barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/streaming.cpp b/barretenberg/cpp/src/msgpack-c/test/streaming.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/streaming.cpp
rename to barretenberg/cpp/src/msgpack-c/test/streaming.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp b/barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp
rename to barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp
rename to barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/user_class.cpp b/barretenberg/cpp/src/msgpack-c/test/user_class.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/user_class.cpp
rename to barretenberg/cpp/src/msgpack-c/test/user_class.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/version.cpp b/barretenberg/cpp/src/msgpack-c/test/version.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/version.cpp
rename to barretenberg/cpp/src/msgpack-c/test/version.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/visitor.cpp b/barretenberg/cpp/src/msgpack-c/test/visitor.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/visitor.cpp
rename to barretenberg/cpp/src/msgpack-c/test/visitor.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/zone.cpp b/barretenberg/cpp/src/msgpack-c/test/zone.cpp
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/zone.cpp
rename to barretenberg/cpp/src/msgpack-c/test/zone.cpp
diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/update_version.sh b/barretenberg/cpp/src/msgpack-c/update_version.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/update_version.sh
rename to barretenberg/cpp/src/msgpack-c/update_version.sh
diff --git a/circuits/cpp/barretenberg/cpp/srs_db/download_ignition.sh b/barretenberg/cpp/srs_db/download_ignition.sh
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/srs_db/download_ignition.sh
rename to barretenberg/cpp/srs_db/download_ignition.sh
diff --git a/circuits/cpp/barretenberg/cpp/srs_db/grumpkin/monomial/README.md b/barretenberg/cpp/srs_db/grumpkin/monomial/README.md
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/srs_db/grumpkin/monomial/README.md
rename to barretenberg/cpp/srs_db/grumpkin/monomial/README.md
diff --git a/circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/checksums b/barretenberg/cpp/srs_db/ignition/monomial/checksums
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/checksums
rename to barretenberg/cpp/srs_db/ignition/monomial/checksums
diff --git a/circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/g2.dat b/barretenberg/cpp/srs_db/ignition/monomial/g2.dat
similarity index 100%
rename from circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/g2.dat
rename to barretenberg/cpp/srs_db/ignition/monomial/g2.dat
diff --git a/circuits/cpp/barretenberg/exports.json b/barretenberg/exports.json
similarity index 100%
rename from circuits/cpp/barretenberg/exports.json
rename to barretenberg/exports.json
diff --git a/circuits/cpp/barretenberg/flake.lock b/barretenberg/flake.lock
similarity index 100%
rename from circuits/cpp/barretenberg/flake.lock
rename to barretenberg/flake.lock
diff --git a/circuits/cpp/barretenberg/flake.nix b/barretenberg/flake.nix
similarity index 100%
rename from circuits/cpp/barretenberg/flake.nix
rename to barretenberg/flake.nix
diff --git a/circuits/cpp/barretenberg/scripts/bindgen.sh b/barretenberg/scripts/bindgen.sh
similarity index 100%
rename from circuits/cpp/barretenberg/scripts/bindgen.sh
rename to barretenberg/scripts/bindgen.sh
diff --git a/circuits/cpp/barretenberg/scripts/c_bind_files.txt b/barretenberg/scripts/c_bind_files.txt
similarity index 100%
rename from circuits/cpp/barretenberg/scripts/c_bind_files.txt
rename to barretenberg/scripts/c_bind_files.txt
diff --git a/circuits/cpp/barretenberg/scripts/decls_json.py b/barretenberg/scripts/decls_json.py
similarity index 100%
rename from circuits/cpp/barretenberg/scripts/decls_json.py
rename to barretenberg/scripts/decls_json.py
diff --git a/circuits/cpp/barretenberg/sol/.gitignore b/barretenberg/sol/.gitignore
similarity index 100%
rename from circuits/cpp/barretenberg/sol/.gitignore
rename to barretenberg/sol/.gitignore
diff --git a/circuits/cpp/barretenberg/sol/Dockerfile b/barretenberg/sol/Dockerfile
similarity index 100%
rename from circuits/cpp/barretenberg/sol/Dockerfile
rename to barretenberg/sol/Dockerfile
diff --git a/circuits/cpp/barretenberg/sol/README.md b/barretenberg/sol/README.md
similarity index 100%
rename from circuits/cpp/barretenberg/sol/README.md
rename to barretenberg/sol/README.md
diff --git a/circuits/cpp/barretenberg/sol/bootstrap.sh b/barretenberg/sol/bootstrap.sh
similarity index 100%
rename from circuits/cpp/barretenberg/sol/bootstrap.sh
rename to barretenberg/sol/bootstrap.sh
diff --git a/circuits/cpp/barretenberg/sol/figures/verifier.png b/barretenberg/sol/figures/verifier.png
similarity index 100%
rename from circuits/cpp/barretenberg/sol/figures/verifier.png
rename to barretenberg/sol/figures/verifier.png
diff --git a/circuits/cpp/barretenberg/sol/foundry.toml b/barretenberg/sol/foundry.toml
similarity index 100%
rename from circuits/cpp/barretenberg/sol/foundry.toml
rename to barretenberg/sol/foundry.toml
diff --git a/circuits/cpp/barretenberg/sol/lib/forge-std b/barretenberg/sol/lib/forge-std
similarity index 100%
rename from circuits/cpp/barretenberg/sol/lib/forge-std
rename to barretenberg/sol/lib/forge-std
diff --git a/circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts b/barretenberg/sol/lib/openzeppelin-contracts
similarity index 100%
rename from circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts
rename to barretenberg/sol/lib/openzeppelin-contracts
diff --git a/circuits/cpp/barretenberg/sol/lib/solidity-stringutils b/barretenberg/sol/lib/solidity-stringutils
similarity index 100%
rename from circuits/cpp/barretenberg/sol/lib/solidity-stringutils
rename to barretenberg/sol/lib/solidity-stringutils
diff --git a/circuits/cpp/barretenberg/sol/remappings.txt b/barretenberg/sol/remappings.txt
similarity index 100%
rename from circuits/cpp/barretenberg/sol/remappings.txt
rename to barretenberg/sol/remappings.txt
diff --git a/circuits/cpp/barretenberg/sol/scripts/init.sh b/barretenberg/sol/scripts/init.sh
similarity index 100%
rename from circuits/cpp/barretenberg/sol/scripts/init.sh
rename to barretenberg/sol/scripts/init.sh
diff --git a/circuits/cpp/barretenberg/sol/scripts/install_foundry.sh b/barretenberg/sol/scripts/install_foundry.sh
similarity index 100%
rename from circuits/cpp/barretenberg/sol/scripts/install_foundry.sh
rename to barretenberg/sol/scripts/install_foundry.sh
diff --git a/circuits/cpp/barretenberg/sol/scripts/run_fuzzer.sh b/barretenberg/sol/scripts/run_fuzzer.sh
similarity index 100%
rename from circuits/cpp/barretenberg/sol/scripts/run_fuzzer.sh
rename to barretenberg/sol/scripts/run_fuzzer.sh
diff --git a/circuits/cpp/barretenberg/sol/src/interfaces/IVerifier.sol b/barretenberg/sol/src/interfaces/IVerifier.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/interfaces/IVerifier.sol
rename to barretenberg/sol/src/interfaces/IVerifier.sol
diff --git a/circuits/cpp/barretenberg/sol/src/ultra/BaseUltraVerifier.sol b/barretenberg/sol/src/ultra/BaseUltraVerifier.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/ultra/BaseUltraVerifier.sol
rename to barretenberg/sol/src/ultra/BaseUltraVerifier.sol
diff --git a/circuits/cpp/barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol b/barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol
rename to barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol
diff --git a/circuits/cpp/barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol b/barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol
rename to barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol
diff --git a/circuits/cpp/barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol b/barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol
rename to barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol
diff --git a/circuits/cpp/barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol b/barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol
rename to barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol
diff --git a/circuits/cpp/barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol b/barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol
rename to barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol
diff --git a/circuits/cpp/barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol b/barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol
rename to barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol
diff --git a/circuits/cpp/barretenberg/sol/test/base/DifferentialFuzzer.sol b/barretenberg/sol/test/base/DifferentialFuzzer.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/test/base/DifferentialFuzzer.sol
rename to barretenberg/sol/test/base/DifferentialFuzzer.sol
diff --git a/circuits/cpp/barretenberg/sol/test/base/TestBase.sol b/barretenberg/sol/test/base/TestBase.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/test/base/TestBase.sol
rename to barretenberg/sol/test/base/TestBase.sol
diff --git a/circuits/cpp/barretenberg/sol/test/ultra/Add2.t.sol b/barretenberg/sol/test/ultra/Add2.t.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/test/ultra/Add2.t.sol
rename to barretenberg/sol/test/ultra/Add2.t.sol
diff --git a/circuits/cpp/barretenberg/sol/test/ultra/Blake.t.sol b/barretenberg/sol/test/ultra/Blake.t.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/test/ultra/Blake.t.sol
rename to barretenberg/sol/test/ultra/Blake.t.sol
diff --git a/circuits/cpp/barretenberg/sol/test/ultra/Recursive.t.sol b/barretenberg/sol/test/ultra/Recursive.t.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/test/ultra/Recursive.t.sol
rename to barretenberg/sol/test/ultra/Recursive.t.sol
diff --git a/circuits/cpp/barretenberg/sol/test/ultra/TestBaseUltra.sol b/barretenberg/sol/test/ultra/TestBaseUltra.sol
similarity index 100%
rename from circuits/cpp/barretenberg/sol/test/ultra/TestBaseUltra.sol
rename to barretenberg/sol/test/ultra/TestBaseUltra.sol
diff --git a/circuits/cpp/barretenberg/ts/.dockerignore b/barretenberg/ts/.dockerignore
similarity index 100%
rename from circuits/cpp/barretenberg/ts/.dockerignore
rename to barretenberg/ts/.dockerignore
diff --git a/circuits/cpp/barretenberg/ts/.eslintrc.cjs b/barretenberg/ts/.eslintrc.cjs
similarity index 100%
rename from circuits/cpp/barretenberg/ts/.eslintrc.cjs
rename to barretenberg/ts/.eslintrc.cjs
diff --git a/circuits/cpp/barretenberg/ts/.gitignore b/barretenberg/ts/.gitignore
similarity index 100%
rename from circuits/cpp/barretenberg/ts/.gitignore
rename to barretenberg/ts/.gitignore
diff --git a/circuits/cpp/barretenberg/ts/.prettierrc.json b/barretenberg/ts/.prettierrc.json
similarity index 100%
rename from circuits/cpp/barretenberg/ts/.prettierrc.json
rename to barretenberg/ts/.prettierrc.json
diff --git a/circuits/cpp/barretenberg/ts/.yarn/releases/yarn-berry.cjs b/barretenberg/ts/.yarn/releases/yarn-berry.cjs
similarity index 100%
rename from circuits/cpp/barretenberg/ts/.yarn/releases/yarn-berry.cjs
rename to barretenberg/ts/.yarn/releases/yarn-berry.cjs
diff --git a/circuits/cpp/barretenberg/ts/.yarnrc.yml b/barretenberg/ts/.yarnrc.yml
similarity index 100%
rename from circuits/cpp/barretenberg/ts/.yarnrc.yml
rename to barretenberg/ts/.yarnrc.yml
diff --git a/barretenberg/ts/CHANGELOG.md b/barretenberg/ts/CHANGELOG.md
index 352f3ac1273..4a19aa6095d 100644
--- a/barretenberg/ts/CHANGELOG.md
+++ b/barretenberg/ts/CHANGELOG.md
@@ -1,15 +1,213 @@
 # Changelog
 
-## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.1...barretenberg.js-v0.5.2) (2023-09-08)
+## [0.7.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.7...barretenberg.js-v0.7.0) (2023-09-13)
+
+
+### Bug Fixes
+
+* Add cjs-entry to bbjs package files ([#2237](https://github.com/AztecProtocol/aztec-packages/issues/2237)) ([ae16193](https://github.com/AztecProtocol/aztec-packages/commit/ae16193b3cdb2da3d57a1c74f7e71f139ced54d1))
+
+
+### Miscellaneous
+
+* Add debugging to run_tests ([#2212](https://github.com/AztecProtocol/aztec-packages/issues/2212)) ([1c5e78a](https://github.com/AztecProtocol/aztec-packages/commit/1c5e78a4ac01bee4b785857447efdb02d8d9cb35))
+
+## [0.6.7](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.6...barretenberg.js-v0.6.7) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.5...barretenberg.js-v0.6.6) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.4...barretenberg.js-v0.6.5) (2023-09-08)
 
 
 ### Miscellaneous
 
-* **master:** Release 0.6.0 ([#2121](https://github.com/AztecProtocol/aztec-packages/issues/2121)) ([9bc8e11](https://github.com/AztecProtocol/aztec-packages/commit/9bc8e11ec4598c54d2c8f37c9f1a38ad90148f12))
+* **barretenberg.js:** Synchronize aztec-packages versions
 
-## [0.6.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.1...barretenberg.js-v0.6.0) (2023-09-08)
+## [0.6.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.3...barretenberg.js-v0.6.4) (2023-09-08)
 
 
 ### Miscellaneous
 
 * **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.2...barretenberg.js-v0.6.3) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.1...barretenberg.js-v0.6.2) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.2...barretenberg.js-v0.6.1) (2023-09-08)
+
+
+### Miscellaneous
+
+* **master:** Release 0.5.2 ([#2141](https://github.com/AztecProtocol/aztec-packages/issues/2141)) ([451aad6](https://github.com/AztecProtocol/aztec-packages/commit/451aad6ea92ebced9839ca14baae10cee327be35))
+* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
+* Release 0.6.1 ([1bd1a79](https://github.com/AztecProtocol/aztec-packages/commit/1bd1a79b0cefcd90306133aab141d992e8ea5fc3))
+
+## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.2...barretenberg.js-v0.5.2) (2023-09-08)
+
+
+### Miscellaneous
+
+* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
+
+## [0.5.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.5.0...barretenberg.js-v0.5.1) (2023-09-05)
+
+
+### Features
+
+* Add `info` command to bb ([#2010](https://github.com/AztecProtocol/barretenberg/issues/2010)) ([2882d97](https://github.com/AztecProtocol/barretenberg/commit/2882d97f5165239badb328be80568e7d683c0465))
+* **ci:** Use content hash in build system, restrict docs build to *.ts or *.cpp ([#1953](https://github.com/AztecProtocol/barretenberg/issues/1953)) ([297a20d](https://github.com/AztecProtocol/barretenberg/commit/297a20d7878a4aabab1cabf2cc5d2d67f9e969c5))
+
+
+### Bug Fixes
+
+* **bb.js:** (breaking change) bundles bb.js properly so that it works in the browser and in node ([#1855](https://github.com/AztecProtocol/barretenberg/issues/1855)) ([bc93a5f](https://github.com/AztecProtocol/barretenberg/commit/bc93a5f8510d0dc600343e7e613ab84380d3c225))
+* **ci:** Incorrect content hash in some build targets ([#1973](https://github.com/AztecProtocol/barretenberg/issues/1973)) ([c6c469a](https://github.com/AztecProtocol/barretenberg/commit/c6c469aa5da7c6973f656ddf8af4fb20c3e8e4f6))
+* Master ([#1981](https://github.com/AztecProtocol/barretenberg/issues/1981)) ([59a454e](https://github.com/AztecProtocol/barretenberg/commit/59a454ecf1611424893e1cb093774a23dde39310))
+
+## [0.5.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.6...barretenberg.js-v0.5.0) (2023-09-01)
+
+
+### ⚠ BREAKING CHANGES
+
+* update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925))
+
+### Miscellaneous Chores
+
+* Update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) ([5d8db8e](https://github.com/AztecProtocol/barretenberg/commit/5d8db8eb993334b43e24a51efba9c59e123320ab))
+
+## [0.4.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.5...barretenberg.js-v0.4.6) (2023-08-29)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## [0.4.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.4...barretenberg.js-v0.4.5) (2023-08-28)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## [0.4.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.3...barretenberg.js-v0.4.4) (2023-08-28)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## [0.4.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.2...barretenberg.js-v0.4.3) (2023-08-23)
+
+
+### Bug Fixes
+
+* Download SRS using one canonical URL across the codebase ([#1748](https://github.com/AztecProtocol/barretenberg/issues/1748)) ([5c91de7](https://github.com/AztecProtocol/barretenberg/commit/5c91de7296e054f6d5ac3dca94ca85e06d496048))
+* Proving fails when circuit has size &gt; ~500K ([#1739](https://github.com/AztecProtocol/barretenberg/issues/1739)) ([6d32383](https://github.com/AztecProtocol/barretenberg/commit/6d323838a525190618d608598357ee4608c46699))
+
+## [0.4.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.1...barretenberg.js-v0.4.2) (2023-08-21)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## [0.4.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.0...barretenberg.js-v0.4.1) (2023-08-21)
+
+
+### Bug Fixes
+
+* **bb:** Fix Typo ([#1709](https://github.com/AztecProtocol/barretenberg/issues/1709)) ([286d64e](https://github.com/AztecProtocol/barretenberg/commit/286d64e6036336314114f1d2a25273f4dabe36f4))
+
+## [0.4.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.6...barretenberg.js-v0.4.0) (2023-08-21)
+
+
+### ⚠ BREAKING CHANGES
+
+* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618))
+
+### Bug Fixes
+
+* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618)) ([180cdc9](https://github.com/AztecProtocol/barretenberg/commit/180cdc9ac7cf9aa793d9774dc866ceb4e6ec3fbc))
+* Bin reference when installing package ([#678](https://github.com/AztecProtocol/barretenberg/issues/678)) ([c734295](https://github.com/AztecProtocol/barretenberg/commit/c734295a10d2c40ede773519664170880f28b2b7))
+* Sync aztec master ([#680](https://github.com/AztecProtocol/barretenberg/issues/680)) ([3afc243](https://github.com/AztecProtocol/barretenberg/commit/3afc2438053f530e49fbebbdbadd8db8a630bb8c))
+
+## [0.3.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.5...barretenberg.js-v0.3.6) (2023-08-08)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## [0.3.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.4...barretenberg.js-v0.3.5) (2023-08-07)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## [0.3.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.3...barretenberg.js-v0.3.4) (2023-07-25)
+
+
+### Features
+
+* Modify bb.js to be compatible with next.js ([#544](https://github.com/AztecProtocol/barretenberg/issues/544)) ([d384089](https://github.com/AztecProtocol/barretenberg/commit/d384089f60d1a6d5baeb0d3459556a310b790366))
+
+## [0.3.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.2...barretenberg.js-v0.3.3) (2023-07-17)
+
+
+### Features
+
+* Bb and bb.js directly parse nargo bincode format. ([#610](https://github.com/AztecProtocol/barretenberg/issues/610)) ([d25e37a](https://github.com/AztecProtocol/barretenberg/commit/d25e37ad74b88dc45337b2a529ede3136dd4a699))
+
+## [0.3.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.1...barretenberg.js-v0.3.2) (2023-07-12)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## [0.3.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.0...barretenberg.js-v0.3.1) (2023-07-11)
+
+
+### Miscellaneous Chores
+
+* **barretenberg.js:** Synchronize barretenberg versions
+
+## 0.3.0 (2023-07-11)
+
+
+### Features
+
+* **bb.js:** initial API ([#232](https://github.com/AztecProtocol/barretenberg/issues/232)) ([c860b02](https://github.com/AztecProtocol/barretenberg/commit/c860b02d80425de161af50acf33e94d94eb0659c))
+* **dsl:** Add ECDSA secp256r1 verification ([#582](https://github.com/AztecProtocol/barretenberg/issues/582)) ([adc4c7b](https://github.com/AztecProtocol/barretenberg/commit/adc4c7b4eb634eae28dd28e25b94b93a5b49c80e))
+* Initial native version of bb binary. ([#524](https://github.com/AztecProtocol/barretenberg/issues/524)) ([4a1b532](https://github.com/AztecProtocol/barretenberg/commit/4a1b5322dc78921d253e6a374eba0b616ab788df))
+* Optimize memory consumption of pedersen generators ([#413](https://github.com/AztecProtocol/barretenberg/issues/413)) ([d60b16a](https://github.com/AztecProtocol/barretenberg/commit/d60b16a14219fd4bd130ce4537c3e94bfa10128f))
+* **ts:** allow passing srs via env functions ([#260](https://github.com/AztecProtocol/barretenberg/issues/260)) ([ac78353](https://github.com/AztecProtocol/barretenberg/commit/ac7835304f4524039abf0a0df9ae85d905f55c86))
+
+
+### Bug Fixes
+
+* **build:** git add -f .yalc ([#265](https://github.com/AztecProtocol/barretenberg/issues/265)) ([7671192](https://github.com/AztecProtocol/barretenberg/commit/7671192c8a60ff0bc0f8ad3e14ac299ff780cc25))
+* bump timeout on common test. ([c9bc87d](https://github.com/AztecProtocol/barretenberg/commit/c9bc87d29fa1325162cb1e7bf2db7cc85747fd9e))
+* Trigger release-please ([#594](https://github.com/AztecProtocol/barretenberg/issues/594)) ([5042861](https://github.com/AztecProtocol/barretenberg/commit/5042861405df6b5659c0c32418720d8bdea81081))
diff --git a/circuits/cpp/barretenberg/ts/Dockerfile b/barretenberg/ts/Dockerfile
similarity index 100%
rename from circuits/cpp/barretenberg/ts/Dockerfile
rename to barretenberg/ts/Dockerfile
diff --git a/circuits/cpp/barretenberg/ts/README.md b/barretenberg/ts/README.md
similarity index 100%
rename from circuits/cpp/barretenberg/ts/README.md
rename to barretenberg/ts/README.md
diff --git a/circuits/cpp/barretenberg/ts/bb.js-dev b/barretenberg/ts/bb.js-dev
similarity index 100%
rename from circuits/cpp/barretenberg/ts/bb.js-dev
rename to barretenberg/ts/bb.js-dev
diff --git a/circuits/cpp/barretenberg/ts/cjs-entry/index.cjs b/barretenberg/ts/cjs-entry/index.cjs
similarity index 100%
rename from circuits/cpp/barretenberg/ts/cjs-entry/index.cjs
rename to barretenberg/ts/cjs-entry/index.cjs
diff --git a/circuits/cpp/barretenberg/ts/cjs-entry/index.d.ts b/barretenberg/ts/cjs-entry/index.d.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/cjs-entry/index.d.ts
rename to barretenberg/ts/cjs-entry/index.d.ts
diff --git a/circuits/cpp/barretenberg/ts/package.json b/barretenberg/ts/package.json
similarity index 98%
rename from circuits/cpp/barretenberg/ts/package.json
rename to barretenberg/ts/package.json
index cb54961e036..a13125a0191 100644
--- a/circuits/cpp/barretenberg/ts/package.json
+++ b/barretenberg/ts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aztec/bb.js",
   "version": "0.7.0",
-  "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/circuits/cpp/barretenberg/ts",
+  "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
   "license": "MIT",
   "type": "module",
   "types": "./cjs-entry/index.d.ts",
diff --git a/circuits/cpp/barretenberg/ts/scripts/run_tests b/barretenberg/ts/scripts/run_tests
similarity index 100%
rename from circuits/cpp/barretenberg/ts/scripts/run_tests
rename to barretenberg/ts/scripts/run_tests
diff --git a/circuits/cpp/barretenberg/ts/src/async_map/index.ts b/barretenberg/ts/src/async_map/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/async_map/index.ts
rename to barretenberg/ts/src/async_map/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg-threads.wasm b/barretenberg/ts/src/barretenberg-threads.wasm
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg-threads.wasm
rename to barretenberg/ts/src/barretenberg-threads.wasm
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg.wasm b/barretenberg/ts/src/barretenberg.wasm
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg.wasm
rename to barretenberg/ts/src/barretenberg.wasm
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg/index.ts b/barretenberg/ts/src/barretenberg/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg/index.ts
rename to barretenberg/ts/src/barretenberg/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/blake2s.test.ts b/barretenberg/ts/src/barretenberg_api/blake2s.test.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/blake2s.test.ts
rename to barretenberg/ts/src/barretenberg_api/blake2s.test.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/common.test.ts b/barretenberg/ts/src/barretenberg_api/common.test.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/common.test.ts
rename to barretenberg/ts/src/barretenberg_api/common.test.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/index.ts b/barretenberg/ts/src/barretenberg_api/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/index.ts
rename to barretenberg/ts/src/barretenberg_api/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/pedersen.test.ts b/barretenberg/ts/src/barretenberg_api/pedersen.test.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/pedersen.test.ts
rename to barretenberg/ts/src/barretenberg_api/pedersen.test.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/schnorr.test.ts b/barretenberg/ts/src/barretenberg_api/schnorr.test.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/schnorr.test.ts
rename to barretenberg/ts/src/barretenberg_api/schnorr.test.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_binder/heap_allocator.ts b/barretenberg/ts/src/barretenberg_binder/heap_allocator.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_binder/heap_allocator.ts
rename to barretenberg/ts/src/barretenberg_binder/heap_allocator.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_binder/index.ts b/barretenberg/ts/src/barretenberg_binder/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_binder/index.ts
rename to barretenberg/ts/src/barretenberg_binder/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts
rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/index.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/helpers/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts
rename to barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.test.ts b/barretenberg/ts/src/barretenberg_wasm/index.test.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.test.ts
rename to barretenberg/ts/src/barretenberg_wasm/index.test.ts
diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.ts b/barretenberg/ts/src/barretenberg_wasm/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.ts
rename to barretenberg/ts/src/barretenberg_wasm/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/bigint-array/index.ts b/barretenberg/ts/src/bigint-array/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/bigint-array/index.ts
rename to barretenberg/ts/src/bigint-array/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/function_declaration.ts b/barretenberg/ts/src/bindgen/function_declaration.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/bindgen/function_declaration.ts
rename to barretenberg/ts/src/bindgen/function_declaration.ts
diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/index.ts b/barretenberg/ts/src/bindgen/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/bindgen/index.ts
rename to barretenberg/ts/src/bindgen/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/mappings.ts b/barretenberg/ts/src/bindgen/mappings.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/bindgen/mappings.ts
rename to barretenberg/ts/src/bindgen/mappings.ts
diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/rust.ts b/barretenberg/ts/src/bindgen/rust.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/bindgen/rust.ts
rename to barretenberg/ts/src/bindgen/rust.ts
diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/to_camel_case.ts b/barretenberg/ts/src/bindgen/to_camel_case.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/bindgen/to_camel_case.ts
rename to barretenberg/ts/src/bindgen/to_camel_case.ts
diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/typescript.ts b/barretenberg/ts/src/bindgen/typescript.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/bindgen/typescript.ts
rename to barretenberg/ts/src/bindgen/typescript.ts
diff --git a/circuits/cpp/barretenberg/ts/src/crs/browser/cached_net_crs.ts b/barretenberg/ts/src/crs/browser/cached_net_crs.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/crs/browser/cached_net_crs.ts
rename to barretenberg/ts/src/crs/browser/cached_net_crs.ts
diff --git a/circuits/cpp/barretenberg/ts/src/crs/browser/index.ts b/barretenberg/ts/src/crs/browser/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/crs/browser/index.ts
rename to barretenberg/ts/src/crs/browser/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/crs/index.ts b/barretenberg/ts/src/crs/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/crs/index.ts
rename to barretenberg/ts/src/crs/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts b/barretenberg/ts/src/crs/net_crs.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/crs/net_crs.ts
rename to barretenberg/ts/src/crs/net_crs.ts
diff --git a/circuits/cpp/barretenberg/ts/src/crs/node/ignition_files_crs.ts b/barretenberg/ts/src/crs/node/ignition_files_crs.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/crs/node/ignition_files_crs.ts
rename to barretenberg/ts/src/crs/node/ignition_files_crs.ts
diff --git a/circuits/cpp/barretenberg/ts/src/crs/node/index.ts b/barretenberg/ts/src/crs/node/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/crs/node/index.ts
rename to barretenberg/ts/src/crs/node/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/examples/simple.rawtest.ts b/barretenberg/ts/src/examples/simple.rawtest.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/examples/simple.rawtest.ts
rename to barretenberg/ts/src/examples/simple.rawtest.ts
diff --git a/circuits/cpp/barretenberg/ts/src/examples/simple.test.ts b/barretenberg/ts/src/examples/simple.test.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/examples/simple.test.ts
rename to barretenberg/ts/src/examples/simple.test.ts
diff --git a/circuits/cpp/barretenberg/ts/src/index.html b/barretenberg/ts/src/index.html
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/index.html
rename to barretenberg/ts/src/index.html
diff --git a/circuits/cpp/barretenberg/ts/src/index.ts b/barretenberg/ts/src/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/index.ts
rename to barretenberg/ts/src/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/info.json b/barretenberg/ts/src/info.json
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/info.json
rename to barretenberg/ts/src/info.json
diff --git a/circuits/cpp/barretenberg/ts/src/main.ts b/barretenberg/ts/src/main.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/main.ts
rename to barretenberg/ts/src/main.ts
diff --git a/circuits/cpp/barretenberg/ts/src/random/browser/index.ts b/barretenberg/ts/src/random/browser/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/random/browser/index.ts
rename to barretenberg/ts/src/random/browser/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/random/index.ts b/barretenberg/ts/src/random/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/random/index.ts
rename to barretenberg/ts/src/random/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/random/node/index.ts b/barretenberg/ts/src/random/node/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/random/node/index.ts
rename to barretenberg/ts/src/random/node/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/serialize/buffer_reader.ts b/barretenberg/ts/src/serialize/buffer_reader.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/serialize/buffer_reader.ts
rename to barretenberg/ts/src/serialize/buffer_reader.ts
diff --git a/circuits/cpp/barretenberg/ts/src/serialize/index.ts b/barretenberg/ts/src/serialize/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/serialize/index.ts
rename to barretenberg/ts/src/serialize/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/serialize/output_type.ts b/barretenberg/ts/src/serialize/output_type.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/serialize/output_type.ts
rename to barretenberg/ts/src/serialize/output_type.ts
diff --git a/circuits/cpp/barretenberg/ts/src/serialize/serialize.ts b/barretenberg/ts/src/serialize/serialize.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/serialize/serialize.ts
rename to barretenberg/ts/src/serialize/serialize.ts
diff --git a/circuits/cpp/barretenberg/ts/src/types/fields.ts b/barretenberg/ts/src/types/fields.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/types/fields.ts
rename to barretenberg/ts/src/types/fields.ts
diff --git a/circuits/cpp/barretenberg/ts/src/types/fixed_size_buffer.ts b/barretenberg/ts/src/types/fixed_size_buffer.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/types/fixed_size_buffer.ts
rename to barretenberg/ts/src/types/fixed_size_buffer.ts
diff --git a/circuits/cpp/barretenberg/ts/src/types/index.ts b/barretenberg/ts/src/types/index.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/types/index.ts
rename to barretenberg/ts/src/types/index.ts
diff --git a/circuits/cpp/barretenberg/ts/src/types/point.ts b/barretenberg/ts/src/types/point.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/types/point.ts
rename to barretenberg/ts/src/types/point.ts
diff --git a/circuits/cpp/barretenberg/ts/src/types/ptr.ts b/barretenberg/ts/src/types/ptr.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/types/ptr.ts
rename to barretenberg/ts/src/types/ptr.ts
diff --git a/circuits/cpp/barretenberg/ts/src/types/raw_buffer.ts b/barretenberg/ts/src/types/raw_buffer.ts
similarity index 100%
rename from circuits/cpp/barretenberg/ts/src/types/raw_buffer.ts
rename to barretenberg/ts/src/types/raw_buffer.ts
diff --git a/circuits/cpp/barretenberg/ts/tsconfig.browser.json b/barretenberg/ts/tsconfig.browser.json
similarity index 100%
rename from circuits/cpp/barretenberg/ts/tsconfig.browser.json
rename to barretenberg/ts/tsconfig.browser.json
diff --git a/circuits/cpp/barretenberg/ts/tsconfig.json b/barretenberg/ts/tsconfig.json
similarity index 100%
rename from circuits/cpp/barretenberg/ts/tsconfig.json
rename to barretenberg/ts/tsconfig.json
diff --git a/circuits/cpp/barretenberg/ts/webpack.config.js b/barretenberg/ts/webpack.config.js
similarity index 100%
rename from circuits/cpp/barretenberg/ts/webpack.config.js
rename to barretenberg/ts/webpack.config.js
diff --git a/circuits/cpp/barretenberg/ts/yarn.lock b/barretenberg/ts/yarn.lock
similarity index 100%
rename from circuits/cpp/barretenberg/ts/yarn.lock
rename to barretenberg/ts/yarn.lock
diff --git a/circuits/cpp/barretenberg/wasi-sdk.nix b/barretenberg/wasi-sdk.nix
similarity index 100%
rename from circuits/cpp/barretenberg/wasi-sdk.nix
rename to barretenberg/wasi-sdk.nix
diff --git a/bootstrap.sh b/bootstrap.sh
index 62b93deb023..cf7a1017228 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -34,5 +34,12 @@ if [ ! -f ~/.nvm/nvm.sh ]; then
   exit 1
 fi
 
+# Install pre-commit git hooks.
+HOOKS_DIR=$(git rev-parse --git-path hooks)
+echo "(cd barretenberg/cpp && ./format.sh staged)" > $HOOKS_DIR/pre-commit
+echo "(cd circuits/cpp && ./format.sh staged)" >> $HOOKS_DIR/pre-commit
+chmod +x $HOOKS_DIR/pre-commit
+
+barretenberg/cpp/bootstrap.sh
 circuits/cpp/bootstrap.sh
 yarn-project/bootstrap.sh
diff --git a/bootstrap_docker.sh b/bootstrap_docker.sh
index 5870435e443..96777a3c389 100755
--- a/bootstrap_docker.sh
+++ b/bootstrap_docker.sh
@@ -36,7 +36,7 @@ if [ -z "$PROJECT_NAME" ]; then
   fi
 fi
 
-source ./build-system/scripts/setup_env $COMMIT_HASH '' mainframe_$USER
+source ./build-system/scripts/setup_env $COMMIT_HASH '' mainframe_$USER > /dev/null
 build_local $PROJECT_NAME $ONLY_TARGET
 
 if [ -z "$PROJECT_NAME" ]; then
diff --git a/build-system/scripts/build b/build-system/scripts/build
index 0dde9ea4945..6b16d320476 100755
--- a/build-system/scripts/build
+++ b/build-system/scripts/build
@@ -93,6 +93,7 @@ fi
 # Pull latest parents that are not ours. We also do not want to pull images suffixed by _, this is how we scope intermediate build images.
 PARENTS=$(cat $DOCKERFILE | sed -n -e 's/^FROM \([^[:space:]]\+\).*/\1/p' | sed '/_$/d' | grep -v $ECR_DEPLOY_URL  | sort | uniq)
 for PARENT in $PARENTS; do
+  [ "$PARENT" == "scratch" ] && continue
   fetch_image $PARENT
 done
 
@@ -118,14 +119,14 @@ done
 # Extract version from commit tag
 # Check if there is a commit tag
 if [[ -n "$COMMIT_TAG" ]]; then
-  
+
   # Check if it's a repo-specific tag
   if [[ "$COMMIT_TAG" == *"/"* ]]; then
     REPO_NAME="${COMMIT_TAG%%/*}"
     COMMIT_TAG_VERSION="${COMMIT_TAG#*/}"
     echo "Tag was made for: $REPO_NAME"
     echo "Version: $COMMIT_TAG_VERSION"
-    
+
     # Check if REPO_NAME is equal to REPOSITORY
     if [ "$REPO_NAME" != "$REPOSITORY" ]; then
       echo "REPO_NAME ($REPO_NAME) does not match REPOSITORY ($REPOSITORY). Ignoring..."
@@ -156,16 +157,16 @@ for STAGE in $STAGES; do
       STAGE_CACHE_FROM="--cache-from $STAGE_IMAGE_LAST_URI"
     fi
   fi
-  
+
   echo "Building stage: $STAGE"
   STAGE_IMAGE_COMMIT_URI=$ECR_URL/$REPOSITORY:cache-$CONTENT_HASH-$STAGE
   # Build our dockerfile, add timing information
   docker build --target $STAGE $STAGE_CACHE_FROM -t $STAGE_IMAGE_COMMIT_URI -f $DOCKERFILE --build-arg COMMIT_TAG=$COMMIT_TAG_VERSION --build-arg ARG_CONTENT_HASH=$CONTENT_HASH . \
   | while read line ; do echo "$(date "+%H:%M:%S")| $line"; done
-  
+
   # We don't want to have redo this stages work when building the final image. Use it as a layer cache.
   CACHE_FROM="--cache-from $STAGE_IMAGE_COMMIT_URI $CACHE_FROM"
-  
+
   echo "Pushing stage: $STAGE"
   retry docker push $STAGE_IMAGE_COMMIT_URI > /dev/null 2>&1
   echo
diff --git a/build-system/scripts/build_local b/build-system/scripts/build_local
index 697bfd6136c..4cd91c28f04 100755
--- a/build-system/scripts/build_local
+++ b/build-system/scripts/build_local
@@ -18,6 +18,22 @@ fi
 ROOT=$(git rev-parse --show-toplevel)
 source $ROOT/build_manifest.sh
 
+# If given a name, check it exists.
+if [ -n "$TARGET_PROJECT" ]; then
+  EXISTS=0
+  for E in ${PROJECTS[@]}; do
+    ARR=(${E//:/ })
+    PROJECT_DIR_NAME=${ARR[0]}
+    if [ "$PROJECT_DIR_NAME" = "$TARGET_PROJECT" ]; then
+      EXISTS=1
+    fi
+  done
+  if [ "$EXISTS" -eq 0 ]; then
+    echo "Unknown project $TARGET_PROJECT, check build_manifest.sh";
+    exit 1
+  fi
+fi
+
 for E in ${PROJECTS[@]}; do
   ARR=(${E//:/ })
   PROJECT_DIR_NAME=${ARR[0]}
@@ -52,11 +68,11 @@ for E in ${PROJECTS[@]}; do
   time docker build ${ADDITIONAL_ARGS:-} --build-arg ARG_COMMIT_HASH=$COMMIT_HASH -f $DOCKERFILE -t $ECR_DEPLOY_URL/$REPO:latest .
   retry docker tag $ECR_DEPLOY_URL/$REPO:latest aztecprotocol/$REPO:latest
 
-  if [ -n "$LAUNCH" ]; then
-    docker run -ti --rm aztecprotocol/$REPO:latest
-  fi
-
   if [ "$PROJECT_DIR_NAME" = "$TARGET_PROJECT" ]; then
+    if [ -n "$LAUNCH" ]; then
+      docker run -ti --rm aztecprotocol/$REPO:latest
+    fi
+
     break
   fi
 
diff --git a/build-system/scripts/check_rebuild b/build-system/scripts/check_rebuild
index d80e9493684..cbfba6420cb 100755
--- a/build-system/scripts/check_rebuild
+++ b/build-system/scripts/check_rebuild
@@ -1,7 +1,5 @@
 #!/bin/bash
-# Fails if any files matching the rebuild patterns, have changed since the base commit.
 # If this script fails (nonzero exit), then the caller should rebuild.
-# The rebuild patterns are taken from the build manifest (computed from set of dependencies).
 set -euo pipefail
 
 TAG=$1
@@ -14,7 +12,7 @@ if ! image_exists $REPOSITORY $TAG; then
   echo "Rebuild required."
   exit 1
 elif image_exists $REPOSITORY tainted; then
-  # If a tainted tag exists, remove it exit with failure to rebuild.
+  # If a tainted tag exists, remove it and exit with failure to rebuild.
   echo "$REPOSITORY has been tainted. Will rebuild."
   exit 1
 else
diff --git a/build-system/scripts/cond_run_script b/build-system/scripts/cond_run_script
new file mode 100755
index 00000000000..90cc9dd7a19
--- /dev/null
+++ b/build-system/scripts/cond_run_script
@@ -0,0 +1,23 @@
+#!/bin/bash
+# Conditionally runs a script if the REPOSITORY content hash has changed and we haven't had a successful run.
+#
+# Arguments are:
+# 1. REPOSITORY: The project repository name in ECR. Used to determine if there are changes since last success.
+# 2... ARGS: Script and arguments to run.
+set -eu
+
+REPOSITORY=$1
+shift
+
+CONTENT_HASH=$(calculate_content_hash $REPOSITORY)
+BASE_TAG=cache-$CONTENT_HASH
+SUCCESS_TAG=$BASE_TAG-$JOB_NAME
+
+echo "Content hash: $CONTENT_HASH"
+
+if ! check_rebuild $SUCCESS_TAG $REPOSITORY; then
+  init_submodules $REPOSITORY
+  cd $(query_manifest projectDir $REPOSITORY)
+  $@
+  retry tag_remote_image $REPOSITORY $BASE_TAG $SUCCESS_TAG
+fi
diff --git a/build-system/scripts/cond_spot_run_build b/build-system/scripts/cond_spot_run_build
index 813f7b6d63e..508096fb3a3 100755
--- a/build-system/scripts/cond_spot_run_build
+++ b/build-system/scripts/cond_spot_run_build
@@ -1,20 +1,7 @@
 #!/bin/bash
 set -eu
-set -o pipefail
 
 REPOSITORY=$1
-shift
-SPEC=$1
-shift
-DOCKERFILE=$(query_manifest dockerfile $REPOSITORY)
+CPUS=$2
 
-CONTENT_HASH=$(calculate_content_hash $REPOSITORY)
-echo "Content hash tag: cache-$CONTENT_HASH"
-
-cd $(query_manifest buildDir $REPOSITORY)
-
-if ! check_rebuild cache-$CONTENT_HASH $REPOSITORY; then
-  init_submodules $REPOSITORY
-  spot_run_script $CONTENT_HASH $SPEC $BUILD_SYSTEM_PATH/remote_build/remote_build $REPOSITORY $@
-  retry tag_remote_image $REPOSITORY cache-$CONTENT_HASH cache-$CONTENT_HASH
-fi
+cond_spot_run_script $REPOSITORY $CPUS build $REPOSITORY
\ No newline at end of file
diff --git a/build-system/scripts/cond_spot_run_script b/build-system/scripts/cond_spot_run_script
index 6fd419974a4..f3f49b715e9 100755
--- a/build-system/scripts/cond_spot_run_script
+++ b/build-system/scripts/cond_spot_run_script
@@ -1,31 +1,34 @@
 #!/bin/bash
-# Conditionally runs a script on a remote spot instance if any dependent code has changed between
-# the last successful run and the present commit.
-#
-# It's expected to be run from the project directory, and that there be a directory called `scripts`
-# containing the given named script to execute on the remote machine.
-#
-# This script is only useful if there is nothing to do in the event there is no rebuild. This is fine
-# for running a suite of tests for example, but is not useful for performing a build, as even if a
-# build has nothing to do, the previous images are retagged with the new commit hash for upstream jobs.
+# Conditionally runs a script on a remote spot instance if the REPOSITORY content hash has changed and we haven't had a
+# successful run.
+# The TAG_POSTFIX is used by cond_spot_run_test whereby we use an image tag postfixed with JOB_NAME to identifify if
+# we need to re-run the job due to prior failures.
 #
 # Arguments are:
 # 1. REPOSITORY: The project repository name in ECR. Used to determine if there are changes since last success.
-# 2. SUCCESS_TAG: To track if this job needs to be run, the repository image is tagged with a prefix after a
-#    successful run. The script will only run if there were relevant code changes since the last successful commit.
-# 3... ARGS: Arguments to pass to spot_run_script.
+# 2. CPUS: Number of cpus on spot request.
+# 3... ARGS: Script and arguments to run.
+#
+# Env vars are:
+# TAG_POSTFIX: Optional. If provided we check for the image tag with this postfix to determine if re-run is required.
 set -eu
 
 REPOSITORY=$1
-shift
-SUCCESS_TAG=$1
-shift
+CPUS=$2
+shift 2
 
 CONTENT_HASH=$(calculate_content_hash $REPOSITORY)
-echo "Content hash tag: cache-$CONTENT_HASH-$SUCCESS_TAG"
+BASE_TAG=cache-$CONTENT_HASH
+SUCCESS_TAG=$BASE_TAG
+
+if [ -n "${TAG_POSTFIX:-}" ]; then
+  SUCCESS_TAG=$BASE_TAG-$TAG_POSTFIX
+fi
+
+echo "Content hash: $CONTENT_HASH"
 
-if ! check_rebuild cache-$CONTENT_HASH-$SUCCESS_TAG $REPOSITORY; then
+if ! check_rebuild $SUCCESS_TAG $REPOSITORY; then
   init_submodules $REPOSITORY
-  spot_run_script $CONTENT_HASH $@
-  retry tag_remote_image $REPOSITORY cache-$CONTENT_HASH cache-$CONTENT_HASH-$SUCCESS_TAG
+  spot_run_script $CONTENT_HASH $CPUS $@
+  retry tag_remote_image $REPOSITORY $BASE_TAG $SUCCESS_TAG
 fi
diff --git a/build-system/scripts/cond_spot_run_test b/build-system/scripts/cond_spot_run_test
new file mode 100755
index 00000000000..383352bfe71
--- /dev/null
+++ b/build-system/scripts/cond_spot_run_test
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -euo pipefail
+
+REPOSITORY=$1
+CPUS=$2
+SCRIPT=$3
+shift 3
+
+# We provide scripts relative to the project root, as that makes more sense.
+# Augment the script path to be relative to the repo root, rather then the project root, for the remote runner.
+SCRIPT=$(query_manifest relativeProjectDir $REPOSITORY)/$SCRIPT
+
+# Specify a TAG_POSTFIX as the JOB_NAME
+mkdir -p /tmp/test-logs
+TAG_POSTFIX=$JOB_NAME cond_spot_run_script $REPOSITORY $CPUS $SCRIPT $@ | tee "/tmp/test-logs/$JOB_NAME.log"
diff --git a/build-system/scripts/cond_spot_run_test_script b/build-system/scripts/cond_spot_run_test_script
deleted file mode 100755
index c760e69d00f..00000000000
--- a/build-system/scripts/cond_spot_run_test_script
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -eu
-SCRIPT_PATH=$1
-REPOSITORY=$2
-shift
-shift
-
-cd $(query_manifest projectDir $REPOSITORY)
-
-mkdir -p /tmp/test-logs
-
-set -o pipefail
-cond_spot_run_script $REPOSITORY $JOB_NAME 32 $SCRIPT_PATH $@ | tee "/tmp/test-logs/$JOB_NAME.log"
diff --git a/build-system/scripts/cond_spot_run_tests b/build-system/scripts/cond_spot_run_tests
deleted file mode 100755
index 78097379f1f..00000000000
--- a/build-system/scripts/cond_spot_run_tests
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -eu
-
-cond_spot_run_test_script ./scripts/run_tests $@
diff --git a/build-system/scripts/query_manifest b/build-system/scripts/query_manifest
index ba7b8c1fe33..e64086badc0 100755
--- a/build-system/scripts/query_manifest
+++ b/build-system/scripts/query_manifest
@@ -3,6 +3,7 @@ set -eu
 CMD=$1
 REPO=$2
 
+ROOT_PATH=${ROOT_PATH:-$PWD}
 MANIFEST=$ROOT_PATH/build_manifest.json
 
 if [ $(jq "has(\"$REPO\")" $MANIFEST) == "false" ]; then
@@ -10,36 +11,65 @@ if [ $(jq "has(\"$REPO\")" $MANIFEST) == "false" ]; then
   exit 1
 fi
 
+function addRebuildPatterns {
+    local TYPE=$(jq -r ".\"$1\".rebuildPatterns | type" $MANIFEST)
+    if [ "$TYPE" == "string" ]; then
+      local FILE=$(jq -r ".\"$1\".rebuildPatterns" $MANIFEST)
+      local BUILD_DIR=$($0 buildDir $1)
+      PATTERNS=(${PATTERNS[@]} $(cat $BUILD_DIR/$FILE))
+    elif [ "$TYPE" == "array" ]; then
+      PATTERNS=(${PATTERNS[@]} $(jq -r ".\"$1\".rebuildPatterns | .[]" $MANIFEST))
+    else
+      >&2 echo "Missing rebuildPatterns property. Either filename as string, or patterns as array."
+      exit 1
+    fi
+}
+
 case "$CMD" in
   dockerfile)
-    jq -r ".\"$REPO\".dockerfile // \"Dockerfile\"" $MANIFEST
+    # In the manifest, the path is relative to buildDir. Return absolute path.
+    BUILD_DIR=$($0 buildDir $REPO)
+    DOCKERFILE=$(jq -r ".\"$REPO\".dockerfile // \"Dockerfile\"" $MANIFEST)
+    echo $BUILD_DIR/$DOCKERFILE
     ;;
   buildDir)
-    jq -r ".\"$REPO\".buildDir" $MANIFEST
+    # In the manifest, the path is relative to the repo root. Return absolute path.
+    BUILD_DIR=$(jq -r ".\"$REPO\".buildDir" $MANIFEST)
+    echo $ROOT_PATH/$BUILD_DIR
     ;;
   projectDir)
+    # In the manifest, the path is relative to the repo root. Return absolute path.
+    PROJECT_DIR=$(jq -r ".\"$REPO\".projectDir // .\"$REPO\".buildDir" $MANIFEST)
+    echo $ROOT_PATH/$PROJECT_DIR
+    ;;
+  relativeProjectDir)
     jq -r ".\"$REPO\".projectDir // .\"$REPO\".buildDir" $MANIFEST
     ;;
   dependencies)
-    ALL_DEPS=()
+    declare -A ALL_DEPS
     add_deps() {
+      if [[ -v ALL_DEPS[$1] ]]; then
+        return
+      fi
+      ALL_DEPS["$1"]=1
       DEPS=($(jq -r ".\"$1\".dependencies // [] | .[]" $MANIFEST))
-      ALL_DEPS=(${ALL_DEPS[@]} ${DEPS[@]})
       for DEP in "${DEPS[@]}"; do
         add_deps $DEP
       done
     }
     add_deps $REPO
-    printf "%s\n" "${ALL_DEPS[@]}" | sort | uniq
+    for KEY in "${!ALL_DEPS[@]}"; do
+      echo $KEY
+    done | sort
     ;;
   rebuildPatterns)
-    ALL_PATTERNS=($(jq -r ".\"$REPO\".rebuildPatterns | .[]" $MANIFEST))
     DEPS=($($0 dependencies $REPO))
+    PATTERNS=()
+    addRebuildPatterns $REPO
     for DEP in "${DEPS[@]}"; do
-      PATTERNS=($(jq -r ".\"$DEP\".rebuildPatterns | .[]" $MANIFEST))
-      ALL_PATTERNS=(${ALL_PATTERNS[@]} ${PATTERNS[@]})
+      addRebuildPatterns $DEP
     done
-    printf "%s\n" "${ALL_PATTERNS[@]}" | sort | uniq
+    printf "%s\n" "${PATTERNS[@]}" | sort | uniq
     ;;
   submodulePath)
     DIR=$($0 buildDir $REPO)
diff --git a/build-system/scripts/remote_run_script b/build-system/scripts/remote_run_script
index 0e6417da156..e2ff2ff7756 100755
--- a/build-system/scripts/remote_run_script
+++ b/build-system/scripts/remote_run_script
@@ -1,17 +1,30 @@
 #!/bin/bash
+# Copies the runner script to the remote instance, runs it giving it script and args to run.
+# The runner script checks out the repository first and runs setup-env.
+#
+# 1. IP: The IP address of the system to run the script on.
+# 2... ARGS: Script and arguments to run.
+#
+# e.g. remote_run_script 1.2.3.4 build my_repo
 set -eu
 
 IP=$1
-FULL_PATH=$2
-shift 2
+shift
 
 SSH_CONFIG_PATH=${SSH_CONFIG_PATH:-$BUILD_SYSTEM_PATH/remote/ssh_config}
-DIR_NAME=$(dirname $FULL_PATH)
-SCRIPT_NAME=$(basename $FULL_PATH)
 
-# Copy all files in script directory to spot instance.
-scp -F $SSH_CONFIG_PATH $DIR_NAME/* $IP:.
-scp -rF $SSH_CONFIG_PATH $BUILD_SYSTEM_PATH $BUILD_SYSTEM_PATH/../.git $BUILD_SYSTEM_PATH/../build_manifest.json $IP:.
+# Copy the runner script to spot instance. This is what we actually run.
+scp -rF $SSH_CONFIG_PATH $BUILD_SYSTEM_PATH/scripts/remote_runner $IP:.
 
 # Run script on remote instance, passing environment variables.
-ssh -A -F $SSH_CONFIG_PATH $IP "COMMIT_HASH=$COMMIT_HASH COMMIT_TAG=$COMMIT_TAG JOB_NAME=$JOB_NAME GIT_REPOSITORY_URL=$GIT_REPOSITORY_URL DOCKERHUB_PASSWORD=$DOCKERHUB_PASSWORD ECR_DEPLOY_URL=$ECR_DEPLOY_URL ECR_URL=$ECR_URL ./$SCRIPT_NAME $@"
+echo "Running ./remote_runner $@ on $IP..."
+ssh -A -F $SSH_CONFIG_PATH $IP "
+  export COMMIT_HASH=$COMMIT_HASH
+  export COMMIT_TAG=$COMMIT_TAG
+  export JOB_NAME=$JOB_NAME
+  export GIT_REPOSITORY_URL=$GIT_REPOSITORY_URL
+  export DOCKERHUB_PASSWORD=$DOCKERHUB_PASSWORD
+  export ECR_DEPLOY_URL=$ECR_DEPLOY_URL
+  export ECR_URL=$ECR_URL
+  ./remote_runner $@
+"
diff --git a/build-system/remote_build/remote_build b/build-system/scripts/remote_runner
similarity index 81%
rename from build-system/remote_build/remote_build
rename to build-system/scripts/remote_runner
index 8eab556ee57..8b0c338a2f7 100755
--- a/build-system/remote_build/remote_build
+++ b/build-system/scripts/remote_runner
@@ -3,7 +3,7 @@ set -eu
 
 ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
 
-echo "Initialising remote build..."
+echo "Checking out code..."
 
 # IF YOU'RE CHANGING THIS, YOU ALSO WANT TO CHANGE: .circleci/config.yml
 # Shallow checkout this commit.
@@ -16,13 +16,11 @@ git config remote.origin.promisor true
 git config remote.origin.partialclonefilter blob:none
 git fetch --depth 1 origin $COMMIT_HASH
 git checkout FETCH_HEAD
-# Checkout barretenberg submodule only.
-git submodule update --init build-system
 
 echo "Git checkout completed."
 
 BASH_ENV=/tmp/bash_env
 echo "Calling setup env..."
 source ./build-system/scripts/setup_env "$COMMIT_HASH" "$COMMIT_TAG" "$JOB_NAME" "$GIT_REPOSITORY_URL"
-echo "Calling build..."
-build $@
+echo "Calling $@..."
+$@
diff --git a/build-system/scripts/spot_run_script b/build-system/scripts/spot_run_script
index ddf4acebc43..920d661bb61 100755
--- a/build-system/scripts/spot_run_script
+++ b/build-system/scripts/spot_run_script
@@ -1,11 +1,14 @@
 #!/bin/bash
 # Runs a test script on a remote spot instance. Arguments are:
-# 1. Content hash for our repository contents. Used for identify spot jobs and image tags.
-# 2. SPEC: Instance specification filename.
-# 3... ARGS: Arguments to pass to remote_run_script.
+# 1. CONTENT_HASH: Content hash for our repository contents. Used to identify spot jobs and image tags.
+# 2. CPUS: Number of cpus on spot request.
+# 3... ARGS: Script and arguments to run.
+#
+# Env vars:
+# JOB_NAME: Set within setup-env. The job name as per CI.
 set -eu
 CONTENT_HASH=$1
-SPEC=$2
+CPUS=$2
 shift 2
 
 # On any sort of exit (error or not), kill spot request so it doesn't count against quota.
@@ -19,7 +22,7 @@ function on_exit {
 trap on_exit EXIT
 
 # Get spot instance.
-IP=$(request_spot $CONTENT_HASH:$JOB_NAME $SPEC)
+IP=$(request_spot $CONTENT_HASH:$JOB_NAME $CPUS)
 
 # Run script remotely on spot instance, capturing success or failure.
 set +e
diff --git a/build-system/scripts/spot_run_test_script b/build-system/scripts/spot_run_test_script
deleted file mode 100755
index 06d4d455380..00000000000
--- a/build-system/scripts/spot_run_test_script
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-set -eu
-SCRIPT_PATH=$1
-REPOSITORY=$2
-shift
-shift
-
-cd $(query_manifest projectDir $REPOSITORY)
-
-mkdir -p /tmp/test-logs
-
-set -o pipefail
-
-CONTENT_HASH=$(calculate_content_hash $REPOSITORY)
-echo "Content hash: $CONTENT_HASH"
-spot_run_script $CONTENT_HASH 32 $SCRIPT_PATH $@ | tee "/tmp/test-logs/$JOB_NAME.log"
diff --git a/build-system/scripts/spot_run_tests b/build-system/scripts/spot_run_tests
deleted file mode 100755
index e7d8183c048..00000000000
--- a/build-system/scripts/spot_run_tests
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -eu
-
-spot_run_test_script ./scripts/run_tests $@
diff --git a/build_manifest.json b/build_manifest.json
index 06f6299b0bb..c00f0764513 100644
--- a/build_manifest.json
+++ b/build_manifest.json
@@ -1,108 +1,80 @@
 {
   "barretenberg-x86_64-linux-clang": {
-    "buildDir": "circuits/cpp/barretenberg/cpp",
+    "buildDir": "barretenberg/cpp",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang",
-    "rebuildPatterns": [
-      "^circuits/cpp/barretenberg/cpp/"
-    ],
+    "rebuildPatterns": ".rebuild_patterns",
     "dependencies": []
   },
   "barretenberg-x86_64-linux-clang-assert": {
-    "buildDir": "circuits/cpp/barretenberg/cpp",
+    "buildDir": "barretenberg/cpp",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-assert",
-    "rebuildPatterns": [
-      "^circuits/cpp/barretenberg/cpp/"
-    ],
+    "rebuildPatterns": ".rebuild_patterns",
     "dependencies": []
   },
   "barretenberg-x86_64-linux-clang-fuzzing": {
-    "buildDir": "circuits/cpp/barretenberg/cpp",
+    "buildDir": "barretenberg/cpp",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing",
-    "rebuildPatterns": [
-      "^circuits/cpp/barretenberg/cpp/"
-    ],
+    "rebuildPatterns": ".rebuild_patterns",
     "dependencies": []
   },
   "barretenberg-x86_64-linux-gcc": {
-    "buildDir": "circuits/cpp/barretenberg/cpp",
+    "buildDir": "barretenberg/cpp",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-gcc",
-    "rebuildPatterns": [
-      "^circuits/cpp/barretenberg/cpp/"
-    ],
+    "rebuildPatterns": ".rebuild_patterns",
     "dependencies": []
   },
   "barretenberg-wasm-linux-clang": {
-    "buildDir": "circuits/cpp/barretenberg/cpp",
+    "buildDir": "barretenberg/cpp",
     "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang",
-    "rebuildPatterns": [
-      "^circuits/cpp/barretenberg/cpp/"
-    ],
+    "rebuildPatterns": ".rebuild_patterns",
     "dependencies": []
   },
   "bb.js": {
-    "buildDir": "circuits/cpp/barretenberg/ts",
-    "rebuildPatterns": ["^circuits/cpp/barretenberg/ts/"],
+    "buildDir": "barretenberg/ts",
+    "rebuildPatterns": ["^barretenberg/ts/"],
     "dependencies": ["barretenberg-wasm-linux-clang"]
   },
   "barretenberg-acir-tests-bb": {
-    "buildDir": "circuits/cpp/barretenberg/acir_tests",
+    "buildDir": "barretenberg/acir_tests",
     "dockerfile": "Dockerfile.bb",
-    "rebuildPatterns": ["^circuits/cpp/barretenberg/acir_tests/"],
+    "rebuildPatterns": ["^barretenberg/acir_tests/"],
     "dependencies": ["barretenberg-x86_64-linux-clang-assert"]
   },
   "barretenberg-acir-tests-bb.js": {
-    "buildDir": "circuits/cpp/barretenberg/acir_tests",
+    "buildDir": "barretenberg/acir_tests",
     "dockerfile": "Dockerfile.bb.js",
-    "rebuildPatterns": ["^circuits/cpp/barretenberg/acir_tests/"],
+    "rebuildPatterns": ["^barretenberg/acir_tests/"],
     "dependencies": ["bb.js"]
   },
   "circuits-wasm-linux-clang": {
     "buildDir": "circuits/cpp",
     "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang",
-    "rebuildPatterns": [
-      "^circuits/"
-    ],
-    "dependencies": []
+    "rebuildPatterns": ".rebuild_patterns",
+    "dependencies": ["barretenberg-wasm-linux-clang"]
   },
   "circuits-wasm-linux-clang-assert": {
     "buildDir": "circuits/cpp",
     "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang-assert",
-    "rebuildPatterns": [
-      "^circuits/"
-    ],
-    "dependencies": []
+    "rebuildPatterns": ".rebuild_patterns",
+    "dependencies": ["barretenberg-wasm-linux-clang"]
   },
   "circuits-x86_64-linux-clang-tidy": {
     "buildDir": "circuits/cpp",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-tidy",
-    "rebuildPatterns": [
-      "^circuits/"
-    ],
-    "dependencies": []
+    "rebuildPatterns": ".rebuild_patterns",
+    "dependencies": ["barretenberg-x86_64-linux-clang"]
   },
   "circuits-x86_64-linux-clang": {
     "buildDir": "circuits/cpp",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang",
-    "rebuildPatterns": [
-      "^circuits/"
-    ],
-    "dependencies": []
+    "rebuildPatterns": ".rebuild_patterns",
+    "dependencies": ["barretenberg-x86_64-linux-clang"]
   },
   "circuits-x86_64-linux-clang-assert": {
     "buildDir": "circuits/cpp",
     "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-assert",
-    "rebuildPatterns": [
-      "^circuits/"
-    ],
-    "dependencies": []
-  },
-  "circuits-x86_64-linux-gcc": {
-    "buildDir": "circuits/cpp",
-    "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-gcc",
-    "rebuildPatterns": [
-      "^circuits/"
-    ],
-    "dependencies": []
+    "rebuildPatterns": ".rebuild_patterns",
+    "dependencies": ["barretenberg-x86_64-linux-clang"]
   },
   "docs": {
     "buildDir": ".",
@@ -127,7 +99,6 @@
     "buildDir": "yarn-project",
     "dockerfile": "yarn-project-base/Dockerfile",
     "rebuildPatterns": [
-      "^circuits/",
       "^l1-contracts/",
       "^yarn-project/l1-artifacts/",
       "^yarn-project/noir-contracts/",
@@ -144,6 +115,7 @@
     "dockerfile": "acir-simulator/Dockerfile",
     "rebuildPatterns": ["^yarn-project/acir-simulator/"],
     "dependencies": [
+      "yarn-project-base",
       "circuits.js",
       "foundation",
       "types",
@@ -157,6 +129,7 @@
     "dockerfile": "archiver/Dockerfile",
     "rebuildPatterns": ["^yarn-project/archiver/"],
     "dependencies": [
+      "yarn-project-base",
       "circuits.js",
       "ethereum",
       "foundation",
@@ -170,6 +143,7 @@
     "dockerfile": "cli/Dockerfile",
     "rebuildPatterns": ["^yarn-project/cli/"],
     "dependencies": [
+      "yarn-project-base",
       "aztec.js",
       "ethereum",
       "foundation",
@@ -184,6 +158,7 @@
     "dockerfile": "aztec-rpc/Dockerfile",
     "rebuildPatterns": ["^yarn-project/aztec-rpc/"],
     "dependencies": [
+      "yarn-project-base",
       "acir-simulator",
       "circuits.js",
       "foundation",
@@ -197,6 +172,7 @@
     "dockerfile": "aztec-sandbox/Dockerfile",
     "rebuildPatterns": ["^yarn-project/aztec-sandbox/"],
     "dependencies": [
+      "yarn-project-base",
       "aztec-node",
       "aztec-rpc",
       "aztec.js",
@@ -213,7 +189,7 @@
     "projectDir": "yarn-project/aztec.js",
     "dockerfile": "aztec.js/Dockerfile",
     "rebuildPatterns": ["^yarn-project/aztec.js/"],
-    "dependencies": ["circuits.js", "foundation", "types"]
+    "dependencies": ["yarn-project-base", "circuits.js", "foundation", "types"]
   },
   "canary-build": {
     "buildDir": "yarn-project",
@@ -221,6 +197,7 @@
     "dockerfile": "canary/Dockerfile.build",
     "rebuildPatterns": ["^yarn-project/canary/"],
     "dependencies": [
+      "yarn-project-base",
       "aztec.js",
       "l1-artifacts",
       "noir-contracts",
@@ -232,17 +209,20 @@
     "projectDir": "yarn-project/canary",
     "dockerfile": "canary/Dockerfile",
     "rebuildPatterns": ["^yarn-project/canary/"],
-    "dependencies": ["aztec.js", "foundation", "l1-artifacts", "noir-contracts"]
+    "dependencies": [
+      "yarn-project-base",
+      "aztec.js",
+      "foundation",
+      "l1-artifacts",
+      "noir-contracts"
+    ]
   },
   "circuits.js": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/circuits.js",
     "dockerfile": "circuits.js/Dockerfile",
-    "rebuildPatterns": [
-      "^circuits/",
-      "^yarn-project/circuits.js/"
-    ],
-    "dependencies": ["foundation"]
+    "rebuildPatterns": ["^yarn-project/circuits.js/"],
+    "dependencies": ["yarn-project-base", "foundation"]
   },
   "end-to-end": {
     "buildDir": "yarn-project",
@@ -250,6 +230,7 @@
     "dockerfile": "end-to-end/Dockerfile",
     "rebuildPatterns": ["^yarn-project/end-to-end/"],
     "dependencies": [
+      "yarn-project-base",
       "archiver",
       "aztec-node",
       "aztec-rpc",
@@ -272,28 +253,28 @@
     "projectDir": "yarn-project/ethereum",
     "dockerfile": "ethereum/Dockerfile",
     "rebuildPatterns": ["^yarn-project/ethereum/"],
-    "dependencies": ["foundation", "l1-artifacts"]
+    "dependencies": ["yarn-project-base", "foundation", "l1-artifacts"]
   },
   "foundation": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/foundation",
     "dockerfile": "foundation/Dockerfile",
     "rebuildPatterns": ["^yarn-project/foundation/"],
-    "dependencies": []
+    "dependencies": ["yarn-project-base"]
   },
   "key-store": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/key-store",
     "dockerfile": "key-store/Dockerfile",
     "rebuildPatterns": ["^yarn-project/key-store/"],
-    "dependencies": ["circuits.js", "foundation", "types"]
+    "dependencies": ["yarn-project-base", "circuits.js", "foundation", "types"]
   },
   "merkle-tree": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/merkle-tree",
     "dockerfile": "merkle-tree/Dockerfile",
     "rebuildPatterns": ["^yarn-project/merkle-tree/"],
-    "dependencies": ["circuits.js", "foundation", "types"]
+    "dependencies": ["yarn-project-base", "circuits.js", "foundation", "types"]
   },
   "noir-contracts-build": {
     "buildDir": "yarn-project",
@@ -303,7 +284,12 @@
       "^yarn-project/noir-contracts/",
       "^yarn-project/noir-libs/"
     ],
-    "dependencies": ["aztec.js", "foundation", "noir-compiler"]
+    "dependencies": [
+      "yarn-project-base",
+      "aztec.js",
+      "foundation",
+      "noir-compiler"
+    ]
   },
   "noir-contracts": {
     "buildDir": "yarn-project",
@@ -313,42 +299,53 @@
       "^yarn-project/noir-contracts/",
       "^yarn-project/noir-libs/"
     ],
-    "dependencies": ["aztec.js", "foundation", "noir-compiler"]
+    "dependencies": [
+      "yarn-project-base",
+      "aztec.js",
+      "foundation",
+      "noir-compiler"
+    ]
   },
   "noir-compiler": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/noir-compiler",
     "dockerfile": "noir-compiler/Dockerfile",
     "rebuildPatterns": ["^yarn-project/noir-compiler/"],
-    "dependencies": ["foundation"]
+    "dependencies": ["yarn-project-base", "foundation"]
   },
   "p2p": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/p2p",
     "dockerfile": "p2p/Dockerfile",
     "rebuildPatterns": ["^yarn-project/p2p/"],
-    "dependencies": ["circuits.js", "foundation", "types"]
+    "dependencies": ["yarn-project-base", "circuits.js", "foundation", "types"]
   },
   "p2p-bootstrap": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/p2p-bootstrap",
     "dockerfile": "p2p/Dockerfile",
     "rebuildPatterns": ["^yarn-project/p2p-bootstrap/"],
-    "dependencies": ["foundation", "p2p"]
+    "dependencies": ["yarn-project-base", "foundation", "p2p"]
   },
   "prover-client": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/prover-client",
     "dockerfile": "prover-client/Dockerfile",
     "rebuildPatterns": ["^yarn-project/prover-client/"],
-    "dependencies": ["foundation"]
+    "dependencies": ["yarn-project-base", "foundation"]
   },
   "rollup-provider": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/rollup-provider",
     "dockerfile": "rollup-provider/Dockerfile",
     "rebuildPatterns": ["^yarn-project/rollup-provider/"],
-    "dependencies": ["aztec-node", "circuits.js", "foundation", "types"]
+    "dependencies": [
+      "yarn-project-base",
+      "aztec-node",
+      "circuits.js",
+      "foundation",
+      "types"
+    ]
   },
   "aztec-node": {
     "buildDir": "yarn-project",
@@ -356,6 +353,7 @@
     "dockerfile": "aztec-node/Dockerfile",
     "rebuildPatterns": ["^yarn-project/aztec-node/"],
     "dependencies": [
+      "yarn-project-base",
       "archiver",
       "circuits.js",
       "foundation",
@@ -373,6 +371,7 @@
     "dockerfile": "sequencer-client/Dockerfile",
     "rebuildPatterns": ["^yarn-project/sequencer-client/"],
     "dependencies": [
+      "yarn-project-base",
       "acir-simulator",
       "circuits.js",
       "ethereum",
@@ -389,13 +388,19 @@
     "projectDir": "yarn-project/types",
     "dockerfile": "types/Dockerfile",
     "rebuildPatterns": ["^yarn-project/types/"],
-    "dependencies": ["circuits.js", "foundation"]
+    "dependencies": ["yarn-project-base", "circuits.js", "foundation"]
   },
   "world-state": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/world-state",
     "dockerfile": "world-state/Dockerfile",
     "rebuildPatterns": ["^yarn-project/world-state/"],
-    "dependencies": ["circuits.js", "foundation", "merkle-tree", "types"]
+    "dependencies": [
+      "yarn-project-base",
+      "circuits.js",
+      "foundation",
+      "merkle-tree",
+      "types"
+    ]
   }
 }
diff --git a/build_manifest.sh b/build_manifest.sh
index 23055fb9fdb..9cd3810f645 100755
--- a/build_manifest.sh
+++ b/build_manifest.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Source this file to define the PROJECTS variable, needed by build_local, used by bootstrap_docker.sh.
 #
-# PROJECT elements have structure PROJECT_DIR_NAME:WORKING_DIR:DOCKERFILE:REPO:LAUNCH.
+# PROJECT elements have structure PROJECT_NAME:WORKING_DIR:DOCKERFILE:REPO:LAUNCH.
 #  PROJECT_NAME: A name by which one can reference this project via the boostrap_docker.sh script.
 #  WORKING_DIR: Everything within this directory is copied into the docker context (excluding paths in .dockerignore).
 #  DOCKERFILE: Defaults to Dockerfile. However some projects have multiple build Dockerfiles located in subdirs.
@@ -14,12 +14,17 @@
 # commit them, so that the most important build path remains fast and simple.
 
 PROJECTS=(
-  bb-wasm:circuits/cpp/barretenberg/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:barretenberg-wasm-linux-clang
-  bb-x86:circuits/cpp/barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:barretenberg-x86_64-linux-clang-assert
-  bb.js:circuits/cpp/barretenberg/ts:Dockerfile:bb.js::1
-  run-acir-tests-bb:circuits/cpp/barretenberg/acir_tests:Dockerfile.bb
-  run-acir-tests-bb.js:circuits/cpp/barretenberg/acir_tests:Dockerfile.bb.js
-  circuits:circuits/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:circuits-wasm-linux-clang
+  # bb-x86_64-linux-clang:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang:barretenberg-x86_64-linux-clang
+  # bb-x86_64-linux-clang-assert:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:barretenberg-x86_64-linux-clang-assert
+  # bb-x86_64-linux-gcc:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-gcc:barretenberg-x86_64-linux-gcc
+  bb-wasm-linux-clang:barretenberg/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:barretenberg-wasm-linux-clang
+  # bb-x86:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:barretenberg-x86_64-linux-clang-assert
+  # bb.js:barretenberg/ts:Dockerfile:bb.js::1
+  # run-acir-tests-bb:barretenberg/acir_tests:Dockerfile.bb
+  # run-acir-tests-bb.js:barretenberg/acir_tests:Dockerfile.bb.js
+  # circuits-x86_64-linux-clang:circuits/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang:circuits-x86_64-linux-clang
+  # circuits-x86_64-linux-clang-assert:circuits/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:circuits-x86_64-linux-clang-assert
+  circuits-wasm-linux-clang:circuits/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:circuits-wasm-linux-clang
   l1-contracts:l1-contracts
   noir-contracts:yarn-project:DockerFile.build:noir-contracts-build
   noir-contracts:yarn-project
diff --git a/circuits/cpp/.rebuild_patterns b/circuits/cpp/.rebuild_patterns
new file mode 100644
index 00000000000..8b81b83403c
--- /dev/null
+++ b/circuits/cpp/.rebuild_patterns
@@ -0,0 +1,3 @@
+^circuits/.*\\.(cpp|cc|cxx|c\\+\\+|h|hpp|hxx|h\\+\\+|c|h|inl|inc|ipp|tpp|cmake)$
+^circuits/.*CMakeLists\\.txt$
+^circuits/.*Dockerfile.*$
\ No newline at end of file
diff --git a/circuits/cpp/CMakeLists.txt b/circuits/cpp/CMakeLists.txt
index 3929ccd2e41..a3286d6121f 100644
--- a/circuits/cpp/CMakeLists.txt
+++ b/circuits/cpp/CMakeLists.txt
@@ -139,10 +139,6 @@ if(COVERAGE)
     )
 endif()
 
-# include barretenberg as ExternalProject
-# (needs WASM to be set already)
-include(cmake/barretenberg.cmake)
-
 include(cmake/build.cmake)
 include(GNUInstallDirs)
 include(cmake/arch.cmake)
diff --git a/circuits/cpp/CMakePresets.json b/circuits/cpp/CMakePresets.json
index a97a84aa1ae..556a8444fcc 100644
--- a/circuits/cpp/CMakePresets.json
+++ b/circuits/cpp/CMakePresets.json
@@ -18,7 +18,6 @@
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
       },
       "cacheVariables": {
-        "CMAKE_BBERG_PRESET": "default",
         "CMAKE_BUILD_TYPE": "Release"
       }
     },
@@ -32,9 +31,6 @@
         "CXX": "$env{BREW_PREFIX}/opt/llvm/bin/clang++",
         "LDFLAGS": "-L$env{BREW_PREFIX}/opt/libomp/lib",
         "CPPFLAGS": "-I$env{BREW_PREFIX}/opt/libomp/include"
-      },
-      "cacheVariables": {
-        "CMAKE_BBERG_PRESET": "homebrew"
       }
     },
     {
@@ -45,9 +41,6 @@
       "environment": {
         "CC": "clang-15",
         "CXX": "clang++-15"
-      },
-      "cacheVariables": {
-        "CMAKE_BBERG_PRESET": "clang15"
       }
     },
     {
@@ -76,9 +69,6 @@
       "environment": {
         "CC": "clang-16",
         "CXX": "clang++-16"
-      },
-      "cacheVariables": {
-        "CMAKE_BBERG_PRESET": "clang16"
       }
     },
     {
@@ -107,9 +97,6 @@
       "environment": {
         "CC": "gcc",
         "CXX": "g++"
-      },
-      "cacheVariables": {
-        "CMAKE_BBERG_PRESET": "gcc"
       }
     },
     {
@@ -120,9 +107,6 @@
       "environment": {
         "CC": "gcc-10",
         "CXX": "g++-10"
-      },
-      "cacheVariables": {
-        "CMAKE_BBERG_PRESET": "gcc10"
       }
     },
     {
@@ -139,8 +123,7 @@
       "inherits": "default",
       "binaryDir": "build-fuzzing",
       "cacheVariables": {
-        "FUZZING": "ON",
-        "CMAKE_BBERG_PRESET": "fuzzing"
+        "FUZZING": "ON"
       }
     },
     {
@@ -151,8 +134,7 @@
       "binaryDir": "build-coverage",
       "cacheVariables": {
         "COVERAGE": "ON",
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_BBERG_PRESET": "coverage"
+        "CMAKE_BUILD_TYPE": "Debug"
       }
     },
     {
@@ -178,7 +160,6 @@
         "CMAKE_C_COMPILER_WORKS": "ON",
         "CMAKE_CXX_COMPILER_WORKS": "ON",
         "CMAKE_EXE_LINKER_FLAGS": "-O3",
-        "CMAKE_BBERG_PRESET": "wasm",
         "CMAKE_BUILD_TYPE": "Release"
       }
     },
diff --git a/circuits/cpp/barretenberg b/circuits/cpp/barretenberg
new file mode 120000
index 00000000000..e9b54f1df3e
--- /dev/null
+++ b/circuits/cpp/barretenberg
@@ -0,0 +1 @@
+../../barretenberg
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/CHANGELOG.md b/circuits/cpp/barretenberg/CHANGELOG.md
deleted file mode 100644
index 8291740c03b..00000000000
--- a/circuits/cpp/barretenberg/CHANGELOG.md
+++ /dev/null
@@ -1,473 +0,0 @@
-# Changelog
-
-## [0.7.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.7...barretenberg-v0.7.0) (2023-09-13)
-
-
-### ⚠ BREAKING CHANGES
-
-* **aztec-noir:** rename noir-aztec to aztec-noir ([#2071](https://github.com/AztecProtocol/aztec-packages/issues/2071))
-
-### Features
-
-* **build:** Use LTS version of ubuntu ([#2239](https://github.com/AztecProtocol/aztec-packages/issues/2239)) ([ce6671e](https://github.com/AztecProtocol/aztec-packages/commit/ce6671e6ab72fcdc8114df5b6a45f81c0086b19d))
-
-
-### Bug Fixes
-
-* **build:** Update ubuntu version used in Docker builds ([#2236](https://github.com/AztecProtocol/aztec-packages/issues/2236)) ([dbe80b7](https://github.com/AztecProtocol/aztec-packages/commit/dbe80b739e97474b29e6a4125ac0d2f16e248b32))
-* Format barretenberg ([#2209](https://github.com/AztecProtocol/aztec-packages/issues/2209)) ([0801372](https://github.com/AztecProtocol/aztec-packages/commit/08013725091c7e80c1e83145ffbf3983cf1e7fe3))
-* Msgpack blowup with bigger objects ([#2207](https://github.com/AztecProtocol/aztec-packages/issues/2207)) ([b909937](https://github.com/AztecProtocol/aztec-packages/commit/b909937ba53b896e11e6b65db08b8f2bb83218d5))
-* Refactor constraints in scalar mul to use the high limb ([#2161](https://github.com/AztecProtocol/aztec-packages/issues/2161)) ([1d0e25d](https://github.com/AztecProtocol/aztec-packages/commit/1d0e25d9fad69aebccacf9f646e3291ea89716ca))
-
-
-### Miscellaneous
-
-* Add debugging to run_tests ([#2212](https://github.com/AztecProtocol/aztec-packages/issues/2212)) ([1c5e78a](https://github.com/AztecProtocol/aztec-packages/commit/1c5e78a4ac01bee4b785857447efdb02d8d9cb35))
-* **aztec-noir:** Rename noir-aztec to aztec-noir ([#2071](https://github.com/AztecProtocol/aztec-packages/issues/2071)) ([e1e14d2](https://github.com/AztecProtocol/aztec-packages/commit/e1e14d2c7fb44d56b9a10a645676d3551830bb10))
-* Update url for acir artifacts ([#2231](https://github.com/AztecProtocol/aztec-packages/issues/2231)) ([5e0abd3](https://github.com/AztecProtocol/aztec-packages/commit/5e0abd35dec449a665760e5ee51eeff89c76532c))
-
-## [0.6.7](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.6...barretenberg-v0.6.7) (2023-09-11)
-
-
-### Miscellaneous
-
-* **barretenberg:** Synchronize aztec-packages versions
-
-## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.5...barretenberg-v0.6.6) (2023-09-11)
-
-
-### Miscellaneous
-
-* **barretenberg:** Synchronize aztec-packages versions
-
-## [0.6.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.4...barretenberg-v0.6.5) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg:** Synchronize aztec-packages versions
-
-## [0.6.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.3...barretenberg-v0.6.4) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg:** Synchronize aztec-packages versions
-
-## [0.6.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.2...barretenberg-v0.6.3) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg:** Synchronize aztec-packages versions
-
-## [0.6.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.1...barretenberg-v0.6.2) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg:** Synchronize aztec-packages versions
-
-## [0.6.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.2...barretenberg-v0.6.1) (2023-09-08)
-
-
-### Bug Fixes
-
-* Work around intermittent wasm webkit issue ([#2140](https://github.com/AztecProtocol/aztec-packages/issues/2140)) ([a9b0934](https://github.com/AztecProtocol/aztec-packages/commit/a9b09344c80d8628f95f859d4e2d455d61f9e7c6))
-
-
-### Miscellaneous
-
-* **master:** Release 0.5.2 ([#2141](https://github.com/AztecProtocol/aztec-packages/issues/2141)) ([451aad6](https://github.com/AztecProtocol/aztec-packages/commit/451aad6ea92ebced9839ca14baae10cee327be35))
-* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
-* Release 0.6.1 ([1bd1a79](https://github.com/AztecProtocol/aztec-packages/commit/1bd1a79b0cefcd90306133aab141d992e8ea5fc3))
-
-## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.2...barretenberg-v0.5.2) (2023-09-08)
-
-
-### Bug Fixes
-
-* Work around intermittent wasm webkit issue ([#2140](https://github.com/AztecProtocol/aztec-packages/issues/2140)) ([a9b0934](https://github.com/AztecProtocol/aztec-packages/commit/a9b09344c80d8628f95f859d4e2d455d61f9e7c6))
-
-
-### Miscellaneous
-
-* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
-
-## [0.5.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.5.0...barretenberg-v0.5.1) (2023-09-05)
-
-
-### Features
-
-* Add `info` command to bb ([#2010](https://github.com/AztecProtocol/barretenberg/issues/2010)) ([2882d97](https://github.com/AztecProtocol/barretenberg/commit/2882d97f5165239badb328be80568e7d683c0465))
-* **ci:** Use content hash in build system, restrict docs build to *.ts or *.cpp ([#1953](https://github.com/AztecProtocol/barretenberg/issues/1953)) ([297a20d](https://github.com/AztecProtocol/barretenberg/commit/297a20d7878a4aabab1cabf2cc5d2d67f9e969c5))
-
-
-### Bug Fixes
-
-* Adds Mac cross compile flags into barretenberg ([#1954](https://github.com/AztecProtocol/barretenberg/issues/1954)) ([0e17d97](https://github.com/AztecProtocol/barretenberg/commit/0e17d978a0cc6805b72646a8e36fd5267cbd6bcd))
-* **bb.js:** (breaking change) bundles bb.js properly so that it works in the browser and in node ([#1855](https://github.com/AztecProtocol/barretenberg/issues/1855)) ([bc93a5f](https://github.com/AztecProtocol/barretenberg/commit/bc93a5f8510d0dc600343e7e613ab84380d3c225))
-* **ci:** Incorrect content hash in some build targets ([#1973](https://github.com/AztecProtocol/barretenberg/issues/1973)) ([c6c469a](https://github.com/AztecProtocol/barretenberg/commit/c6c469aa5da7c6973f656ddf8af4fb20c3e8e4f6))
-* Compilation on homebrew clang 16.06 ([#1937](https://github.com/AztecProtocol/barretenberg/issues/1937)) ([79c29ee](https://github.com/AztecProtocol/barretenberg/commit/79c29eebbdb78c1e9aa5b4a3da6207fbf93bdd10))
-* Master ([#1981](https://github.com/AztecProtocol/barretenberg/issues/1981)) ([59a454e](https://github.com/AztecProtocol/barretenberg/commit/59a454ecf1611424893e1cb093774a23dde39310))
-* Unify base64 interface between mac and linux (cherry-picked) ([#1968](https://github.com/AztecProtocol/barretenberg/issues/1968)) ([37ee120](https://github.com/AztecProtocol/barretenberg/commit/37ee1204eba280442b6941eff448d6ff15eb9f04))
-
-## [0.5.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.6...barretenberg-v0.5.0) (2023-09-01)
-
-
-### ⚠ BREAKING CHANGES
-
-* update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925))
-
-### Bug Fixes
-
-* Benchmark preset uses clang16 ([#1902](https://github.com/AztecProtocol/barretenberg/issues/1902)) ([cd0ff0e](https://github.com/AztecProtocol/barretenberg/commit/cd0ff0e2c049917ec47a110b45d76bed4c00ae2a))
-* Reset keccak var inputs to 0 ([#1881](https://github.com/AztecProtocol/barretenberg/issues/1881)) ([23011ee](https://github.com/AztecProtocol/barretenberg/commit/23011ee1ea7f1b00b0f4194ebceedc75ea01c157))
-
-
-### Miscellaneous Chores
-
-* Update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) ([5d8db8e](https://github.com/AztecProtocol/barretenberg/commit/5d8db8eb993334b43e24a51efba9c59e123320ab))
-
-## [0.4.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.5...barretenberg-v0.4.6) (2023-08-29)
-
-
-### Bug Fixes
-
-* Truncate SRS size to the amount of points that we have downloaded ([#1862](https://github.com/AztecProtocol/barretenberg/issues/1862)) ([3bcf12b](https://github.com/AztecProtocol/barretenberg/commit/3bcf12b1a302280d5112475c5993b125e130209e))
-
-## [0.4.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.4...barretenberg-v0.4.5) (2023-08-28)
-
-
-### Bug Fixes
-
-* Conditionally compile base64 command for bb binary ([#1851](https://github.com/AztecProtocol/barretenberg/issues/1851)) ([8f8b9f4](https://github.com/AztecProtocol/barretenberg/commit/8f8b9f46028a08342a3337db633782e5313e2763))
-
-## [0.4.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.3...barretenberg-v0.4.4) (2023-08-28)
-
-
-### Features
-
-* Add ARM build for Mac + cleanup artifacts ([#1837](https://github.com/AztecProtocol/barretenberg/issues/1837)) ([2d2d5ea](https://github.com/AztecProtocol/barretenberg/commit/2d2d5ea33c512ab36c1214fb5bb90f80d8247469))
-
-## [0.4.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.2...barretenberg-v0.4.3) (2023-08-23)
-
-
-### Features
-
-* **bb:** Use an environment variable to set the transcript URL ([#1750](https://github.com/AztecProtocol/barretenberg/issues/1750)) ([41d362e](https://github.com/AztecProtocol/barretenberg/commit/41d362e9c9ffeb763cd56ca8a9f8c4512b86c80c))
-
-
-### Bug Fixes
-
-* Clang version in README and subrepo edge case ([#1730](https://github.com/AztecProtocol/barretenberg/issues/1730)) ([74158c4](https://github.com/AztecProtocol/barretenberg/commit/74158c4e467d4b6ab90e7d5aeb9a28f04adc1d66))
-* Download SRS using one canonical URL across the codebase ([#1748](https://github.com/AztecProtocol/barretenberg/issues/1748)) ([5c91de7](https://github.com/AztecProtocol/barretenberg/commit/5c91de7296e054f6d5ac3dca94ca85e06d496048))
-* Proving fails when circuit has size &gt; ~500K ([#1739](https://github.com/AztecProtocol/barretenberg/issues/1739)) ([6d32383](https://github.com/AztecProtocol/barretenberg/commit/6d323838a525190618d608598357ee4608c46699))
-* Revert clang check bootstrap.sh ([#1734](https://github.com/AztecProtocol/barretenberg/issues/1734)) ([65a38bc](https://github.com/AztecProtocol/barretenberg/commit/65a38bc045c66c5f64e87ba8c6e446945f2f0a24))
-* Update barretenberg bootstrap.sh for mac ([#1732](https://github.com/AztecProtocol/barretenberg/issues/1732)) ([f21ac3e](https://github.com/AztecProtocol/barretenberg/commit/f21ac3e893b5d30f7a4ba8ca10e6fd70f5c617b4))
-
-## [0.4.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.1...barretenberg-v0.4.2) (2023-08-21)
-
-
-### Bug Fixes
-
-* Remove automatic update to `AztecProtocol/dev-bb.js` ([#1712](https://github.com/AztecProtocol/barretenberg/issues/1712)) ([d883900](https://github.com/AztecProtocol/barretenberg/commit/d883900f9b297f659d14583ac93eede5160f9aae))
-
-## [0.4.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.4.0...barretenberg-v0.4.1) (2023-08-21)
-
-
-### Bug Fixes
-
-* **bb:** Fix Typo ([#1709](https://github.com/AztecProtocol/barretenberg/issues/1709)) ([286d64e](https://github.com/AztecProtocol/barretenberg/commit/286d64e6036336314114f1d2a25273f4dabe36f4))
-
-## [0.4.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.6...barretenberg-v0.4.0) (2023-08-21)
-
-
-### ⚠ BREAKING CHANGES
-
-* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618))
-
-### Features
-
-* Add msgpack defs to remaining circuit types ([#1538](https://github.com/AztecProtocol/barretenberg/issues/1538)) ([e560e39](https://github.com/AztecProtocol/barretenberg/commit/e560e3955d039a93e2ed157c684ea36abd178d4b))
-* Add workflow to output to dev-bb.js ([#1299](https://github.com/AztecProtocol/barretenberg/issues/1299)) ([25a54f1](https://github.com/AztecProtocol/barretenberg/commit/25a54f123e6f98dafef4cd882839106eadf6ab8d))
-* Celer benchmark ([#1369](https://github.com/AztecProtocol/barretenberg/issues/1369)) ([8fd364a](https://github.com/AztecProtocol/barretenberg/commit/8fd364a3ff6e7b5f377ef5ec37649b47fe0a3e44))
-* Honk recursive verifier Pt. 1 ([#1488](https://github.com/AztecProtocol/barretenberg/issues/1488)) ([030dace](https://github.com/AztecProtocol/barretenberg/commit/030dacebd9831ed938b546133373cad63e17ecd8))
-* New stdlib Transcript  ([#1219](https://github.com/AztecProtocol/barretenberg/issues/1219)) ([1b9e077](https://github.com/AztecProtocol/barretenberg/commit/1b9e0770e7e470f2708eb6f96cd5ee831b84f4f4))
-
-
-### Bug Fixes
-
-* **acir:** When retrying failed ACIR tests it should not use the default CLI argument ([#1673](https://github.com/AztecProtocol/barretenberg/issues/1673)) ([ea4792d](https://github.com/AztecProtocol/barretenberg/commit/ea4792ddc9c23f7390f47cf78d4939cce6458a46))
-* Align bbmalloc implementations ([#1513](https://github.com/AztecProtocol/barretenberg/issues/1513)) ([b92338d](https://github.com/AztecProtocol/barretenberg/commit/b92338d3c9de9d21a6933747a3f1479266d16f9e))
-* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618)) ([180cdc9](https://github.com/AztecProtocol/barretenberg/commit/180cdc9ac7cf9aa793d9774dc866ceb4e6ec3fbc))
-* Bb sync take 2 ([#1669](https://github.com/AztecProtocol/barretenberg/issues/1669)) ([d3eebe4](https://github.com/AztecProtocol/barretenberg/commit/d3eebe46e5b702801c866d7dd073a0eeb9f475b7))
-* Bin reference when installing package ([#678](https://github.com/AztecProtocol/barretenberg/issues/678)) ([c734295](https://github.com/AztecProtocol/barretenberg/commit/c734295a10d2c40ede773519664170880f28b2b7))
-* Fix paths in `barretenberg` bootstrap.sh script ([#1662](https://github.com/AztecProtocol/barretenberg/issues/1662)) ([c8917cd](https://github.com/AztecProtocol/barretenberg/commit/c8917cd8ec415dafe5309ec0e90aba28184d8294))
-* Fixed a failing test and added a small fuzzer ([#1384](https://github.com/AztecProtocol/barretenberg/issues/1384)) ([441e972](https://github.com/AztecProtocol/barretenberg/commit/441e972c88c5c314b4958e158f977f60a8c9e32d))
-* Sync aztec master ([#680](https://github.com/AztecProtocol/barretenberg/issues/680)) ([3afc243](https://github.com/AztecProtocol/barretenberg/commit/3afc2438053f530e49fbebbdbadd8db8a630bb8c))
-
-## [0.3.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.5...barretenberg-v0.3.6) (2023-08-08)
-
-
-### Features
-
-* Update release-please.yml ([#651](https://github.com/AztecProtocol/barretenberg/issues/651)) ([2795df6](https://github.com/AztecProtocol/barretenberg/commit/2795df6b705175a32fe2a6f18b3c572e297e277e))
-
-## [0.3.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.4...barretenberg-v0.3.5) (2023-08-07)
-
-
-### Features
-
-* Celer benchmark ([#1369](https://github.com/AztecProtocol/barretenberg/issues/1369)) ([d4ade2a](https://github.com/AztecProtocol/barretenberg/commit/d4ade2a5f06a3abf3c9c2635946d7121cc2f64b4))
-* Goblin Honk Composer/Prover/Verifier ([#1220](https://github.com/AztecProtocol/barretenberg/issues/1220)) ([970bb07](https://github.com/AztecProtocol/barretenberg/commit/970bb073763cc59552cd05dccf7f8fc63f58cef9))
-* Goblin translator prototype ([#1249](https://github.com/AztecProtocol/barretenberg/issues/1249)) ([7738d74](https://github.com/AztecProtocol/barretenberg/commit/7738d74791acc0fa8b1b1d8bb2a77783ca900123))
-* Internal keyword + lending contract and tests ([#978](https://github.com/AztecProtocol/barretenberg/issues/978)) ([e58ca4b](https://github.com/AztecProtocol/barretenberg/commit/e58ca4b332272fc57b2a5358bb5003bac79a8f5a))
-* Minimal barretenberg .circleci ([#1352](https://github.com/AztecProtocol/barretenberg/issues/1352)) ([708e2e2](https://github.com/AztecProtocol/barretenberg/commit/708e2e2786de5dce5bfc770c54734e5862a436e5))
-
-
-### Bug Fixes
-
-* Bootstrap.sh git hook for monorepo ([#1256](https://github.com/AztecProtocol/barretenberg/issues/1256)) ([b22b8d5](https://github.com/AztecProtocol/barretenberg/commit/b22b8d5f42ddfae140068c3ce8b3053d4c8d1874))
-* Build-system spot request cancellation ([#1339](https://github.com/AztecProtocol/barretenberg/issues/1339)) ([fc1d96a](https://github.com/AztecProtocol/barretenberg/commit/fc1d96a744a8d5a6cae06c408546c3638408551d))
-* Fixing external benchmarks ([#1250](https://github.com/AztecProtocol/barretenberg/issues/1250)) ([0ea6a39](https://github.com/AztecProtocol/barretenberg/commit/0ea6a39950e8cd5ff7765031457c162d03ebae06))
-* Fixing fuzzing build after composer splitting ([#1317](https://github.com/AztecProtocol/barretenberg/issues/1317)) ([946c23c](https://github.com/AztecProtocol/barretenberg/commit/946c23c52d45ddce973e453c40c048734e7f6937))
-* Reinstate barretenberg-benchmark-aggregator ([#1330](https://github.com/AztecProtocol/barretenberg/issues/1330)) ([407a915](https://github.com/AztecProtocol/barretenberg/commit/407a915a94c7d83dec9e14a11ad0e3461fd2906d))
-* Retry git submodule fetch ([#1371](https://github.com/AztecProtocol/barretenberg/issues/1371)) ([037dda3](https://github.com/AztecProtocol/barretenberg/commit/037dda3d254d56a20292d2bed5a9582d36c08427))
-
-## [0.3.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.3...barretenberg-v0.3.4) (2023-07-25)
-
-
-### Features
-
-* Add Goblin Ultra Circuit builder ([#587](https://github.com/AztecProtocol/barretenberg/issues/587)) ([2d38c25](https://github.com/AztecProtocol/barretenberg/commit/2d38c252de8b867955da661181e51f1a5f28cbc6))
-* Modify bb.js to be compatible with next.js ([#544](https://github.com/AztecProtocol/barretenberg/issues/544)) ([d384089](https://github.com/AztecProtocol/barretenberg/commit/d384089f60d1a6d5baeb0d3459556a310b790366))
-* Support public inputs in Ultra Honk ([#581](https://github.com/AztecProtocol/barretenberg/issues/581)) ([9cd0a06](https://github.com/AztecProtocol/barretenberg/commit/9cd0a064b8258bf4f72dd9e1c5e8f85b074d1bbc))
-
-## [0.3.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.2...barretenberg-v0.3.3) (2023-07-17)
-
-
-### Features
-
-* Bb and bb.js directly parse nargo bincode format. ([#610](https://github.com/AztecProtocol/barretenberg/issues/610)) ([d25e37a](https://github.com/AztecProtocol/barretenberg/commit/d25e37ad74b88dc45337b2a529ede3136dd4a699))
-* Goblin work done in Valencia ([#569](https://github.com/AztecProtocol/barretenberg/issues/569)) ([57af751](https://github.com/AztecProtocol/barretenberg/commit/57af751646dc3c038fea24ada4e160f6d422845f))
-
-## [0.3.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.1...barretenberg-v0.3.2) (2023-07-12)
-
-
-### Features
-
-* **msgpack:** Ability to specify NOSCHEMA for cbinds ([#605](https://github.com/AztecProtocol/barretenberg/issues/605)) ([8a4f5f1](https://github.com/AztecProtocol/barretenberg/commit/8a4f5f1d31e1d631c1cd3ed49c100858b58c56b2))
-
-## [0.3.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg-v0.3.0...barretenberg-v0.3.1) (2023-07-11)
-
-
-### Features
-
-* Sentence case changelog titles ([#598](https://github.com/AztecProtocol/barretenberg/issues/598)) ([1466108](https://github.com/AztecProtocol/barretenberg/commit/146610857ae511e9cfb27f873f49cec2dd19ddad))
-
-## 0.3.0 (2023-07-11)
-
-
-### ⚠ BREAKING CHANGES
-
-* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501))
-* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436))
-* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417))
-* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385))
-* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162))
-
-### Features
-
-* Add `get_sibling_path` method in MerkleTree ([#584](https://github.com/AztecProtocol/barretenberg/issues/584)) ([b3db9f8](https://github.com/AztecProtocol/barretenberg/commit/b3db9f8944e546cd9da9a1529e2562ee75e62369))
-* Add `signature_verification_result` to schnorr stdlib ([#173](https://github.com/AztecProtocol/barretenberg/issues/173)) ([7ae381e](https://github.com/AztecProtocol/barretenberg/commit/7ae381e4c5a084efde18917569518c7d4040b653))
-* Add equality and serialization to poly_triple ([#172](https://github.com/AztecProtocol/barretenberg/issues/172)) ([142b041](https://github.com/AztecProtocol/barretenberg/commit/142b041b2d3d090785f0e6f319fbf7504c751098))
-* Add installation targets for libbarretenberg, wasm & headers ([#185](https://github.com/AztecProtocol/barretenberg/issues/185)) ([f2fdebe](https://github.com/AztecProtocol/barretenberg/commit/f2fdebe037d4d2d90761f98e28b4b0d3af9a0f63))
-* Add Noir DSL with acir_format and turbo_proofs namespaces ([#198](https://github.com/AztecProtocol/barretenberg/issues/198)) ([54fab22](https://github.com/AztecProtocol/barretenberg/commit/54fab2217f437bb04a5e9fb71b271cf91b90c6e5))
-* Add pkgconfig output for installed target ([#208](https://github.com/AztecProtocol/barretenberg/issues/208)) ([d85a365](https://github.com/AztecProtocol/barretenberg/commit/d85a365180ac2672bbd33bd8b799a1f154716ab3))
-* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417)) ([697fabb](https://github.com/AztecProtocol/barretenberg/commit/697fabb7cbeadb9264db5047e7fd36565dad8790))
-* Allow bootstrap to work with linux + clang on ARM ([#131](https://github.com/AztecProtocol/barretenberg/issues/131)) ([52cb06b](https://github.com/AztecProtocol/barretenberg/commit/52cb06b445c73f2f324af6595af70ce9c130eb09))
-* **api:** external cpp header for circuits ([#489](https://github.com/AztecProtocol/barretenberg/issues/489)) ([fbbb342](https://github.com/AztecProtocol/barretenberg/commit/fbbb34287fdef0e8fedb2e25c5431f17501ad653))
-* **bb.js:** initial API ([#232](https://github.com/AztecProtocol/barretenberg/issues/232)) ([c860b02](https://github.com/AztecProtocol/barretenberg/commit/c860b02d80425de161af50acf33e94d94eb0659c))
-* Benchmark suite update ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
-* Benchmark suite update ([#508](https://github.com/AztecProtocol/barretenberg/issues/508)) ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
-* CI to test aztec circuits with current commit of bberg ([#418](https://github.com/AztecProtocol/barretenberg/issues/418)) ([20a0873](https://github.com/AztecProtocol/barretenberg/commit/20a0873dcbfe4a862ad53a9c137030689a521a04))
-* **dsl:** Add ECDSA secp256r1 verification ([#582](https://github.com/AztecProtocol/barretenberg/issues/582)) ([adc4c7b](https://github.com/AztecProtocol/barretenberg/commit/adc4c7b4eb634eae28dd28e25b94b93a5b49c80e))
-* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436)) ([e0b8804](https://github.com/AztecProtocol/barretenberg/commit/e0b8804b9418c7aa39e29e800fecb4ed15d73b80))
-* **github:** add pull request template ([65f3e33](https://github.com/AztecProtocol/barretenberg/commit/65f3e3312061e7284c0dd0f0f89fa92ee92f9eac))
-* **honk:** Shared relation arithmetic ([#514](https://github.com/AztecProtocol/barretenberg/issues/514)) ([0838474](https://github.com/AztecProtocol/barretenberg/commit/0838474e67469a6d91d6595d1ee23e1dea53863c))
-* Improve barretenberg headers ([#201](https://github.com/AztecProtocol/barretenberg/issues/201)) ([4e03839](https://github.com/AztecProtocol/barretenberg/commit/4e03839a970a5d07dab7f86cd2b7166a09f5045a))
-* Initial native version of bb binary. ([#524](https://github.com/AztecProtocol/barretenberg/issues/524)) ([4a1b532](https://github.com/AztecProtocol/barretenberg/commit/4a1b5322dc78921d253e6a374eba0b616ab788df))
-* Make the circuit constructors field agnostic so we can check circuits on grumpkin ([#534](https://github.com/AztecProtocol/barretenberg/issues/534)) ([656d794](https://github.com/AztecProtocol/barretenberg/commit/656d7944f94f3da88250f3140838f3e32e9d0174))
-* Multithreaded Sumcheck ([#556](https://github.com/AztecProtocol/barretenberg/issues/556)) ([c4094b1](https://github.com/AztecProtocol/barretenberg/commit/c4094b155ba9d8e914c3e6a5b0d7808945b1eeed))
-* **nullifier_tree:** make empty nullifier tree leaves hash be 0 ([#360](https://github.com/AztecProtocol/barretenberg/issues/360)) ([#382](https://github.com/AztecProtocol/barretenberg/issues/382)) ([b85ab8d](https://github.com/AztecProtocol/barretenberg/commit/b85ab8d587b3e93db2aa0f1c4f012e58e5d97915))
-* Optimize memory consumption of pedersen generators ([#413](https://github.com/AztecProtocol/barretenberg/issues/413)) ([d60b16a](https://github.com/AztecProtocol/barretenberg/commit/d60b16a14219fd4bd130ce4537c3e94bfa10128f))
-* Parallelised folding in Gemini ([#550](https://github.com/AztecProtocol/barretenberg/issues/550)) ([3b962d3](https://github.com/AztecProtocol/barretenberg/commit/3b962d372491430871443fd1b95fd9e049e233c8))
-* **pkg-config:** Add a bindir variable ([#239](https://github.com/AztecProtocol/barretenberg/issues/239)) ([611bf34](https://github.com/AztecProtocol/barretenberg/commit/611bf34bcc6f82969a6fe546bf0a7cbecda6d36d))
-* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162)) ([09db0be](https://github.com/AztecProtocol/barretenberg/commit/09db0be3d09ee12b4b73b03abe8fa4565cdb6660))
-* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385)) ([74dbce5](https://github.com/AztecProtocol/barretenberg/commit/74dbce5dfa126ecd6dbda7b758581752f7b6a389))
-* Sort includes ([#571](https://github.com/AztecProtocol/barretenberg/issues/571)) ([dfa8736](https://github.com/AztecProtocol/barretenberg/commit/dfa8736136323e62a705066d25bef962a6a0b82d))
-* Split plonk and honk tests ([#529](https://github.com/AztecProtocol/barretenberg/issues/529)) ([ba583ff](https://github.com/AztecProtocol/barretenberg/commit/ba583ff00509f636feae7b78304b115e34fc2357))
-* Support nix package manager ([#234](https://github.com/AztecProtocol/barretenberg/issues/234)) ([19a72fe](https://github.com/AztecProtocol/barretenberg/commit/19a72fec0ff8d451fc94a9f5563202867a5f8147))
-* **ts:** allow passing srs via env functions ([#260](https://github.com/AztecProtocol/barretenberg/issues/260)) ([ac78353](https://github.com/AztecProtocol/barretenberg/commit/ac7835304f4524039abf0a0df9ae85d905f55c86))
-* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
-* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([#531](https://github.com/AztecProtocol/barretenberg/issues/531)) ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
-* Utilize globally installed benchmark if available ([#152](https://github.com/AztecProtocol/barretenberg/issues/152)) ([fbc5027](https://github.com/AztecProtocol/barretenberg/commit/fbc502794e9bbdfda797b11ac71eba996d649722))
-* Utilize globally installed gtest if available ([#151](https://github.com/AztecProtocol/barretenberg/issues/151)) ([efa18a6](https://github.com/AztecProtocol/barretenberg/commit/efa18a621917dc6c38f453825cadc76eb793a73c))
-* Utilize globally installed leveldb if available ([#134](https://github.com/AztecProtocol/barretenberg/issues/134)) ([255dfb5](https://github.com/AztecProtocol/barretenberg/commit/255dfb52adca885b0a4e4380769a279922af49ff))
-* Working UltraPlonk for Noir ([#299](https://github.com/AztecProtocol/barretenberg/issues/299)) ([d56dfbd](https://github.com/AztecProtocol/barretenberg/commit/d56dfbdfd74b438b3c8652e1ae8740de99f93ae5))
-
-
-### Bug Fixes
-
-* add NUM_RESERVED_GATES before fetching subgroup size in composer ([#539](https://github.com/AztecProtocol/barretenberg/issues/539)) ([fa11abf](https://github.com/AztecProtocol/barretenberg/commit/fa11abf0877314b03420d6f7ace1312df41cd50b))
-* Adds `VERSION` file to release-please ([#542](https://github.com/AztecProtocol/barretenberg/issues/542)) ([31fb34c](https://github.com/AztecProtocol/barretenberg/commit/31fb34c307a4336414b1fd2076d96105a29b0e7b))
-* Align native library object library with wasm ([#238](https://github.com/AztecProtocol/barretenberg/issues/238)) ([4fa6c0d](https://github.com/AztecProtocol/barretenberg/commit/4fa6c0d2d8c6309d53757ad54d3433d1d662de5f))
-* Avoid bb.js memory issues. ([#578](https://github.com/AztecProtocol/barretenberg/issues/578)) ([96891de](https://github.com/AztecProtocol/barretenberg/commit/96891de21fd74ca33ea75ae97f73cada39a5d337))
-* Avoid targeting honk test files when testing is disabled ([#125](https://github.com/AztecProtocol/barretenberg/issues/125)) ([e4a70ed](https://github.com/AztecProtocol/barretenberg/commit/e4a70edf2bb39d67095cbe21fff310372369a92d))
-* BarycentricData instantiation time and unused code in secp curves ([#572](https://github.com/AztecProtocol/barretenberg/issues/572)) ([bc78bb0](https://github.com/AztecProtocol/barretenberg/commit/bc78bb00d273c756fa4f02967d219cd3fd788890))
-* bbmalloc linker error ([#459](https://github.com/AztecProtocol/barretenberg/issues/459)) ([d4761c1](https://github.com/AztecProtocol/barretenberg/commit/d4761c11f30eeecbcb2485f50516bee71809bab1))
-* Build on stock apple clang. ([#592](https://github.com/AztecProtocol/barretenberg/issues/592)) ([0ac4bc3](https://github.com/AztecProtocol/barretenberg/commit/0ac4bc36619f85c1b3a65d3f825ba5683cbbe30c))
-* **build:** git add -f .yalc ([#265](https://github.com/AztecProtocol/barretenberg/issues/265)) ([7671192](https://github.com/AztecProtocol/barretenberg/commit/7671192c8a60ff0bc0f8ad3e14ac299ff780cc25))
-* bump timeout on common test. ([c9bc87d](https://github.com/AztecProtocol/barretenberg/commit/c9bc87d29fa1325162cb1e7bf2db7cc85747fd9e))
-* Check for wasm-opt during configure & run on post_build ([#175](https://github.com/AztecProtocol/barretenberg/issues/175)) ([1ff6af3](https://github.com/AztecProtocol/barretenberg/commit/1ff6af3cb6b7b4d3bb53bfbdcbf1c3a568e0fa86))
-* check_circuit bug fix ([#510](https://github.com/AztecProtocol/barretenberg/issues/510)) ([4b156a3](https://github.com/AztecProtocol/barretenberg/commit/4b156a3648e6da9dfe292e354da9a27185d2aa9d))
-* cleanup of include statements and dependencies ([#527](https://github.com/AztecProtocol/barretenberg/issues/527)) ([b288c24](https://github.com/AztecProtocol/barretenberg/commit/b288c2420bdc350658cd3776bad1eb087cc28d63))
-* **cmake:** Remove leveldb dependency that was accidentally re-added ([#335](https://github.com/AztecProtocol/barretenberg/issues/335)) ([3534e2b](https://github.com/AztecProtocol/barretenberg/commit/3534e2bfcca46dbca30573286f43425dab6bc810))
-* **dsl:** Use info instead of std::cout to log ([#323](https://github.com/AztecProtocol/barretenberg/issues/323)) ([486d738](https://github.com/AztecProtocol/barretenberg/commit/486d73842b4b7d6aa84fa12d7462fe52e892d416))
-* Ecdsa Malleability Bug ([#512](https://github.com/AztecProtocol/barretenberg/issues/512)) ([5cf856c](https://github.com/AztecProtocol/barretenberg/commit/5cf856c5c29c9f9b8abb87d7bde23b4932711350))
-* **ecdsa:** correct short weierstrass curve eqn  ([#567](https://github.com/AztecProtocol/barretenberg/issues/567)) ([386ec63](https://github.com/AztecProtocol/barretenberg/commit/386ec6372156d604e37e58490f1c7396077f84c4))
-* Ensure barretenberg provides headers that Noir needs ([#200](https://github.com/AztecProtocol/barretenberg/issues/200)) ([0171a49](https://github.com/AztecProtocol/barretenberg/commit/0171a499a175f88a0ee3fcfd4de0f43ad0ebff85))
-* Ensure TBB is optional using OPTIONAL_COMPONENTS ([#127](https://github.com/AztecProtocol/barretenberg/issues/127)) ([e3039b2](https://github.com/AztecProtocol/barretenberg/commit/e3039b26ea8aca4b8fdc4b2cbac6716ace261c76))
-* Fixed the memory issue ([#509](https://github.com/AztecProtocol/barretenberg/issues/509)) ([107d438](https://github.com/AztecProtocol/barretenberg/commit/107d438ad96847e40f8e5374749b8cba820b2007))
-* Increment CMakeList version on releases ([#536](https://github.com/AztecProtocol/barretenberg/issues/536)) ([b571411](https://github.com/AztecProtocol/barretenberg/commit/b571411a6d58f79e3e2553c3b1c81b4f186f2245))
-* msgpack error ([#456](https://github.com/AztecProtocol/barretenberg/issues/456)) ([943d6d0](https://github.com/AztecProtocol/barretenberg/commit/943d6d07c57bea521c2593e892e839f25f82b289))
-* msgpack variant_impl.hpp ([#462](https://github.com/AztecProtocol/barretenberg/issues/462)) ([b5838a6](https://github.com/AztecProtocol/barretenberg/commit/b5838a6c9fe456e832776da21379e41c0a2bbd5d))
-* **nix:** Disable ASM & ADX when building in Nix ([#327](https://github.com/AztecProtocol/barretenberg/issues/327)) ([3bc724d](https://github.com/AztecProtocol/barretenberg/commit/3bc724d2163d29041bfa29a1e49625bab77289a2))
-* **nix:** Use wasi-sdk 12 to provide barretenberg-wasm in overlay ([#315](https://github.com/AztecProtocol/barretenberg/issues/315)) ([4a06992](https://github.com/AztecProtocol/barretenberg/commit/4a069923f4a869f8c2315e6d3f738db6e66dcdfa))
-* Pass brew omp location via LDFLAGS and CPPFLAGS ([#126](https://github.com/AztecProtocol/barretenberg/issues/126)) ([54141f1](https://github.com/AztecProtocol/barretenberg/commit/54141f12de9eee86220003b1f80d39a41795cedc))
-* Remove leveldb_store from stdlib_merkle_tree ([#149](https://github.com/AztecProtocol/barretenberg/issues/149)) ([3ce5e7e](https://github.com/AztecProtocol/barretenberg/commit/3ce5e7e17ca7bb806373be833a44d55a8e584bda))
-* Revert "fix: add NUM_RESERVED_GATES before fetching subgroup size in composer" ([#540](https://github.com/AztecProtocol/barretenberg/issues/540)) ([a9fbc39](https://github.com/AztecProtocol/barretenberg/commit/a9fbc3973f24680f676682d15c3a4cef0a1ab798))
-* Revert generator changes that cause memory OOB access ([#338](https://github.com/AztecProtocol/barretenberg/issues/338)) ([500daf1](https://github.com/AztecProtocol/barretenberg/commit/500daf1ceb03771d2c01eaf1a86139a7ac1d814f))
-* Soundness issue in bigfield's `evaluate_multiply_add` method ([#558](https://github.com/AztecProtocol/barretenberg/issues/558)) ([1a98ac6](https://github.com/AztecProtocol/barretenberg/commit/1a98ac64787a0e2904fd22043497a8d11afe5e6c))
-* **srs:** Detect shasum utility when downloading lagrange ([#143](https://github.com/AztecProtocol/barretenberg/issues/143)) ([515604d](https://github.com/AztecProtocol/barretenberg/commit/515604dff83648e00106f35511aa567921599a78))
-* Store lagrange forms of selector polys w/ Ultra ([#255](https://github.com/AztecProtocol/barretenberg/issues/255)) ([b121963](https://github.com/AztecProtocol/barretenberg/commit/b12196362497c8dfb3a64284d28de2d8ee7d730c))
-* throw -&gt; throw_or_abort in sol gen ([#388](https://github.com/AztecProtocol/barretenberg/issues/388)) ([7cfe3f0](https://github.com/AztecProtocol/barretenberg/commit/7cfe3f055815e333ff8a8f1f30e8377c83d2182a))
-* Trigger release-please ([#594](https://github.com/AztecProtocol/barretenberg/issues/594)) ([5042861](https://github.com/AztecProtocol/barretenberg/commit/5042861405df6b5659c0c32418720d8bdea81081))
-* Update versioning in nix files when a release is made ([#549](https://github.com/AztecProtocol/barretenberg/issues/549)) ([1b3ff93](https://github.com/AztecProtocol/barretenberg/commit/1b3ff93e7ed8873583cdade95a860adb8823f1cd))
-* **wasm:** Remove the CMAKE_STAGING_PREFIX variable from wasm preset ([#240](https://github.com/AztecProtocol/barretenberg/issues/240)) ([f2f8d1f](https://github.com/AztecProtocol/barretenberg/commit/f2f8d1f7a24ca73e30c981fd245c86f7f964abb7))
-* Wrap each use of filesystem library in ifndef __wasm__ ([#181](https://github.com/AztecProtocol/barretenberg/issues/181)) ([0eae962](https://github.com/AztecProtocol/barretenberg/commit/0eae96293b4d2da6b6b23ae80ac132fb49f90915))
-
-
-### Code Refactoring
-
-* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501)) ([709a29c](https://github.com/AztecProtocol/barretenberg/commit/709a29c89a305be017270361780995353188035a))
-
-## [0.2.0](https://github.com/AztecProtocol/barretenberg/compare/v0.1.0...v0.2.0) (2023-07-11)
-
-
-### ⚠ BREAKING CHANGES
-
-* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501))
-
-### Features
-
-* Add `get_sibling_path` method in MerkleTree ([#584](https://github.com/AztecProtocol/barretenberg/issues/584)) ([b3db9f8](https://github.com/AztecProtocol/barretenberg/commit/b3db9f8944e546cd9da9a1529e2562ee75e62369))
-* **dsl:** Add ECDSA secp256r1 verification ([#582](https://github.com/AztecProtocol/barretenberg/issues/582)) ([adc4c7b](https://github.com/AztecProtocol/barretenberg/commit/adc4c7b4eb634eae28dd28e25b94b93a5b49c80e))
-* Initial native version of bb binary. ([#524](https://github.com/AztecProtocol/barretenberg/issues/524)) ([4a1b532](https://github.com/AztecProtocol/barretenberg/commit/4a1b5322dc78921d253e6a374eba0b616ab788df))
-* Make the circuit constructors field agnostic so we can check circuits on grumpkin ([#534](https://github.com/AztecProtocol/barretenberg/issues/534)) ([656d794](https://github.com/AztecProtocol/barretenberg/commit/656d7944f94f3da88250f3140838f3e32e9d0174))
-* Multithreaded Sumcheck ([#556](https://github.com/AztecProtocol/barretenberg/issues/556)) ([c4094b1](https://github.com/AztecProtocol/barretenberg/commit/c4094b155ba9d8e914c3e6a5b0d7808945b1eeed))
-* Optimize memory consumption of pedersen generators ([#413](https://github.com/AztecProtocol/barretenberg/issues/413)) ([d60b16a](https://github.com/AztecProtocol/barretenberg/commit/d60b16a14219fd4bd130ce4537c3e94bfa10128f))
-* Parallelised folding in Gemini ([#550](https://github.com/AztecProtocol/barretenberg/issues/550)) ([3b962d3](https://github.com/AztecProtocol/barretenberg/commit/3b962d372491430871443fd1b95fd9e049e233c8))
-* Sort includes ([#571](https://github.com/AztecProtocol/barretenberg/issues/571)) ([dfa8736](https://github.com/AztecProtocol/barretenberg/commit/dfa8736136323e62a705066d25bef962a6a0b82d))
-* Split plonk and honk tests ([#529](https://github.com/AztecProtocol/barretenberg/issues/529)) ([ba583ff](https://github.com/AztecProtocol/barretenberg/commit/ba583ff00509f636feae7b78304b115e34fc2357))
-
-
-### Bug Fixes
-
-* add NUM_RESERVED_GATES before fetching subgroup size in composer ([#539](https://github.com/AztecProtocol/barretenberg/issues/539)) ([fa11abf](https://github.com/AztecProtocol/barretenberg/commit/fa11abf0877314b03420d6f7ace1312df41cd50b))
-* Adds `VERSION` file to release-please ([#542](https://github.com/AztecProtocol/barretenberg/issues/542)) ([31fb34c](https://github.com/AztecProtocol/barretenberg/commit/31fb34c307a4336414b1fd2076d96105a29b0e7b))
-* Avoid bb.js memory issues. ([#578](https://github.com/AztecProtocol/barretenberg/issues/578)) ([96891de](https://github.com/AztecProtocol/barretenberg/commit/96891de21fd74ca33ea75ae97f73cada39a5d337))
-* BarycentricData instantiation time and unused code in secp curves ([#572](https://github.com/AztecProtocol/barretenberg/issues/572)) ([bc78bb0](https://github.com/AztecProtocol/barretenberg/commit/bc78bb00d273c756fa4f02967d219cd3fd788890))
-* Build on stock apple clang. ([#592](https://github.com/AztecProtocol/barretenberg/issues/592)) ([0ac4bc3](https://github.com/AztecProtocol/barretenberg/commit/0ac4bc36619f85c1b3a65d3f825ba5683cbbe30c))
-* bump timeout on common test. ([c9bc87d](https://github.com/AztecProtocol/barretenberg/commit/c9bc87d29fa1325162cb1e7bf2db7cc85747fd9e))
-* check_circuit bug fix ([#510](https://github.com/AztecProtocol/barretenberg/issues/510)) ([4b156a3](https://github.com/AztecProtocol/barretenberg/commit/4b156a3648e6da9dfe292e354da9a27185d2aa9d))
-* cleanup of include statements and dependencies ([#527](https://github.com/AztecProtocol/barretenberg/issues/527)) ([b288c24](https://github.com/AztecProtocol/barretenberg/commit/b288c2420bdc350658cd3776bad1eb087cc28d63))
-* Ecdsa Malleability Bug ([#512](https://github.com/AztecProtocol/barretenberg/issues/512)) ([5cf856c](https://github.com/AztecProtocol/barretenberg/commit/5cf856c5c29c9f9b8abb87d7bde23b4932711350))
-* **ecdsa:** correct short weierstrass curve eqn  ([#567](https://github.com/AztecProtocol/barretenberg/issues/567)) ([386ec63](https://github.com/AztecProtocol/barretenberg/commit/386ec6372156d604e37e58490f1c7396077f84c4))
-* Increment CMakeList version on releases ([#536](https://github.com/AztecProtocol/barretenberg/issues/536)) ([b571411](https://github.com/AztecProtocol/barretenberg/commit/b571411a6d58f79e3e2553c3b1c81b4f186f2245))
-* Revert "fix: add NUM_RESERVED_GATES before fetching subgroup size in composer" ([#540](https://github.com/AztecProtocol/barretenberg/issues/540)) ([a9fbc39](https://github.com/AztecProtocol/barretenberg/commit/a9fbc3973f24680f676682d15c3a4cef0a1ab798))
-* Soundness issue in bigfield's `evaluate_multiply_add` method ([#558](https://github.com/AztecProtocol/barretenberg/issues/558)) ([1a98ac6](https://github.com/AztecProtocol/barretenberg/commit/1a98ac64787a0e2904fd22043497a8d11afe5e6c))
-* Update versioning in nix files when a release is made ([#549](https://github.com/AztecProtocol/barretenberg/issues/549)) ([1b3ff93](https://github.com/AztecProtocol/barretenberg/commit/1b3ff93e7ed8873583cdade95a860adb8823f1cd))
-
-
-### Code Refactoring
-
-* Use circuit builders ([#501](https://github.com/AztecProtocol/barretenberg/issues/501)) ([709a29c](https://github.com/AztecProtocol/barretenberg/commit/709a29c89a305be017270361780995353188035a))
-
-## 0.1.0 (2023-06-15)
-
-
-### ⚠ BREAKING CHANGES
-
-* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436))
-* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417))
-* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385))
-* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162))
-
-### Features
-
-* Add `signature_verification_result` to schnorr stdlib ([#173](https://github.com/AztecProtocol/barretenberg/issues/173)) ([7ae381e](https://github.com/AztecProtocol/barretenberg/commit/7ae381e4c5a084efde18917569518c7d4040b653))
-* Add equality and serialization to poly_triple ([#172](https://github.com/AztecProtocol/barretenberg/issues/172)) ([142b041](https://github.com/AztecProtocol/barretenberg/commit/142b041b2d3d090785f0e6f319fbf7504c751098))
-* Add installation targets for libbarretenberg, wasm & headers ([#185](https://github.com/AztecProtocol/barretenberg/issues/185)) ([f2fdebe](https://github.com/AztecProtocol/barretenberg/commit/f2fdebe037d4d2d90761f98e28b4b0d3af9a0f63))
-* Add Noir DSL with acir_format and turbo_proofs namespaces ([#198](https://github.com/AztecProtocol/barretenberg/issues/198)) ([54fab22](https://github.com/AztecProtocol/barretenberg/commit/54fab2217f437bb04a5e9fb71b271cf91b90c6e5))
-* Add pkgconfig output for installed target ([#208](https://github.com/AztecProtocol/barretenberg/issues/208)) ([d85a365](https://github.com/AztecProtocol/barretenberg/commit/d85a365180ac2672bbd33bd8b799a1f154716ab3))
-* add support for ROM and RAM ACVM opcodes ([#417](https://github.com/AztecProtocol/barretenberg/issues/417)) ([697fabb](https://github.com/AztecProtocol/barretenberg/commit/697fabb7cbeadb9264db5047e7fd36565dad8790))
-* Allow bootstrap to work with linux + clang on ARM ([#131](https://github.com/AztecProtocol/barretenberg/issues/131)) ([52cb06b](https://github.com/AztecProtocol/barretenberg/commit/52cb06b445c73f2f324af6595af70ce9c130eb09))
-* **api:** external cpp header for circuits ([#489](https://github.com/AztecProtocol/barretenberg/issues/489)) ([fbbb342](https://github.com/AztecProtocol/barretenberg/commit/fbbb34287fdef0e8fedb2e25c5431f17501ad653))
-* **bb.js:** initial API ([#232](https://github.com/AztecProtocol/barretenberg/issues/232)) ([c860b02](https://github.com/AztecProtocol/barretenberg/commit/c860b02d80425de161af50acf33e94d94eb0659c))
-* Benchmark suite update ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
-* Benchmark suite update ([#508](https://github.com/AztecProtocol/barretenberg/issues/508)) ([d7b1499](https://github.com/AztecProtocol/barretenberg/commit/d7b14993ac8d329664fd36e7b4aa083935b1d407))
-* CI to test aztec circuits with current commit of bberg ([#418](https://github.com/AztecProtocol/barretenberg/issues/418)) ([20a0873](https://github.com/AztecProtocol/barretenberg/commit/20a0873dcbfe4a862ad53a9c137030689a521a04))
-* **dsl:** add hash index to pedersen constraint ([#436](https://github.com/AztecProtocol/barretenberg/issues/436)) ([e0b8804](https://github.com/AztecProtocol/barretenberg/commit/e0b8804b9418c7aa39e29e800fecb4ed15d73b80))
-* **github:** add pull request template ([65f3e33](https://github.com/AztecProtocol/barretenberg/commit/65f3e3312061e7284c0dd0f0f89fa92ee92f9eac))
-* **honk:** Shared relation arithmetic ([#514](https://github.com/AztecProtocol/barretenberg/issues/514)) ([0838474](https://github.com/AztecProtocol/barretenberg/commit/0838474e67469a6d91d6595d1ee23e1dea53863c))
-* Improve barretenberg headers ([#201](https://github.com/AztecProtocol/barretenberg/issues/201)) ([4e03839](https://github.com/AztecProtocol/barretenberg/commit/4e03839a970a5d07dab7f86cd2b7166a09f5045a))
-* **nullifier_tree:** make empty nullifier tree leaves hash be 0 ([#360](https://github.com/AztecProtocol/barretenberg/issues/360)) ([#382](https://github.com/AztecProtocol/barretenberg/issues/382)) ([b85ab8d](https://github.com/AztecProtocol/barretenberg/commit/b85ab8d587b3e93db2aa0f1c4f012e58e5d97915))
-* **pkg-config:** Add a bindir variable ([#239](https://github.com/AztecProtocol/barretenberg/issues/239)) ([611bf34](https://github.com/AztecProtocol/barretenberg/commit/611bf34bcc6f82969a6fe546bf0a7cbecda6d36d))
-* Remove TOOLCHAIN logic and replace with CMake presets ([#162](https://github.com/AztecProtocol/barretenberg/issues/162)) ([09db0be](https://github.com/AztecProtocol/barretenberg/commit/09db0be3d09ee12b4b73b03abe8fa4565cdb6660))
-* replace `MerkleMembershipConstraint` with`ComputeMerkleRootConstraint` ([#385](https://github.com/AztecProtocol/barretenberg/issues/385)) ([74dbce5](https://github.com/AztecProtocol/barretenberg/commit/74dbce5dfa126ecd6dbda7b758581752f7b6a389))
-* Support nix package manager ([#234](https://github.com/AztecProtocol/barretenberg/issues/234)) ([19a72fe](https://github.com/AztecProtocol/barretenberg/commit/19a72fec0ff8d451fc94a9f5563202867a5f8147))
-* **ts:** allow passing srs via env functions ([#260](https://github.com/AztecProtocol/barretenberg/issues/260)) ([ac78353](https://github.com/AztecProtocol/barretenberg/commit/ac7835304f4524039abf0a0df9ae85d905f55c86))
-* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
-* **ultrahonk:** Added a simple filler table to minimize the amount of entries used to make UltraHonk polynomials non-zero ([#531](https://github.com/AztecProtocol/barretenberg/issues/531)) ([b20b401](https://github.com/AztecProtocol/barretenberg/commit/b20b4012546c5b67623950d0fedb0974df8bf345))
-* Utilize globally installed benchmark if available ([#152](https://github.com/AztecProtocol/barretenberg/issues/152)) ([fbc5027](https://github.com/AztecProtocol/barretenberg/commit/fbc502794e9bbdfda797b11ac71eba996d649722))
-* Utilize globally installed gtest if available ([#151](https://github.com/AztecProtocol/barretenberg/issues/151)) ([efa18a6](https://github.com/AztecProtocol/barretenberg/commit/efa18a621917dc6c38f453825cadc76eb793a73c))
-* Utilize globally installed leveldb if available ([#134](https://github.com/AztecProtocol/barretenberg/issues/134)) ([255dfb5](https://github.com/AztecProtocol/barretenberg/commit/255dfb52adca885b0a4e4380769a279922af49ff))
-* Working UltraPlonk for Noir ([#299](https://github.com/AztecProtocol/barretenberg/issues/299)) ([d56dfbd](https://github.com/AztecProtocol/barretenberg/commit/d56dfbdfd74b438b3c8652e1ae8740de99f93ae5))
-
-
-### Bug Fixes
-
-* Align native library object library with wasm ([#238](https://github.com/AztecProtocol/barretenberg/issues/238)) ([4fa6c0d](https://github.com/AztecProtocol/barretenberg/commit/4fa6c0d2d8c6309d53757ad54d3433d1d662de5f))
-* Avoid targeting honk test files when testing is disabled ([#125](https://github.com/AztecProtocol/barretenberg/issues/125)) ([e4a70ed](https://github.com/AztecProtocol/barretenberg/commit/e4a70edf2bb39d67095cbe21fff310372369a92d))
-* bbmalloc linker error ([#459](https://github.com/AztecProtocol/barretenberg/issues/459)) ([d4761c1](https://github.com/AztecProtocol/barretenberg/commit/d4761c11f30eeecbcb2485f50516bee71809bab1))
-* **build:** git add -f .yalc ([#265](https://github.com/AztecProtocol/barretenberg/issues/265)) ([7671192](https://github.com/AztecProtocol/barretenberg/commit/7671192c8a60ff0bc0f8ad3e14ac299ff780cc25))
-* Check for wasm-opt during configure & run on post_build ([#175](https://github.com/AztecProtocol/barretenberg/issues/175)) ([1ff6af3](https://github.com/AztecProtocol/barretenberg/commit/1ff6af3cb6b7b4d3bb53bfbdcbf1c3a568e0fa86))
-* **cmake:** Remove leveldb dependency that was accidentally re-added ([#335](https://github.com/AztecProtocol/barretenberg/issues/335)) ([3534e2b](https://github.com/AztecProtocol/barretenberg/commit/3534e2bfcca46dbca30573286f43425dab6bc810))
-* **dsl:** Use info instead of std::cout to log ([#323](https://github.com/AztecProtocol/barretenberg/issues/323)) ([486d738](https://github.com/AztecProtocol/barretenberg/commit/486d73842b4b7d6aa84fa12d7462fe52e892d416))
-* Ensure barretenberg provides headers that Noir needs ([#200](https://github.com/AztecProtocol/barretenberg/issues/200)) ([0171a49](https://github.com/AztecProtocol/barretenberg/commit/0171a499a175f88a0ee3fcfd4de0f43ad0ebff85))
-* Ensure TBB is optional using OPTIONAL_COMPONENTS ([#127](https://github.com/AztecProtocol/barretenberg/issues/127)) ([e3039b2](https://github.com/AztecProtocol/barretenberg/commit/e3039b26ea8aca4b8fdc4b2cbac6716ace261c76))
-* Fixed the memory issue ([#509](https://github.com/AztecProtocol/barretenberg/issues/509)) ([107d438](https://github.com/AztecProtocol/barretenberg/commit/107d438ad96847e40f8e5374749b8cba820b2007))
-* msgpack error ([#456](https://github.com/AztecProtocol/barretenberg/issues/456)) ([943d6d0](https://github.com/AztecProtocol/barretenberg/commit/943d6d07c57bea521c2593e892e839f25f82b289))
-* msgpack variant_impl.hpp ([#462](https://github.com/AztecProtocol/barretenberg/issues/462)) ([b5838a6](https://github.com/AztecProtocol/barretenberg/commit/b5838a6c9fe456e832776da21379e41c0a2bbd5d))
-* **nix:** Disable ASM & ADX when building in Nix ([#327](https://github.com/AztecProtocol/barretenberg/issues/327)) ([3bc724d](https://github.com/AztecProtocol/barretenberg/commit/3bc724d2163d29041bfa29a1e49625bab77289a2))
-* **nix:** Use wasi-sdk 12 to provide barretenberg-wasm in overlay ([#315](https://github.com/AztecProtocol/barretenberg/issues/315)) ([4a06992](https://github.com/AztecProtocol/barretenberg/commit/4a069923f4a869f8c2315e6d3f738db6e66dcdfa))
-* Pass brew omp location via LDFLAGS and CPPFLAGS ([#126](https://github.com/AztecProtocol/barretenberg/issues/126)) ([54141f1](https://github.com/AztecProtocol/barretenberg/commit/54141f12de9eee86220003b1f80d39a41795cedc))
-* Remove leveldb_store from stdlib_merkle_tree ([#149](https://github.com/AztecProtocol/barretenberg/issues/149)) ([3ce5e7e](https://github.com/AztecProtocol/barretenberg/commit/3ce5e7e17ca7bb806373be833a44d55a8e584bda))
-* Revert generator changes that cause memory OOB access ([#338](https://github.com/AztecProtocol/barretenberg/issues/338)) ([500daf1](https://github.com/AztecProtocol/barretenberg/commit/500daf1ceb03771d2c01eaf1a86139a7ac1d814f))
-* **srs:** Detect shasum utility when downloading lagrange ([#143](https://github.com/AztecProtocol/barretenberg/issues/143)) ([515604d](https://github.com/AztecProtocol/barretenberg/commit/515604dff83648e00106f35511aa567921599a78))
-* Store lagrange forms of selector polys w/ Ultra ([#255](https://github.com/AztecProtocol/barretenberg/issues/255)) ([b121963](https://github.com/AztecProtocol/barretenberg/commit/b12196362497c8dfb3a64284d28de2d8ee7d730c))
-* throw -&gt; throw_or_abort in sol gen ([#388](https://github.com/AztecProtocol/barretenberg/issues/388)) ([7cfe3f0](https://github.com/AztecProtocol/barretenberg/commit/7cfe3f055815e333ff8a8f1f30e8377c83d2182a))
-* **wasm:** Remove the CMAKE_STAGING_PREFIX variable from wasm preset ([#240](https://github.com/AztecProtocol/barretenberg/issues/240)) ([f2f8d1f](https://github.com/AztecProtocol/barretenberg/commit/f2f8d1f7a24ca73e30c981fd245c86f7f964abb7))
-* Wrap each use of filesystem library in ifndef __wasm__ ([#181](https://github.com/AztecProtocol/barretenberg/issues/181)) ([0eae962](https://github.com/AztecProtocol/barretenberg/commit/0eae96293b4d2da6b6b23ae80ac132fb49f90915))
diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz b/circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz
deleted file mode 100644
index d1fe5b039c4..00000000000
Binary files a/circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz and /dev/null differ
diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz b/circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz
deleted file mode 100644
index b250bdfe7bc..00000000000
Binary files a/circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz and /dev/null differ
diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
deleted file mode 100644
index e829b776cd3..00000000000
--- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.18 AS builder
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        clang16 \
-        openmp-dev \
-        cmake \
-        ninja \
-        git \
-        curl \
-        perl
-
-WORKDIR /usr/src/barretenberg/cpp
-
-COPY . .
-# Build the entire project, as we want to check everything builds under clang
-RUN cmake --preset default && cmake --build --preset default
-
-FROM alpine:3.18
-RUN apk update && apk add openmp
-COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
\ No newline at end of file
diff --git a/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests b/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests
deleted file mode 100755
index 59cc680393f..00000000000
--- a/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-set -eu
-
-# To be called from CI for testing with docker and AWS.
-# Can't be called locally unless AWS credentials are set up.
-#
-# Call from config.yml
-# Example:
-#   command: cond_spot_run_script circuits-wasm-linux-clang-assert 1 wasm scripts/a3-tests -*.skip*:*.circuit*
-
-AZTEC_COMMIT=$1 # Aztec commit/branch to checkout (MANDATORY)
-NUM_TRANSCRIPTS=$2 # integer (MANDATORY)
-ARCH=$3 # x86_64 or wasm (MUST BE LOWERCASE) (MANDATORY) used in aztec's circuits `run_tests_local`
-# TESTS=$4 (MANDATORY) used in aztec's circuits `run_tests_local` (test files rel to circuits/cpp)
-# GTEST_FILTER=$5 (optional) used in aztec's circuits `run_tests_local`
-# *** See `run_tests_local` for the args forwarded to that script
-shift # arg1 (aztec commit) and arg2 (num transcripts) are not forwarded
-shift # to aztec's circuits `run_tests_local`
-
-$(aws ecr get-login --region us-east-2 --no-include-email) 2> /dev/null
-
-export PATH="$PATH:$(git rev-parse --show-toplevel)/build-system/scripts"
-REPOSITORY="barretenberg-circuits-${ARCH}-linux-clang-builder-runner"
-IMAGE_URI=$(calculate_image_uri $REPOSITORY)
-retry docker pull $IMAGE_URI
-
-if [ "$ARCH" != "wasm" ]; then
-  # x86_64 / anything other than wasm
-  PRESET=default
-  CONFIGURE_OPTS="-DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON"
-  BUILD_DIR=build
-else
-  PRESET=wasm
-  BUILD_DIR=build-wasm
-fi
-
-echo "*** Running Aztec circuits tests on commit: $AZTEC_COMMIT"
-# run tests in docker
-RUN_ARGS="$@" # helper var necessary for some reason to pass all args to docker run
-docker run --rm -t $IMAGE_URI /bin/sh -c "\
-  set -xe; \
-  cd /usr/src/; \
-  git clone https://github.com/AztecProtocol/aztec3-packages.git; \
-  cd /usr/src/aztec3-packages/circuits/cpp; \
-  git checkout $AZTEC_COMMIT; \
-  rm -rf /usr/src/aztec3-packages/circuits/cpp/barretenberg;
-  mv /usr/src/barretenberg .; \
-  cmake --preset $PRESET $CONFIGURE_OPTS; \
-  cmake --build --preset $PRESET; \
-  cd /usr/src/aztec3-packages/circuits/cpp/barretenberg/cpp/srs_db; \
-  ./download_ignition.sh $NUM_TRANSCRIPTS; \
-  cd /usr/src/aztec3-packages/circuits/cpp; \
-  export PATH=\$PATH:~/.wasmtime/bin/; \
-  ./scripts/run_tests_local $RUN_ARGS;"
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp
deleted file mode 100644
index 3bda4b65bef..00000000000
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-#include "acir_format.hpp"
-#include "barretenberg/crypto/ecdsa/ecdsa.hpp"
-#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
-#include "barretenberg/plonk/proof_system/types/proof.hpp"
-#include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
-#include "fixed_base_scalar_mul.hpp"
-
-#include <cstdint>
-#include <gtest/gtest.h>
-#include <vector>
-
-namespace acir_format::tests {
-using group_ct = proof_system::plonk::stdlib::group<Builder>;
-
-size_t generate_scalar_mul_constraints(FixedBaseScalarMul& scalar_mul_constraint,
-                                       WitnessVector& witness_values,
-                                       uint256_t low_value,
-                                       uint256_t high_value,
-                                       grumpkin::g1::affine_element expected)
-{
-    uint32_t offset = 1;
-
-    uint32_t low_index = offset;
-    witness_values.emplace_back(low_value);
-    offset += 1;
-
-    uint32_t high_index = offset;
-    witness_values.emplace_back(high_value);
-    offset += 1;
-
-    uint32_t pub_key_x_index = offset;
-    witness_values.emplace_back(expected.x);
-    offset += 1;
-
-    uint32_t pub_key_y_index = offset;
-    witness_values.emplace_back(expected.y);
-    offset += 1;
-
-    scalar_mul_constraint = FixedBaseScalarMul{
-        .low = low_index,
-        .high = high_index,
-        .pub_key_x = pub_key_x_index,
-        .pub_key_y = pub_key_y_index,
-    };
-
-    return offset;
-}
-
-size_t generate_fixed_base_scalar_mul_fixtures(FixedBaseScalarMul& scalar_mul_constraint,
-                                               WitnessVector& witness_values,
-                                               grumpkin::fr low,
-                                               grumpkin::fr high)
-{
-
-    auto two_pow_128 = grumpkin::fr(2).pow(128);
-    grumpkin::g1::element expected_projective = (grumpkin::g1::one * low) + grumpkin::g1::one * (high * two_pow_128);
-    grumpkin::g1::affine_element expected = expected_projective.normalize();
-    return generate_scalar_mul_constraints(scalar_mul_constraint, witness_values, low, high, expected);
-}
-
-TEST(FixedBaseScalarMul, TestSimpleScalarMul)
-{
-    FixedBaseScalarMul scalar_mul_constraint;
-    WitnessVector witness_values;
-    auto low = grumpkin::fr(1);
-    auto high = grumpkin::fr(2);
-    size_t num_variables = generate_fixed_base_scalar_mul_fixtures(scalar_mul_constraint, witness_values, low, high);
-    acir_format constraint_system{
-        .varnum = static_cast<uint32_t>(num_variables),
-        .public_inputs = {},
-        .logic_constraints = {},
-        .range_constraints = {},
-        .sha256_constraints = {},
-        .schnorr_constraints = {},
-        .ecdsa_k1_constraints = {},
-        .ecdsa_r1_constraints = {},
-        .blake2s_constraints = {},
-        .keccak_constraints = {},
-        .keccak_var_constraints = {},
-        .pedersen_constraints = {},
-        .hash_to_field_constraints = {},
-        .fixed_base_scalar_mul_constraints = { scalar_mul_constraint },
-        .recursion_constraints = {},
-        .constraints = {},
-        .block_constraints = {},
-    };
-
-    auto builder = create_circuit_with_witness(constraint_system, witness_values);
-
-    auto composer = Composer();
-    auto prover = composer.create_prover(builder);
-
-    auto proof = prover.construct_proof();
-    auto verifier = composer.create_verifier(builder);
-    EXPECT_EQ(verifier.verify_proof(proof), true);
-}
-TEST(FixedBaseScalarMul, TestLimbLargerThan2Pow128)
-{
-    FixedBaseScalarMul scalar_mul_constraint;
-    WitnessVector witness_values;
-    grumpkin::fr low = grumpkin::fr(2).pow(129);
-    grumpkin::fr high = 1;
-    size_t num_variables = generate_fixed_base_scalar_mul_fixtures(scalar_mul_constraint, witness_values, low, high);
-    acir_format constraint_system{
-        .varnum = static_cast<uint32_t>(num_variables),
-        .public_inputs = {},
-        .logic_constraints = {},
-        .range_constraints = {},
-        .sha256_constraints = {},
-        .schnorr_constraints = {},
-        .ecdsa_k1_constraints = {},
-        .ecdsa_r1_constraints = {},
-        .blake2s_constraints = {},
-        .keccak_constraints = {},
-        .keccak_var_constraints = {},
-        .pedersen_constraints = {},
-        .hash_to_field_constraints = {},
-        .fixed_base_scalar_mul_constraints = { scalar_mul_constraint },
-        .recursion_constraints = {},
-        .constraints = {},
-        .block_constraints = {},
-    };
-
-    auto builder = create_circuit_with_witness(constraint_system, witness_values);
-
-    auto composer = Composer();
-    auto prover = composer.create_prover(builder);
-
-    auto proof = prover.construct_proof();
-    auto verifier = composer.create_verifier(builder);
-    EXPECT_EQ(verifier.verify_proof(proof), false);
-}
-
-} // namespace acir_format::tests
diff --git a/circuits/cpp/barretenberg/ts/CHANGELOG.md b/circuits/cpp/barretenberg/ts/CHANGELOG.md
deleted file mode 100644
index 4a19aa6095d..00000000000
--- a/circuits/cpp/barretenberg/ts/CHANGELOG.md
+++ /dev/null
@@ -1,213 +0,0 @@
-# Changelog
-
-## [0.7.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.7...barretenberg.js-v0.7.0) (2023-09-13)
-
-
-### Bug Fixes
-
-* Add cjs-entry to bbjs package files ([#2237](https://github.com/AztecProtocol/aztec-packages/issues/2237)) ([ae16193](https://github.com/AztecProtocol/aztec-packages/commit/ae16193b3cdb2da3d57a1c74f7e71f139ced54d1))
-
-
-### Miscellaneous
-
-* Add debugging to run_tests ([#2212](https://github.com/AztecProtocol/aztec-packages/issues/2212)) ([1c5e78a](https://github.com/AztecProtocol/aztec-packages/commit/1c5e78a4ac01bee4b785857447efdb02d8d9cb35))
-
-## [0.6.7](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.6...barretenberg.js-v0.6.7) (2023-09-11)
-
-
-### Miscellaneous
-
-* **barretenberg.js:** Synchronize aztec-packages versions
-
-## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.5...barretenberg.js-v0.6.6) (2023-09-11)
-
-
-### Miscellaneous
-
-* **barretenberg.js:** Synchronize aztec-packages versions
-
-## [0.6.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.4...barretenberg.js-v0.6.5) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg.js:** Synchronize aztec-packages versions
-
-## [0.6.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.3...barretenberg.js-v0.6.4) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg.js:** Synchronize aztec-packages versions
-
-## [0.6.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.2...barretenberg.js-v0.6.3) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg.js:** Synchronize aztec-packages versions
-
-## [0.6.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.1...barretenberg.js-v0.6.2) (2023-09-08)
-
-
-### Miscellaneous
-
-* **barretenberg.js:** Synchronize aztec-packages versions
-
-## [0.6.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.2...barretenberg.js-v0.6.1) (2023-09-08)
-
-
-### Miscellaneous
-
-* **master:** Release 0.5.2 ([#2141](https://github.com/AztecProtocol/aztec-packages/issues/2141)) ([451aad6](https://github.com/AztecProtocol/aztec-packages/commit/451aad6ea92ebced9839ca14baae10cee327be35))
-* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
-* Release 0.6.1 ([1bd1a79](https://github.com/AztecProtocol/aztec-packages/commit/1bd1a79b0cefcd90306133aab141d992e8ea5fc3))
-
-## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.2...barretenberg.js-v0.5.2) (2023-09-08)
-
-
-### Miscellaneous
-
-* Release 0.5.2 ([f76b53c](https://github.com/AztecProtocol/aztec-packages/commit/f76b53c985116ac131a9b11b2a255feb7d0f8f13))
-
-## [0.5.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.5.0...barretenberg.js-v0.5.1) (2023-09-05)
-
-
-### Features
-
-* Add `info` command to bb ([#2010](https://github.com/AztecProtocol/barretenberg/issues/2010)) ([2882d97](https://github.com/AztecProtocol/barretenberg/commit/2882d97f5165239badb328be80568e7d683c0465))
-* **ci:** Use content hash in build system, restrict docs build to *.ts or *.cpp ([#1953](https://github.com/AztecProtocol/barretenberg/issues/1953)) ([297a20d](https://github.com/AztecProtocol/barretenberg/commit/297a20d7878a4aabab1cabf2cc5d2d67f9e969c5))
-
-
-### Bug Fixes
-
-* **bb.js:** (breaking change) bundles bb.js properly so that it works in the browser and in node ([#1855](https://github.com/AztecProtocol/barretenberg/issues/1855)) ([bc93a5f](https://github.com/AztecProtocol/barretenberg/commit/bc93a5f8510d0dc600343e7e613ab84380d3c225))
-* **ci:** Incorrect content hash in some build targets ([#1973](https://github.com/AztecProtocol/barretenberg/issues/1973)) ([c6c469a](https://github.com/AztecProtocol/barretenberg/commit/c6c469aa5da7c6973f656ddf8af4fb20c3e8e4f6))
-* Master ([#1981](https://github.com/AztecProtocol/barretenberg/issues/1981)) ([59a454e](https://github.com/AztecProtocol/barretenberg/commit/59a454ecf1611424893e1cb093774a23dde39310))
-
-## [0.5.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.6...barretenberg.js-v0.5.0) (2023-09-01)
-
-
-### ⚠ BREAKING CHANGES
-
-* update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925))
-
-### Miscellaneous Chores
-
-* Update to acvm 0.24.0 ([#1925](https://github.com/AztecProtocol/barretenberg/issues/1925)) ([5d8db8e](https://github.com/AztecProtocol/barretenberg/commit/5d8db8eb993334b43e24a51efba9c59e123320ab))
-
-## [0.4.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.5...barretenberg.js-v0.4.6) (2023-08-29)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## [0.4.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.4...barretenberg.js-v0.4.5) (2023-08-28)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## [0.4.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.3...barretenberg.js-v0.4.4) (2023-08-28)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## [0.4.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.2...barretenberg.js-v0.4.3) (2023-08-23)
-
-
-### Bug Fixes
-
-* Download SRS using one canonical URL across the codebase ([#1748](https://github.com/AztecProtocol/barretenberg/issues/1748)) ([5c91de7](https://github.com/AztecProtocol/barretenberg/commit/5c91de7296e054f6d5ac3dca94ca85e06d496048))
-* Proving fails when circuit has size &gt; ~500K ([#1739](https://github.com/AztecProtocol/barretenberg/issues/1739)) ([6d32383](https://github.com/AztecProtocol/barretenberg/commit/6d323838a525190618d608598357ee4608c46699))
-
-## [0.4.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.1...barretenberg.js-v0.4.2) (2023-08-21)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## [0.4.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.4.0...barretenberg.js-v0.4.1) (2023-08-21)
-
-
-### Bug Fixes
-
-* **bb:** Fix Typo ([#1709](https://github.com/AztecProtocol/barretenberg/issues/1709)) ([286d64e](https://github.com/AztecProtocol/barretenberg/commit/286d64e6036336314114f1d2a25273f4dabe36f4))
-
-## [0.4.0](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.6...barretenberg.js-v0.4.0) (2023-08-21)
-
-
-### ⚠ BREAKING CHANGES
-
-* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618))
-
-### Bug Fixes
-
-* Barretenberg binaries now take in the encoded circuit instead of a json file ([#1618](https://github.com/AztecProtocol/barretenberg/issues/1618)) ([180cdc9](https://github.com/AztecProtocol/barretenberg/commit/180cdc9ac7cf9aa793d9774dc866ceb4e6ec3fbc))
-* Bin reference when installing package ([#678](https://github.com/AztecProtocol/barretenberg/issues/678)) ([c734295](https://github.com/AztecProtocol/barretenberg/commit/c734295a10d2c40ede773519664170880f28b2b7))
-* Sync aztec master ([#680](https://github.com/AztecProtocol/barretenberg/issues/680)) ([3afc243](https://github.com/AztecProtocol/barretenberg/commit/3afc2438053f530e49fbebbdbadd8db8a630bb8c))
-
-## [0.3.6](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.5...barretenberg.js-v0.3.6) (2023-08-08)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## [0.3.5](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.4...barretenberg.js-v0.3.5) (2023-08-07)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## [0.3.4](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.3...barretenberg.js-v0.3.4) (2023-07-25)
-
-
-### Features
-
-* Modify bb.js to be compatible with next.js ([#544](https://github.com/AztecProtocol/barretenberg/issues/544)) ([d384089](https://github.com/AztecProtocol/barretenberg/commit/d384089f60d1a6d5baeb0d3459556a310b790366))
-
-## [0.3.3](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.2...barretenberg.js-v0.3.3) (2023-07-17)
-
-
-### Features
-
-* Bb and bb.js directly parse nargo bincode format. ([#610](https://github.com/AztecProtocol/barretenberg/issues/610)) ([d25e37a](https://github.com/AztecProtocol/barretenberg/commit/d25e37ad74b88dc45337b2a529ede3136dd4a699))
-
-## [0.3.2](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.1...barretenberg.js-v0.3.2) (2023-07-12)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## [0.3.1](https://github.com/AztecProtocol/barretenberg/compare/barretenberg.js-v0.3.0...barretenberg.js-v0.3.1) (2023-07-11)
-
-
-### Miscellaneous Chores
-
-* **barretenberg.js:** Synchronize barretenberg versions
-
-## 0.3.0 (2023-07-11)
-
-
-### Features
-
-* **bb.js:** initial API ([#232](https://github.com/AztecProtocol/barretenberg/issues/232)) ([c860b02](https://github.com/AztecProtocol/barretenberg/commit/c860b02d80425de161af50acf33e94d94eb0659c))
-* **dsl:** Add ECDSA secp256r1 verification ([#582](https://github.com/AztecProtocol/barretenberg/issues/582)) ([adc4c7b](https://github.com/AztecProtocol/barretenberg/commit/adc4c7b4eb634eae28dd28e25b94b93a5b49c80e))
-* Initial native version of bb binary. ([#524](https://github.com/AztecProtocol/barretenberg/issues/524)) ([4a1b532](https://github.com/AztecProtocol/barretenberg/commit/4a1b5322dc78921d253e6a374eba0b616ab788df))
-* Optimize memory consumption of pedersen generators ([#413](https://github.com/AztecProtocol/barretenberg/issues/413)) ([d60b16a](https://github.com/AztecProtocol/barretenberg/commit/d60b16a14219fd4bd130ce4537c3e94bfa10128f))
-* **ts:** allow passing srs via env functions ([#260](https://github.com/AztecProtocol/barretenberg/issues/260)) ([ac78353](https://github.com/AztecProtocol/barretenberg/commit/ac7835304f4524039abf0a0df9ae85d905f55c86))
-
-
-### Bug Fixes
-
-* **build:** git add -f .yalc ([#265](https://github.com/AztecProtocol/barretenberg/issues/265)) ([7671192](https://github.com/AztecProtocol/barretenberg/commit/7671192c8a60ff0bc0f8ad3e14ac299ff780cc25))
-* bump timeout on common test. ([c9bc87d](https://github.com/AztecProtocol/barretenberg/commit/c9bc87d29fa1325162cb1e7bf2db7cc85747fd9e))
-* Trigger release-please ([#594](https://github.com/AztecProtocol/barretenberg/issues/594)) ([5042861](https://github.com/AztecProtocol/barretenberg/commit/5042861405df6b5659c0c32418720d8bdea81081))
diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/acir.gz b/circuits/cpp/barretenberg/ts/bin-test/target/acir.gz
deleted file mode 100644
index d1fe5b039c4..00000000000
Binary files a/circuits/cpp/barretenberg/ts/bin-test/target/acir.gz and /dev/null differ
diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/witness.gz b/circuits/cpp/barretenberg/ts/bin-test/target/witness.gz
deleted file mode 100644
index b250bdfe7bc..00000000000
Binary files a/circuits/cpp/barretenberg/ts/bin-test/target/witness.gz and /dev/null differ
diff --git a/circuits/cpp/bootstrap.sh b/circuits/cpp/bootstrap.sh
index 0462e0085f6..f90114e82a4 100755
--- a/circuits/cpp/bootstrap.sh
+++ b/circuits/cpp/bootstrap.sh
@@ -16,18 +16,8 @@ if [ -n "${CLEAN:-}" ]; then
   # Clean.
   rm -rf ./build
   rm -rf ./build-wasm
-
-  # Clean barretenberg.
-  rm -rf ./barretenberg/cpp/build
-  rm -rf ./barretenberg/cpp/build-wasm
-  rm -rf ./barretenberg/cpp/src/wasi-sdk-*
 fi
 
-# Install formatting git hook.
-HOOKS_DIR=$(git rev-parse --git-path hooks)
-echo "cd \$(git rev-parse --show-toplevel)/circuits/cpp && ./format.sh staged" > $HOOKS_DIR/pre-commit
-chmod +x $HOOKS_DIR/pre-commit
-
 # Determine system.
 if [[ "$OSTYPE" == "darwin"* ]]; then
   OS=macos
@@ -38,9 +28,6 @@ else
   exit 1
 fi
 
-# Download ignition transcripts.
-(cd barretenberg/cpp/srs_db && ./download_ignition.sh 3)
-
 # Pick native toolchain file.
 ARCH=$(uname -m)
 if [ "$OS" == "macos" ]; then
@@ -74,9 +61,6 @@ echo "#################################"
 cmake --preset $PRESET -DCMAKE_BUILD_TYPE=RelWithAssert
 cmake --build --preset $PRESET ${@/#/--target }
 
-# Install the webassembly toolchain.
-(cd ./barretenberg/cpp && ./scripts/install-wasi-sdk.sh)
-
 # Build WASM.
 cmake --preset wasm
 cmake --build --preset wasm
diff --git a/circuits/cpp/cmake/barretenberg.cmake b/circuits/cpp/cmake/barretenberg.cmake
deleted file mode 100644
index 41e68f00721..00000000000
--- a/circuits/cpp/cmake/barretenberg.cmake
+++ /dev/null
@@ -1,72 +0,0 @@
-# Here we Set up barretenberg as an ExternalProject
-# - Point to its source and build directories
-# - Construct its `configure` and `build` command lines
-# - include its `src/` in `search path for includes
-# - Depend on specific libraries from barretenberg
-#
-# If barretenberg's cmake files change, its configure and build are triggered
-# If barretenberg's source files change, build is triggered
-
-include(ExternalProject)
-
-# Reference barretenberg artifacts (like library archives) via this dir:
-if (WASM)
-    set(BBERG_BUILD_DIR ${BBERG_DIR}/build-wasm)
-    set(BBERG_TARGETS --target barretenberg --target env --target wasi --target barretenberg.wasm)
-else()
-    set(BBERG_BUILD_DIR ${BBERG_DIR}/build)
-    set(BBERG_TARGETS --target barretenberg --target env --target wasi)
-endif()
-
-if(NOT CMAKE_BBERG_PRESET)
-    set(CMAKE_BBERG_PRESET default)
-endif()
-
-# Naming: Project: Barretenberg, Libraries: barretenberg, env
-# Need BUILD_ALWAYS to ensure that barretenberg is automatically reconfigured when its CMake files change
-# "Enabling this option forces the build step to always be run. This can be the easiest way to robustly
-#  ensure that the external project's own build dependencies are evaluated rather than relying on the
-#  default success timestamp-based method." - https://cmake.org/cmake/help/latest/module/ExternalProject.html
-
-ExternalProject_Add(Barretenberg
-    SOURCE_DIR ${BBERG_DIR}
-    BUILD_IN_SOURCE TRUE
-    BUILD_ALWAYS TRUE
-    UPDATE_COMMAND ""
-    INSTALL_COMMAND ""
-    CONFIGURE_COMMAND
-        ${CMAKE_COMMAND}
-        --preset ${CMAKE_BBERG_PRESET}
-        -DCMAKE_CXX_FLAGS=${CMAKE_BBERG_CXX_FLAGS}
-        -DMULTITHREADING=${MULTITHREADING}
-        -DENABLE_ASAN=${ENABLE_ASAN}
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    BUILD_COMMAND
-        ${CMAKE_COMMAND}
-        --build
-        --preset ${CMAKE_BBERG_PRESET}
-        ${BBERG_TARGETS}
-    # byproducts needed by ninja generator (not needed by make)
-    BUILD_BYPRODUCTS
-        ${BBERG_BUILD_DIR}/lib/libbarretenberg.a
-        ${BBERG_BUILD_DIR}/lib/libenv.a
-)
-
-include_directories(${BBERG_DIR}/src)
-
-# Add the imported barretenberg and env libraries, point to their library archives,
-# and add a dependency of these libraries on the imported project
-add_library(barretenberg STATIC IMPORTED)
-set_target_properties(barretenberg PROPERTIES IMPORTED_LOCATION ${BBERG_BUILD_DIR}/lib/libbarretenberg.a)
-add_dependencies(barretenberg Barretenberg)
-
-# env is needed for logstr in native executables and wasm tests
-# It is otherwise omitted from wasm to prevent use of C++ logstr instead of imported/Typescript
-add_library(env STATIC IMPORTED)
-set_target_properties(env PROPERTIES IMPORTED_LOCATION ${BBERG_BUILD_DIR}/lib/libenv.a)
-add_dependencies(env Barretenberg)
-
-# wasi is needed to initialize global statics and ensure we're following the reactor wasi pattern.
-add_library(wasi STATIC IMPORTED)
-set_target_properties(wasi PROPERTIES IMPORTED_LOCATION ${BBERG_BUILD_DIR}/lib/libwasi.a)
-add_dependencies(wasi Barretenberg)
diff --git a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang
index 73600fc890e..1dc91d8ba1a 100644
--- a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang
+++ b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang
@@ -1,16 +1,14 @@
+FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang as bb
+
 FROM ubuntu:lunar AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl binaryen
-
-WORKDIR /usr/src/circuits/cpp/barretenberg/cpp
-COPY ./barretenberg/cpp/scripts/install-wasi-sdk.sh ./scripts/install-wasi-sdk.sh
-RUN ./scripts/install-wasi-sdk.sh
+COPY --from=bb /usr/src/barretenberg/cpp /usr/src/barretenberg/cpp
 WORKDIR /usr/src/circuits/cpp
 COPY . .
-
 RUN cmake --preset wasm && cmake --build --preset wasm --target aztec3-circuits.wasm
 
-FROM alpine:3.17
+FROM scratch
+COPY --from=builder /usr/src/barretenberg/cpp/build-wasm/bin/barretenberg.wasm /usr/src/barretenberg/cpp/build-wasm/bin/primitives.wasm
+COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
 COPY --from=builder /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm
-COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/build-wasm/bin/barretenberg.wasm /usr/src/circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm
-COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db
 COPY --from=builder /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures
diff --git a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert
index 59ce8179f8b..8bb6eb718e8 100644
--- a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert
+++ b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert
@@ -1,18 +1,16 @@
+FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-wasm-linux-clang as bb
+
 FROM ubuntu:lunar AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git libssl-dev cmake ninja-build curl binaryen
-
-WORKDIR /usr/src/circuits/cpp/barretenberg/cpp
-COPY ./barretenberg/cpp/scripts/install-wasi-sdk.sh ./scripts/install-wasi-sdk.sh
-RUN ./scripts/install-wasi-sdk.sh
+COPY --from=bb /usr/src/barretenberg/cpp /usr/src/barretenberg/cpp
 WORKDIR /usr/src/circuits/cpp
 COPY . .
-
 RUN cmake --preset wasm && cmake --build --preset wasm
 
 FROM ubuntu:lunar
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y xz-utils curl
 RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1
-COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db
+COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
 COPY --from=builder /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures
 COPY --from=builder /usr/src/circuits/cpp/scripts /usr/src/circuits/cpp/scripts
 COPY --from=builder /usr/src/circuits/cpp/build-wasm/bin/*_tests /usr/src/circuits/cpp/build-wasm/bin/
diff --git a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang b/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
index c2ccf93631b..c0eca292e40 100644
--- a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
+++ b/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang
@@ -1,23 +1,22 @@
+FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang as bb
+
 FROM alpine:3.17 AS builder
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache \
         build-base \
         clang15 \
-        openmp-dev \
         cmake \
         ninja \
         git \
         curl \
         perl
-
+COPY --from=bb /usr/src/barretenberg/cpp /usr/src/barretenberg/cpp
 WORKDIR /usr/src/circuits/cpp
-
 COPY . .
 # Build the entire project, as we want to check everything builds under clang
 RUN cmake --preset default && cmake --build --preset default
 
 FROM alpine:3.17
-RUN apk update && apk add openmp
-COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db
+COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
 COPY --from=builder /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures
\ No newline at end of file
diff --git a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert b/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
index 98da87ea4d6..9095d9d056a 100644
--- a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
+++ b/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert
@@ -1,24 +1,25 @@
+FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang as bb
+
 FROM alpine:3.17 AS builder
 RUN apk update \
     && apk upgrade \
     && apk add --no-cache \
         build-base \
         clang15 \
-        openmp-dev \
         cmake \
         ninja \
         git \
         curl \
         perl
-
+COPY --from=bb /usr/src/barretenberg/cpp /usr/src/barretenberg/cpp
 WORKDIR /usr/src/circuits/cpp
 COPY . .
 # Build everything to ensure everything builds. All tests will be run from the result of this build.
 RUN cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DCI=ON && cmake --build --preset default
 
 FROM alpine:3.17
-RUN apk update && apk add curl openmp bash
-COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db
+RUN apk update && apk add curl bash libstdc++
+COPY --from=builder /usr/src/barretenberg/cpp/srs_db /usr/src/barretenberg/cpp/srs_db
 COPY --from=builder /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures
 COPY --from=builder /usr/src/circuits/cpp/scripts /usr/src/circuits/cpp/scripts
 COPY --from=builder /usr/src/circuits/cpp/build/bin/*_tests /usr/src/circuits/cpp/build/bin/
\ No newline at end of file
diff --git a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-tidy b/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-tidy
index 6064bc941c4..c852c9f8a34 100644
--- a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-tidy
+++ b/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-tidy
@@ -1,3 +1,5 @@
+FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang as bb
+
 FROM alpine:3.17 AS builder
 RUN apk update \
     && apk upgrade \
@@ -13,11 +15,9 @@ RUN apk update \
         perl \
         bash \
         python3
-
+COPY --from=bb /usr/src/barretenberg/cpp /usr/src/barretenberg/cpp
 WORKDIR /usr/src/circuits/cpp
-
 COPY . .
-
 # Configure cmake and check if code is tidy
 RUN cmake --preset default
 RUN ./scripts/tidy.sh fix
\ No newline at end of file
diff --git a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc b/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
deleted file mode 100644
index d2c506fe4d7..00000000000
--- a/circuits/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM alpine:3.17 AS builder
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        cmake \
-        ninja \
-        git \
-        curl
-WORKDIR /usr/src/circuits/cpp
-COPY . .
-# Build the entire project, as we want to check everything builds under gcc.
-RUN cmake --preset gcc -DCI=ON && cmake --build --preset gcc
-
-FROM alpine:3.17
-RUN apk update && apk add libstdc++ libgomp
-COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db
-COPY --from=builder /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures /usr/src/circuits/cpp/src/aztec3/circuits/kernel/private/fixtures
diff --git a/circuits/cpp/format.sh b/circuits/cpp/format.sh
index 4ed7b6472ad..e12e84ab27a 100755
--- a/circuits/cpp/format.sh
+++ b/circuits/cpp/format.sh
@@ -2,7 +2,7 @@
 set -eu
 
 if [ "${1:-}" == "staged" ]; then
-  echo Formatting staged files...
+  echo Formatting circuits staged files...
   for FILE in $(git diff-index --diff-filter=d --relative --cached --name-only HEAD | grep -e '\.\(cpp\|hpp\|tcc\)$'); do
     clang-format -i $FILE
     sed -i.bak 's/\r$//' $FILE && rm ${FILE}.bak
diff --git a/circuits/cpp/scripts/build_run_tests_docker_local b/circuits/cpp/scripts/build_run_tests_docker_local
index a075cbba172..2ca15edddfb 100755
--- a/circuits/cpp/scripts/build_run_tests_docker_local
+++ b/circuits/cpp/scripts/build_run_tests_docker_local
@@ -32,8 +32,8 @@ time docker build -f $DOCKERFILE -t $IMAGE_URI .
 RUN_ARGS="$@" # helper var necessary for some reason to pass all args to docker run
 time docker run --rm -t $IMAGE_URI /bin/sh -c "\
   set -xe; \
-  cd /usr/src/circuits/cpp/barretenberg/cpp/srs_db; \
-  ln -sf /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/srs_db; \
+  cd /usr/src/barretenberg/cpp/srs_db; \
+  ln -sf /usr/src/barretenberg/cpp/srs_db /usr/src/circuits/cpp/srs_db; \
   ./download_ignition.sh $NUM_TRANSCRIPTS; \
   cd /usr/src/circuits/cpp; \
   export PATH=\$PATH:~/.wasmtime/bin/; \
diff --git a/circuits/cpp/scripts/run_tests b/circuits/cpp/scripts/run_tests
index a7ff014edcb..003dac3ed13 100755
--- a/circuits/cpp/scripts/run_tests
+++ b/circuits/cpp/scripts/run_tests
@@ -33,9 +33,10 @@ $(git rev-parse --show-toplevel)/build-system/scripts/retry docker pull $IMAGE_U
 RUN_ARGS="$@" # helper var necessary for some reason to pass all args to docker run
 time docker run --rm -t $IMAGE_URI /bin/sh -c "\
   set -xe; \
+  mv /usr/src/barretenberg /usr/src/circuits/cpp/; \
   cd /usr/src/circuits/cpp/barretenberg/cpp/srs_db; \
-  ln -sf /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/srs_db; \
   ./download_ignition.sh $NUM_TRANSCRIPTS; \
   cd /usr/src/circuits/cpp; \
+  ln -sf /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/srs_db; \
   export PATH=\$PATH:~/.wasmtime/bin/; \
   ./scripts/run_tests_local $RUN_ARGS;"
diff --git a/circuits/cpp/src/CMakeLists.txt b/circuits/cpp/src/CMakeLists.txt
index 52aa6bbbb22..fa1462dcf39 100644
--- a/circuits/cpp/src/CMakeLists.txt
+++ b/circuits/cpp/src/CMakeLists.txt
@@ -14,7 +14,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     add_compile_options(-fconstexpr-ops-limit=100000000)
 endif()
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../barretenberg/cpp/src/msgpack-c/include)
+include_directories(${CMAKE_SOURCE_DIR}/barretenberg/cpp/src)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/barretenberg/cpp/src/msgpack-c/include)
 
 # I feel this should be limited to ecc, however it's currently used in headers that go across libraries,
 # and there currently isn't an easy way to inherit the DDISABLE_SHENANIGANS parameter.
diff --git a/circuits/cpp/src/aztec3/CMakeLists.txt b/circuits/cpp/src/aztec3/CMakeLists.txt
index ff5e0a94b0a..72dcc455356 100644
--- a/circuits/cpp/src/aztec3/CMakeLists.txt
+++ b/circuits/cpp/src/aztec3/CMakeLists.txt
@@ -1,9 +1,16 @@
+if (WASM)
+    link_directories(${CMAKE_SOURCE_DIR}/barretenberg/cpp/build-wasm/lib)
+else()
+    link_directories(${CMAKE_SOURCE_DIR}/barretenberg/cpp/build/lib)
+endif()
+
 add_subdirectory(circuits)
 add_subdirectory(oracle)
 add_subdirectory(dbs)
 add_subdirectory(utils)
 
 if (WASM)
+
     # We can't build a wasm module by just linking to the libraries as that produces, nothing.
     # There are a couple of other ways to avoiding listing all the object files here and leveraging the dependency
     # tree, but they come with the problem that they will import the 'env' object files. We explicitly want to avoid
@@ -24,5 +31,4 @@ if (WASM)
         # TODO revisit implications of whole-archive
         -nostartfiles -Wl,--whole-archive -Wl,--no-entry -Wl,--export-dynamic -Wl,--import-memory -Wl,--allow-undefined -Wl,--stack-first -Wl,-z,stack-size=1048576
     )
-
 endif()
diff --git a/docs/.dockerignore b/docs/.dockerignore
index 7e43ece4f42..61e5039c958 100644
--- a/docs/.dockerignore
+++ b/docs/.dockerignore
@@ -13,7 +13,7 @@ Release/
 circuits/cpp/build/
 circuits/cpp/build-wasm/
 circuits/cpp/build-coverage/
-circuits/cpp/barretenberg/
+barretenberg/
 
 # Ignore Node.js build artifacts
 */node_modules/
diff --git a/release-please-config.json b/release-please-config.json
index fbc063f21a9..fa44df2381a 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -22,12 +22,12 @@
       "package-name": "aztec-packages",
       "extra-files": ["VERSION"]
     },
-    "circuits/cpp/barretenberg/ts": {
+    "barretenberg/ts": {
       "release-type": "node",
       "package-name": "barretenberg.js",
       "component": "barretenberg.js"
     },
-    "circuits/cpp/barretenberg": {
+    "barretenberg": {
       "release-type": "simple",
       "component": "barretenberg",
       "package-name": "barretenberg",
diff --git a/scripts/migrate_barretenberg_branch.sh b/scripts/migrate_barretenberg_branch.sh
index 9f3001c7421..8cf396867c3 100755
--- a/scripts/migrate_barretenberg_branch.sh
+++ b/scripts/migrate_barretenberg_branch.sh
@@ -36,7 +36,7 @@ fi
 
 BRANCH="$1"
 COMMIT_MESSAGE="$2"
-SUBREPO_PATH=circuits/cpp/barretenberg # can be changed to another subrepo if useful
+SUBREPO_PATH=barretenberg # can be changed to another subrepo if useful
 
 SCRIPT_DIR=$(dirname "$(realpath "$0")")
 cd "$SCRIPT_DIR"/..
@@ -59,7 +59,7 @@ fi
 
 echo "(branch migrate) Automatic git data fix"
 # Tosses away the .gitrepo changes, as those we only want if pulling from barretenberg master, not PRs (which will go in as aztec commits).
-# because git-subrepo uses 'git rm -r', we fix up .gitmodules after as well. This is an edge-case gotcha using 
+# because git-subrepo uses 'git rm -r', we fix up .gitmodules after as well. This is an edge-case gotcha using
 # git submodules along with git-subrepo.
 
 git checkout HEAD^ -- "$SUBREPO_PATH"/.gitrepo .gitmodules
diff --git a/yarn-project/aztec-sandbox/Dockerfile b/yarn-project/aztec-sandbox/Dockerfile
index 49d86dddaaa..fb4464fc5dd 100644
--- a/yarn-project/aztec-sandbox/Dockerfile
+++ b/yarn-project/aztec-sandbox/Dockerfile
@@ -3,7 +3,7 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
 ARG COMMIT_TAG=""
 
 # Remove SRS files (currently not producing proofs)
-RUN rm -rf /usr/src/circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial
+RUN rm -rf /usr/src/barretenberg/cpp/srs_db/ignition/monomial
 COPY . .
 
 # Update aztec-rpc version if COMMIT_TAG has been used
diff --git a/yarn-project/circuits.js/src/crs/index.ts b/yarn-project/circuits.js/src/crs/index.ts
index 2f1af8aa764..f91cb772686 100644
--- a/yarn-project/circuits.js/src/crs/index.ts
+++ b/yarn-project/circuits.js/src/crs/index.ts
@@ -145,7 +145,7 @@ export class Crs {
        */
       const SRS_DEV_PATH =
         dirname(fileURLToPath(import.meta.url)) +
-        '/../../../../circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/transcript00.dat';
+        '/../../../../barretenberg/cpp/srs_db/ignition/monomial/transcript00.dat';
       this.crs = existsSync(SRS_DEV_PATH) ? new FileCrs(numPoints, SRS_DEV_PATH) : new NetCrs(numPoints);
     } else {
       this.crs = new NetCrs(numPoints);
diff --git a/yarn-project/circuits.js/src/structs/aggregation_object.ts b/yarn-project/circuits.js/src/structs/aggregation_object.ts
index e4dd278e344..c00dd2795e0 100644
--- a/yarn-project/circuits.js/src/structs/aggregation_object.ts
+++ b/yarn-project/circuits.js/src/structs/aggregation_object.ts
@@ -10,7 +10,7 @@ import { G1AffineElement } from './verification_key.js';
 /**
  * Contains the aggregated proof of all the previous kernel iterations.
  *
- * See circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
+ * See barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp
  * for more context.
  */
 export class AggregationObject {
diff --git a/yarn-project/end-to-end/scripts/cond_run_script b/yarn-project/end-to-end/scripts/cond_run_script.delme
similarity index 100%
rename from yarn-project/end-to-end/scripts/cond_run_script
rename to yarn-project/end-to-end/scripts/cond_run_script.delme
diff --git a/yarn-project/noir-contracts/Dockerfile.build b/yarn-project/noir-contracts/Dockerfile.build
index 9479e8d0658..4a5cda55695 100644
--- a/yarn-project/noir-contracts/Dockerfile.build
+++ b/yarn-project/noir-contracts/Dockerfile.build
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
 WORKDIR /usr/src/yarn-project
 COPY . .
 
-WORKDIR /usr/src/yarn-project/noir-contracts 
+WORKDIR /usr/src/yarn-project/noir-contracts
 
 # Download and extract nargo
 ENV NARGO_HOME="/usr/src/yarn-project/noir-contracts/.nargo"
diff --git a/yarn-project/package.json b/yarn-project/package.json
index 6e84f6160b8..b02bb1c561f 100644
--- a/yarn-project/package.json
+++ b/yarn-project/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "prepare": "node ./yarn-project-base/scripts/update_package_jsons.mjs && yarn workspaces foreach run prepare && workspaces-to-typescript-project-references --tsconfigPath tsconfig.json && prettier -w */tsconfig.json",
-    "prepare:check": "node ./yarn-project-base/scripts/update_package_jsons.mjs --check && yarn workspaces foreach run prepare:check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.json",
+    "prepare:check": "node ./yarn-project-base/scripts/update_package_jsons.mjs --check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.json",
     "docs": "typedoc --out docs/dist && cd docs && yarn serve",
     "formatting": "yarn workspaces foreach -p -v run formatting",
     "formatting:fix": "yarn workspaces foreach -p -v run formatting:fix",
diff --git a/yarn-project/yarn-project-base/Dockerfile b/yarn-project/yarn-project-base/Dockerfile
index ae0e91ea864..ffcf3abb8c2 100644
--- a/yarn-project/yarn-project-base/Dockerfile
+++ b/yarn-project/yarn-project-base/Dockerfile
@@ -8,9 +8,9 @@ RUN apk update && apk add --no-cache build-base git python3 curl bash jq sed
 COPY --from=contracts /usr/src/l1-contracts/out /usr/src/l1-contracts/out
 
 COPY --from=circuits /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm
-COPY --from=circuits /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm
-COPY --from=circuits /usr/src/circuits/cpp/barretenberg/cpp/srs_db/download_ignition.sh /usr/src/circuits/cpp/barretenberg/cpp/srs_db/download_ignition.sh
-WORKDIR /usr/src/circuits/cpp/barretenberg/cpp/srs_db
+COPY --from=circuits /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/barretenberg/cpp/build-wasm/bin/primitives.wasm
+COPY --from=circuits /usr/src/barretenberg/cpp/srs_db/download_ignition.sh /usr/src/barretenberg/cpp/srs_db/download_ignition.sh
+WORKDIR /usr/src/barretenberg/cpp/srs_db
 RUN ./download_ignition.sh 1
 
 WORKDIR /usr/src/yarn-project
@@ -71,11 +71,6 @@ RUN /bin/bash -c '\
   [[ $F =~ (.*-) ]] && ln $F /root/.yarn/berry/cache/${BASH_REMATCH[1]}8.zip; \
   done'
 
-# We hack around the build context by copying the build manifest to and from the yarn_project root,
-# see the comment in .circleci/config.yml for more info.
-COPY build_manifest.json ./
-RUN cp build_manifest.json ../
-
 # Copy tsconfig to check dependencies
 COPY acir-simulator/tsconfig.json acir-simulator/tsconfig.json
 COPY archiver/tsconfig.json archiver/tsconfig.json