noir-lang · kevaundray · Sep 11, 2023 · Sep 11, 2023 · Sep 11, 2023 · Sep 11, 2023
diff --git a/.github/workflows/abi_wasm.yml b/.github/workflows/abi_wasm.yml
@@ -88,10 +88,10 @@ jobs:
       - name: Set up test environment
         uses: ./.github/actions/setup
         with:
-          working-directory: ./crates/noirc_abi_wasm
+          working-directory: ./compiler/noirc_abi_wasm
 
       - name: Run node tests
-        working-directory: ./crates/noirc_abi_wasm
+        working-directory: ./compiler/noirc_abi_wasm
         run: yarn test
 
   noirc-abi-wasm-test-browser:
@@ -110,7 +110,7 @@ jobs:
           path: ./result
 
       - name: Query playwright version
-        working-directory: ./crates/noirc_abi_wasm
+        working-directory: ./compiler/noirc_abi_wasm
         run: echo "PLAYWRIGHT_VERSION=$(yarn info @web/test-runner-playwright --json | jq .children.Version)" >> $GITHUB_ENV
 
       - name: Cache playwright binaries
@@ -124,15 +124,15 @@ jobs:
       - name: Set up test environment
         uses: ./.github/actions/setup
         with:
-          working-directory: ./crates/noirc_abi_wasm
+          working-directory: ./compiler/noirc_abi_wasm
 
       - name: Install playwright deps
         if: steps.playwright-cache.outputs.cache-hit != 'true'
-        working-directory: ./crates/noirc_abi_wasm
+        working-directory: ./compiler/noirc_abi_wasm
         run: |
           npx playwright install
           npx playwright install-deps
 
       - name: Run browser tests
-        working-directory: ./crates/noirc_abi_wasm
+        working-directory: ./compiler/noirc_abi_wasm
         run: yarn test:browser
diff --git a/.github/workflows/release-source-resolver.yml b/.github/workflows/release-source-resolver.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Bump version
-        working-directory: ./crates/source-resolver
+        working-directory: ./compiler/source-resolver
         id: bump_version
         run: |
           if [ -z "${{ github.event.inputs.version }}" ]; then
@@ -27,15 +27,15 @@ jobs:
           echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
 
       - name: Install dependencies
-        working-directory: ./crates/source-resolver
+        working-directory: ./compiler/source-resolver
         run: npm install
 
       - name: Build noir-source-resolver
-        working-directory: ./crates/source-resolver
+        working-directory: ./compiler/source-resolver
         run: npm run build
 
       - name: Publish to NPM
-        working-directory: ./crates/source-resolver
+        working-directory: ./compiler/source-resolver
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
@@ -47,7 +47,7 @@ jobs:
 
       - name: Commit updates
         run: |
-          git add crates/source-resolver/package-lock.json
-          git add crates/source-resolver/package.json
+          git add compiler/source-resolver/package-lock.json
+          git add compiler/source-resolver/package.json
           git commit -m "chore: Update source-resolver to ${{ env.NEW_VERSION }}"
           git push
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -93,11 +93,11 @@ jobs:
           retention-days: 3
 
       - name: Install `integration-tests` dependencies
-        working-directory: ./crates/integration-tests
+        working-directory: ./compiler/integration-tests
         run: yarn install
 
       - name: Run `integration-tests`
-        working-directory: ./crates/integration-tests
+        working-directory: ./compiler/integration-tests
         run: |
           yarn test:browser
 

diff --git a/.github/workflows/test-source-resolver.yml b/.github/workflows/test-source-resolver.yml
@@ -3,10 +3,10 @@ name: Test Source Resolver
 on:
   push:
     paths:
-      - "crates/source-resolver/**"
+      - "compiler/source-resolver/**"
   pull_request:
     paths:
-      - "crates/source-resolver/**"
+      - "compiler/source-resolver/**"
 
 jobs:
   test:
@@ -17,13 +17,13 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install dependencies
-        working-directory: ./crates/source-resolver
+        working-directory: ./compiler/source-resolver
         run: npm install
 
       - name: Build noir-source-resolver
-        working-directory: ./crates/source-resolver
+        working-directory: ./compiler/source-resolver
         run: npm run build
 
       - name: Run tests
-        working-directory: ./crates/source-resolver
+        working-directory: ./compiler/source-resolver
         run: npm run test
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -131,7 +131,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: noir_wasm
-          path: ./crates/wasm/result
+          path: ./compiler/wasm/result
 
       - name: Download nargo binary
         uses: actions/download-artifact@v3
@@ -140,7 +140,7 @@ jobs:
           path: ./nargo
 
       - name: Compile test program with Nargo CLI
-        working-directory: ./crates/wasm/noir-script
+        working-directory: ./compiler/wasm/noir-script
         run: |
           nargo_binary=${{ github.workspace }}/nargo/nargo
           chmod +x $nargo_binary
@@ -149,20 +149,20 @@ jobs:
       - name: Set up test environment
         uses: ./.github/actions/setup
         with:
-          working-directory: ./crates/wasm
+          working-directory: ./compiler/wasm
 
       - name: Install dependencies
-        working-directory: ./crates/wasm
+        working-directory: ./compiler/wasm
         run: yarn install
 
       - name: Install playwright deps
-        working-directory: ./crates/wasm
+        working-directory: ./compiler/wasm
         run: |
           npx playwright install
           npx playwright install-deps
 
       - name: Run tests
-        working-directory: ./crates/wasm
+        working-directory: ./compiler/wasm
         run: |
           yarn test:browser
           yarn test:node
diff --git a/.gitignore b/.gitignore
@@ -6,9 +6,9 @@ node_modules
 pkg/
 
 # Source resolver
-crates/source-resolver/node_modules
-crates/source-resolver/lib
-crates/source-resolver/lib-node
+compiler/source-resolver/node_modules
+compiler/source-resolver/lib
+compiler/source-resolver/lib-node
 
 # Nix stuff
 **/outputs
@@ -25,8 +25,8 @@ result
 *.vk
 **/Verifier.toml
 **/target
-!crates/nargo_cli/tests/acir_artifacts/*/target
-!crates/nargo_cli/tests/acir_artifacts/*/target/witness.gz
+!tooling/nargo_cli/tests/acir_artifacts/*/target
+!tooling/nargo_cli/tests/acir_artifacts/*/target/witness.gz
 
 # Github Actions scratch space
 # This gives a location to download artifacts into the repository in CI without making git dirty.

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,23 +1,23 @@
 [workspace]
 
 members = [
-    "crates/acvm_backend_barretenberg",
-    "crates/noirc_evaluator",
-    "crates/noirc_frontend",
-    "crates/noirc_errors",
-    "crates/noirc_driver",
-    "crates/noirc_printable_type",
-    "crates/nargo",
-    "crates/nargo_cli",
-    "crates/nargo_toml",
-    "crates/fm",
-    "crates/arena",
-    "crates/noirc_abi",
-    "crates/noirc_abi_wasm",
-    "crates/iter-extended",
-    "crates/wasm",
+    "compiler/noirc_evaluator",
+    "compiler/noirc_frontend",
+    "compiler/noirc_errors",
+    "compiler/noirc_driver",
+    "compiler/noirc_printable_type",
+    "tooling/acvm_backend_barretenberg",
+    "tooling/nargo",
+    "tooling/nargo_cli",
+    "tooling/nargo_toml",
+    "compiler/fm",
+    "compiler/arena",
+    "compiler/noirc_abi",
+    "compiler/noirc_abi_wasm",
+    "compiler/iter-extended",
+    "compiler/wasm",
 ]
-default-members = ["crates/nargo_cli"]
+default-members = ["tooling/nargo_cli"]
 resolver = "2"
 
 [workspace.package]
@@ -30,26 +30,29 @@ rust-version = "1.66"
 
 [workspace.dependencies]
 acvm = "0.26.0"
-arena = { path = "crates/arena" }
-fm = { path = "crates/fm" }
-iter-extended = { path = "crates/iter-extended" }
-nargo = { path = "crates/nargo" }
-nargo_cli = { path = "crates/nargo_cli" }
-nargo_toml = { path = "crates/nargo_toml" }
-noir_lsp = { path = "crates/lsp" }
-noirc_abi = { path = "crates/noirc_abi" }
-noirc_driver = { path = "crates/noirc_driver" }
-noirc_errors = { path = "crates/noirc_errors" }
-noirc_evaluator = { path = "crates/noirc_evaluator" }
-noirc_frontend = { path = "crates/noirc_frontend" }
-noirc_printable_type = { path = "crates/noirc_printable_type" }
-noir_wasm = { path = "crates/wasm" }
+arena = { path = "compiler/arena" }
+fm = { path = "compiler/fm" }
+iter-extended = { path = "compiler/iter-extended" }
+nargo = { path = "tooling/nargo" }
+nargo_cli = { path = "tooling/nargo_cli" }
+nargo_toml = { path = "tooling/nargo_toml" }
+noir_lsp = { path = "tooling/lsp" }
+noirc_abi = { path = "compiler/noirc_abi" }
+noirc_driver = { path = "compiler/noirc_driver" }
+noirc_errors = { path = "compiler/noirc_errors" }
+noirc_evaluator = { path = "compiler/noirc_evaluator" }
+noirc_frontend = { path = "compiler/noirc_frontend" }
+noirc_printable_type = { path = "compiler/noirc_printable_type" }
+noir_wasm = { path = "compiler/wasm" }
 cfg-if = "1.0.0"
 clap = { version = "4.3.19", features = ["derive"] }
 codespan = { version = "0.11.1", features = ["serialization"] }
 codespan-lsp = "0.11.1"
 codespan-reporting = "0.11.1"
-chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312", default-features = false, features = ["ahash", "std"] }
+chumsky = { git = "https://github.com/jfecher/chumsky", rev = "ad9d312", default-features = false, features = [
+    "ahash",
+    "std",
+] }
 dirs = "4"
 lsp-types = "0.94"
 serde = { version = "1.0.136", features = ["derive"] }

