refactor: reorganize folders (#540)

* refactor: move compiler, riscv into toolchain * refactor: create circuits folder * refactor: create lib folder * chore: update workflows * fix: ecc workflow * refactor: update vm folder structure * fix: toolchain imports * fix: toolchain imports * chore: fix lint * fix: update import
openvm-org · Oct 14, 2024 · 32b50d4 · 32b50d4
1 parent 8edcd1b
commit 32b50d4
Show file tree

Hide file tree

Showing 539 changed files with 517 additions and 426 deletions.
diff --git a/.github/workflows/ecc.yml b/.github/workflows/ecc.yml
@@ -7,10 +7,12 @@ on:
     branches: ["main"]
     paths:
       - "stark-backend/**"
-      - "primitives/**"
+      - "circuits/primitives/**"
       - "vm/**"
-      - "compiler/**"
-      - "ecc/**"
+      - "toolchain/compiler/**"
+      - "circuits/ecc/**"
+      - "lib/ecc/**"
+      - "lib/ecc-execution/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -33,6 +35,16 @@ jobs:
       - uses: taiki-e/install-action@nextest
 
       - name: Run ecc-lib crate tests
-        working-directory: ecc/lib
+        working-directory: lib/ecc
+        run: |
+          cargo nextest run --cargo-profile=fast --features parallel
+
+      - name: Run ecc-execution crate tests
+        working-directory: lib/ecc-execution
+        run: |
+          cargo nextest run --cargo-profile=fast
+
+      - name: Run ecc-circuits crate tests
+        working-directory: circuits/ecc
         run: |
           cargo nextest run --cargo-profile=fast --features parallel
diff --git a/.github/workflows/primitives.yml b/.github/workflows/primitives.yml
@@ -7,8 +7,8 @@ on:
     branches: ["main"]
     paths:
       - "stark-backend/**"
-      - "primitives/**"
-      - "poseidon2-air/**"
+      - "circuits/primitives/**"
+      - "circuits/hashes/poseidon2-air/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -31,11 +31,11 @@ jobs:
       - uses: taiki-e/install-action@nextest
 
       - name: Run tests for primitives
-        working-directory: primitives
+        working-directory: circuits/primitives
         run: |
           cargo nextest run --cargo-profile fast --features parallel
 
       - name: Run tests for poseidon2-air
-        working-directory: poseidon2-air
+        working-directory: circuits/hashes/poseidon2-air
         run: |
           cargo nextest run --cargo-profile fast --features parallel
diff --git a/.github/workflows/recursion-bench.yml b/.github/workflows/recursion-bench.yml
@@ -7,10 +7,10 @@ on:
     branches: ["main"]
     paths:
       - "stark-backend/**"
-      - "primitives/**"
+      - "circuits/primitives/**"
       - "vm/**"
-      - "compiler/**"
-      - "recursion/**"
+      - "toolchain/compiler/**"
+      - "lib/recursion/**"
       - ".github/workflows/benchmark-call.yml"
   label:
     types: [created]

diff --git a/.github/workflows/recursion.yml b/.github/workflows/recursion.yml
@@ -7,10 +7,10 @@ on:
     branches: ["main"]
     paths:
       - "stark-backend/**"
-      - "primitives/**"
+      - "circuits/primitives/**"
       - "vm/**"
-      - "compiler/**"
-      - "recursion/**"
+      - "toolchain/compiler/**"
+      - "lib/recursion/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -37,7 +37,7 @@ jobs:
           version: v0.8.19
 
       - name: Run recursion crate tests
-        working-directory: recursion
+        working-directory: lib/recursion
         run: |
           cargo nextest run --cargo-profile=fast --features parallel
           cargo nextest run --cargo-profile=fast --features parallel,static-verifier -- halo2::tests
diff --git a/.github/workflows/vm.yml b/.github/workflows/vm.yml
@@ -7,9 +7,9 @@ on:
     branches: ["main"]
     paths:
       - "stark-backend/**"
-      - "primitives/**"
+      - "circuits/primitives/**"
       - "vm/**"
-      - "compiler/**"
+      - "toolchain/compiler/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -37,6 +37,6 @@ jobs:
           cargo nextest run --cargo-profile=fast --features parallel
 
       - name: Run compiler crate tests
-        working-directory: compiler
+        working-directory: toolchain/compiler
         run: |
           cargo nextest run --cargo-profile=fast --features parallel
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,19 +1,19 @@
 [workspace]
 members = [
-    "primitives",
-    "compiler",
     "derive",
-    "poseidon2-air",
-    "recursion",
-    "ecc/lib",
-    "ecc/execution",
-    "ecc/primitives",
-    "stark-backend",
+    "circuits/ecc",
+    "circuits/hashes/poseidon2-air",
+    "circuits/primitives",
+    "lib/ecc",
+    "lib/ecc-execution",
+    "lib/recursion",
     "sdk",
-    "vm",
-    "riscv/zkvm/lib",
-    "riscv/zkvm/platform",
-    "riscv/transpiler",
+    "stark-backend",
+    "toolchain/compiler",
+    "toolchain/riscv/zkvm/lib",
+    "toolchain/riscv/zkvm/platform",
+    "toolchain/riscv/transpiler",
+    "vm"
 ]
 resolver = "2"
 
@@ -58,15 +58,15 @@ incremental = true
 lto = "thin"
 
 [workspace.dependencies]
-axvm-platform = { path = "riscv/zkvm/platform", default-features = false }
-axvm = { path = "riscv/zkvm/lib", default-features = false }
-afs-compiler = { path = "compiler", default-features = false }
+axvm-platform = { path = "toolchain/riscv/zkvm/platform", default-features = false }
+axvm = { path = "toolchain/riscv/zkvm/lib", default-features = false }
+afs-compiler = { path = "toolchain/compiler", default-features = false }
 stark-vm = { path = "vm", default-features = false }
-afs-primitives = { path = "primitives", default-features = false }
+afs-primitives = { path = "circuits/primitives", default-features = false }
 afs-stark-backend = { path = "stark-backend", default-features = false }
 afs-derive = { path = "derive", default-features = false }
 ax-sdk = { path = "sdk", default-features = false }
-afs-transpiler = { path = "riscv/transpiler", default-features = false }
+afs-transpiler = { path = "toolchain/riscv/transpiler", default-features = false }
 
 p3-air = { git = "https://github.com/Plonky3/Plonky3.git", rev = "95e56fa" }
 p3-field = { git = "https://github.com/Plonky3/Plonky3.git", rev = "95e56fa" }

diff --git a/ecc/primitives/Cargo.toml → circuits/ecc/Cargo.toml b/ecc/primitives/Cargo.toml → circuits/ecc/Cargo.toml
@@ -6,7 +6,7 @@ description = "Elliptic curve cryptography building blocks."
 
 [dependencies]
 afs-stark-backend = { path = "../../stark-backend" }
-afs-primitives = { path = "../../primitives" }
+afs-primitives = { path = "../primitives" }
 ax-sdk = { path = "../../sdk" }
 p3-air = { workspace = true }
 p3-field = { workspace = true }
@@ -37,7 +37,7 @@ k256 = { workspace = true }
 elliptic-curve = { workspace = true, features = ["std"] }
 
 [dev-dependencies]
-afs-primitives = { path = "../../primitives" }
+afs-primitives = { path = "../primitives" }
 hex-literal = { workspace = true }
 sha3 = "0.10.8"
 

diff --git a/...primitives/src/field_expression/README.md → circuits/ecc/src/field_expression/README.md b/...primitives/src/field_expression/README.md → circuits/ecc/src/field_expression/README.md
diff --git a/...rimitives/src/field_expression/builder.rs → circuits/ecc/src/field_expression/builder.rs b/...rimitives/src/field_expression/builder.rs → circuits/ecc/src/field_expression/builder.rs
diff --git a/...es/src/field_expression/field_variable.rs → ...cc/src/field_expression/field_variable.rs b/...es/src/field_expression/field_variable.rs → ...cc/src/field_expression/field_variable.rs
diff --git a/ecc/primitives/src/field_expression/mod.rs → circuits/ecc/src/field_expression/mod.rs b/ecc/primitives/src/field_expression/mod.rs → circuits/ecc/src/field_expression/mod.rs
diff --git a/...ves/src/field_expression/symbolic_expr.rs → ...ecc/src/field_expression/symbolic_expr.rs b/...ves/src/field_expression/symbolic_expr.rs → ...ecc/src/field_expression/symbolic_expr.rs
diff --git a/ecc/primitives/src/field_expression/tests.rs → circuits/ecc/src/field_expression/tests.rs b/ecc/primitives/src/field_expression/tests.rs → circuits/ecc/src/field_expression/tests.rs
diff --git a/ecc/primitives/src/lib.rs → circuits/ecc/src/lib.rs b/ecc/primitives/src/lib.rs → circuits/ecc/src/lib.rs
diff --git a/ecc/primitives/src/utils.rs → circuits/ecc/src/utils.rs b/ecc/primitives/src/utils.rs → circuits/ecc/src/utils.rs
diff --git a/poseidon2-air/Cargo.toml → circuits/hashes/poseidon2-air/Cargo.toml b/poseidon2-air/Cargo.toml → circuits/hashes/poseidon2-air/Cargo.toml
@@ -15,10 +15,10 @@ p3-util = { workspace = true }
 zkhash = { workspace = true }
 rand = "0.8"
 
-afs-primitives = { path = "../primitives" }
-afs-stark-backend = { path = "../stark-backend", default-features = false }
-afs-derive = { path = "../derive" }
-ax-sdk = { path = "../sdk" }
+afs-primitives = { path = "../../primitives" }
+afs-stark-backend = { path = "../../../stark-backend", default-features = false }
+afs-derive = { path = "../../../derive" }
+ax-sdk = { path = "../../../sdk" }
 lazy_static = "1.5.0"
 itertools.workspace = true
 

diff --git a/poseidon2-air/src/lib.rs → circuits/hashes/poseidon2-air/src/lib.rs b/poseidon2-air/src/lib.rs → circuits/hashes/poseidon2-air/src/lib.rs
diff --git a/poseidon2-air/src/poseidon2/air.rs → ...hashes/poseidon2-air/src/poseidon2/air.rs b/poseidon2-air/src/poseidon2/air.rs → ...hashes/poseidon2-air/src/poseidon2/air.rs
diff --git a/poseidon2-air/src/poseidon2/bridge.rs → ...hes/poseidon2-air/src/poseidon2/bridge.rs b/poseidon2-air/src/poseidon2/bridge.rs → ...hes/poseidon2-air/src/poseidon2/bridge.rs
diff --git a/poseidon2-air/src/poseidon2/columns.rs → ...es/poseidon2-air/src/poseidon2/columns.rs b/poseidon2-air/src/poseidon2/columns.rs → ...es/poseidon2-air/src/poseidon2/columns.rs
diff --git a/poseidon2-air/src/poseidon2/mod.rs → ...hashes/poseidon2-air/src/poseidon2/mod.rs b/poseidon2-air/src/poseidon2/mod.rs → ...hashes/poseidon2-air/src/poseidon2/mod.rs
diff --git a/poseidon2-air/src/poseidon2/tests.rs → ...shes/poseidon2-air/src/poseidon2/tests.rs b/poseidon2-air/src/poseidon2/tests.rs → ...shes/poseidon2-air/src/poseidon2/tests.rs
diff --git a/poseidon2-air/src/poseidon2/trace.rs → ...shes/poseidon2-air/src/poseidon2/trace.rs b/poseidon2-air/src/poseidon2/trace.rs → ...shes/poseidon2-air/src/poseidon2/trace.rs
diff --git a/primitives/Cargo.toml → circuits/primitives/Cargo.toml b/primitives/Cargo.toml → circuits/primitives/Cargo.toml
@@ -18,8 +18,8 @@ p3-util = { workspace = true }
 rand = "0.8"
 derive-new = "0.6.0"
 
-afs-stark-backend = { path = "../stark-backend", default-features = false }
-afs-derive = { path = "../derive" }
+afs-stark-backend = { path = "../../stark-backend", default-features = false }
+afs-derive = { path = "../../derive" }
 parking_lot = "0.12.2"
 itertools.workspace = true
 getset = "0.1.2"
@@ -41,7 +41,7 @@ p3-merkle-tree = { workspace = true }
 p3-poseidon2 = { workspace = true }
 p3-symmetric = { workspace = true }
 test-case = "3.3.1"
-ax-sdk = { path = "../sdk" }
+ax-sdk = { path = "../../sdk" }
 
 [features]
 default = []

diff --git a/primitives/src/assert_less_than/air.rs → ...ts/primitives/src/assert_less_than/air.rs b/primitives/src/assert_less_than/air.rs → ...ts/primitives/src/assert_less_than/air.rs
diff --git a/primitives/src/assert_less_than/bridge.rs → ...primitives/src/assert_less_than/bridge.rs b/primitives/src/assert_less_than/bridge.rs → ...primitives/src/assert_less_than/bridge.rs
diff --git a/primitives/src/assert_less_than/columns.rs → ...rimitives/src/assert_less_than/columns.rs b/primitives/src/assert_less_than/columns.rs → ...rimitives/src/assert_less_than/columns.rs
diff --git a/primitives/src/assert_less_than/mod.rs → ...ts/primitives/src/assert_less_than/mod.rs b/primitives/src/assert_less_than/mod.rs → ...ts/primitives/src/assert_less_than/mod.rs
diff --git a/primitives/src/assert_less_than/tests.rs → .../primitives/src/assert_less_than/tests.rs b/primitives/src/assert_less_than/tests.rs → .../primitives/src/assert_less_than/tests.rs
diff --git a/primitives/src/assert_less_than/trace.rs → .../primitives/src/assert_less_than/trace.rs b/primitives/src/assert_less_than/trace.rs → .../primitives/src/assert_less_than/trace.rs
diff --git a/primitives/src/assert_sorted/air.rs → circuits/primitives/src/assert_sorted/air.rs b/primitives/src/assert_sorted/air.rs → circuits/primitives/src/assert_sorted/air.rs
diff --git a/primitives/src/assert_sorted/bridge.rs → ...ts/primitives/src/assert_sorted/bridge.rs b/primitives/src/assert_sorted/bridge.rs → ...ts/primitives/src/assert_sorted/bridge.rs
diff --git a/primitives/src/assert_sorted/columns.rs → ...s/primitives/src/assert_sorted/columns.rs b/primitives/src/assert_sorted/columns.rs → ...s/primitives/src/assert_sorted/columns.rs
diff --git a/primitives/src/assert_sorted/mod.rs → circuits/primitives/src/assert_sorted/mod.rs b/primitives/src/assert_sorted/mod.rs → circuits/primitives/src/assert_sorted/mod.rs
diff --git a/primitives/src/assert_sorted/tests.rs → ...its/primitives/src/assert_sorted/tests.rs b/primitives/src/assert_sorted/tests.rs → ...its/primitives/src/assert_sorted/tests.rs
diff --git a/primitives/src/assert_sorted/trace.rs → ...its/primitives/src/assert_sorted/trace.rs b/primitives/src/assert_sorted/trace.rs → ...its/primitives/src/assert_sorted/trace.rs
diff --git a/primitives/src/bigint/README.md → circuits/primitives/src/bigint/README.md b/primitives/src/bigint/README.md → circuits/primitives/src/bigint/README.md
diff --git a/...ves/src/bigint/check_carry_mod_to_zero.rs → ...ves/src/bigint/check_carry_mod_to_zero.rs b/...ves/src/bigint/check_carry_mod_to_zero.rs → ...ves/src/bigint/check_carry_mod_to_zero.rs
diff --git a/primitives/src/bigint/check_carry_to_zero.rs → ...mitives/src/bigint/check_carry_to_zero.rs b/primitives/src/bigint/check_carry_to_zero.rs → ...mitives/src/bigint/check_carry_to_zero.rs
diff --git a/primitives/src/bigint/mod.rs → circuits/primitives/src/bigint/mod.rs b/primitives/src/bigint/mod.rs → circuits/primitives/src/bigint/mod.rs
diff --git a/...ives/src/bigint/modular_arithmetic/add.rs → ...ives/src/bigint/modular_arithmetic/add.rs b/...ives/src/bigint/modular_arithmetic/add.rs → ...ives/src/bigint/modular_arithmetic/add.rs
diff --git a/...ives/src/bigint/modular_arithmetic/div.rs → ...ives/src/bigint/modular_arithmetic/div.rs b/...ives/src/bigint/modular_arithmetic/div.rs → ...ives/src/bigint/modular_arithmetic/div.rs
diff --git a/...ives/src/bigint/modular_arithmetic/mod.rs → ...ives/src/bigint/modular_arithmetic/mod.rs b/...ives/src/bigint/modular_arithmetic/mod.rs → ...ives/src/bigint/modular_arithmetic/mod.rs
diff --git a/...ives/src/bigint/modular_arithmetic/mul.rs → ...ives/src/bigint/modular_arithmetic/mul.rs b/...ives/src/bigint/modular_arithmetic/mul.rs → ...ives/src/bigint/modular_arithmetic/mul.rs
diff --git a/...ives/src/bigint/modular_arithmetic/sub.rs → ...ives/src/bigint/modular_arithmetic/sub.rs b/...ives/src/bigint/modular_arithmetic/sub.rs → ...ives/src/bigint/modular_arithmetic/sub.rs
diff --git a/...es/src/bigint/modular_arithmetic/tests.rs → ...es/src/bigint/modular_arithmetic/tests.rs b/...es/src/bigint/modular_arithmetic/tests.rs → ...es/src/bigint/modular_arithmetic/tests.rs
diff --git a/...bigint/tests/check_carry_mod_zero_test.rs → ...bigint/tests/check_carry_mod_zero_test.rs b/...bigint/tests/check_carry_mod_zero_test.rs → ...bigint/tests/check_carry_mod_zero_test.rs
diff --git a/.../bigint/tests/check_carry_to_zero_test.rs → .../bigint/tests/check_carry_to_zero_test.rs b/.../bigint/tests/check_carry_to_zero_test.rs → .../bigint/tests/check_carry_to_zero_test.rs
diff --git a/primitives/src/bigint/tests/mod.rs → circuits/primitives/src/bigint/tests/mod.rs b/primitives/src/bigint/tests/mod.rs → circuits/primitives/src/bigint/tests/mod.rs
diff --git a/primitives/src/bigint/utils.rs → circuits/primitives/src/bigint/utils.rs b/primitives/src/bigint/utils.rs → circuits/primitives/src/bigint/utils.rs
diff --git a/primitives/src/bitwise_op_lookup/air.rs → ...s/primitives/src/bitwise_op_lookup/air.rs b/primitives/src/bitwise_op_lookup/air.rs → ...s/primitives/src/bitwise_op_lookup/air.rs
diff --git a/primitives/src/bitwise_op_lookup/bus.rs → ...s/primitives/src/bitwise_op_lookup/bus.rs b/primitives/src/bitwise_op_lookup/bus.rs → ...s/primitives/src/bitwise_op_lookup/bus.rs
diff --git a/primitives/src/bitwise_op_lookup/columns.rs → ...imitives/src/bitwise_op_lookup/columns.rs b/primitives/src/bitwise_op_lookup/columns.rs → ...imitives/src/bitwise_op_lookup/columns.rs
diff --git a/primitives/src/bitwise_op_lookup/mod.rs → ...s/primitives/src/bitwise_op_lookup/mod.rs b/primitives/src/bitwise_op_lookup/mod.rs → ...s/primitives/src/bitwise_op_lookup/mod.rs
diff --git a/...ives/src/bitwise_op_lookup/tests/dummy.rs → ...ives/src/bitwise_op_lookup/tests/dummy.rs b/...ives/src/bitwise_op_lookup/tests/dummy.rs → ...ives/src/bitwise_op_lookup/tests/dummy.rs
diff --git a/...itives/src/bitwise_op_lookup/tests/mod.rs → ...itives/src/bitwise_op_lookup/tests/mod.rs b/...itives/src/bitwise_op_lookup/tests/mod.rs → ...itives/src/bitwise_op_lookup/tests/mod.rs
diff --git a/primitives/src/bitwise_op_lookup/trace.rs → ...primitives/src/bitwise_op_lookup/trace.rs b/primitives/src/bitwise_op_lookup/trace.rs → ...primitives/src/bitwise_op_lookup/trace.rs
diff --git a/primitives/src/ecc/air.rs → circuits/primitives/src/ecc/air.rs b/primitives/src/ecc/air.rs → circuits/primitives/src/ecc/air.rs
diff --git a/primitives/src/ecc/columns.rs → circuits/primitives/src/ecc/columns.rs b/primitives/src/ecc/columns.rs → circuits/primitives/src/ecc/columns.rs
diff --git a/primitives/src/ecc/mod.rs → circuits/primitives/src/ecc/mod.rs b/primitives/src/ecc/mod.rs → circuits/primitives/src/ecc/mod.rs
diff --git a/primitives/src/ecc/tests.rs → circuits/primitives/src/ecc/tests.rs b/primitives/src/ecc/tests.rs → circuits/primitives/src/ecc/tests.rs
diff --git a/primitives/src/ecc/trace.rs → circuits/primitives/src/ecc/trace.rs b/primitives/src/ecc/trace.rs → circuits/primitives/src/ecc/trace.rs
diff --git a/primitives/src/ecc/utils.rs → circuits/primitives/src/ecc/utils.rs b/primitives/src/ecc/utils.rs → circuits/primitives/src/ecc/utils.rs
diff --git a/primitives/src/is_equal/air.rs → circuits/primitives/src/is_equal/air.rs b/primitives/src/is_equal/air.rs → circuits/primitives/src/is_equal/air.rs
diff --git a/primitives/src/is_equal/columns.rs → circuits/primitives/src/is_equal/columns.rs b/primitives/src/is_equal/columns.rs → circuits/primitives/src/is_equal/columns.rs
diff --git a/primitives/src/is_equal/mod.rs → circuits/primitives/src/is_equal/mod.rs b/primitives/src/is_equal/mod.rs → circuits/primitives/src/is_equal/mod.rs
diff --git a/primitives/src/is_equal/tests.rs → circuits/primitives/src/is_equal/tests.rs b/primitives/src/is_equal/tests.rs → circuits/primitives/src/is_equal/tests.rs
diff --git a/primitives/src/is_equal/trace.rs → circuits/primitives/src/is_equal/trace.rs b/primitives/src/is_equal/trace.rs → circuits/primitives/src/is_equal/trace.rs
diff --git a/primitives/src/is_equal_vec/air.rs → circuits/primitives/src/is_equal_vec/air.rs b/primitives/src/is_equal_vec/air.rs → circuits/primitives/src/is_equal_vec/air.rs
diff --git a/primitives/src/is_equal_vec/columns.rs → ...ts/primitives/src/is_equal_vec/columns.rs b/primitives/src/is_equal_vec/columns.rs → ...ts/primitives/src/is_equal_vec/columns.rs
diff --git a/primitives/src/is_equal_vec/mod.rs → circuits/primitives/src/is_equal_vec/mod.rs b/primitives/src/is_equal_vec/mod.rs → circuits/primitives/src/is_equal_vec/mod.rs
diff --git a/primitives/src/is_equal_vec/tests.rs → ...uits/primitives/src/is_equal_vec/tests.rs b/primitives/src/is_equal_vec/tests.rs → ...uits/primitives/src/is_equal_vec/tests.rs
diff --git a/primitives/src/is_equal_vec/trace.rs → ...uits/primitives/src/is_equal_vec/trace.rs b/primitives/src/is_equal_vec/trace.rs → ...uits/primitives/src/is_equal_vec/trace.rs
diff --git a/primitives/src/is_less_than/air.rs → circuits/primitives/src/is_less_than/air.rs b/primitives/src/is_less_than/air.rs → circuits/primitives/src/is_less_than/air.rs
diff --git a/primitives/src/is_less_than/bridge.rs → ...its/primitives/src/is_less_than/bridge.rs b/primitives/src/is_less_than/bridge.rs → ...its/primitives/src/is_less_than/bridge.rs
diff --git a/primitives/src/is_less_than/columns.rs → ...ts/primitives/src/is_less_than/columns.rs b/primitives/src/is_less_than/columns.rs → ...ts/primitives/src/is_less_than/columns.rs
diff --git a/primitives/src/is_less_than/mod.rs → circuits/primitives/src/is_less_than/mod.rs b/primitives/src/is_less_than/mod.rs → circuits/primitives/src/is_less_than/mod.rs
diff --git a/primitives/src/is_less_than/tests.rs → ...uits/primitives/src/is_less_than/tests.rs b/primitives/src/is_less_than/tests.rs → ...uits/primitives/src/is_less_than/tests.rs
diff --git a/primitives/src/is_less_than/trace.rs → ...uits/primitives/src/is_less_than/trace.rs b/primitives/src/is_less_than/trace.rs → ...uits/primitives/src/is_less_than/trace.rs
diff --git a/primitives/src/is_less_than_bits/air.rs → ...s/primitives/src/is_less_than_bits/air.rs b/primitives/src/is_less_than_bits/air.rs → ...s/primitives/src/is_less_than_bits/air.rs
diff --git a/primitives/src/is_less_than_bits/columns.rs → ...imitives/src/is_less_than_bits/columns.rs b/primitives/src/is_less_than_bits/columns.rs → ...imitives/src/is_less_than_bits/columns.rs
diff --git a/primitives/src/is_less_than_bits/mod.rs → ...s/primitives/src/is_less_than_bits/mod.rs b/primitives/src/is_less_than_bits/mod.rs → ...s/primitives/src/is_less_than_bits/mod.rs
diff --git a/primitives/src/is_less_than_bits/tests.rs → ...primitives/src/is_less_than_bits/tests.rs b/primitives/src/is_less_than_bits/tests.rs → ...primitives/src/is_less_than_bits/tests.rs
diff --git a/primitives/src/is_less_than_bits/trace.rs → ...primitives/src/is_less_than_bits/trace.rs b/primitives/src/is_less_than_bits/trace.rs → ...primitives/src/is_less_than_bits/trace.rs
diff --git a/primitives/src/is_less_than_tuple/air.rs → .../primitives/src/is_less_than_tuple/air.rs b/primitives/src/is_less_than_tuple/air.rs → .../primitives/src/is_less_than_tuple/air.rs
diff --git a/primitives/src/is_less_than_tuple/bridge.rs → ...imitives/src/is_less_than_tuple/bridge.rs b/primitives/src/is_less_than_tuple/bridge.rs → ...imitives/src/is_less_than_tuple/bridge.rs
diff --git a/primitives/src/is_less_than_tuple/columns.rs → ...mitives/src/is_less_than_tuple/columns.rs b/primitives/src/is_less_than_tuple/columns.rs → ...mitives/src/is_less_than_tuple/columns.rs
diff --git a/primitives/src/is_less_than_tuple/mod.rs → .../primitives/src/is_less_than_tuple/mod.rs b/primitives/src/is_less_than_tuple/mod.rs → .../primitives/src/is_less_than_tuple/mod.rs
diff --git a/primitives/src/is_less_than_tuple/tests.rs → ...rimitives/src/is_less_than_tuple/tests.rs b/primitives/src/is_less_than_tuple/tests.rs → ...rimitives/src/is_less_than_tuple/tests.rs
diff --git a/primitives/src/is_less_than_tuple/trace.rs → ...rimitives/src/is_less_than_tuple/trace.rs b/primitives/src/is_less_than_tuple/trace.rs → ...rimitives/src/is_less_than_tuple/trace.rs
diff --git a/...itives/src/is_less_than_tuple_bits/air.rs → ...itives/src/is_less_than_tuple_bits/air.rs b/...itives/src/is_less_than_tuple_bits/air.rs → ...itives/src/is_less_than_tuple_bits/air.rs
diff --git a/...es/src/is_less_than_tuple_bits/columns.rs → ...es/src/is_less_than_tuple_bits/columns.rs b/...es/src/is_less_than_tuple_bits/columns.rs → ...es/src/is_less_than_tuple_bits/columns.rs
diff --git a/...itives/src/is_less_than_tuple_bits/mod.rs → ...itives/src/is_less_than_tuple_bits/mod.rs b/...itives/src/is_less_than_tuple_bits/mod.rs → ...itives/src/is_less_than_tuple_bits/mod.rs
diff --git a/...ives/src/is_less_than_tuple_bits/tests.rs → ...ives/src/is_less_than_tuple_bits/tests.rs b/...ives/src/is_less_than_tuple_bits/tests.rs → ...ives/src/is_less_than_tuple_bits/tests.rs
diff --git a/...ives/src/is_less_than_tuple_bits/trace.rs → ...ives/src/is_less_than_tuple_bits/trace.rs b/...ives/src/is_less_than_tuple_bits/trace.rs → ...ives/src/is_less_than_tuple_bits/trace.rs
diff --git a/primitives/src/is_zero/air.rs → circuits/primitives/src/is_zero/air.rs b/primitives/src/is_zero/air.rs → circuits/primitives/src/is_zero/air.rs
diff --git a/primitives/src/is_zero/columns.rs → circuits/primitives/src/is_zero/columns.rs b/primitives/src/is_zero/columns.rs → circuits/primitives/src/is_zero/columns.rs
diff --git a/primitives/src/is_zero/mod.rs → circuits/primitives/src/is_zero/mod.rs b/primitives/src/is_zero/mod.rs → circuits/primitives/src/is_zero/mod.rs
diff --git a/primitives/src/is_zero/tests.rs → circuits/primitives/src/is_zero/tests.rs b/primitives/src/is_zero/tests.rs → circuits/primitives/src/is_zero/tests.rs
diff --git a/primitives/src/is_zero/trace.rs → circuits/primitives/src/is_zero/trace.rs b/primitives/src/is_zero/trace.rs → circuits/primitives/src/is_zero/trace.rs
diff --git a/primitives/src/lib.rs → circuits/primitives/src/lib.rs b/primitives/src/lib.rs → circuits/primitives/src/lib.rs
diff --git a/primitives/src/merkle_proof/air.rs → circuits/primitives/src/merkle_proof/air.rs b/primitives/src/merkle_proof/air.rs → circuits/primitives/src/merkle_proof/air.rs
diff --git a/primitives/src/merkle_proof/bridge.rs → ...its/primitives/src/merkle_proof/bridge.rs b/primitives/src/merkle_proof/bridge.rs → ...its/primitives/src/merkle_proof/bridge.rs
diff --git a/primitives/src/merkle_proof/columns.rs → ...ts/primitives/src/merkle_proof/columns.rs b/primitives/src/merkle_proof/columns.rs → ...ts/primitives/src/merkle_proof/columns.rs
diff --git a/primitives/src/merkle_proof/mod.rs → circuits/primitives/src/merkle_proof/mod.rs b/primitives/src/merkle_proof/mod.rs → circuits/primitives/src/merkle_proof/mod.rs
diff --git a/primitives/src/merkle_proof/round_flags.rs → ...rimitives/src/merkle_proof/round_flags.rs b/primitives/src/merkle_proof/round_flags.rs → ...rimitives/src/merkle_proof/round_flags.rs
diff --git a/primitives/src/merkle_proof/tests.rs → ...uits/primitives/src/merkle_proof/tests.rs b/primitives/src/merkle_proof/tests.rs → ...uits/primitives/src/merkle_proof/tests.rs
diff --git a/primitives/src/merkle_proof/trace.rs → ...uits/primitives/src/merkle_proof/trace.rs b/primitives/src/merkle_proof/trace.rs → ...uits/primitives/src/merkle_proof/trace.rs
diff --git a/primitives/src/offline_checker/air.rs → ...its/primitives/src/offline_checker/air.rs b/primitives/src/offline_checker/air.rs → ...its/primitives/src/offline_checker/air.rs
diff --git a/primitives/src/offline_checker/bridge.rs → .../primitives/src/offline_checker/bridge.rs b/primitives/src/offline_checker/bridge.rs → .../primitives/src/offline_checker/bridge.rs
diff --git a/primitives/src/offline_checker/columns.rs → ...primitives/src/offline_checker/columns.rs b/primitives/src/offline_checker/columns.rs → ...primitives/src/offline_checker/columns.rs
diff --git a/primitives/src/offline_checker/mod.rs → ...its/primitives/src/offline_checker/mod.rs b/primitives/src/offline_checker/mod.rs → ...its/primitives/src/offline_checker/mod.rs
diff --git a/primitives/src/offline_checker/trace.rs → ...s/primitives/src/offline_checker/trace.rs b/primitives/src/offline_checker/trace.rs → ...s/primitives/src/offline_checker/trace.rs
diff --git a/primitives/src/range/air.rs → circuits/primitives/src/range/air.rs b/primitives/src/range/air.rs → circuits/primitives/src/range/air.rs
diff --git a/primitives/src/range/bus.rs → circuits/primitives/src/range/bus.rs b/primitives/src/range/bus.rs → circuits/primitives/src/range/bus.rs
diff --git a/primitives/src/range/columns.rs → circuits/primitives/src/range/columns.rs b/primitives/src/range/columns.rs → circuits/primitives/src/range/columns.rs
diff --git a/primitives/src/range/mod.rs → circuits/primitives/src/range/mod.rs b/primitives/src/range/mod.rs → circuits/primitives/src/range/mod.rs
diff --git a/primitives/src/range/tests/list/air.rs → ...ts/primitives/src/range/tests/list/air.rs b/primitives/src/range/tests/list/air.rs → ...ts/primitives/src/range/tests/list/air.rs
diff --git a/primitives/src/range/tests/list/columns.rs → ...rimitives/src/range/tests/list/columns.rs b/primitives/src/range/tests/list/columns.rs → ...rimitives/src/range/tests/list/columns.rs
diff --git a/primitives/src/range/tests/list/mod.rs → ...ts/primitives/src/range/tests/list/mod.rs b/primitives/src/range/tests/list/mod.rs → ...ts/primitives/src/range/tests/list/mod.rs
diff --git a/primitives/src/range/tests/list/trace.rs → .../primitives/src/range/tests/list/trace.rs b/primitives/src/range/tests/list/trace.rs → .../primitives/src/range/tests/list/trace.rs
diff --git a/primitives/src/range/tests/mod.rs → circuits/primitives/src/range/tests/mod.rs b/primitives/src/range/tests/mod.rs → circuits/primitives/src/range/tests/mod.rs
diff --git a/primitives/src/range/trace.rs → circuits/primitives/src/range/trace.rs b/primitives/src/range/trace.rs → circuits/primitives/src/range/trace.rs
diff --git a/primitives/src/range_gate/air.rs → circuits/primitives/src/range_gate/air.rs b/primitives/src/range_gate/air.rs → circuits/primitives/src/range_gate/air.rs
diff --git a/primitives/src/range_gate/columns.rs → ...uits/primitives/src/range_gate/columns.rs b/primitives/src/range_gate/columns.rs → ...uits/primitives/src/range_gate/columns.rs
diff --git a/primitives/src/range_gate/mod.rs → circuits/primitives/src/range_gate/mod.rs b/primitives/src/range_gate/mod.rs → circuits/primitives/src/range_gate/mod.rs
diff --git a/primitives/src/range_gate/tests.rs → circuits/primitives/src/range_gate/tests.rs b/primitives/src/range_gate/tests.rs → circuits/primitives/src/range_gate/tests.rs
diff --git a/primitives/src/range_gate/trace.rs → circuits/primitives/src/range_gate/trace.rs b/primitives/src/range_gate/trace.rs → circuits/primitives/src/range_gate/trace.rs
diff --git a/primitives/src/range_tuple/air.rs → circuits/primitives/src/range_tuple/air.rs b/primitives/src/range_tuple/air.rs → circuits/primitives/src/range_tuple/air.rs
diff --git a/primitives/src/range_tuple/bus.rs → circuits/primitives/src/range_tuple/bus.rs b/primitives/src/range_tuple/bus.rs → circuits/primitives/src/range_tuple/bus.rs
diff --git a/primitives/src/range_tuple/columns.rs → ...its/primitives/src/range_tuple/columns.rs b/primitives/src/range_tuple/columns.rs → ...its/primitives/src/range_tuple/columns.rs
diff --git a/primitives/src/range_tuple/mod.rs → circuits/primitives/src/range_tuple/mod.rs b/primitives/src/range_tuple/mod.rs → circuits/primitives/src/range_tuple/mod.rs
diff --git a/primitives/src/range_tuple/tests.rs → circuits/primitives/src/range_tuple/tests.rs b/primitives/src/range_tuple/tests.rs → circuits/primitives/src/range_tuple/tests.rs
diff --git a/primitives/src/range_tuple/trace.rs → circuits/primitives/src/range_tuple/trace.rs b/primitives/src/range_tuple/trace.rs → circuits/primitives/src/range_tuple/trace.rs
diff --git a/primitives/src/sub_chip.rs → circuits/primitives/src/sub_chip.rs b/primitives/src/sub_chip.rs → circuits/primitives/src/sub_chip.rs
diff --git a/primitives/src/sum/air.rs → circuits/primitives/src/sum/air.rs b/primitives/src/sum/air.rs → circuits/primitives/src/sum/air.rs
diff --git a/primitives/src/sum/bridge.rs → circuits/primitives/src/sum/bridge.rs b/primitives/src/sum/bridge.rs → circuits/primitives/src/sum/bridge.rs
diff --git a/primitives/src/sum/columns.rs → circuits/primitives/src/sum/columns.rs b/primitives/src/sum/columns.rs → circuits/primitives/src/sum/columns.rs
diff --git a/primitives/src/sum/mod.rs → circuits/primitives/src/sum/mod.rs b/primitives/src/sum/mod.rs → circuits/primitives/src/sum/mod.rs
diff --git a/primitives/src/sum/tests.rs → circuits/primitives/src/sum/tests.rs b/primitives/src/sum/tests.rs → circuits/primitives/src/sum/tests.rs
diff --git a/primitives/src/sum/trace.rs → circuits/primitives/src/sum/trace.rs b/primitives/src/sum/trace.rs → circuits/primitives/src/sum/trace.rs
diff --git a/primitives/src/utils.rs → circuits/primitives/src/utils.rs b/primitives/src/utils.rs → circuits/primitives/src/utils.rs
diff --git a/primitives/src/var_range/air.rs → circuits/primitives/src/var_range/air.rs b/primitives/src/var_range/air.rs → circuits/primitives/src/var_range/air.rs
diff --git a/primitives/src/var_range/bus.rs → circuits/primitives/src/var_range/bus.rs b/primitives/src/var_range/bus.rs → circuits/primitives/src/var_range/bus.rs
diff --git a/primitives/src/var_range/columns.rs → circuits/primitives/src/var_range/columns.rs b/primitives/src/var_range/columns.rs → circuits/primitives/src/var_range/columns.rs
diff --git a/primitives/src/var_range/mod.rs → circuits/primitives/src/var_range/mod.rs b/primitives/src/var_range/mod.rs → circuits/primitives/src/var_range/mod.rs
diff --git a/primitives/src/var_range/tests/dummy_airs.rs → ...mitives/src/var_range/tests/dummy_airs.rs b/primitives/src/var_range/tests/dummy_airs.rs → ...mitives/src/var_range/tests/dummy_airs.rs
diff --git a/primitives/src/var_range/tests/mod.rs → ...its/primitives/src/var_range/tests/mod.rs b/primitives/src/var_range/tests/mod.rs → ...its/primitives/src/var_range/tests/mod.rs
diff --git a/primitives/src/var_range/trace.rs → circuits/primitives/src/var_range/trace.rs b/primitives/src/var_range/trace.rs → circuits/primitives/src/var_range/trace.rs
diff --git a/primitives/src/xor/bits/air.rs → circuits/primitives/src/xor/bits/air.rs b/primitives/src/xor/bits/air.rs → circuits/primitives/src/xor/bits/air.rs
diff --git a/primitives/src/xor/bits/columns.rs → circuits/primitives/src/xor/bits/columns.rs b/primitives/src/xor/bits/columns.rs → circuits/primitives/src/xor/bits/columns.rs
diff --git a/primitives/src/xor/bits/mod.rs → circuits/primitives/src/xor/bits/mod.rs b/primitives/src/xor/bits/mod.rs → circuits/primitives/src/xor/bits/mod.rs
diff --git a/primitives/src/xor/bits/tests/mod.rs → ...uits/primitives/src/xor/bits/tests/mod.rs b/primitives/src/xor/bits/tests/mod.rs → ...uits/primitives/src/xor/bits/tests/mod.rs
diff --git a/...s/src/xor/bits/tests/xor_requester/air.rs → ...s/src/xor/bits/tests/xor_requester/air.rs b/...s/src/xor/bits/tests/xor_requester/air.rs → ...s/src/xor/bits/tests/xor_requester/air.rs
diff --git a/...c/xor/bits/tests/xor_requester/columns.rs → ...c/xor/bits/tests/xor_requester/columns.rs b/...c/xor/bits/tests/xor_requester/columns.rs → ...c/xor/bits/tests/xor_requester/columns.rs
diff --git a/...s/src/xor/bits/tests/xor_requester/mod.rs → ...s/src/xor/bits/tests/xor_requester/mod.rs b/...s/src/xor/bits/tests/xor_requester/mod.rs → ...s/src/xor/bits/tests/xor_requester/mod.rs
diff --git a/...src/xor/bits/tests/xor_requester/trace.rs → ...src/xor/bits/tests/xor_requester/trace.rs b/...src/xor/bits/tests/xor_requester/trace.rs → ...src/xor/bits/tests/xor_requester/trace.rs
diff --git a/primitives/src/xor/bits/trace.rs → circuits/primitives/src/xor/bits/trace.rs b/primitives/src/xor/bits/trace.rs → circuits/primitives/src/xor/bits/trace.rs
diff --git a/primitives/src/xor/bus.rs → circuits/primitives/src/xor/bus.rs b/primitives/src/xor/bus.rs → circuits/primitives/src/xor/bus.rs
diff --git a/primitives/src/xor/limbs/air.rs → circuits/primitives/src/xor/limbs/air.rs b/primitives/src/xor/limbs/air.rs → circuits/primitives/src/xor/limbs/air.rs
diff --git a/primitives/src/xor/limbs/bridge.rs → circuits/primitives/src/xor/limbs/bridge.rs b/primitives/src/xor/limbs/bridge.rs → circuits/primitives/src/xor/limbs/bridge.rs
diff --git a/primitives/src/xor/limbs/columns.rs → circuits/primitives/src/xor/limbs/columns.rs b/primitives/src/xor/limbs/columns.rs → circuits/primitives/src/xor/limbs/columns.rs
diff --git a/primitives/src/xor/limbs/mod.rs → circuits/primitives/src/xor/limbs/mod.rs b/primitives/src/xor/limbs/mod.rs → circuits/primitives/src/xor/limbs/mod.rs
diff --git a/primitives/src/xor/limbs/tests.rs → circuits/primitives/src/xor/limbs/tests.rs b/primitives/src/xor/limbs/tests.rs → circuits/primitives/src/xor/limbs/tests.rs
diff --git a/primitives/src/xor/limbs/trace.rs → circuits/primitives/src/xor/limbs/trace.rs b/primitives/src/xor/limbs/trace.rs → circuits/primitives/src/xor/limbs/trace.rs
diff --git a/primitives/src/xor/lookup/air.rs → circuits/primitives/src/xor/lookup/air.rs b/primitives/src/xor/lookup/air.rs → circuits/primitives/src/xor/lookup/air.rs
diff --git a/primitives/src/xor/lookup/columns.rs → ...uits/primitives/src/xor/lookup/columns.rs b/primitives/src/xor/lookup/columns.rs → ...uits/primitives/src/xor/lookup/columns.rs
diff --git a/primitives/src/xor/lookup/mod.rs → circuits/primitives/src/xor/lookup/mod.rs b/primitives/src/xor/lookup/mod.rs → circuits/primitives/src/xor/lookup/mod.rs
diff --git a/primitives/src/xor/lookup/trace.rs → circuits/primitives/src/xor/lookup/trace.rs b/primitives/src/xor/lookup/trace.rs → circuits/primitives/src/xor/lookup/trace.rs
diff --git a/primitives/src/xor/mod.rs → circuits/primitives/src/xor/mod.rs b/primitives/src/xor/mod.rs → circuits/primitives/src/xor/mod.rs
diff --git a/ecc/execution/Cargo.toml → lib/ecc-execution/Cargo.toml b/ecc/execution/Cargo.toml → lib/ecc-execution/Cargo.toml
diff --git a/ecc/execution/src/common/field.rs → lib/ecc-execution/src/common/field.rs b/ecc/execution/src/common/field.rs → lib/ecc-execution/src/common/field.rs
diff --git a/ecc/execution/src/common/final_exp.rs → lib/ecc-execution/src/common/final_exp.rs b/ecc/execution/src/common/final_exp.rs → lib/ecc-execution/src/common/final_exp.rs
diff --git a/ecc/execution/src/common/line.rs → lib/ecc-execution/src/common/line.rs b/ecc/execution/src/common/line.rs → lib/ecc-execution/src/common/line.rs
diff --git a/ecc/execution/src/common/miller_loop.rs → lib/ecc-execution/src/common/miller_loop.rs b/ecc/execution/src/common/miller_loop.rs → lib/ecc-execution/src/common/miller_loop.rs
diff --git a/ecc/execution/src/common/miller_step.rs → lib/ecc-execution/src/common/miller_step.rs b/ecc/execution/src/common/miller_step.rs → lib/ecc-execution/src/common/miller_step.rs
diff --git a/ecc/execution/src/common/mod.rs → lib/ecc-execution/src/common/mod.rs b/ecc/execution/src/common/mod.rs → lib/ecc-execution/src/common/mod.rs
diff --git a/ecc/execution/src/common/point.rs → lib/ecc-execution/src/common/point.rs b/ecc/execution/src/common/point.rs → lib/ecc-execution/src/common/point.rs
diff --git a/ecc/execution/src/curves/bls12_381/curve.rs → ...c-execution/src/curves/bls12_381/curve.rs b/ecc/execution/src/curves/bls12_381/curve.rs → ...c-execution/src/curves/bls12_381/curve.rs
diff --git a/ecc/execution/src/curves/bls12_381/field.rs → ...c-execution/src/curves/bls12_381/field.rs b/ecc/execution/src/curves/bls12_381/field.rs → ...c-execution/src/curves/bls12_381/field.rs
diff --git a/...ecution/src/curves/bls12_381/final_exp.rs → ...ecution/src/curves/bls12_381/final_exp.rs b/...ecution/src/curves/bls12_381/final_exp.rs → ...ecution/src/curves/bls12_381/final_exp.rs
diff --git a/ecc/execution/src/curves/bls12_381/line.rs → ...cc-execution/src/curves/bls12_381/line.rs b/ecc/execution/src/curves/bls12_381/line.rs → ...cc-execution/src/curves/bls12_381/line.rs
diff --git a/...ution/src/curves/bls12_381/miller_loop.rs → ...ution/src/curves/bls12_381/miller_loop.rs b/...ution/src/curves/bls12_381/miller_loop.rs → ...ution/src/curves/bls12_381/miller_loop.rs
diff --git a/ecc/execution/src/curves/bls12_381/mod.rs → ...ecc-execution/src/curves/bls12_381/mod.rs b/ecc/execution/src/curves/bls12_381/mod.rs → ...ecc-execution/src/curves/bls12_381/mod.rs
diff --git a/...ecution/src/curves/bls12_381/tests/mod.rs → ...ecution/src/curves/bls12_381/tests/mod.rs b/...ecution/src/curves/bls12_381/tests/mod.rs → ...ecution/src/curves/bls12_381/tests/mod.rs
diff --git a/...n/src/curves/bls12_381/tests/test_line.rs → ...n/src/curves/bls12_381/tests/test_line.rs b/...n/src/curves/bls12_381/tests/test_line.rs → ...n/src/curves/bls12_381/tests/test_line.rs
diff --git a/...urves/bls12_381/tests/test_miller_loop.rs → ...urves/bls12_381/tests/test_miller_loop.rs b/...urves/bls12_381/tests/test_miller_loop.rs → ...urves/bls12_381/tests/test_miller_loop.rs
diff --git a/ecc/execution/src/curves/bn254/curve.rs → lib/ecc-execution/src/curves/bn254/curve.rs b/ecc/execution/src/curves/bn254/curve.rs → lib/ecc-execution/src/curves/bn254/curve.rs
diff --git a/ecc/execution/src/curves/bn254/field.rs → lib/ecc-execution/src/curves/bn254/field.rs b/ecc/execution/src/curves/bn254/field.rs → lib/ecc-execution/src/curves/bn254/field.rs
diff --git a/ecc/execution/src/curves/bn254/final_exp.rs → ...c-execution/src/curves/bn254/final_exp.rs b/ecc/execution/src/curves/bn254/final_exp.rs → ...c-execution/src/curves/bn254/final_exp.rs
diff --git a/ecc/execution/src/curves/bn254/line.rs → lib/ecc-execution/src/curves/bn254/line.rs b/ecc/execution/src/curves/bn254/line.rs → lib/ecc-execution/src/curves/bn254/line.rs
diff --git a/...execution/src/curves/bn254/miller_loop.rs → ...execution/src/curves/bn254/miller_loop.rs b/...execution/src/curves/bn254/miller_loop.rs → ...execution/src/curves/bn254/miller_loop.rs
diff --git a/ecc/execution/src/curves/bn254/mod.rs → lib/ecc-execution/src/curves/bn254/mod.rs b/ecc/execution/src/curves/bn254/mod.rs → lib/ecc-execution/src/curves/bn254/mod.rs
diff --git a/ecc/execution/src/curves/bn254/tests/mod.rs → ...c-execution/src/curves/bn254/tests/mod.rs b/ecc/execution/src/curves/bn254/tests/mod.rs → ...c-execution/src/curves/bn254/tests/mod.rs
diff --git a/.../src/curves/bn254/tests/test_final_exp.rs → .../src/curves/bn254/tests/test_final_exp.rs b/.../src/curves/bn254/tests/test_final_exp.rs → .../src/curves/bn254/tests/test_final_exp.rs
diff --git a/...ution/src/curves/bn254/tests/test_line.rs → ...ution/src/curves/bn254/tests/test_line.rs b/...ution/src/curves/bn254/tests/test_line.rs → ...ution/src/curves/bn254/tests/test_line.rs
diff --git a/...rc/curves/bn254/tests/test_miller_loop.rs → ...rc/curves/bn254/tests/test_miller_loop.rs b/...rc/curves/bn254/tests/test_miller_loop.rs → ...rc/curves/bn254/tests/test_miller_loop.rs
diff --git a/ecc/execution/src/curves/mod.rs → lib/ecc-execution/src/curves/mod.rs b/ecc/execution/src/curves/mod.rs → lib/ecc-execution/src/curves/mod.rs
diff --git a/ecc/execution/src/lib.rs → lib/ecc-execution/src/lib.rs b/ecc/execution/src/lib.rs → lib/ecc-execution/src/lib.rs
diff --git a/ecc/execution/src/tests/convert.rs → lib/ecc-execution/src/tests/convert.rs b/ecc/execution/src/tests/convert.rs → lib/ecc-execution/src/tests/convert.rs
diff --git a/...tion/src/tests/integration_miller_loop.rs → ...tion/src/tests/integration_miller_loop.rs b/...tion/src/tests/integration_miller_loop.rs → ...tion/src/tests/integration_miller_loop.rs
diff --git a/ecc/execution/src/tests/mod.rs → lib/ecc-execution/src/tests/mod.rs b/ecc/execution/src/tests/mod.rs → lib/ecc-execution/src/tests/mod.rs
diff --git a/ecc/execution/src/tests/utils.rs → lib/ecc-execution/src/tests/utils.rs b/ecc/execution/src/tests/utils.rs → lib/ecc-execution/src/tests/utils.rs
diff --git a/ecc/lib/Cargo.toml → lib/ecc/Cargo.toml b/ecc/lib/Cargo.toml → lib/ecc/Cargo.toml
@@ -6,7 +6,7 @@ description = "Elliptic curve cryptography library written in Axiom's eDSL."
 
 [dependencies]
 afs-stark-backend = { path = "../../stark-backend" }
-afs-compiler = { path = "../../compiler" }
+afs-compiler = { path = "../../toolchain/compiler" }
 ax-sdk = { path = "../../sdk" }
 stark-vm = { path = "../../vm" }
 p3-air = { workspace = true }
@@ -38,7 +38,7 @@ k256 = { workspace = true }
 elliptic-curve = { workspace = true, features = ["std"] }
 
 [dev-dependencies]
-afs-primitives = { path = "../../primitives" }
+afs-primitives = { path = "../../circuits/primitives" }
 hex-literal = { workspace = true }
 sha3 = "0.10.8"
 test-log.workspace = true

diff --git a/ecc/lib/src/ec_add_slow.rs → lib/ecc/src/ec_add_slow.rs b/ecc/lib/src/ec_add_slow.rs → lib/ecc/src/ec_add_slow.rs
diff --git a/ecc/lib/src/ec_fixed_scalar_multiply.rs → lib/ecc/src/ec_fixed_scalar_multiply.rs b/ecc/lib/src/ec_fixed_scalar_multiply.rs → lib/ecc/src/ec_fixed_scalar_multiply.rs
diff --git a/ecc/lib/src/ec_mul.rs → lib/ecc/src/ec_mul.rs b/ecc/lib/src/ec_mul.rs → lib/ecc/src/ec_mul.rs
diff --git a/ecc/lib/src/ecdsa.rs → lib/ecc/src/ecdsa.rs b/ecc/lib/src/ecdsa.rs → lib/ecc/src/ecdsa.rs
diff --git a/ecc/lib/src/lib.rs → lib/ecc/src/lib.rs b/ecc/lib/src/lib.rs → lib/ecc/src/lib.rs
diff --git a/ecc/lib/src/tests/ecdsa.rs → lib/ecc/src/tests/ecdsa.rs b/ecc/lib/src/tests/ecdsa.rs → lib/ecc/src/tests/ecdsa.rs
diff --git a/ecc/lib/src/tests/mod.rs → lib/ecc/src/tests/mod.rs b/ecc/lib/src/tests/mod.rs → lib/ecc/src/tests/mod.rs
diff --git a/ecc/lib/src/types.rs → lib/ecc/src/types.rs b/ecc/lib/src/types.rs → lib/ecc/src/types.rs
@@ -9,7 +9,7 @@ use k256::{
 };
 use num_bigint_dig::BigUint;
 use p3_field::{AbstractField, PrimeField64};
-use stark_vm::modular_addsub::big_uint_to_num_limbs;
+use stark_vm::intrinsics::modular_addsub::big_uint_to_num_limbs;
 use zkhash::ark_ff::Zero;
 
 /// EC point in Rust. **Unsafe** to assume (x, y) is a point on the curve.

diff --git a/recursion/.gitignore → lib/recursion/.gitignore b/recursion/.gitignore → lib/recursion/.gitignore
diff --git a/recursion/Cargo.toml → lib/recursion/Cargo.toml b/recursion/Cargo.toml → lib/recursion/Cargo.toml
@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-afs-stark-backend = { path = "../stark-backend" }
-afs-compiler = { path = "../compiler", features = ["sdk"] }
-ax-sdk = { path = "../sdk" }                                # TODO: feature-gate sdk
-afs-derive = { path = "../derive" }
-stark-vm = { path = "../vm", features = ["sdk"] }
-ax-ecc-lib = { path = "../ecc/lib" }
+afs-stark-backend = { path = "../../stark-backend" }
+afs-compiler = { path = "../../toolchain/compiler", features = ["sdk"] }
+ax-sdk = { path = "../../sdk" }                                # TODO: feature-gate sdk
+afs-derive = { path = "../../derive" }
+stark-vm = { path = "../../vm", features = ["sdk"] }
+ax-ecc-lib = { path = "../ecc" }
 
 p3-air = { workspace = true }
 p3-field = { workspace = true }
@@ -44,7 +44,7 @@ metrics = { workspace = true, optional = true }
 cfg-if = { workspace = true }
 
 [dev-dependencies]
-afs-primitives = { path = "../primitives" }
+afs-primitives = { path = "../../circuits/primitives" }
 
 [[bin]]
 name = "verify_fibair"

diff --git a/recursion/src/bin/alu256_e2e.rs → lib/recursion/src/bin/alu256_e2e.rs b/recursion/src/bin/alu256_e2e.rs → lib/recursion/src/bin/alu256_e2e.rs
diff --git a/recursion/src/bin/small_e2e.rs → lib/recursion/src/bin/small_e2e.rs b/recursion/src/bin/small_e2e.rs → lib/recursion/src/bin/small_e2e.rs
diff --git a/recursion/src/bin/tiny_e2e.rs → lib/recursion/src/bin/tiny_e2e.rs b/recursion/src/bin/tiny_e2e.rs → lib/recursion/src/bin/tiny_e2e.rs
diff --git a/recursion/src/bin/verify_fibair.rs → lib/recursion/src/bin/verify_fibair.rs b/recursion/src/bin/verify_fibair.rs → lib/recursion/src/bin/verify_fibair.rs
diff --git a/recursion/src/challenger/duplex.rs → lib/recursion/src/challenger/duplex.rs b/recursion/src/challenger/duplex.rs → lib/recursion/src/challenger/duplex.rs
diff --git a/recursion/src/challenger/mod.rs → lib/recursion/src/challenger/mod.rs b/recursion/src/challenger/mod.rs → lib/recursion/src/challenger/mod.rs
diff --git a/recursion/src/challenger/multi_field32.rs → ...recursion/src/challenger/multi_field32.rs b/recursion/src/challenger/multi_field32.rs → ...recursion/src/challenger/multi_field32.rs
diff --git a/recursion/src/commit.rs → lib/recursion/src/commit.rs b/recursion/src/commit.rs → lib/recursion/src/commit.rs
diff --git a/recursion/src/config/mod.rs → lib/recursion/src/config/mod.rs b/recursion/src/config/mod.rs → lib/recursion/src/config/mod.rs
diff --git a/recursion/src/config/outer.rs → lib/recursion/src/config/outer.rs b/recursion/src/config/outer.rs → lib/recursion/src/config/outer.rs
diff --git a/recursion/src/digest.rs → lib/recursion/src/digest.rs b/recursion/src/digest.rs → lib/recursion/src/digest.rs
diff --git a/recursion/src/folder.rs → lib/recursion/src/folder.rs b/recursion/src/folder.rs → lib/recursion/src/folder.rs
diff --git a/recursion/src/fri/domain.rs → lib/recursion/src/fri/domain.rs b/recursion/src/fri/domain.rs → lib/recursion/src/fri/domain.rs
diff --git a/recursion/src/fri/hints.rs → lib/recursion/src/fri/hints.rs b/recursion/src/fri/hints.rs → lib/recursion/src/fri/hints.rs
diff --git a/recursion/src/fri/mod.rs → lib/recursion/src/fri/mod.rs b/recursion/src/fri/mod.rs → lib/recursion/src/fri/mod.rs
diff --git a/recursion/src/fri/two_adic_pcs.rs → lib/recursion/src/fri/two_adic_pcs.rs b/recursion/src/fri/two_adic_pcs.rs → lib/recursion/src/fri/two_adic_pcs.rs
@@ -316,7 +316,7 @@ pub mod tests {
     use p3_matrix::dense::RowMajorMatrix;
     use p3_uni_stark::{StarkGenericConfig, Val};
     use rand::rngs::OsRng;
-    use stark_vm::program::Program;
+    use stark_vm::system::program::Program;
 
     use crate::{
         challenger::{duplex::DuplexChallengerVariable, CanObserveDigest, FeltChallenger},

diff --git a/recursion/src/fri/types.rs → lib/recursion/src/fri/types.rs b/recursion/src/fri/types.rs → lib/recursion/src/fri/types.rs
diff --git a/recursion/src/fri/witness.rs → lib/recursion/src/fri/witness.rs b/recursion/src/fri/witness.rs → lib/recursion/src/fri/witness.rs
diff --git a/recursion/src/halo2/mod.rs → lib/recursion/src/halo2/mod.rs b/recursion/src/halo2/mod.rs → lib/recursion/src/halo2/mod.rs
diff --git a/recursion/src/halo2/testing_utils.rs → lib/recursion/src/halo2/testing_utils.rs b/recursion/src/halo2/testing_utils.rs → lib/recursion/src/halo2/testing_utils.rs
diff --git a/recursion/src/halo2/tests/mod.rs → lib/recursion/src/halo2/tests/mod.rs b/recursion/src/halo2/tests/mod.rs → lib/recursion/src/halo2/tests/mod.rs
diff --git a/recursion/src/halo2/tests/multi_field32.rs → ...ecursion/src/halo2/tests/multi_field32.rs b/recursion/src/halo2/tests/multi_field32.rs → ...ecursion/src/halo2/tests/multi_field32.rs
diff --git a/recursion/src/halo2/tests/outer_poseidon2.rs → ...ursion/src/halo2/tests/outer_poseidon2.rs b/recursion/src/halo2/tests/outer_poseidon2.rs → ...ursion/src/halo2/tests/outer_poseidon2.rs
diff --git a/recursion/src/halo2/tests/stark.rs → lib/recursion/src/halo2/tests/stark.rs b/recursion/src/halo2/tests/stark.rs → lib/recursion/src/halo2/tests/stark.rs
diff --git a/recursion/src/halo2/utils.rs → lib/recursion/src/halo2/utils.rs b/recursion/src/halo2/utils.rs → lib/recursion/src/halo2/utils.rs
diff --git a/recursion/src/halo2/verifier.rs → lib/recursion/src/halo2/verifier.rs b/recursion/src/halo2/verifier.rs → lib/recursion/src/halo2/verifier.rs
diff --git a/recursion/src/helper.rs → lib/recursion/src/helper.rs b/recursion/src/helper.rs → lib/recursion/src/helper.rs
diff --git a/recursion/src/hints.rs → lib/recursion/src/hints.rs b/recursion/src/hints.rs → lib/recursion/src/hints.rs
@@ -26,7 +26,7 @@ use p3_merkle_tree::FieldMerkleTreeMmcs;
 use p3_poseidon2::{Poseidon2, Poseidon2ExternalMatrixGeneral};
 use p3_symmetric::{PaddingFreeSponge, TruncatedPermutation};
 use p3_util::log2_strict_usize;
-use stark_vm::modular_addsub::big_uint_to_num_limbs;
+use stark_vm::intrinsics::modular_addsub::big_uint_to_num_limbs;
 
 use crate::{
     types::{InnerConfig, VerifierInput},

diff --git a/recursion/src/lib.rs → lib/recursion/src/lib.rs b/recursion/src/lib.rs → lib/recursion/src/lib.rs
diff --git a/recursion/src/outer_poseidon2.rs → lib/recursion/src/outer_poseidon2.rs b/recursion/src/outer_poseidon2.rs → lib/recursion/src/outer_poseidon2.rs
diff --git a/recursion/src/stark/mod.rs → lib/recursion/src/stark/mod.rs b/recursion/src/stark/mod.rs → lib/recursion/src/stark/mod.rs
@@ -18,7 +18,7 @@ use p3_baby_bear::BabyBear;
 use p3_commit::LagrangeSelectors;
 use p3_field::{AbstractExtensionField, AbstractField, TwoAdicField};
 use p3_matrix::{dense::RowMajorMatrixView, stack::VerticalPair};
-use stark_vm::program::Program;
+use stark_vm::system::program::Program;
 
 use crate::{
     challenger::{duplex::DuplexChallengerVariable, ChallengerVariable},

diff --git a/recursion/src/stark/outer.rs → lib/recursion/src/stark/outer.rs b/recursion/src/stark/outer.rs → lib/recursion/src/stark/outer.rs
diff --git a/recursion/src/testing_utils.rs → lib/recursion/src/testing_utils.rs b/recursion/src/testing_utils.rs → lib/recursion/src/testing_utils.rs
@@ -12,7 +12,7 @@ use inner::build_verification_program;
 use p3_baby_bear::BabyBear;
 use p3_commit::PolynomialSpace;
 use p3_uni_stark::{Domain, StarkGenericConfig, Val};
-use stark_vm::{program::Program, vm::config::VmConfig};
+use stark_vm::system::{program::Program, vm::config::VmConfig};
 
 use crate::hints::InnerVal;
 
@@ -27,7 +27,7 @@ pub mod inner {
         },
         engine::{StarkFriEngine, VerificationDataWithFriParams},
     };
-    use stark_vm::vm::config::VmConfig;
+    use stark_vm::system::vm::config::VmConfig;
 
     use super::*;
     use crate::{hints::Hintable, stark::VerifierProgram, types::new_from_inner_multi_vk};

diff --git a/recursion/src/tests.rs → lib/recursion/src/tests.rs b/recursion/src/tests.rs → lib/recursion/src/tests.rs
@@ -23,7 +23,7 @@ use ax_sdk::{
 use p3_field::{AbstractField, PrimeField32};
 use p3_matrix::{dense::RowMajorMatrix, Matrix};
 use p3_uni_stark::{StarkGenericConfig, Val};
-use stark_vm::{sdk::gen_vm_program_stark_for_test, vm::config::VmConfig};
+use stark_vm::{sdk::gen_vm_program_stark_for_test, system::vm::config::VmConfig};
 
 use crate::{
     hints::Hintable, stark::VerifierProgram, testing_utils::inner::run_recursive_test,

diff --git a/recursion/src/types.rs → lib/recursion/src/types.rs b/recursion/src/types.rs → lib/recursion/src/types.rs
diff --git a/recursion/src/utils.rs → lib/recursion/src/utils.rs b/recursion/src/utils.rs → lib/recursion/src/utils.rs
diff --git a/recursion/src/vars.rs → lib/recursion/src/vars.rs b/recursion/src/vars.rs → lib/recursion/src/vars.rs
diff --git a/recursion/src/view.rs → lib/recursion/src/view.rs b/recursion/src/view.rs → lib/recursion/src/view.rs
diff --git a/recursion/src/witness.rs → lib/recursion/src/witness.rs b/recursion/src/witness.rs → lib/recursion/src/witness.rs
diff --git a/recursion/tests/cached_trace.rs → lib/recursion/tests/cached_trace.rs b/recursion/tests/cached_trace.rs → lib/recursion/tests/cached_trace.rs
diff --git a/recursion/tests/recursion.rs → lib/recursion/tests/recursion.rs b/recursion/tests/recursion.rs → lib/recursion/tests/recursion.rs
@@ -8,7 +8,7 @@ use p3_baby_bear::BabyBear;
 use p3_commit::PolynomialSpace;
 use p3_field::{extension::BinomialExtensionField, AbstractField};
 use p3_uni_stark::{Domain, StarkGenericConfig};
-use stark_vm::{
+use stark_vm::system::{
     program::Program,
     vm::{config::VmConfig, VirtualMachine},
 };

diff --git a/recursion/trusted_setup_s3.sh → lib/recursion/trusted_setup_s3.sh b/recursion/trusted_setup_s3.sh → lib/recursion/trusted_setup_s3.sh
diff --git a/compiler/Cargo.toml → toolchain/compiler/Cargo.toml b/compiler/Cargo.toml → toolchain/compiler/Cargo.toml
@@ -10,9 +10,9 @@ edition = "2021"
 p3-field = { workspace = true }
 p3-baby-bear = { workspace = true }
 p3-bn254-fr = { workspace = true }
-afs-derive = { path = "../derive" }
-ax-sdk = { path = "../sdk" }
-stark-vm = { path = "../vm" }
+afs-derive = { path = "../../derive" }
+ax-sdk = { path = "../../sdk" }
+stark-vm = { path = "../../vm" }
 tracing.workspace = true
 itertools.workspace = true
 serde.workspace = true

diff --git a/compiler/README.md → toolchain/compiler/README.md b/compiler/README.md → toolchain/compiler/README.md
diff --git a/compiler/examples/fibonacci.rs → toolchain/compiler/examples/fibonacci.rs b/compiler/examples/fibonacci.rs → toolchain/compiler/examples/fibonacci.rs
diff --git a/compiler/src/asm/builder.rs → toolchain/compiler/src/asm/builder.rs b/compiler/src/asm/builder.rs → toolchain/compiler/src/asm/builder.rs
@@ -1,5 +1,5 @@
 use p3_field::{ExtensionField, PrimeField32, TwoAdicField};
-use stark_vm::program::Program;
+use stark_vm::system::program::Program;
 
 use super::{config::AsmConfig, AsmCompiler};
 use crate::{

diff --git a/compiler/src/asm/code.rs → toolchain/compiler/src/asm/code.rs b/compiler/src/asm/code.rs → toolchain/compiler/src/asm/code.rs
@@ -2,7 +2,7 @@ use alloc::{collections::BTreeMap, format};
 use core::{fmt, fmt::Display};
 
 use p3_field::{ExtensionField, PrimeField32};
-use stark_vm::program::DebugInfo;
+use stark_vm::system::program::DebugInfo;
 
 use super::AsmInstruction;
 

diff --git a/compiler/src/asm/compiler.rs → toolchain/compiler/src/asm/compiler.rs b/compiler/src/asm/compiler.rs → toolchain/compiler/src/asm/compiler.rs
@@ -2,7 +2,7 @@ use alloc::{collections::BTreeMap, vec};
 use std::collections::BTreeSet;
 
 use p3_field::{ExtensionField, Field, PrimeField32, TwoAdicField};
-use stark_vm::program::DebugInfo;
+use stark_vm::system::program::DebugInfo;
 
 use super::{config::AsmConfig, AssemblyCode, BasicBlock, IndexTriple, ValueOrConst};
 use crate::{

diff --git a/compiler/src/asm/config.rs → toolchain/compiler/src/asm/config.rs b/compiler/src/asm/config.rs → toolchain/compiler/src/asm/config.rs
diff --git a/compiler/src/asm/instruction.rs → toolchain/compiler/src/asm/instruction.rs b/compiler/src/asm/instruction.rs → toolchain/compiler/src/asm/instruction.rs
diff --git a/compiler/src/asm/mod.rs → toolchain/compiler/src/asm/mod.rs b/compiler/src/asm/mod.rs → toolchain/compiler/src/asm/mod.rs
diff --git a/compiler/src/asm/utils.rs → toolchain/compiler/src/asm/utils.rs b/compiler/src/asm/utils.rs → toolchain/compiler/src/asm/utils.rs
diff --git a/compiler/src/constraints/halo2/baby_bear.rs → ...mpiler/src/constraints/halo2/baby_bear.rs b/compiler/src/constraints/halo2/baby_bear.rs → ...mpiler/src/constraints/halo2/baby_bear.rs
diff --git a/compiler/src/constraints/halo2/compiler.rs → ...ompiler/src/constraints/halo2/compiler.rs b/compiler/src/constraints/halo2/compiler.rs → ...ompiler/src/constraints/halo2/compiler.rs
@@ -14,7 +14,7 @@ use snark_verifier_sdk::snark_verifier::{
     },
     util::arithmetic::PrimeField as _,
 };
-use stark_vm::vm::cycle_tracker::CycleTracker;
+use stark_vm::system::vm::cycle_tracker::CycleTracker;
 
 use super::stats::Halo2Stats;
 use crate::{

diff --git a/compiler/src/constraints/halo2/mod.rs → ...ain/compiler/src/constraints/halo2/mod.rs b/compiler/src/constraints/halo2/mod.rs → ...ain/compiler/src/constraints/halo2/mod.rs
diff --git a/...r/src/constraints/halo2/poseidon2_perm.rs → ...r/src/constraints/halo2/poseidon2_perm.rs b/...r/src/constraints/halo2/poseidon2_perm.rs → ...r/src/constraints/halo2/poseidon2_perm.rs
diff --git a/compiler/src/constraints/halo2/stats.rs → ...n/compiler/src/constraints/halo2/stats.rs b/compiler/src/constraints/halo2/stats.rs → ...n/compiler/src/constraints/halo2/stats.rs
diff --git a/compiler/src/constraints/mod.rs → toolchain/compiler/src/constraints/mod.rs b/compiler/src/constraints/mod.rs → toolchain/compiler/src/constraints/mod.rs
diff --git a/compiler/src/constraints/opcodes.rs → ...chain/compiler/src/constraints/opcodes.rs b/compiler/src/constraints/opcodes.rs → ...chain/compiler/src/constraints/opcodes.rs
diff --git a/compiler/src/conversion/mod.rs → toolchain/compiler/src/conversion/mod.rs b/compiler/src/conversion/mod.rs → toolchain/compiler/src/conversion/mod.rs
@@ -2,8 +2,10 @@ use num_bigint_dig::BigUint;
 use p3_field::{ExtensionField, PrimeField32, PrimeField64};
 use stark_vm::{
     arch::instructions::*,
-    program::{DebugInfo, Instruction, Program},
-    vm::config::Modulus,
+    system::{
+        program::{DebugInfo, Instruction, Program},
+        vm::config::Modulus,
+    },
 };
 use strum::EnumCount;
 

diff --git a/compiler/src/ir/bits.rs → toolchain/compiler/src/ir/bits.rs b/compiler/src/ir/bits.rs → toolchain/compiler/src/ir/bits.rs
diff --git a/compiler/src/ir/builder.rs → toolchain/compiler/src/ir/builder.rs b/compiler/src/ir/builder.rs → toolchain/compiler/src/ir/builder.rs
diff --git a/compiler/src/ir/collections.rs → toolchain/compiler/src/ir/collections.rs b/compiler/src/ir/collections.rs → toolchain/compiler/src/ir/collections.rs
diff --git a/compiler/src/ir/elliptic_curve.rs → toolchain/compiler/src/ir/elliptic_curve.rs b/compiler/src/ir/elliptic_curve.rs → toolchain/compiler/src/ir/elliptic_curve.rs
diff --git a/compiler/src/ir/instructions.rs → toolchain/compiler/src/ir/instructions.rs b/compiler/src/ir/instructions.rs → toolchain/compiler/src/ir/instructions.rs