diff --git a/crates/arena/Cargo.toml → compiler/arena/Cargo.toml b/crates/arena/Cargo.toml → compiler/arena/Cargo.toml
diff --git a/crates/arena/src/lib.rs → compiler/arena/src/lib.rs b/crates/arena/src/lib.rs → compiler/arena/src/lib.rs
diff --git a/crates/fm/Cargo.toml → compiler/fm/Cargo.toml b/crates/fm/Cargo.toml → compiler/fm/Cargo.toml
diff --git a/crates/fm/build.rs → compiler/fm/build.rs b/crates/fm/build.rs → compiler/fm/build.rs
diff --git a/crates/fm/src/file_map.rs → compiler/fm/src/file_map.rs b/crates/fm/src/file_map.rs → compiler/fm/src/file_map.rs
diff --git a/crates/fm/src/file_reader.rs → compiler/fm/src/file_reader.rs b/crates/fm/src/file_reader.rs → compiler/fm/src/file_reader.rs
diff --git a/crates/fm/src/lib.rs → compiler/fm/src/lib.rs b/crates/fm/src/lib.rs → compiler/fm/src/lib.rs
diff --git a/crates/integration-tests/.eslintrc.js → compiler/integration-tests/.eslintrc.js b/crates/integration-tests/.eslintrc.js → compiler/integration-tests/.eslintrc.js
diff --git a/crates/integration-tests/package.json → compiler/integration-tests/package.json b/crates/integration-tests/package.json → compiler/integration-tests/package.json
diff --git a/...tion/browser/compile_prove_verify.test.ts → ...tion/browser/compile_prove_verify.test.ts b/...tion/browser/compile_prove_verify.test.ts → ...tion/browser/compile_prove_verify.test.ts
@@ -38,10 +38,10 @@ const CIRCUIT_SIZE = 2 ** 19;
 
 const test_cases = [
     {
-        case: "crates/nargo_cli/tests/execution_success/1_mul"
+        case: "tooling/nargo_cli/tests/execution_success/1_mul"
     },
     {
-        case: "crates/nargo_cli/tests/execution_success/double_verify_proof"
+        case: "tooling/nargo_cli/tests/execution_success/double_verify_proof"
     }
 ];
 

diff --git a/...egration-tests/web-test-runner.config.mjs → ...egration-tests/web-test-runner.config.mjs b/...egration-tests/web-test-runner.config.mjs → ...egration-tests/web-test-runner.config.mjs
diff --git a/crates/integration-tests/yarn.lock → compiler/integration-tests/yarn.lock b/crates/integration-tests/yarn.lock → compiler/integration-tests/yarn.lock
diff --git a/crates/iter-extended/Cargo.toml → compiler/iter-extended/Cargo.toml b/crates/iter-extended/Cargo.toml → compiler/iter-extended/Cargo.toml
diff --git a/crates/iter-extended/src/lib.rs → compiler/iter-extended/src/lib.rs b/crates/iter-extended/src/lib.rs → compiler/iter-extended/src/lib.rs
diff --git a/crates/noirc_abi/Cargo.toml → compiler/noirc_abi/Cargo.toml b/crates/noirc_abi/Cargo.toml → compiler/noirc_abi/Cargo.toml
diff --git a/crates/noirc_abi/src/errors.rs → compiler/noirc_abi/src/errors.rs b/crates/noirc_abi/src/errors.rs → compiler/noirc_abi/src/errors.rs
diff --git a/crates/noirc_abi/src/input_parser/json.rs → compiler/noirc_abi/src/input_parser/json.rs b/crates/noirc_abi/src/input_parser/json.rs → compiler/noirc_abi/src/input_parser/json.rs
diff --git a/crates/noirc_abi/src/input_parser/mod.rs → compiler/noirc_abi/src/input_parser/mod.rs b/crates/noirc_abi/src/input_parser/mod.rs → compiler/noirc_abi/src/input_parser/mod.rs
diff --git a/crates/noirc_abi/src/input_parser/toml.rs → compiler/noirc_abi/src/input_parser/toml.rs b/crates/noirc_abi/src/input_parser/toml.rs → compiler/noirc_abi/src/input_parser/toml.rs
diff --git a/crates/noirc_abi/src/lib.rs → compiler/noirc_abi/src/lib.rs b/crates/noirc_abi/src/lib.rs → compiler/noirc_abi/src/lib.rs
diff --git a/crates/noirc_abi/src/serialization.rs → compiler/noirc_abi/src/serialization.rs b/crates/noirc_abi/src/serialization.rs → compiler/noirc_abi/src/serialization.rs
diff --git a/crates/noirc_abi_wasm/.eslintignore → compiler/noirc_abi_wasm/.eslintignore b/crates/noirc_abi_wasm/.eslintignore → compiler/noirc_abi_wasm/.eslintignore
diff --git a/crates/noirc_abi_wasm/.eslintrc.js → compiler/noirc_abi_wasm/.eslintrc.js b/crates/noirc_abi_wasm/.eslintrc.js → compiler/noirc_abi_wasm/.eslintrc.js
diff --git a/crates/noirc_abi_wasm/.gitignore → compiler/noirc_abi_wasm/.gitignore b/crates/noirc_abi_wasm/.gitignore → compiler/noirc_abi_wasm/.gitignore
diff --git a/crates/noirc_abi_wasm/.mocharc.json → compiler/noirc_abi_wasm/.mocharc.json b/crates/noirc_abi_wasm/.mocharc.json → compiler/noirc_abi_wasm/.mocharc.json
diff --git a/...rc_abi_wasm/.yarn/releases/yarn-3.5.1.cjs → ...rc_abi_wasm/.yarn/releases/yarn-3.5.1.cjs b/...rc_abi_wasm/.yarn/releases/yarn-3.5.1.cjs → ...rc_abi_wasm/.yarn/releases/yarn-3.5.1.cjs
diff --git a/crates/noirc_abi_wasm/.yarnrc.yml → compiler/noirc_abi_wasm/.yarnrc.yml b/crates/noirc_abi_wasm/.yarnrc.yml → compiler/noirc_abi_wasm/.yarnrc.yml
diff --git a/crates/noirc_abi_wasm/CHANGELOG.md → compiler/noirc_abi_wasm/CHANGELOG.md b/crates/noirc_abi_wasm/CHANGELOG.md → compiler/noirc_abi_wasm/CHANGELOG.md
diff --git a/crates/noirc_abi_wasm/Cargo.toml → compiler/noirc_abi_wasm/Cargo.toml b/crates/noirc_abi_wasm/Cargo.toml → compiler/noirc_abi_wasm/Cargo.toml
diff --git a/crates/noirc_abi_wasm/README.md → compiler/noirc_abi_wasm/README.md b/crates/noirc_abi_wasm/README.md → compiler/noirc_abi_wasm/README.md
diff --git a/crates/noirc_abi_wasm/build.rs → compiler/noirc_abi_wasm/build.rs b/crates/noirc_abi_wasm/build.rs → compiler/noirc_abi_wasm/build.rs
diff --git a/crates/noirc_abi_wasm/build.sh → compiler/noirc_abi_wasm/build.sh b/crates/noirc_abi_wasm/build.sh → compiler/noirc_abi_wasm/build.sh
diff --git a/.../noirc_abi_wasm/buildPhaseCargoCommand.sh → .../noirc_abi_wasm/buildPhaseCargoCommand.sh b/.../noirc_abi_wasm/buildPhaseCargoCommand.sh → .../noirc_abi_wasm/buildPhaseCargoCommand.sh
diff --git a/crates/noirc_abi_wasm/installPhase.sh → compiler/noirc_abi_wasm/installPhase.sh b/crates/noirc_abi_wasm/installPhase.sh → compiler/noirc_abi_wasm/installPhase.sh
diff --git a/crates/noirc_abi_wasm/package.json → compiler/noirc_abi_wasm/package.json b/crates/noirc_abi_wasm/package.json → compiler/noirc_abi_wasm/package.json
diff --git a/crates/noirc_abi_wasm/src/js_witness_map.rs → ...iler/noirc_abi_wasm/src/js_witness_map.rs b/crates/noirc_abi_wasm/src/js_witness_map.rs → ...iler/noirc_abi_wasm/src/js_witness_map.rs
diff --git a/crates/noirc_abi_wasm/src/lib.rs → compiler/noirc_abi_wasm/src/lib.rs b/crates/noirc_abi_wasm/src/lib.rs → compiler/noirc_abi_wasm/src/lib.rs
diff --git a/crates/noirc_abi_wasm/src/temp.rs → compiler/noirc_abi_wasm/src/temp.rs b/crates/noirc_abi_wasm/src/temp.rs → compiler/noirc_abi_wasm/src/temp.rs
diff --git a/..._abi_wasm/test/browser/abi_encode.test.ts → ..._abi_wasm/test/browser/abi_encode.test.ts b/..._abi_wasm/test/browser/abi_encode.test.ts → ..._abi_wasm/test/browser/abi_encode.test.ts
diff --git a/...irc_abi_wasm/test/node/abi_encode.test.ts → ...irc_abi_wasm/test/node/abi_encode.test.ts b/...irc_abi_wasm/test/node/abi_encode.test.ts → ...irc_abi_wasm/test/node/abi_encode.test.ts
diff --git a/.../noirc_abi_wasm/test/shared/abi_encode.ts → .../noirc_abi_wasm/test/shared/abi_encode.ts b/.../noirc_abi_wasm/test/shared/abi_encode.ts → .../noirc_abi_wasm/test/shared/abi_encode.ts
diff --git a/crates/noirc_abi_wasm/test/types.ts → compiler/noirc_abi_wasm/test/types.ts b/crates/noirc_abi_wasm/test/types.ts → compiler/noirc_abi_wasm/test/types.ts
diff --git a/crates/noirc_abi_wasm/tsconfig.json → compiler/noirc_abi_wasm/tsconfig.json b/crates/noirc_abi_wasm/tsconfig.json → compiler/noirc_abi_wasm/tsconfig.json
diff --git a/...noirc_abi_wasm/web-test-runner.config.mjs → ...noirc_abi_wasm/web-test-runner.config.mjs b/...noirc_abi_wasm/web-test-runner.config.mjs → ...noirc_abi_wasm/web-test-runner.config.mjs
diff --git a/crates/noirc_abi_wasm/yarn.lock → compiler/noirc_abi_wasm/yarn.lock b/crates/noirc_abi_wasm/yarn.lock → compiler/noirc_abi_wasm/yarn.lock
diff --git a/crates/noirc_driver/Cargo.toml → compiler/noirc_driver/Cargo.toml b/crates/noirc_driver/Cargo.toml → compiler/noirc_driver/Cargo.toml
diff --git a/crates/noirc_driver/src/contract.rs → compiler/noirc_driver/src/contract.rs b/crates/noirc_driver/src/contract.rs → compiler/noirc_driver/src/contract.rs
diff --git a/crates/noirc_driver/src/lib.rs → compiler/noirc_driver/src/lib.rs b/crates/noirc_driver/src/lib.rs → compiler/noirc_driver/src/lib.rs
diff --git a/crates/noirc_driver/src/program.rs → compiler/noirc_driver/src/program.rs b/crates/noirc_driver/src/program.rs → compiler/noirc_driver/src/program.rs
diff --git a/crates/noirc_errors/Cargo.toml → compiler/noirc_errors/Cargo.toml b/crates/noirc_errors/Cargo.toml → compiler/noirc_errors/Cargo.toml
diff --git a/crates/noirc_errors/src/debug_info.rs → compiler/noirc_errors/src/debug_info.rs b/crates/noirc_errors/src/debug_info.rs → compiler/noirc_errors/src/debug_info.rs
diff --git a/crates/noirc_errors/src/lib.rs → compiler/noirc_errors/src/lib.rs b/crates/noirc_errors/src/lib.rs → compiler/noirc_errors/src/lib.rs
diff --git a/crates/noirc_errors/src/position.rs → compiler/noirc_errors/src/position.rs b/crates/noirc_errors/src/position.rs → compiler/noirc_errors/src/position.rs
diff --git a/crates/noirc_errors/src/reporter.rs → compiler/noirc_errors/src/reporter.rs b/crates/noirc_errors/src/reporter.rs → compiler/noirc_errors/src/reporter.rs
diff --git a/crates/noirc_evaluator/Cargo.toml → compiler/noirc_evaluator/Cargo.toml b/crates/noirc_evaluator/Cargo.toml → compiler/noirc_evaluator/Cargo.toml
diff --git a/...oirc_evaluator/src/brillig/brillig_gen.rs → ...oirc_evaluator/src/brillig/brillig_gen.rs b/...oirc_evaluator/src/brillig/brillig_gen.rs → ...oirc_evaluator/src/brillig/brillig_gen.rs
diff --git a/.../brillig/brillig_gen/brillig_black_box.rs → .../brillig/brillig_gen/brillig_black_box.rs b/.../brillig/brillig_gen/brillig_black_box.rs → .../brillig/brillig_gen/brillig_black_box.rs
diff --git a/.../src/brillig/brillig_gen/brillig_block.rs → .../src/brillig/brillig_gen/brillig_block.rs b/.../src/brillig/brillig_gen/brillig_block.rs → .../src/brillig/brillig_gen/brillig_block.rs
diff --git a/.../brillig/brillig_gen/brillig_directive.rs → .../brillig/brillig_gen/brillig_directive.rs b/.../brillig/brillig_gen/brillig_directive.rs → .../brillig/brillig_gen/brillig_directive.rs
diff --git a/...tor/src/brillig/brillig_gen/brillig_fn.rs → ...tor/src/brillig/brillig_gen/brillig_fn.rs b/...tor/src/brillig/brillig_gen/brillig_fn.rs → ...tor/src/brillig/brillig_gen/brillig_fn.rs
diff --git a/.../brillig/brillig_gen/brillig_slice_ops.rs → .../brillig/brillig_gen/brillig_slice_ops.rs b/.../brillig/brillig_gen/brillig_slice_ops.rs → .../brillig/brillig_gen/brillig_slice_ops.rs
diff --git a/...noirc_evaluator/src/brillig/brillig_ir.rs → ...noirc_evaluator/src/brillig/brillig_ir.rs b/...noirc_evaluator/src/brillig/brillig_ir.rs → ...noirc_evaluator/src/brillig/brillig_ir.rs
diff --git a/...luator/src/brillig/brillig_ir/artifact.rs → ...luator/src/brillig/brillig_ir/artifact.rs b/...luator/src/brillig/brillig_ir/artifact.rs → ...luator/src/brillig/brillig_ir/artifact.rs
diff --git a/...ator/src/brillig/brillig_ir/debug_show.rs → ...ator/src/brillig/brillig_ir/debug_show.rs b/...ator/src/brillig/brillig_ir/debug_show.rs → ...ator/src/brillig/brillig_ir/debug_show.rs
diff --git a/...tor/src/brillig/brillig_ir/entry_point.rs → ...tor/src/brillig/brillig_ir/entry_point.rs b/...tor/src/brillig/brillig_ir/entry_point.rs → ...tor/src/brillig/brillig_ir/entry_point.rs
diff --git a/...uator/src/brillig/brillig_ir/registers.rs → ...uator/src/brillig/brillig_ir/registers.rs b/...uator/src/brillig/brillig_ir/registers.rs → ...uator/src/brillig/brillig_ir/registers.rs
diff --git a/crates/noirc_evaluator/src/brillig/mod.rs → compiler/noirc_evaluator/src/brillig/mod.rs b/crates/noirc_evaluator/src/brillig/mod.rs → compiler/noirc_evaluator/src/brillig/mod.rs
diff --git a/crates/noirc_evaluator/src/errors.rs → compiler/noirc_evaluator/src/errors.rs b/crates/noirc_evaluator/src/errors.rs → compiler/noirc_evaluator/src/errors.rs
diff --git a/crates/noirc_evaluator/src/lib.rs → compiler/noirc_evaluator/src/lib.rs b/crates/noirc_evaluator/src/lib.rs → compiler/noirc_evaluator/src/lib.rs
diff --git a/crates/noirc_evaluator/src/ssa.rs → compiler/noirc_evaluator/src/ssa.rs b/crates/noirc_evaluator/src/ssa.rs → compiler/noirc_evaluator/src/ssa.rs
diff --git a/...es/noirc_evaluator/src/ssa/abi_gen/mod.rs → ...er/noirc_evaluator/src/ssa/abi_gen/mod.rs b/...es/noirc_evaluator/src/ssa/abi_gen/mod.rs → ...er/noirc_evaluator/src/ssa/abi_gen/mod.rs
diff --git a/...irc_evaluator/src/ssa/acir_gen/acir_ir.rs → ...irc_evaluator/src/ssa/acir_gen/acir_ir.rs b/...irc_evaluator/src/ssa/acir_gen/acir_ir.rs → ...irc_evaluator/src/ssa/acir_gen/acir_ir.rs
diff --git a/...src/ssa/acir_gen/acir_ir/acir_variable.rs → ...src/ssa/acir_gen/acir_ir/acir_variable.rs b/...src/ssa/acir_gen/acir_ir/acir_variable.rs → ...src/ssa/acir_gen/acir_ir/acir_variable.rs
diff --git a/...rc/ssa/acir_gen/acir_ir/generated_acir.rs → ...rc/ssa/acir_gen/acir_ir/generated_acir.rs b/...rc/ssa/acir_gen/acir_ir/generated_acir.rs → ...rc/ssa/acir_gen/acir_ir/generated_acir.rs
diff --git a/...valuator/src/ssa/acir_gen/acir_ir/sort.rs → ...valuator/src/ssa/acir_gen/acir_ir/sort.rs b/...valuator/src/ssa/acir_gen/acir_ir/sort.rs → ...valuator/src/ssa/acir_gen/acir_ir/sort.rs
diff --git a/...s/noirc_evaluator/src/ssa/acir_gen/mod.rs → ...r/noirc_evaluator/src/ssa/acir_gen/mod.rs b/...s/noirc_evaluator/src/ssa/acir_gen/mod.rs → ...r/noirc_evaluator/src/ssa/acir_gen/mod.rs
diff --git a/...evaluator/src/ssa/function_builder/mod.rs → ...evaluator/src/ssa/function_builder/mod.rs b/...evaluator/src/ssa/function_builder/mod.rs → ...evaluator/src/ssa/function_builder/mod.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir.rs → compiler/noirc_evaluator/src/ssa/ir.rs b/crates/noirc_evaluator/src/ssa/ir.rs → compiler/noirc_evaluator/src/ssa/ir.rs
diff --git a/...noirc_evaluator/src/ssa/ir/basic_block.rs → ...noirc_evaluator/src/ssa/ir/basic_block.rs b/...noirc_evaluator/src/ssa/ir/basic_block.rs → ...noirc_evaluator/src/ssa/ir/basic_block.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir/cfg.rs → compiler/noirc_evaluator/src/ssa/ir/cfg.rs b/crates/noirc_evaluator/src/ssa/ir/cfg.rs → compiler/noirc_evaluator/src/ssa/ir/cfg.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir/dfg.rs → compiler/noirc_evaluator/src/ssa/ir/dfg.rs b/crates/noirc_evaluator/src/ssa/ir/dfg.rs → compiler/noirc_evaluator/src/ssa/ir/dfg.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir/dom.rs → compiler/noirc_evaluator/src/ssa/ir/dom.rs b/crates/noirc_evaluator/src/ssa/ir/dom.rs → compiler/noirc_evaluator/src/ssa/ir/dom.rs
diff --git a/...es/noirc_evaluator/src/ssa/ir/function.rs → ...er/noirc_evaluator/src/ssa/ir/function.rs b/...es/noirc_evaluator/src/ssa/ir/function.rs → ...er/noirc_evaluator/src/ssa/ir/function.rs
diff --git a/...evaluator/src/ssa/ir/function_inserter.rs → ...evaluator/src/ssa/ir/function_inserter.rs b/...evaluator/src/ssa/ir/function_inserter.rs → ...evaluator/src/ssa/ir/function_inserter.rs
diff --git a/...noirc_evaluator/src/ssa/ir/instruction.rs → ...noirc_evaluator/src/ssa/ir/instruction.rs b/...noirc_evaluator/src/ssa/ir/instruction.rs → ...noirc_evaluator/src/ssa/ir/instruction.rs
diff --git a/..._evaluator/src/ssa/ir/instruction/call.rs → ..._evaluator/src/ssa/ir/instruction/call.rs b/..._evaluator/src/ssa/ir/instruction/call.rs → ..._evaluator/src/ssa/ir/instruction/call.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir/map.rs → compiler/noirc_evaluator/src/ssa/ir/map.rs b/crates/noirc_evaluator/src/ssa/ir/map.rs → compiler/noirc_evaluator/src/ssa/ir/map.rs
diff --git a/.../noirc_evaluator/src/ssa/ir/post_order.rs → .../noirc_evaluator/src/ssa/ir/post_order.rs b/.../noirc_evaluator/src/ssa/ir/post_order.rs → .../noirc_evaluator/src/ssa/ir/post_order.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir/printer.rs → ...ler/noirc_evaluator/src/ssa/ir/printer.rs b/crates/noirc_evaluator/src/ssa/ir/printer.rs → ...ler/noirc_evaluator/src/ssa/ir/printer.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir/types.rs → compiler/noirc_evaluator/src/ssa/ir/types.rs b/crates/noirc_evaluator/src/ssa/ir/types.rs → compiler/noirc_evaluator/src/ssa/ir/types.rs
diff --git a/crates/noirc_evaluator/src/ssa/ir/value.rs → compiler/noirc_evaluator/src/ssa/ir/value.rs b/crates/noirc_evaluator/src/ssa/ir/value.rs → compiler/noirc_evaluator/src/ssa/ir/value.rs
diff --git a/.../noirc_evaluator/src/ssa/opt/array_use.rs → .../noirc_evaluator/src/ssa/opt/array_use.rs b/.../noirc_evaluator/src/ssa/opt/array_use.rs → .../noirc_evaluator/src/ssa/opt/array_use.rs
diff --git a/..._evaluator/src/ssa/opt/assert_constant.rs → ..._evaluator/src/ssa/opt/assert_constant.rs b/..._evaluator/src/ssa/opt/assert_constant.rs → ..._evaluator/src/ssa/opt/assert_constant.rs
diff --git a/...evaluator/src/ssa/opt/constant_folding.rs → ...evaluator/src/ssa/opt/constant_folding.rs b/...evaluator/src/ssa/opt/constant_folding.rs → ...evaluator/src/ssa/opt/constant_folding.rs
diff --git a/..._evaluator/src/ssa/opt/defunctionalize.rs → ..._evaluator/src/ssa/opt/defunctionalize.rs b/..._evaluator/src/ssa/opt/defunctionalize.rs → ..._evaluator/src/ssa/opt/defunctionalize.rs
diff --git a/crates/noirc_evaluator/src/ssa/opt/die.rs → compiler/noirc_evaluator/src/ssa/opt/die.rs b/crates/noirc_evaluator/src/ssa/opt/die.rs → compiler/noirc_evaluator/src/ssa/opt/die.rs
diff --git a/...oirc_evaluator/src/ssa/opt/flatten_cfg.rs → ...oirc_evaluator/src/ssa/opt/flatten_cfg.rs b/...oirc_evaluator/src/ssa/opt/flatten_cfg.rs → ...oirc_evaluator/src/ssa/opt/flatten_cfg.rs
diff --git a/...rc/ssa/opt/flatten_cfg/branch_analysis.rs → ...rc/ssa/opt/flatten_cfg/branch_analysis.rs b/...rc/ssa/opt/flatten_cfg/branch_analysis.rs → ...rc/ssa/opt/flatten_cfg/branch_analysis.rs
diff --git a/...s/noirc_evaluator/src/ssa/opt/inlining.rs → ...r/noirc_evaluator/src/ssa/opt/inlining.rs b/...s/noirc_evaluator/src/ssa/opt/inlining.rs → ...r/noirc_evaluator/src/ssa/opt/inlining.rs
diff --git a/...es/noirc_evaluator/src/ssa/opt/mem2reg.rs → ...er/noirc_evaluator/src/ssa/opt/mem2reg.rs b/...es/noirc_evaluator/src/ssa/opt/mem2reg.rs → ...er/noirc_evaluator/src/ssa/opt/mem2reg.rs
diff --git a/...valuator/src/ssa/opt/mem2reg/alias_set.rs → ...valuator/src/ssa/opt/mem2reg/alias_set.rs b/...valuator/src/ssa/opt/mem2reg/alias_set.rs → ...valuator/src/ssa/opt/mem2reg/alias_set.rs
diff --git a/...rc_evaluator/src/ssa/opt/mem2reg/block.rs → ...rc_evaluator/src/ssa/opt/mem2reg/block.rs b/...rc_evaluator/src/ssa/opt/mem2reg/block.rs → ...rc_evaluator/src/ssa/opt/mem2reg/block.rs
diff --git a/crates/noirc_evaluator/src/ssa/opt/mod.rs → compiler/noirc_evaluator/src/ssa/opt/mod.rs b/crates/noirc_evaluator/src/ssa/opt/mod.rs → compiler/noirc_evaluator/src/ssa/opt/mod.rs
diff --git a/...irc_evaluator/src/ssa/opt/simplify_cfg.rs → ...irc_evaluator/src/ssa/opt/simplify_cfg.rs b/...irc_evaluator/src/ssa/opt/simplify_cfg.rs → ...irc_evaluator/src/ssa/opt/simplify_cfg.rs
diff --git a/.../noirc_evaluator/src/ssa/opt/unrolling.rs → .../noirc_evaluator/src/ssa/opt/unrolling.rs b/.../noirc_evaluator/src/ssa/opt/unrolling.rs → .../noirc_evaluator/src/ssa/opt/unrolling.rs
diff --git a/...oirc_evaluator/src/ssa/ssa_gen/context.rs → ...oirc_evaluator/src/ssa/ssa_gen/context.rs b/...oirc_evaluator/src/ssa/ssa_gen/context.rs → ...oirc_evaluator/src/ssa/ssa_gen/context.rs
diff --git a/...es/noirc_evaluator/src/ssa/ssa_gen/mod.rs → ...er/noirc_evaluator/src/ssa/ssa_gen/mod.rs b/...es/noirc_evaluator/src/ssa/ssa_gen/mod.rs → ...er/noirc_evaluator/src/ssa/ssa_gen/mod.rs
diff --git a/...oirc_evaluator/src/ssa/ssa_gen/program.rs → ...oirc_evaluator/src/ssa/ssa_gen/program.rs b/...oirc_evaluator/src/ssa/ssa_gen/program.rs → ...oirc_evaluator/src/ssa/ssa_gen/program.rs
diff --git a/.../noirc_evaluator/src/ssa/ssa_gen/value.rs → .../noirc_evaluator/src/ssa/ssa_gen/value.rs b/.../noirc_evaluator/src/ssa/ssa_gen/value.rs → .../noirc_evaluator/src/ssa/ssa_gen/value.rs
diff --git a/crates/noirc_frontend/Cargo.toml → compiler/noirc_frontend/Cargo.toml b/crates/noirc_frontend/Cargo.toml → compiler/noirc_frontend/Cargo.toml
diff --git a/crates/noirc_frontend/src/ast/expression.rs → ...iler/noirc_frontend/src/ast/expression.rs b/crates/noirc_frontend/src/ast/expression.rs → ...iler/noirc_frontend/src/ast/expression.rs
diff --git a/crates/noirc_frontend/src/ast/function.rs → compiler/noirc_frontend/src/ast/function.rs b/crates/noirc_frontend/src/ast/function.rs → compiler/noirc_frontend/src/ast/function.rs
diff --git a/crates/noirc_frontend/src/ast/mod.rs → compiler/noirc_frontend/src/ast/mod.rs b/crates/noirc_frontend/src/ast/mod.rs → compiler/noirc_frontend/src/ast/mod.rs
diff --git a/crates/noirc_frontend/src/ast/statement.rs → compiler/noirc_frontend/src/ast/statement.rs b/crates/noirc_frontend/src/ast/statement.rs → compiler/noirc_frontend/src/ast/statement.rs
diff --git a/crates/noirc_frontend/src/ast/structure.rs → compiler/noirc_frontend/src/ast/structure.rs b/crates/noirc_frontend/src/ast/structure.rs → compiler/noirc_frontend/src/ast/structure.rs
diff --git a/crates/noirc_frontend/src/ast/traits.rs → compiler/noirc_frontend/src/ast/traits.rs b/crates/noirc_frontend/src/ast/traits.rs → compiler/noirc_frontend/src/ast/traits.rs
diff --git a/crates/noirc_frontend/src/ast/type_alias.rs → ...iler/noirc_frontend/src/ast/type_alias.rs b/crates/noirc_frontend/src/ast/type_alias.rs → ...iler/noirc_frontend/src/ast/type_alias.rs
diff --git a/crates/noirc_frontend/src/graph/mod.rs → compiler/noirc_frontend/src/graph/mod.rs b/crates/noirc_frontend/src/graph/mod.rs → compiler/noirc_frontend/src/graph/mod.rs
diff --git a/...rontend/src/hir/def_collector/dc_crate.rs → ...rontend/src/hir/def_collector/dc_crate.rs b/...rontend/src/hir/def_collector/dc_crate.rs → ...rontend/src/hir/def_collector/dc_crate.rs
diff --git a/..._frontend/src/hir/def_collector/dc_mod.rs → ..._frontend/src/hir/def_collector/dc_mod.rs b/..._frontend/src/hir/def_collector/dc_mod.rs → ..._frontend/src/hir/def_collector/dc_mod.rs
diff --git a/..._frontend/src/hir/def_collector/errors.rs → ..._frontend/src/hir/def_collector/errors.rs b/..._frontend/src/hir/def_collector/errors.rs → ..._frontend/src/hir/def_collector/errors.rs
diff --git a/...irc_frontend/src/hir/def_collector/mod.rs → ...irc_frontend/src/hir/def_collector/mod.rs b/...irc_frontend/src/hir/def_collector/mod.rs → ...irc_frontend/src/hir/def_collector/mod.rs
diff --git a/...frontend/src/hir/def_map/aztec_library.rs → ...frontend/src/hir/def_map/aztec_library.rs b/...frontend/src/hir/def_map/aztec_library.rs → ...frontend/src/hir/def_map/aztec_library.rs
diff --git a/...rc_frontend/src/hir/def_map/item_scope.rs → ...rc_frontend/src/hir/def_map/item_scope.rs b/...rc_frontend/src/hir/def_map/item_scope.rs → ...rc_frontend/src/hir/def_map/item_scope.rs
diff --git a/crates/noirc_frontend/src/hir/def_map/mod.rs → ...ler/noirc_frontend/src/hir/def_map/mod.rs b/crates/noirc_frontend/src/hir/def_map/mod.rs → ...ler/noirc_frontend/src/hir/def_map/mod.rs
diff --git a/...c_frontend/src/hir/def_map/module_data.rs → ...c_frontend/src/hir/def_map/module_data.rs b/...c_frontend/src/hir/def_map/module_data.rs → ...c_frontend/src/hir/def_map/module_data.rs
diff --git a/...rc_frontend/src/hir/def_map/module_def.rs → ...rc_frontend/src/hir/def_map/module_def.rs b/...rc_frontend/src/hir/def_map/module_def.rs → ...rc_frontend/src/hir/def_map/module_def.rs
diff --git a/...irc_frontend/src/hir/def_map/namespace.rs → ...irc_frontend/src/hir/def_map/namespace.rs b/...irc_frontend/src/hir/def_map/namespace.rs → ...irc_frontend/src/hir/def_map/namespace.rs
diff --git a/crates/noirc_frontend/src/hir/mod.rs → compiler/noirc_frontend/src/hir/mod.rs b/crates/noirc_frontend/src/hir/mod.rs → compiler/noirc_frontend/src/hir/mod.rs
diff --git a/...irc_frontend/src/hir/resolution/errors.rs → ...irc_frontend/src/hir/resolution/errors.rs b/...irc_frontend/src/hir/resolution/errors.rs → ...irc_frontend/src/hir/resolution/errors.rs
diff --git a/...irc_frontend/src/hir/resolution/import.rs → ...irc_frontend/src/hir/resolution/import.rs b/...irc_frontend/src/hir/resolution/import.rs → ...irc_frontend/src/hir/resolution/import.rs
diff --git a/.../noirc_frontend/src/hir/resolution/mod.rs → .../noirc_frontend/src/hir/resolution/mod.rs b/.../noirc_frontend/src/hir/resolution/mod.rs → .../noirc_frontend/src/hir/resolution/mod.rs
diff --git a/...ntend/src/hir/resolution/path_resolver.rs → ...ntend/src/hir/resolution/path_resolver.rs b/...ntend/src/hir/resolution/path_resolver.rs → ...ntend/src/hir/resolution/path_resolver.rs
diff --git a/...c_frontend/src/hir/resolution/resolver.rs → ...c_frontend/src/hir/resolution/resolver.rs b/...c_frontend/src/hir/resolution/resolver.rs → ...c_frontend/src/hir/resolution/resolver.rs
diff --git a/crates/noirc_frontend/src/hir/scope/mod.rs → compiler/noirc_frontend/src/hir/scope/mod.rs b/crates/noirc_frontend/src/hir/scope/mod.rs → compiler/noirc_frontend/src/hir/scope/mod.rs
diff --git a/...irc_frontend/src/hir/type_check/errors.rs → ...irc_frontend/src/hir/type_check/errors.rs b/...irc_frontend/src/hir/type_check/errors.rs → ...irc_frontend/src/hir/type_check/errors.rs
diff --git a/...noirc_frontend/src/hir/type_check/expr.rs → ...noirc_frontend/src/hir/type_check/expr.rs b/...noirc_frontend/src/hir/type_check/expr.rs → ...noirc_frontend/src/hir/type_check/expr.rs
diff --git a/.../noirc_frontend/src/hir/type_check/mod.rs → .../noirc_frontend/src/hir/type_check/mod.rs b/.../noirc_frontend/src/hir/type_check/mod.rs → .../noirc_frontend/src/hir/type_check/mod.rs
diff --git a/...noirc_frontend/src/hir/type_check/stmt.rs → ...noirc_frontend/src/hir/type_check/stmt.rs b/...noirc_frontend/src/hir/type_check/stmt.rs → ...noirc_frontend/src/hir/type_check/stmt.rs
diff --git a/crates/noirc_frontend/src/hir_def/expr.rs → compiler/noirc_frontend/src/hir_def/expr.rs b/crates/noirc_frontend/src/hir_def/expr.rs → compiler/noirc_frontend/src/hir_def/expr.rs
diff --git a/...es/noirc_frontend/src/hir_def/function.rs → ...er/noirc_frontend/src/hir_def/function.rs b/...es/noirc_frontend/src/hir_def/function.rs → ...er/noirc_frontend/src/hir_def/function.rs
diff --git a/crates/noirc_frontend/src/hir_def/mod.rs → compiler/noirc_frontend/src/hir_def/mod.rs b/crates/noirc_frontend/src/hir_def/mod.rs → compiler/noirc_frontend/src/hir_def/mod.rs
diff --git a/crates/noirc_frontend/src/hir_def/stmt.rs → compiler/noirc_frontend/src/hir_def/stmt.rs b/crates/noirc_frontend/src/hir_def/stmt.rs → compiler/noirc_frontend/src/hir_def/stmt.rs
diff --git a/crates/noirc_frontend/src/hir_def/types.rs → compiler/noirc_frontend/src/hir_def/types.rs b/crates/noirc_frontend/src/hir_def/types.rs → compiler/noirc_frontend/src/hir_def/types.rs
diff --git a/crates/noirc_frontend/src/lexer/errors.rs → compiler/noirc_frontend/src/lexer/errors.rs b/crates/noirc_frontend/src/lexer/errors.rs → compiler/noirc_frontend/src/lexer/errors.rs
diff --git a/crates/noirc_frontend/src/lexer/lexer.rs → compiler/noirc_frontend/src/lexer/lexer.rs b/crates/noirc_frontend/src/lexer/lexer.rs → compiler/noirc_frontend/src/lexer/lexer.rs
diff --git a/crates/noirc_frontend/src/lexer/mod.rs → compiler/noirc_frontend/src/lexer/mod.rs b/crates/noirc_frontend/src/lexer/mod.rs → compiler/noirc_frontend/src/lexer/mod.rs
diff --git a/crates/noirc_frontend/src/lexer/token.rs → compiler/noirc_frontend/src/lexer/token.rs b/crates/noirc_frontend/src/lexer/token.rs → compiler/noirc_frontend/src/lexer/token.rs
diff --git a/crates/noirc_frontend/src/lib.rs → compiler/noirc_frontend/src/lib.rs b/crates/noirc_frontend/src/lib.rs → compiler/noirc_frontend/src/lib.rs
diff --git a/...oirc_frontend/src/monomorphization/ast.rs → ...oirc_frontend/src/monomorphization/ast.rs b/...oirc_frontend/src/monomorphization/ast.rs → ...oirc_frontend/src/monomorphization/ast.rs
diff --git a/...oirc_frontend/src/monomorphization/mod.rs → ...oirc_frontend/src/monomorphization/mod.rs b/...oirc_frontend/src/monomorphization/mod.rs → ...oirc_frontend/src/monomorphization/mod.rs
diff --git a/..._frontend/src/monomorphization/printer.rs → ..._frontend/src/monomorphization/printer.rs b/..._frontend/src/monomorphization/printer.rs → ..._frontend/src/monomorphization/printer.rs
diff --git a/crates/noirc_frontend/src/node_interner.rs → compiler/noirc_frontend/src/node_interner.rs b/crates/noirc_frontend/src/node_interner.rs → compiler/noirc_frontend/src/node_interner.rs
diff --git a/crates/noirc_frontend/src/parser/errors.rs → compiler/noirc_frontend/src/parser/errors.rs b/crates/noirc_frontend/src/parser/errors.rs → compiler/noirc_frontend/src/parser/errors.rs
diff --git a/crates/noirc_frontend/src/parser/labels.rs → compiler/noirc_frontend/src/parser/labels.rs b/crates/noirc_frontend/src/parser/labels.rs → compiler/noirc_frontend/src/parser/labels.rs
diff --git a/crates/noirc_frontend/src/parser/mod.rs → compiler/noirc_frontend/src/parser/mod.rs b/crates/noirc_frontend/src/parser/mod.rs → compiler/noirc_frontend/src/parser/mod.rs
diff --git a/crates/noirc_frontend/src/parser/parser.rs → compiler/noirc_frontend/src/parser/parser.rs b/crates/noirc_frontend/src/parser/parser.rs → compiler/noirc_frontend/src/parser/parser.rs
diff --git a/crates/noirc_printable_type/Cargo.toml → compiler/noirc_printable_type/Cargo.toml b/crates/noirc_printable_type/Cargo.toml → compiler/noirc_printable_type/Cargo.toml
diff --git a/crates/noirc_printable_type/src/lib.rs → compiler/noirc_printable_type/src/lib.rs b/crates/noirc_printable_type/src/lib.rs → compiler/noirc_printable_type/src/lib.rs
diff --git a/crates/readme.md → compiler/readme.md b/crates/readme.md → compiler/readme.md
diff --git a/crates/source-resolver/package-lock.json → compiler/source-resolver/package-lock.json b/crates/source-resolver/package-lock.json → compiler/source-resolver/package-lock.json
diff --git a/crates/source-resolver/package.json → compiler/source-resolver/package.json b/crates/source-resolver/package.json → compiler/source-resolver/package.json
diff --git a/crates/source-resolver/src/index.ts → compiler/source-resolver/src/index.ts b/crates/source-resolver/src/index.ts → compiler/source-resolver/src/index.ts
diff --git a/crates/source-resolver/src/index_node.ts → compiler/source-resolver/src/index_node.ts b/crates/source-resolver/src/index_node.ts → compiler/source-resolver/src/index_node.ts
diff --git a/...resolver/test/cjs_initialization.test.cjs → ...resolver/test/cjs_initialization.test.cjs b/...resolver/test/cjs_initialization.test.cjs → ...resolver/test/cjs_initialization.test.cjs
diff --git a/...resolver/test/esm_initialization.test.mjs → ...resolver/test/esm_initialization.test.mjs b/...resolver/test/esm_initialization.test.mjs → ...resolver/test/esm_initialization.test.mjs
diff --git a/crates/source-resolver/tsconfig.cjs.json → compiler/source-resolver/tsconfig.cjs.json b/crates/source-resolver/tsconfig.cjs.json → compiler/source-resolver/tsconfig.cjs.json
diff --git a/crates/source-resolver/tsconfig.esm.json → compiler/source-resolver/tsconfig.esm.json b/crates/source-resolver/tsconfig.esm.json → compiler/source-resolver/tsconfig.esm.json
diff --git a/crates/source-resolver/types/index.d.ts → compiler/source-resolver/types/index.d.ts b/crates/source-resolver/types/index.d.ts → compiler/source-resolver/types/index.d.ts
diff --git a/crates/source-resolver/types/index_node.d.ts → ...ler/source-resolver/types/index_node.d.ts b/crates/source-resolver/types/index_node.d.ts → ...ler/source-resolver/types/index_node.d.ts
diff --git a/crates/wasm/.gitignore → compiler/wasm/.gitignore b/crates/wasm/.gitignore → compiler/wasm/.gitignore
diff --git a/crates/wasm/.mocharc.json → compiler/wasm/.mocharc.json b/crates/wasm/.mocharc.json → compiler/wasm/.mocharc.json
diff --git a/crates/wasm/.yarn/releases/yarn-3.5.1.cjs → compiler/wasm/.yarn/releases/yarn-3.5.1.cjs b/crates/wasm/.yarn/releases/yarn-3.5.1.cjs → compiler/wasm/.yarn/releases/yarn-3.5.1.cjs
diff --git a/crates/wasm/CHANGELOG.md → compiler/wasm/CHANGELOG.md b/crates/wasm/CHANGELOG.md → compiler/wasm/CHANGELOG.md
diff --git a/crates/wasm/Cargo.toml → compiler/wasm/Cargo.toml b/crates/wasm/Cargo.toml → compiler/wasm/Cargo.toml
diff --git a/crates/wasm/README.md → compiler/wasm/README.md b/crates/wasm/README.md → compiler/wasm/README.md
diff --git a/crates/wasm/build.rs → compiler/wasm/build.rs b/crates/wasm/build.rs → compiler/wasm/build.rs
diff --git a/crates/wasm/build.sh → compiler/wasm/build.sh b/crates/wasm/build.sh → compiler/wasm/build.sh
diff --git a/crates/wasm/buildPhaseCargoCommand.sh → compiler/wasm/buildPhaseCargoCommand.sh b/crates/wasm/buildPhaseCargoCommand.sh → compiler/wasm/buildPhaseCargoCommand.sh
diff --git a/crates/wasm/installPhase.sh → compiler/wasm/installPhase.sh b/crates/wasm/installPhase.sh → compiler/wasm/installPhase.sh
diff --git a/crates/wasm/noir-script/Nargo.toml → compiler/wasm/noir-script/Nargo.toml b/crates/wasm/noir-script/Nargo.toml → compiler/wasm/noir-script/Nargo.toml
diff --git a/crates/wasm/noir-script/src/main.nr → compiler/wasm/noir-script/src/main.nr b/crates/wasm/noir-script/src/main.nr → compiler/wasm/noir-script/src/main.nr
diff --git a/crates/wasm/package.json → compiler/wasm/package.json b/crates/wasm/package.json → compiler/wasm/package.json
diff --git a/crates/wasm/src/circuit.rs → compiler/wasm/src/circuit.rs b/crates/wasm/src/circuit.rs → compiler/wasm/src/circuit.rs
diff --git a/crates/wasm/src/compile.rs → compiler/wasm/src/compile.rs b/crates/wasm/src/compile.rs → compiler/wasm/src/compile.rs
diff --git a/crates/wasm/src/lib.rs → compiler/wasm/src/lib.rs b/crates/wasm/src/lib.rs → compiler/wasm/src/lib.rs
diff --git a/crates/wasm/test/browser/index.test.ts → compiler/wasm/test/browser/index.test.ts b/crates/wasm/test/browser/index.test.ts → compiler/wasm/test/browser/index.test.ts
diff --git a/crates/wasm/test/index.d.ts → compiler/wasm/test/index.d.ts b/crates/wasm/test/index.d.ts → compiler/wasm/test/index.d.ts
diff --git a/crates/wasm/test/node/index.test.ts → compiler/wasm/test/node/index.test.ts b/crates/wasm/test/node/index.test.ts → compiler/wasm/test/node/index.test.ts
diff --git a/crates/wasm/test/shared.ts → compiler/wasm/test/shared.ts b/crates/wasm/test/shared.ts → compiler/wasm/test/shared.ts
diff --git a/crates/wasm/tsconfig.json → compiler/wasm/tsconfig.json b/crates/wasm/tsconfig.json → compiler/wasm/tsconfig.json
diff --git a/crates/wasm/web-test-runner.config.mjs → compiler/wasm/web-test-runner.config.mjs b/crates/wasm/web-test-runner.config.mjs → compiler/wasm/web-test-runner.config.mjs
diff --git a/crates/wasm/yarn.lock → compiler/wasm/yarn.lock b/crates/wasm/yarn.lock → compiler/wasm/yarn.lock
diff --git a/crates/nargo_cli/tests/execution_success/workspace/target/witness.tr b/crates/nargo_cli/tests/execution_success/workspace/target/witness.tr
diff --git a/flake.nix b/flake.nix
@@ -377,11 +377,11 @@
         ];
 
         buildPhaseCargoCommand = ''
-          bash crates/wasm/buildPhaseCargoCommand.sh release
+          bash compiler/wasm/buildPhaseCargoCommand.sh release
         '';
 
         installPhase = ''
-          bash crates/wasm/installPhase.sh
+          bash compiler/wasm/installPhase.sh
         '';
 
       });
@@ -412,11 +412,11 @@
         ];
 
         buildPhaseCargoCommand = ''
-          bash crates/noirc_abi_wasm/buildPhaseCargoCommand.sh release
+          bash compiler/noirc_abi_wasm/buildPhaseCargoCommand.sh release
         '';
 
         installPhase = ''
-          bash crates/noirc_abi_wasm/installPhase.sh
+          bash compiler/noirc_abi_wasm/installPhase.sh
         '';
 
       });

diff --git a/release-please-config.json b/release-please-config.json
@@ -15,7 +15,7 @@
         "flake.nix",
         {
           "type": "json",
-          "path": "crates/wasm/package.json",
+          "path": "compiler/wasm/package.json",
           "jsonpath": "$.version"
         }
       ]

diff --git a/release-tests/test/6_array.test.js b/release-tests/test/6_array.test.js
@@ -19,27 +19,27 @@ test("promise resolved", async () => {
   promiseResolved = true;
 });
 
-test("nargo builds ../crates/nargo_cli/tests/execution_success/6_array sucessfully", async () => {
+test("nargo builds ../tooling/nargo_cli/tests/execution_success/6_array sucessfully", async () => {
   await within(async () => {
-    cd("../crates/nargo_cli/tests/execution_success/6_array");
+    cd("../tooling/nargo_cli/tests/execution_success/6_array");
     const command = `${NARGO_BIN} check`;
 
     await $`${command}`.nothrow();
   });
 });
 
-test("nargo creates proof ../crates/nargo_cli/tests/execution_success/6_array sucessfully", async () => {
+test("nargo creates proof ../tooling/nargo_cli/tests/execution_success/6_array sucessfully", async () => {
   await within(async () => {
-    cd("../crates/nargo_cli/tests/execution_success/6_array");
+    cd("../tooling/nargo_cli/tests/execution_success/6_array");
     const command = `${NARGO_BIN} prove 6_array`;
 
     await $`${command}`.nothrow();
   });
 });
 
-test("nargo verifies proof ../crates/nargo_cli/tests/execution_success/6_array sucessfully", async () => {
+test("nargo verifies proof ../tooling/nargo_cli/tests/execution_success/6_array sucessfully", async () => {
   await within(async () => {
-    cd("../crates/nargo_cli/tests/execution_success/6_array");
+    cd("../tooling/nargo_cli/tests/execution_success/6_array");
     const command = `${NARGO_BIN} verify 6_array`;
 
     await $`${command}`.nothrow();

diff --git a/crates/acvm_backend_barretenberg/.gitignore → tooling/acvm_backend_barretenberg/.gitignore b/crates/acvm_backend_barretenberg/.gitignore → tooling/acvm_backend_barretenberg/.gitignore
diff --git a/...es/acvm_backend_barretenberg/CHANGELOG.md → ...ng/acvm_backend_barretenberg/CHANGELOG.md b/...es/acvm_backend_barretenberg/CHANGELOG.md → ...ng/acvm_backend_barretenberg/CHANGELOG.md
diff --git a/crates/acvm_backend_barretenberg/Cargo.toml → tooling/acvm_backend_barretenberg/Cargo.toml b/crates/acvm_backend_barretenberg/Cargo.toml → tooling/acvm_backend_barretenberg/Cargo.toml
diff --git a/crates/acvm_backend_barretenberg/build.rs → tooling/acvm_backend_barretenberg/build.rs b/crates/acvm_backend_barretenberg/build.rs → tooling/acvm_backend_barretenberg/build.rs
diff --git a/..._backend_barretenberg/src/cli/contract.rs → ..._backend_barretenberg/src/cli/contract.rs b/..._backend_barretenberg/src/cli/contract.rs → ..._backend_barretenberg/src/cli/contract.rs
diff --git a/...cvm_backend_barretenberg/src/cli/gates.rs → ...cvm_backend_barretenberg/src/cli/gates.rs b/...cvm_backend_barretenberg/src/cli/gates.rs → ...cvm_backend_barretenberg/src/cli/gates.rs
diff --git a/...acvm_backend_barretenberg/src/cli/info.rs → ...acvm_backend_barretenberg/src/cli/info.rs b/...acvm_backend_barretenberg/src/cli/info.rs → ...acvm_backend_barretenberg/src/cli/info.rs
diff --git a/.../acvm_backend_barretenberg/src/cli/mod.rs → .../acvm_backend_barretenberg/src/cli/mod.rs b/.../acvm_backend_barretenberg/src/cli/mod.rs → .../acvm_backend_barretenberg/src/cli/mod.rs
diff --git a/...cvm_backend_barretenberg/src/cli/prove.rs → ...cvm_backend_barretenberg/src/cli/prove.rs b/...cvm_backend_barretenberg/src/cli/prove.rs → ...cvm_backend_barretenberg/src/cli/prove.rs
diff --git a/...vm_backend_barretenberg/src/cli/verify.rs → ...vm_backend_barretenberg/src/cli/verify.rs b/...vm_backend_barretenberg/src/cli/verify.rs → ...vm_backend_barretenberg/src/cli/verify.rs
diff --git a/..._backend_barretenberg/src/cli/write_vk.rs → ..._backend_barretenberg/src/cli/write_vk.rs b/..._backend_barretenberg/src/cli/write_vk.rs → ..._backend_barretenberg/src/cli/write_vk.rs
diff --git a/...cvm_backend_barretenberg/src/contract.sol → ...cvm_backend_barretenberg/src/contract.sol b/...cvm_backend_barretenberg/src/contract.sol → ...cvm_backend_barretenberg/src/contract.sol
diff --git a/...acvm_backend_barretenberg/src/download.rs → ...acvm_backend_barretenberg/src/download.rs b/...acvm_backend_barretenberg/src/download.rs → ...acvm_backend_barretenberg/src/download.rs
diff --git a/crates/acvm_backend_barretenberg/src/lib.rs → tooling/acvm_backend_barretenberg/src/lib.rs b/crates/acvm_backend_barretenberg/src/lib.rs → tooling/acvm_backend_barretenberg/src/lib.rs
diff --git a/..._backend_barretenberg/src/proof_system.rs → ..._backend_barretenberg/src/proof_system.rs b/..._backend_barretenberg/src/proof_system.rs → ..._backend_barretenberg/src/proof_system.rs
diff --git a/...ackend_barretenberg/src/smart_contract.rs → ...ackend_barretenberg/src/smart_contract.rs b/...ackend_barretenberg/src/smart_contract.rs → ...ackend_barretenberg/src/smart_contract.rs
diff --git a/...erg/test-binaries/mock_backend/Cargo.lock → ...erg/test-binaries/mock_backend/Cargo.lock b/...erg/test-binaries/mock_backend/Cargo.lock → ...erg/test-binaries/mock_backend/Cargo.lock
diff --git a/...erg/test-binaries/mock_backend/Cargo.toml → ...erg/test-binaries/mock_backend/Cargo.toml b/...erg/test-binaries/mock_backend/Cargo.toml → ...erg/test-binaries/mock_backend/Cargo.toml
diff --git a/...binaries/mock_backend/src/contract_cmd.rs → ...binaries/mock_backend/src/contract_cmd.rs b/...binaries/mock_backend/src/contract_cmd.rs → ...binaries/mock_backend/src/contract_cmd.rs
diff --git a/...st-binaries/mock_backend/src/gates_cmd.rs → ...st-binaries/mock_backend/src/gates_cmd.rs b/...st-binaries/mock_backend/src/gates_cmd.rs → ...st-binaries/mock_backend/src/gates_cmd.rs
diff --git a/...est-binaries/mock_backend/src/info_cmd.rs → ...est-binaries/mock_backend/src/info_cmd.rs b/...est-binaries/mock_backend/src/info_cmd.rs → ...est-binaries/mock_backend/src/info_cmd.rs
diff --git a/...rg/test-binaries/mock_backend/src/main.rs → ...rg/test-binaries/mock_backend/src/main.rs b/...rg/test-binaries/mock_backend/src/main.rs → ...rg/test-binaries/mock_backend/src/main.rs
diff --git a/...st-binaries/mock_backend/src/prove_cmd.rs → ...st-binaries/mock_backend/src/prove_cmd.rs b/...st-binaries/mock_backend/src/prove_cmd.rs → ...st-binaries/mock_backend/src/prove_cmd.rs
diff --git a/...t-binaries/mock_backend/src/verify_cmd.rs → ...t-binaries/mock_backend/src/verify_cmd.rs b/...t-binaries/mock_backend/src/verify_cmd.rs → ...t-binaries/mock_backend/src/verify_cmd.rs
diff --git a/...binaries/mock_backend/src/write_vk_cmd.rs → ...binaries/mock_backend/src/write_vk_cmd.rs b/...binaries/mock_backend/src/write_vk_cmd.rs → ...binaries/mock_backend/src/write_vk_cmd.rs
diff --git a/crates/lsp/Cargo.toml → tooling/lsp/Cargo.toml b/crates/lsp/Cargo.toml → tooling/lsp/Cargo.toml
diff --git a/crates/lsp/src/lib.rs → tooling/lsp/src/lib.rs b/crates/lsp/src/lib.rs → tooling/lsp/src/lib.rs
diff --git a/crates/nargo/Cargo.toml → tooling/nargo/Cargo.toml b/crates/nargo/Cargo.toml → tooling/nargo/Cargo.toml
diff --git a/crates/nargo/build.rs → tooling/nargo/build.rs b/crates/nargo/build.rs → tooling/nargo/build.rs
diff --git a/crates/nargo/src/artifacts/contract.rs → tooling/nargo/src/artifacts/contract.rs b/crates/nargo/src/artifacts/contract.rs → tooling/nargo/src/artifacts/contract.rs
diff --git a/crates/nargo/src/artifacts/debug.rs → tooling/nargo/src/artifacts/debug.rs b/crates/nargo/src/artifacts/debug.rs → tooling/nargo/src/artifacts/debug.rs
diff --git a/crates/nargo/src/artifacts/mod.rs → tooling/nargo/src/artifacts/mod.rs b/crates/nargo/src/artifacts/mod.rs → tooling/nargo/src/artifacts/mod.rs
diff --git a/crates/nargo/src/artifacts/program.rs → tooling/nargo/src/artifacts/program.rs b/crates/nargo/src/artifacts/program.rs → tooling/nargo/src/artifacts/program.rs
diff --git a/crates/nargo/src/constants.rs → tooling/nargo/src/constants.rs b/crates/nargo/src/constants.rs → tooling/nargo/src/constants.rs
diff --git a/crates/nargo/src/errors.rs → tooling/nargo/src/errors.rs b/crates/nargo/src/errors.rs → tooling/nargo/src/errors.rs
diff --git a/crates/nargo/src/lib.rs → tooling/nargo/src/lib.rs b/crates/nargo/src/lib.rs → tooling/nargo/src/lib.rs
diff --git a/crates/nargo/src/ops/execute.rs → tooling/nargo/src/ops/execute.rs b/crates/nargo/src/ops/execute.rs → tooling/nargo/src/ops/execute.rs
diff --git a/crates/nargo/src/ops/foreign_calls.rs → tooling/nargo/src/ops/foreign_calls.rs b/crates/nargo/src/ops/foreign_calls.rs → tooling/nargo/src/ops/foreign_calls.rs
diff --git a/crates/nargo/src/ops/mod.rs → tooling/nargo/src/ops/mod.rs b/crates/nargo/src/ops/mod.rs → tooling/nargo/src/ops/mod.rs
diff --git a/crates/nargo/src/ops/optimize.rs → tooling/nargo/src/ops/optimize.rs b/crates/nargo/src/ops/optimize.rs → tooling/nargo/src/ops/optimize.rs
diff --git a/crates/nargo/src/ops/test.rs → tooling/nargo/src/ops/test.rs b/crates/nargo/src/ops/test.rs → tooling/nargo/src/ops/test.rs
diff --git a/crates/nargo/src/package.rs → tooling/nargo/src/package.rs b/crates/nargo/src/package.rs → tooling/nargo/src/package.rs
diff --git a/crates/nargo/src/workspace.rs → tooling/nargo/src/workspace.rs b/crates/nargo/src/workspace.rs → tooling/nargo/src/workspace.rs
diff --git a/crates/nargo_cli/Cargo.toml → tooling/nargo_cli/Cargo.toml b/crates/nargo_cli/Cargo.toml → tooling/nargo_cli/Cargo.toml
diff --git a/crates/nargo_cli/benches/criterion.rs → tooling/nargo_cli/benches/criterion.rs b/crates/nargo_cli/benches/criterion.rs → tooling/nargo_cli/benches/criterion.rs
diff --git a/crates/nargo_cli/benches/iai.rs → tooling/nargo_cli/benches/iai.rs b/crates/nargo_cli/benches/iai.rs → tooling/nargo_cli/benches/iai.rs
diff --git a/crates/nargo_cli/benches/utils.rs → tooling/nargo_cli/benches/utils.rs b/crates/nargo_cli/benches/utils.rs → tooling/nargo_cli/benches/utils.rs
diff --git a/crates/nargo_cli/build.rs → tooling/nargo_cli/build.rs b/crates/nargo_cli/build.rs → tooling/nargo_cli/build.rs
diff --git a/crates/nargo_cli/src/backends.rs → tooling/nargo_cli/src/backends.rs b/crates/nargo_cli/src/backends.rs → tooling/nargo_cli/src/backends.rs
diff --git a/...go_cli/src/cli/backend_cmd/current_cmd.rs → ...go_cli/src/cli/backend_cmd/current_cmd.rs b/...go_cli/src/cli/backend_cmd/current_cmd.rs → ...go_cli/src/cli/backend_cmd/current_cmd.rs
diff --git a/...go_cli/src/cli/backend_cmd/install_cmd.rs → ...go_cli/src/cli/backend_cmd/install_cmd.rs b/...go_cli/src/cli/backend_cmd/install_cmd.rs → ...go_cli/src/cli/backend_cmd/install_cmd.rs
diff --git a/...s/nargo_cli/src/cli/backend_cmd/ls_cmd.rs → ...g/nargo_cli/src/cli/backend_cmd/ls_cmd.rs b/...s/nargo_cli/src/cli/backend_cmd/ls_cmd.rs → ...g/nargo_cli/src/cli/backend_cmd/ls_cmd.rs
diff --git a/crates/nargo_cli/src/cli/backend_cmd/mod.rs → tooling/nargo_cli/src/cli/backend_cmd/mod.rs b/crates/nargo_cli/src/cli/backend_cmd/mod.rs → tooling/nargo_cli/src/cli/backend_cmd/mod.rs
diff --git a/..._cli/src/cli/backend_cmd/uninstall_cmd.rs → ..._cli/src/cli/backend_cmd/uninstall_cmd.rs b/..._cli/src/cli/backend_cmd/uninstall_cmd.rs → ..._cli/src/cli/backend_cmd/uninstall_cmd.rs
diff --git a/.../nargo_cli/src/cli/backend_cmd/use_cmd.rs → .../nargo_cli/src/cli/backend_cmd/use_cmd.rs b/.../nargo_cli/src/cli/backend_cmd/use_cmd.rs → .../nargo_cli/src/cli/backend_cmd/use_cmd.rs
diff --git a/crates/nargo_cli/src/cli/check_cmd.rs → tooling/nargo_cli/src/cli/check_cmd.rs b/crates/nargo_cli/src/cli/check_cmd.rs → tooling/nargo_cli/src/cli/check_cmd.rs
diff --git a/...nargo_cli/src/cli/codegen_verifier_cmd.rs → ...nargo_cli/src/cli/codegen_verifier_cmd.rs b/...nargo_cli/src/cli/codegen_verifier_cmd.rs → ...nargo_cli/src/cli/codegen_verifier_cmd.rs
diff --git a/crates/nargo_cli/src/cli/compile_cmd.rs → tooling/nargo_cli/src/cli/compile_cmd.rs b/crates/nargo_cli/src/cli/compile_cmd.rs → tooling/nargo_cli/src/cli/compile_cmd.rs
diff --git a/crates/nargo_cli/src/cli/execute_cmd.rs → tooling/nargo_cli/src/cli/execute_cmd.rs b/crates/nargo_cli/src/cli/execute_cmd.rs → tooling/nargo_cli/src/cli/execute_cmd.rs
diff --git a/crates/nargo_cli/src/cli/fs/inputs.rs → tooling/nargo_cli/src/cli/fs/inputs.rs b/crates/nargo_cli/src/cli/fs/inputs.rs → tooling/nargo_cli/src/cli/fs/inputs.rs
diff --git a/crates/nargo_cli/src/cli/fs/mod.rs → tooling/nargo_cli/src/cli/fs/mod.rs b/crates/nargo_cli/src/cli/fs/mod.rs → tooling/nargo_cli/src/cli/fs/mod.rs
diff --git a/crates/nargo_cli/src/cli/fs/program.rs → tooling/nargo_cli/src/cli/fs/program.rs b/crates/nargo_cli/src/cli/fs/program.rs → tooling/nargo_cli/src/cli/fs/program.rs
diff --git a/crates/nargo_cli/src/cli/fs/proof.rs → tooling/nargo_cli/src/cli/fs/proof.rs b/crates/nargo_cli/src/cli/fs/proof.rs → tooling/nargo_cli/src/cli/fs/proof.rs
diff --git a/crates/nargo_cli/src/cli/fs/witness.rs → tooling/nargo_cli/src/cli/fs/witness.rs b/crates/nargo_cli/src/cli/fs/witness.rs → tooling/nargo_cli/src/cli/fs/witness.rs
diff --git a/crates/nargo_cli/src/cli/info_cmd.rs → tooling/nargo_cli/src/cli/info_cmd.rs b/crates/nargo_cli/src/cli/info_cmd.rs → tooling/nargo_cli/src/cli/info_cmd.rs
diff --git a/crates/nargo_cli/src/cli/init_cmd.rs → tooling/nargo_cli/src/cli/init_cmd.rs b/crates/nargo_cli/src/cli/init_cmd.rs → tooling/nargo_cli/src/cli/init_cmd.rs
diff --git a/crates/nargo_cli/src/cli/lsp_cmd.rs → tooling/nargo_cli/src/cli/lsp_cmd.rs b/crates/nargo_cli/src/cli/lsp_cmd.rs → tooling/nargo_cli/src/cli/lsp_cmd.rs
diff --git a/crates/nargo_cli/src/cli/mod.rs → tooling/nargo_cli/src/cli/mod.rs b/crates/nargo_cli/src/cli/mod.rs → tooling/nargo_cli/src/cli/mod.rs
diff --git a/crates/nargo_cli/src/cli/new_cmd.rs → tooling/nargo_cli/src/cli/new_cmd.rs b/crates/nargo_cli/src/cli/new_cmd.rs → tooling/nargo_cli/src/cli/new_cmd.rs
diff --git a/crates/nargo_cli/src/cli/prove_cmd.rs → tooling/nargo_cli/src/cli/prove_cmd.rs b/crates/nargo_cli/src/cli/prove_cmd.rs → tooling/nargo_cli/src/cli/prove_cmd.rs
diff --git a/crates/nargo_cli/src/cli/test_cmd.rs → tooling/nargo_cli/src/cli/test_cmd.rs b/crates/nargo_cli/src/cli/test_cmd.rs → tooling/nargo_cli/src/cli/test_cmd.rs
diff --git a/crates/nargo_cli/src/cli/verify_cmd.rs → tooling/nargo_cli/src/cli/verify_cmd.rs b/crates/nargo_cli/src/cli/verify_cmd.rs → tooling/nargo_cli/src/cli/verify_cmd.rs
diff --git a/crates/nargo_cli/src/errors.rs → tooling/nargo_cli/src/errors.rs b/crates/nargo_cli/src/errors.rs → tooling/nargo_cli/src/errors.rs
diff --git a/crates/nargo_cli/src/main.rs → tooling/nargo_cli/src/main.rs b/crates/nargo_cli/src/main.rs → tooling/nargo_cli/src/main.rs
diff --git a/crates/nargo_cli/tests/README.md → tooling/nargo_cli/tests/README.md b/crates/nargo_cli/tests/README.md → tooling/nargo_cli/tests/README.md
diff --git a/...s/1327_concrete_in_generic/target/acir.gz → ...s/1327_concrete_in_generic/target/acir.gz b/...s/1327_concrete_in_generic/target/acir.gz → ...s/1327_concrete_in_generic/target/acir.gz
diff --git a/...327_concrete_in_generic/target/witness.gz → ...327_concrete_in_generic/target/witness.gz b/...327_concrete_in_generic/target/witness.gz → ...327_concrete_in_generic/target/witness.gz
diff --git a/...tests/acir_artifacts/1_mul/target/acir.gz → ...tests/acir_artifacts/1_mul/target/acir.gz b/...tests/acir_artifacts/1_mul/target/acir.gz → ...tests/acir_artifacts/1_mul/target/acir.gz
diff --git a/...ts/acir_artifacts/1_mul/target/witness.gz → ...ts/acir_artifacts/1_mul/target/witness.gz b/...ts/acir_artifacts/1_mul/target/witness.gz → ...ts/acir_artifacts/1_mul/target/witness.gz
diff --git a/...tests/acir_artifacts/2_div/target/acir.gz → ...tests/acir_artifacts/2_div/target/acir.gz b/...tests/acir_artifacts/2_div/target/acir.gz → ...tests/acir_artifacts/2_div/target/acir.gz
diff --git a/...ts/acir_artifacts/2_div/target/witness.gz → ...ts/acir_artifacts/2_div/target/witness.gz b/...ts/acir_artifacts/2_div/target/witness.gz → ...ts/acir_artifacts/2_div/target/witness.gz
diff --git a/...tests/acir_artifacts/3_add/target/acir.gz → ...tests/acir_artifacts/3_add/target/acir.gz b/...tests/acir_artifacts/3_add/target/acir.gz → ...tests/acir_artifacts/3_add/target/acir.gz
diff --git a/...ts/acir_artifacts/3_add/target/witness.gz → ...ts/acir_artifacts/3_add/target/witness.gz b/...ts/acir_artifacts/3_add/target/witness.gz → ...ts/acir_artifacts/3_add/target/witness.gz
diff --git a/...tests/acir_artifacts/4_sub/target/acir.gz → ...tests/acir_artifacts/4_sub/target/acir.gz b/...tests/acir_artifacts/4_sub/target/acir.gz → ...tests/acir_artifacts/4_sub/target/acir.gz
diff --git a/...ts/acir_artifacts/4_sub/target/witness.gz → ...ts/acir_artifacts/4_sub/target/witness.gz b/...ts/acir_artifacts/4_sub/target/witness.gz → ...ts/acir_artifacts/4_sub/target/witness.gz
diff --git a/...ests/acir_artifacts/5_over/target/acir.gz → ...ests/acir_artifacts/5_over/target/acir.gz b/...ests/acir_artifacts/5_over/target/acir.gz → ...ests/acir_artifacts/5_over/target/acir.gz
diff --git a/...s/acir_artifacts/5_over/target/witness.gz → ...s/acir_artifacts/5_over/target/witness.gz b/...s/acir_artifacts/5_over/target/witness.gz → ...s/acir_artifacts/5_over/target/witness.gz
diff --git a/...cli/tests/acir_artifacts/6/target/acir.gz → ...cli/tests/acir_artifacts/6/target/acir.gz b/...cli/tests/acir_artifacts/6/target/acir.gz → ...cli/tests/acir_artifacts/6/target/acir.gz
diff --git a/.../tests/acir_artifacts/6/target/witness.gz → .../tests/acir_artifacts/6/target/witness.gz b/.../tests/acir_artifacts/6/target/witness.gz → .../tests/acir_artifacts/6/target/witness.gz
diff --git a/...sts/acir_artifacts/6_array/target/acir.gz → ...sts/acir_artifacts/6_array/target/acir.gz b/...sts/acir_artifacts/6_array/target/acir.gz → ...sts/acir_artifacts/6_array/target/acir.gz
diff --git a/.../acir_artifacts/6_array/target/witness.gz → .../acir_artifacts/6_array/target/witness.gz b/.../acir_artifacts/6_array/target/witness.gz → .../acir_artifacts/6_array/target/witness.gz
diff --git a/...cli/tests/acir_artifacts/7/target/acir.gz → ...cli/tests/acir_artifacts/7/target/acir.gz b/...cli/tests/acir_artifacts/7/target/acir.gz → ...cli/tests/acir_artifacts/7/target/acir.gz
diff --git a/.../tests/acir_artifacts/7/target/witness.gz → .../tests/acir_artifacts/7/target/witness.gz b/.../tests/acir_artifacts/7/target/witness.gz → .../tests/acir_artifacts/7/target/witness.gz
diff --git a/.../acir_artifacts/7_function/target/acir.gz → .../acir_artifacts/7_function/target/acir.gz b/.../acir_artifacts/7_function/target/acir.gz → .../acir_artifacts/7_function/target/acir.gz
diff --git a/...ir_artifacts/7_function/target/witness.gz → ...ir_artifacts/7_function/target/witness.gz b/...ir_artifacts/7_function/target/witness.gz → ...ir_artifacts/7_function/target/witness.gz
diff --git a/...ir_artifacts/8_integration/target/acir.gz → ...ir_artifacts/8_integration/target/acir.gz b/...ir_artifacts/8_integration/target/acir.gz → ...ir_artifacts/8_integration/target/acir.gz