diff --git a/.github/actions/setup-and-build-nocheck/action.yml b/.github/actions/setup-and-build-nocheck/action.yml
index 3b8832b30d..e70e2f2e23 100644
--- a/.github/actions/setup-and-build-nocheck/action.yml
+++ b/.github/actions/setup-and-build-nocheck/action.yml
@@ -19,7 +19,7 @@ runs:
       with:
         path: |
           .local
-          light-prover/proving-keys
+          prover/server/proving-keys
         key: ${{ runner.os }}-local-${{ hashFiles('scripts/install.sh') }}
 
     - name: Install dependencies
@@ -72,5 +72,5 @@ runs:
       with:
         path: |
           .local
-          light-prover/proving-keys
-        key: ${{ runner.os }}-local-${{ hashFiles('scripts/install.sh') }}
\ No newline at end of file
+          prover/server/proving-keys
+        key: ${{ runner.os }}-local-${{ hashFiles('scripts/install.sh') }}
diff --git a/.github/actions/setup-and-build/action.yml b/.github/actions/setup-and-build/action.yml
index e11c5714a4..473b70e7b3 100644
--- a/.github/actions/setup-and-build/action.yml
+++ b/.github/actions/setup-and-build/action.yml
@@ -21,8 +21,8 @@ runs:
       with:
         path: |
           .local
-          light-prover/proving-keys
-        key: ${{ runner.os }}-local-${{ hashFiles('scripts/install.sh', 'light-prover/scripts/download_keys.sh') }}
+          prover/server/proving-keys
+        key: ${{ runner.os }}-local-${{ hashFiles('scripts/install.sh', 'prover/server/scripts/download_keys.sh') }}
 
     - name: Install dependencies
       if: steps.restore-local-cache.outputs.cache-hit != 'true'
@@ -62,7 +62,7 @@ runs:
         source ./scripts/devenv.sh
         mkdir -p /home/runner/.config/solana/
         solana-keygen new --no-bip39-passphrase -o /home/runner/.config/solana/id.json
-        
+
     - name: Copy spl_noop.so to target/deploy
       shell: bash
       run: |
@@ -75,8 +75,8 @@ runs:
       with:
         path: |
           .local
-          light-prover/proving-keys
-        key: ${{ runner.os }}-local-${{ hashFiles('scripts/install.sh', 'light-prover/scripts/download_keys.sh') }}
+          prover/server/proving-keys
+        key: ${{ runner.os }}-local-${{ hashFiles('scripts/install.sh', 'prover/server/scripts/download_keys.sh') }}
 
     - name: Check for git changes
       shell: bash
diff --git a/.github/workflows/light-system-programs-tests.yml b/.github/workflows/light-system-programs-tests.yml
index 4ce4773c69..5a6d6bfb63 100644
--- a/.github/workflows/light-system-programs-tests.yml
+++ b/.github/workflows/light-system-programs-tests.yml
@@ -4,8 +4,8 @@ on:
       - main
     paths:
       - "programs/**"
-      - "test-programs/**"
-      - "circuit-lib/verifier/**"
+      - "program-tests/**"
+      - "program-libs/verifier/**"
       - "merkle-tree/**"
       - ".github/workflows/light-system-programs-tests.yml"
       - "test-utils/**"
@@ -14,8 +14,8 @@ on:
       - "*"
     paths:
       - "programs/**"
-      - "test-programs/**"
-      - "circuit-lib/verifier/**"
+      - "program-tests/**"
+      - "program-libs/verifier/**"
       - "merkle-tree/**"
       - ".github/workflows/light-system-programs-tests.yml"
       - "test-utils/**"
@@ -70,12 +70,12 @@ jobs:
         run: |
           source ./scripts/devenv.sh
           anchor build
-          npx nx build @lightprotocol/test-programs
+          npx nx build @lightprotocol/program-tests
 
       - name: ${{ matrix.program }}
         run: |
           source ./scripts/devenv.sh
-          
+
           IFS=',' read -r -a sub_tests <<< "${{ join(fromJSON(matrix['sub-tests']), ', ') }}"
           for subtest in "${sub_tests[@]}"
           do
diff --git a/.github/workflows/prover-release.yml b/.github/workflows/prover-release.yml
index a14d6d660a..87f6241a98 100644
--- a/.github/workflows/prover-release.yml
+++ b/.github/workflows/prover-release.yml
@@ -2,7 +2,7 @@ name: Release prover binaries
 on:
   push:
     tags:
-      - 'light-prover*'
+      - "light-prover*"
 
 jobs:
   create_release:
@@ -18,7 +18,7 @@ jobs:
 
       - name: Build artifacts
         run: |
-          cd light-prover
+          cd prover/server
           for cfgstr in "darwin amd64" "darwin arm64" "linux amd64" "windows amd64"; do
             IFS=' ' read -r -a cfg <<< "$cfgstr"
             export GOOS="${cfg[0]}"
@@ -31,7 +31,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            light-prover/prover-darwin-amd64
-            light-prover/prover-darwin-arm64
-            light-prover/prover-linux-amd64
-            light-prover/prover-windows-amd64
+            prover/server/prover-darwin-amd64
+            prover/server/prover-darwin-arm64
+            prover/server/prover-linux-amd64
+            prover/server/prover-windows-amd64
diff --git a/.github/workflows/prover-test.yml b/.github/workflows/prover-test.yml
index 2e74fe4290..02c302bd33 100644
--- a/.github/workflows/prover-test.yml
+++ b/.github/workflows/prover-test.yml
@@ -3,16 +3,16 @@ on:
   push:
     branches:
       - main
-      - 'release/**'
+      - "release/**"
     paths:
-      - "light-prover/**"
+      - "prover/server/**"
       - ".github/workflows/prover-test.yml"
       - ".github/workflows/prover-release.yml"
   pull_request:
     branches:
       - "*"
     paths:
-      - "light-prover/**"
+      - "prover/server/**"
       - ".github/workflows/prover-test.yml"
       - ".github/workflows/prover-release.yml"
     types:
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: "./light-prover/go.mod"
+          go-version-file: "./prover/server/go.mod"
 
       - name: Install Elan
         run: |
@@ -43,50 +43,50 @@ jobs:
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
-          path: light-prover/formal-verification/lake-packages
+          path: prover/server/formal-verification/lake-packages
           key: "${{ env.LAKE_VERSION }}"
 
       - name: Download keys for lightweight tests
         if: ${{ github.event.pull_request.base.ref == 'main' }}
         run: |
-          cd light-prover
+          cd prover/server
           ./scripts/download_keys.sh light
 
       - name: Download keys for full tests
         if: ${{ github.event.pull_request.base.ref == 'release' }}
         run: |
-          cd light-prover
+          cd prover/server
           ./scripts/download_keys.sh full
 
       - name: Build
         run: |
-          cd light-prover
+          cd prover/server
           go build
 
       - name: Unit tests
         run: |
-          cd light-prover
+          cd prover/server
           go test ./prover -timeout 60m
 
       - name: Lightweight integration tests
         if: ${{ github.event.pull_request.base.ref == 'main' }}
         run: |
-          cd light-prover
+          cd prover/server
           go test -run TestLightweight -timeout 15m
-  
+
       - name: Full integration tests
         if: ${{ github.event.pull_request.base.ref == 'release' }}
         run: |
-          cd light-prover
+          cd prover/server
           go test -run TestFull -timeout 120m
 
       # - name: Extract circuit to Lean
       #   run: |
-      #     cd light-prover
+      #     cd prover/server
       #     ./light-prover extract-circuit --output formal-verification/FormalVerification/Circuit.lean --tree-height=26 --compressed-accounts=8
 
       # - name: Build lean project
       #   run: |
-      #     cd light-prover/formal-verification
+      #     cd prover/server/formal-verification
       #     ~/.elan/bin/lake exe cache get
       #     ~/.elan/bin/lake build
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4116107bea..1e005aa3b6 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -6,7 +6,7 @@ on:
       - ".cargo/**"
       - "**/*.rs"
       - "**/Cargo.*"
-      - "light-prover/**"
+      - "prover/server/**"
       - ".github/workflows/rust.yml"
   pull_request:
     branches:
@@ -14,7 +14,7 @@ on:
     paths:
       - "**/*.rs"
       - "**/Cargo.*"
-      - "light-prover/**"
+      - "prover/server/**"
       - ".github/workflows/rust.yml"
 
     types:
diff --git a/.gitignore b/.gitignore
index 1e80a69583..16940e20bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,7 @@ node_modules
 
 /cli/.crates2.json
 /cli/.crates.toml
-test-programs/e2e-test/**/*.txt
+program-tests/e2e-test/**/*.txt
 output.txt
 .nx/cache
 .nx/workspace-data
diff --git a/CODEOWNERS b/CODEOWNERS
index 143781e069..e6622161a4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,17 +1,12 @@
 assets/ @SwenSchaeferjohann
-circuit-lib/ @ananas-block @sergeytimoshin
+program-libs/ @ananas-block @sergeytimoshin
 cli/ @ananas-block @sergeytimoshin
-macro-circom/ @ananas-block
-macros/ @vadorovsky
-merkle-tree/ @ananas-block @vadorovsky
-programs/ @ananas-block @vadorovsky
+programs/ @ananas-block
 prover.js/ @sergeytimoshin
 examples/ @ananas-block @SwenSchaeferjohann
 rpc/ @sergeytimoshin @SwenSchaeferjohann
-scripts/ @vadorovsky
-third-party/ @vadorovsky
+scripts/ @ananas-block @sergeytimoshin
+third-party/ @ananas-block
 tsconfig/ @SwenSchaeferjohann
-utils/ @vadorovsky
-verifier-sdk/ @ananas-block @vadorovsky
 web/ @SwenSchaeferjohann
-xtask/ @vadorovsky
\ No newline at end of file
+xtask/ @ananans-block
diff --git a/Cargo.lock b/Cargo.lock
index d8f08a2009..b50011913e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6531,13 +6531,14 @@ dependencies = [
 
 [[package]]
 name = "spl-account-compression"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602499d5fe3b60280239c4656a361b283c8c5f73f769c6cf41d2e8a151ce72db"
+checksum = "dfcf740e5242f2ad63325e600c368702f32db84608fc8b70d70633c68dd1486d"
 dependencies = [
  "anchor-lang",
  "bytemuck",
  "solana-program",
+ "solana-security-txt",
  "spl-concurrent-merkle-tree 0.3.0",
  "spl-noop",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index a30d1d8cd5..302274b26f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,36 +1,41 @@
 [workspace]
 resolver = "2"
 members = [
-    "heap",
-    "circuit-lib/light-prover-client",
-    "circuit-lib/verifier",
-    "macros/aligned-sized",
-    "macros/light",
-    "macros/light-sdk-macros",
-    "merkle-tree/*",
+    "program-libs/aligned-sized",
+    "program-libs/batched-merkle-tree",
+    "program-libs/bloom-filter",
+    "program-libs/hasher",
+    "program-libs/utils",
+    "program-libs/verifier",
+    "program-libs/merkle-tree-metadata",
+    "program-libs/bounded-vec",
+    "program-libs/concurrent-merkle-tree",
+    "program-libs/hash-set",
+    "program-libs/indexed-merkle-tree",
     "programs/account-compression",
     "programs/system",
     "programs/compressed-token",
     "programs/registry",
-    "client",
-    "sdk",
-    "test-utils",
-    "utils",
+    "sdk-libs/client",
+    "sdk-libs/macros",
+    "sdk-libs/sdk",
+    "sdk-libs/photon-api",
+    "sdk-libs/program-test",
     "xtask",
     "examples/name-service/programs/*",
     "examples/token-escrow/programs/*",
-    "test-programs/account-compression-test/",
-    "test-programs/compressed-token-test/",
-    "test-programs/e2e-test/",
-    "test-programs/registry-test/",
-    "test-programs/system-cpi-test/",
-    "test-programs/system-test/",
-    "test-programs/sdk-test-program/programs/sdk-test/",
-    "test-programs/create-address-test-program/",
+    "program-tests/account-compression-test/",
+    "program-tests/compressed-token-test/",
+    "program-tests/e2e-test/",
+    "program-tests/registry-test/",
+    "program-tests/system-cpi-test/",
+    "program-tests/system-test/",
+    "program-tests/sdk-test-program/programs/sdk-test/",
+    "program-tests/create-address-test-program/",
+    "program-tests/utils",
+    "program-tests/merkle-tree",
     "forester-utils",
     "forester",
-    "photon-api", 
-    "light-program-test",
 ]
 
 [profile.release]
@@ -78,32 +83,35 @@ log = "0.4"
 thiserror = "1.0"
 
 # Light Protocol
-light-client = { path = "client", version = "0.9.1" }
-light-concurrent-merkle-tree = { path = "merkle-tree/concurrent", version = "1.1.0" }
-light-hasher = { path = "merkle-tree/hasher", version = "1.1.0" }
-light-indexed-merkle-tree = { path = "merkle-tree/indexed", version = "1.1.0" }
-light-macros = { path = "macros/light", version = "1.1.0" }
-light-merkle-tree-reference = { path = "merkle-tree/reference", version = "1.1.0" }
-light-prover-client = { path = "circuit-lib/light-prover-client", version = "1.2.0" }
-light-sdk = { path = "sdk", version = "0.11.0" }
-light-sdk-macros = { path = "macros/light-sdk-macros", version = "0.4.0" }
-light-utils = { path = "utils", version = "1.1.0" }
-light-verifier = { path = "circuit-lib/verifier", version = "1.1.0" }
-photon-api = { path = "photon-api", version = "0.45.0" }
+light-hash-set = { version = "1.2.0", path = "program-libs/hash-set" }
+light-indexed-merkle-tree = { version = "1.1.0", path = "program-libs/indexed-merkle-tree" }
+light-concurrent-merkle-tree = { version = "1.1.0" , path= "program-libs/concurrent-merkle-tree"}
+light-client = { path = "sdk-libs/client", version = "0.9.1" }
+light-hasher = { path = "program-libs/hasher", version = "1.1.0" }
+light-macros = { path = "program-libs/macros", version = "1.1.0" }
+light-merkle-tree-reference = { path = "program-tests/merkle-tree", version = "1.1.0" }
+light-heap = { path = "program-libs/heap", version = "1.1.0" }
+light-prover-client = { path = "prover/client", version = "1.2.0" }
+light-sdk = { path = "sdk-libs/sdk", version = "0.11.0" }
+light-sdk-macros = { path = "sdk-libs/macros", version = "0.4.0" }
+light-utils = { path = "program-libs/utils", version = "1.1.0" }
+light-verifier = { path = "program-libs/verifier", version = "1.1.0" }
+photon-api = { path = "sdk-libs/photon-api", version = "0.45.0" }
 forester-utils = { path = "forester-utils", version = "1.2.0" }
-light-hash-set = { path = "merkle-tree/hash-set", version = "1.2.0" }
 account-compression = { path = "programs/account-compression", version = "1.2.0", features = ["cpi"] }
 light-compressed-token = { path = "programs/compressed-token", version = "1.2.0", features = ["cpi"] }
 light-system-program = { path = "programs/system", version = "1.2.0", features = ["cpi"] }
 light-registry = { path = "programs/registry", version = "1.2.0",  features = ["cpi"]}
-create-address-test-program = { path = "test-programs/create-address-test-program", version = "1.0.0", features = ["cpi"] }
-light-program-test = { path = "light-program-test", version = "0.1.0" }
-light-batched-merkle-tree = { path = "merkle-tree/batched", version = "0.1.0" }
-light-merkle-tree-metadata = { path = "merkle-tree/metadata", version = "0.1.0" }
-aligned-sized = { path = "macros/aligned-sized", version = "1.1.0" }
-light-bloom-filter = { path = "merkle-tree/bloom-filter", version = "0.1.0" }
-light-bounded-vec = { path = "merkle-tree/bounded-vec", version = "1.1.0" }
+create-address-test-program = { path = "program-tests/create-address-test-program", version = "1.0.0", features = ["cpi"] }
+light-program-test = { path = "sdk-libs/program-test", version = "0.1.0" }
+light-batched-merkle-tree = { path = "program-libs/batched-merkle-tree", version = "0.1.0" }
+light-merkle-tree-metadata = { path = "program-libs/merkle-tree-metadata", version = "0.1.0" }
+aligned-sized = { path = "program-libs/aligned-sized", version = "1.1.0" }
+light-bloom-filter = { path = "program-libs/bloom-filter", version = "0.1.0" }
+light-bounded-vec = { path = "program-libs/bounded-vec", version = "1.1.0" }
 light-poseidon = { version = "0.2.0" }
+light-test-utils = { path = "program-tests/utils", version = "1.2.1" }
+create-address-program-test = { path = "program-tests/create-address-test-program", version = "1.0.0" }
 bytemuck = { version = "1.17" }
 # Math and crypto
 num-bigint = "0.4.6"
diff --git a/README.md b/README.md
index 4e3d7f8bdb..9a2fcc85fc 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,11 @@ The documentation is available here: https://github.com/Lightprotocol/developer-
 ## Verifiable Build
 
 Prerequisites:
+
 - solana-verify
 - docker
-Install `solana-verify` with `cargo-install solana-verify` or see [github](https://github.com/Ellipsis-Labs/solana-verifiable-build) for alternative install instructions.
-See https://docs.docker.com/engine/install/ for `docker` install instructions.
+  Install `solana-verify` with `cargo-install solana-verify` or see [github](https://github.com/Ellipsis-Labs/solana-verifiable-build) for alternative install instructions.
+  See https://docs.docker.com/engine/install/ for `docker` install instructions.
 
 ```
 ./scripts/build-verifiable.sh
@@ -75,6 +76,7 @@ There are three ways of setting up the development environment:
 - Windows is not supported.
 
 ### Prerequisites:
+
 - Ubuntu, `sudo apt-get install lld clang`
 - Fedora, `sudo dnf install clang lld`
 - Arch, `sudo pacman -S lld clang`
@@ -93,6 +95,7 @@ directory inside your repository clone).
 ```
 
 By default, this will install a subset of gnark keys with Merkle tree heights sufficient for running tests. If you need the full set of production keys, you can use the --full-keys flag:
+
 ```
 ./scripts/install.sh --full-keys
 ```
@@ -168,7 +171,7 @@ solana-keygen new -o ~/.config/solana/id.json
 
 ### Program tests
 
-Program tests are located in test-programs.
+Program tests are located in program-tests.
 Many tests start a local prover server.
 To avoid conflicts between local prover servers run program tests with `--test-threads=1` so that tests are executed in sequence.
 
diff --git a/cli/scripts/buildProver.sh b/cli/scripts/buildProver.sh
index f789f2d789..81a15019bf 100755
--- a/cli/scripts/buildProver.sh
+++ b/cli/scripts/buildProver.sh
@@ -7,7 +7,7 @@ build_prover() {
 }
 
 root_dir="$(git rev-parse --show-toplevel)"
-gnark_dir="${root_dir}/light-prover"
+gnark_dir="${root_dir}/prover/server"
 out_dir="${root_dir}/cli/bin"
 
 if [ ! -e "$out_dir" ]; then
diff --git a/examples/name-service/programs/name-service-without-macros/Cargo.toml b/examples/name-service/programs/name-service-without-macros/Cargo.toml
index fe3bbb18ff..86f059d48e 100644
--- a/examples/name-service/programs/name-service-without-macros/Cargo.toml
+++ b/examples/name-service/programs/name-service-without-macros/Cargo.toml
@@ -35,7 +35,7 @@ solana-sdk = { workspace = true }
 
 [dev-dependencies]
 light-client = { workspace = true , features = ["devenv"]}
-light-test-utils = { path = "../../../../test-utils", version = "1.2.0", features = ["devenv"] }
+light-test-utils = { workspace = true, features = ["devenv"] }
 light-program-test = { workspace = true, features = ["devenv"] }
 solana-program-test = { workspace = true }
 tokio = "1.36.0"
diff --git a/examples/name-service/programs/name-service/Cargo.toml b/examples/name-service/programs/name-service/Cargo.toml
index 4a8f894e65..a03ad77eed 100644
--- a/examples/name-service/programs/name-service/Cargo.toml
+++ b/examples/name-service/programs/name-service/Cargo.toml
@@ -35,7 +35,7 @@ solana-sdk = { workspace = true }
 
 [dev-dependencies]
 light-client = { workspace = true , features = ["devenv"]}
-light-test-utils = { path = "../../../../test-utils", version = "1.2.0", features = ["devenv"] }
+light-test-utils = { workspace = true, features = ["devenv"] }
 light-program-test = { workspace = true }
 solana-program-test = { workspace = true }
 tokio = "1.36.0"
diff --git a/examples/token-escrow/programs/token-escrow/Cargo.toml b/examples/token-escrow/programs/token-escrow/Cargo.toml
index bf6c192a36..9d0ca72135 100644
--- a/examples/token-escrow/programs/token-escrow/Cargo.toml
+++ b/examples/token-escrow/programs/token-escrow/Cargo.toml
@@ -24,18 +24,18 @@ anchor-lang = { workspace = true, features = ["init-if-needed"] }
 light-compressed-token = { workspace = true }
 light-system-program = { workspace = true }
 account-compression = { workspace = true }
-light-hasher = { path = "../../../../merkle-tree/hasher", version = "1.1.0" }
-light-verifier = { path = "../../../../circuit-lib/verifier", version = "1.1.0" }
+light-hasher = { workspace = true }
+light-verifier = { workspace = true }
 light-sdk = { workspace = true, features = ["legacy"] }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 solana-sdk = { workspace = true }
 
 [dev-dependencies]
-light-test-utils = { version = "1.2.0", path = "../../../../test-utils", features = ["devenv"] }
+light-test-utils = { workspace = true, features = ["devenv"] }
 light-program-test = { workspace = true, features = ["devenv"] }
 tokio = { workspace = true }
-light-prover-client = { path = "../../../../circuit-lib/light-prover-client", version = "1.2.0" }
+light-prover-client = { workspace = true, version = "1.2.0" }
 anchor-spl = { workspace = true }
 
 [lints.rust.unexpected_cfgs]
diff --git a/forester-utils/Cargo.toml b/forester-utils/Cargo.toml
index f45687bf4c..4b50e00a51 100644
--- a/forester-utils/Cargo.toml
+++ b/forester-utils/Cargo.toml
@@ -11,14 +11,14 @@ description = "Utility library for Light's Forester node implementation"
 account-compression = { workspace = true }
 light-compressed-token = { workspace = true }
 light-hash-set = { workspace=true }
-light-hasher = { version = "1.1.0", path = "../merkle-tree/hasher" }
-light-merkle-tree-reference = { version = "1.1.0", path = "../merkle-tree/reference" }
-light-concurrent-merkle-tree = { version = "1.1.0", path = "../merkle-tree/concurrent" }
-light-indexed-merkle-tree = { path = "../merkle-tree/indexed/", version = "1.1.0" }
-light-prover-client = { path = "../circuit-lib/light-prover-client", version = "1.2.0" }
+light-hasher = { workspace = true }
+light-merkle-tree-reference = { workspace = true }
+light-concurrent-merkle-tree = { workspace = true }
+light-indexed-merkle-tree = { workspace = true }
+light-prover-client = { workspace = true }
 light-registry = { workspace = true }
-light-system-program = { path = "../programs/system", version = "1.2.0", features = ["cpi"] }
-light-utils = { path = "../utils", version = "1.1.0" }
+light-system-program = { workspace = true, features = ["cpi"] }
+light-utils = { workspace = true }
 light-batched-merkle-tree = { workspace = true }
 
 photon-api = { workspace = true }
diff --git a/forester/Cargo.toml b/forester/Cargo.toml
index 0383d69211..dc7ce01d8a 100644
--- a/forester/Cargo.toml
+++ b/forester/Cargo.toml
@@ -14,10 +14,10 @@ solana-program = { workspace = true }
 account-compression = { workspace = true }
 light-batched-merkle-tree = { workspace = true }
 light-prover-client = { workspace = true }
-light-system-program = { path = "../programs/system", features = ["cpi"] }
+light-system-program = { workspace = true, features = ["cpi"] }
 light-hash-set = { workspace = true, features = ["solana"] }
-light-hasher = { path = "../merkle-tree/hasher" }
-light-merkle-tree-reference = { path = "../merkle-tree/reference" }
+light-hasher = { workspace = true }
+light-merkle-tree-reference = { workspace = true }
 light-registry = { workspace = true}
 light-utils = { workspace = true }
 light-verifier = { workspace = true }
@@ -47,8 +47,8 @@ light-merkle-tree-metadata = { workspace = true }
 
 [dev-dependencies]
 serial_test = "3.2.0"
-light-prover-client = {path = "../circuit-lib/light-prover-client" }
-light-merkle-tree-reference = {path = "../merkle-tree/reference"}
-light-hasher = {path = "../merkle-tree/hasher"}
-light-test-utils = {path = "../test-utils" }
+light-prover-client = { workspace = true }
+light-merkle-tree-reference = { workspace = true}
+light-hasher = { workspace = true}
+light-test-utils = { workspace = true }
 light-program-test = { workspace = true, features = ["devenv"] }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 81ebf8196d..30d5ca4e29 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -561,9 +561,9 @@ importers:
 
   programs: {}
 
-  test-programs: {}
+  program-tests: {}
 
-  test-programs/sdk-test-program:
+  program-tests/sdk-test-program:
     dependencies:
       '@coral-xyz/anchor':
         specifier: ^0.29.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 424504e75a..974314d2d4 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,7 +1,7 @@
 packages:
   - "tsconfig/**"
   - "programs/**"
-  - "circuit-lib/**"
+  - "program-libs/**"
   - "cli/**"
   - "account-compression/programs/**"
   - "sdk/**"
@@ -9,4 +9,4 @@ packages:
   - "js/compressed-token/**"
   - "examples/**"
   - "forester/**"
-  - "test-programs/**"
+  - "program-tests/**"
diff --git a/macros/aligned-sized/Cargo.lock b/program-libs/aligned-sized/Cargo.lock
similarity index 100%
rename from macros/aligned-sized/Cargo.lock
rename to program-libs/aligned-sized/Cargo.lock
diff --git a/macros/aligned-sized/Cargo.toml b/program-libs/aligned-sized/Cargo.toml
similarity index 100%
rename from macros/aligned-sized/Cargo.toml
rename to program-libs/aligned-sized/Cargo.toml
diff --git a/macros/aligned-sized/LICENSE b/program-libs/aligned-sized/LICENSE
similarity index 100%
rename from macros/aligned-sized/LICENSE
rename to program-libs/aligned-sized/LICENSE
diff --git a/macros/aligned-sized/README.md b/program-libs/aligned-sized/README.md
similarity index 100%
rename from macros/aligned-sized/README.md
rename to program-libs/aligned-sized/README.md
diff --git a/macros/aligned-sized/src/expand.rs b/program-libs/aligned-sized/src/expand.rs
similarity index 100%
rename from macros/aligned-sized/src/expand.rs
rename to program-libs/aligned-sized/src/expand.rs
diff --git a/macros/aligned-sized/src/lib.rs b/program-libs/aligned-sized/src/lib.rs
similarity index 100%
rename from macros/aligned-sized/src/lib.rs
rename to program-libs/aligned-sized/src/lib.rs
diff --git a/macros/aligned-sized/tests/test.rs b/program-libs/aligned-sized/tests/test.rs
similarity index 100%
rename from macros/aligned-sized/tests/test.rs
rename to program-libs/aligned-sized/tests/test.rs
diff --git a/merkle-tree/batched/Cargo.toml b/program-libs/batched-merkle-tree/Cargo.toml
similarity index 83%
rename from merkle-tree/batched/Cargo.toml
rename to program-libs/batched-merkle-tree/Cargo.toml
index b242ecd3ed..9efc4bd243 100644
--- a/merkle-tree/batched/Cargo.toml
+++ b/program-libs/batched-merkle-tree/Cargo.toml
@@ -28,8 +28,8 @@ bytemuck = { workspace = true }
 
 [dev-dependencies]
 rand = "0.8.5"
-light-prover-client = { version = "1.2.0", path = "../../circuit-lib/light-prover-client", features = ["gnark"] }
-light-merkle-tree-reference = { version = "1.1.0", path = "../../merkle-tree/reference" }
+light-prover-client = { workspace = true }
+light-merkle-tree-reference = { workspace = true }
 tokio = {workspace = true}
 serial_test = {workspace = true}
 
diff --git a/merkle-tree/batched/src/batch.rs b/program-libs/batched-merkle-tree/src/batch.rs
similarity index 100%
rename from merkle-tree/batched/src/batch.rs
rename to program-libs/batched-merkle-tree/src/batch.rs
diff --git a/merkle-tree/batched/src/batch_metadata.rs b/program-libs/batched-merkle-tree/src/batch_metadata.rs
similarity index 100%
rename from merkle-tree/batched/src/batch_metadata.rs
rename to program-libs/batched-merkle-tree/src/batch_metadata.rs
diff --git a/merkle-tree/batched/src/constants.rs b/program-libs/batched-merkle-tree/src/constants.rs
similarity index 100%
rename from merkle-tree/batched/src/constants.rs
rename to program-libs/batched-merkle-tree/src/constants.rs
diff --git a/merkle-tree/batched/src/errors.rs b/program-libs/batched-merkle-tree/src/errors.rs
similarity index 100%
rename from merkle-tree/batched/src/errors.rs
rename to program-libs/batched-merkle-tree/src/errors.rs
diff --git a/merkle-tree/batched/src/event.rs b/program-libs/batched-merkle-tree/src/event.rs
similarity index 100%
rename from merkle-tree/batched/src/event.rs
rename to program-libs/batched-merkle-tree/src/event.rs
diff --git a/merkle-tree/batched/src/initialize_address_tree.rs b/program-libs/batched-merkle-tree/src/initialize_address_tree.rs
similarity index 100%
rename from merkle-tree/batched/src/initialize_address_tree.rs
rename to program-libs/batched-merkle-tree/src/initialize_address_tree.rs
diff --git a/merkle-tree/batched/src/initialize_state_tree.rs b/program-libs/batched-merkle-tree/src/initialize_state_tree.rs
similarity index 100%
rename from merkle-tree/batched/src/initialize_state_tree.rs
rename to program-libs/batched-merkle-tree/src/initialize_state_tree.rs
diff --git a/merkle-tree/batched/src/lib.rs b/program-libs/batched-merkle-tree/src/lib.rs
similarity index 100%
rename from merkle-tree/batched/src/lib.rs
rename to program-libs/batched-merkle-tree/src/lib.rs
diff --git a/merkle-tree/batched/src/merkle_tree.rs b/program-libs/batched-merkle-tree/src/merkle_tree.rs
similarity index 100%
rename from merkle-tree/batched/src/merkle_tree.rs
rename to program-libs/batched-merkle-tree/src/merkle_tree.rs
diff --git a/merkle-tree/batched/src/queue.rs b/program-libs/batched-merkle-tree/src/queue.rs
similarity index 100%
rename from merkle-tree/batched/src/queue.rs
rename to program-libs/batched-merkle-tree/src/queue.rs
diff --git a/merkle-tree/batched/src/rollover_address_tree.rs b/program-libs/batched-merkle-tree/src/rollover_address_tree.rs
similarity index 100%
rename from merkle-tree/batched/src/rollover_address_tree.rs
rename to program-libs/batched-merkle-tree/src/rollover_address_tree.rs
diff --git a/merkle-tree/batched/src/rollover_state_tree.rs b/program-libs/batched-merkle-tree/src/rollover_state_tree.rs
similarity index 100%
rename from merkle-tree/batched/src/rollover_state_tree.rs
rename to program-libs/batched-merkle-tree/src/rollover_state_tree.rs
diff --git a/merkle-tree/batched/src/zero_copy.rs b/program-libs/batched-merkle-tree/src/zero_copy.rs
similarity index 100%
rename from merkle-tree/batched/src/zero_copy.rs
rename to program-libs/batched-merkle-tree/src/zero_copy.rs
diff --git a/merkle-tree/batched/tests/initialize_address_tree.rs b/program-libs/batched-merkle-tree/tests/initialize_address_tree.rs
similarity index 100%
rename from merkle-tree/batched/tests/initialize_address_tree.rs
rename to program-libs/batched-merkle-tree/tests/initialize_address_tree.rs
diff --git a/merkle-tree/batched/tests/initialize_state_tree.rs b/program-libs/batched-merkle-tree/tests/initialize_state_tree.rs
similarity index 100%
rename from merkle-tree/batched/tests/initialize_state_tree.rs
rename to program-libs/batched-merkle-tree/tests/initialize_state_tree.rs
diff --git a/merkle-tree/batched/tests/merkle_tree.rs b/program-libs/batched-merkle-tree/tests/merkle_tree.rs
similarity index 100%
rename from merkle-tree/batched/tests/merkle_tree.rs
rename to program-libs/batched-merkle-tree/tests/merkle_tree.rs
diff --git a/merkle-tree/batched/tests/queue.rs b/program-libs/batched-merkle-tree/tests/queue.rs
similarity index 100%
rename from merkle-tree/batched/tests/queue.rs
rename to program-libs/batched-merkle-tree/tests/queue.rs
diff --git a/merkle-tree/batched/tests/rollover_address_tree.rs b/program-libs/batched-merkle-tree/tests/rollover_address_tree.rs
similarity index 100%
rename from merkle-tree/batched/tests/rollover_address_tree.rs
rename to program-libs/batched-merkle-tree/tests/rollover_address_tree.rs
diff --git a/merkle-tree/batched/tests/rollover_state_tree.rs b/program-libs/batched-merkle-tree/tests/rollover_state_tree.rs
similarity index 100%
rename from merkle-tree/batched/tests/rollover_state_tree.rs
rename to program-libs/batched-merkle-tree/tests/rollover_state_tree.rs
diff --git a/merkle-tree/batched/tests/zero_copy.rs b/program-libs/batched-merkle-tree/tests/zero_copy.rs
similarity index 100%
rename from merkle-tree/batched/tests/zero_copy.rs
rename to program-libs/batched-merkle-tree/tests/zero_copy.rs
diff --git a/merkle-tree/bloom-filter/Cargo.toml b/program-libs/bloom-filter/Cargo.toml
similarity index 88%
rename from merkle-tree/bloom-filter/Cargo.toml
rename to program-libs/bloom-filter/Cargo.toml
index ed4315767f..aef65171b1 100644
--- a/merkle-tree/bloom-filter/Cargo.toml
+++ b/program-libs/bloom-filter/Cargo.toml
@@ -19,4 +19,4 @@ thiserror = "1.0"
 
 [dev-dependencies]
 rand = "0.8"
-light-utils = { path = "../../utils", version = "1.0.0" }
+light-utils = { workspace = true }
diff --git a/merkle-tree/bloom-filter/src/lib.rs b/program-libs/bloom-filter/src/lib.rs
similarity index 100%
rename from merkle-tree/bloom-filter/src/lib.rs
rename to program-libs/bloom-filter/src/lib.rs
diff --git a/merkle-tree/bounded-vec/Cargo.toml b/program-libs/bounded-vec/Cargo.toml
similarity index 100%
rename from merkle-tree/bounded-vec/Cargo.toml
rename to program-libs/bounded-vec/Cargo.toml
diff --git a/merkle-tree/bounded-vec/src/lib.rs b/program-libs/bounded-vec/src/lib.rs
similarity index 100%
rename from merkle-tree/bounded-vec/src/lib.rs
rename to program-libs/bounded-vec/src/lib.rs
diff --git a/merkle-tree/bounded-vec/src/offset/copy.rs b/program-libs/bounded-vec/src/offset/copy.rs
similarity index 100%
rename from merkle-tree/bounded-vec/src/offset/copy.rs
rename to program-libs/bounded-vec/src/offset/copy.rs
diff --git a/merkle-tree/bounded-vec/src/offset/mod.rs b/program-libs/bounded-vec/src/offset/mod.rs
similarity index 100%
rename from merkle-tree/bounded-vec/src/offset/mod.rs
rename to program-libs/bounded-vec/src/offset/mod.rs
diff --git a/merkle-tree/bounded-vec/src/offset/zero_copy.rs b/program-libs/bounded-vec/src/offset/zero_copy.rs
similarity index 100%
rename from merkle-tree/bounded-vec/src/offset/zero_copy.rs
rename to program-libs/bounded-vec/src/offset/zero_copy.rs
diff --git a/merkle-tree/concurrent/Cargo.toml b/program-libs/concurrent-merkle-tree/Cargo.toml
similarity index 77%
rename from merkle-tree/concurrent/Cargo.toml
rename to program-libs/concurrent-merkle-tree/Cargo.toml
index dfba68e5e4..4e495e0ff7 100644
--- a/merkle-tree/concurrent/Cargo.toml
+++ b/program-libs/concurrent-merkle-tree/Cargo.toml
@@ -17,9 +17,9 @@ solana = [
 [dependencies]
 borsh = "0.10"
 bytemuck = { version = "1.17", features = ["derive"] }
-light-bounded-vec = { path = "../bounded-vec", version = "1.1.0" }
-light-hasher = { path = "../hasher", version = "1.1.0" }
-light-utils = { version = "1.1.0", path = "../../utils" }
+light-bounded-vec = { workspace = true }
+light-hasher = { workspace = true }
+light-utils = { workspace = true }
 memoffset = "0.9"
 solana-program = { workspace = true, optional = true }
 thiserror = "1.0"
@@ -27,7 +27,7 @@ thiserror = "1.0"
 [dev-dependencies]
 ark-bn254 = "0.4"
 ark-ff = "0.4"
-light-merkle-tree-reference = { path = "../reference", version = "1.1.0" }
+light-merkle-tree-reference = { workspace = true}
 light-hash-set = { workspace = true, features = ["solana"] }
 rand = "0.8"
 solana-program = {  workspace = true }
diff --git a/merkle-tree/concurrent/src/changelog.rs b/program-libs/concurrent-merkle-tree/src/changelog.rs
similarity index 100%
rename from merkle-tree/concurrent/src/changelog.rs
rename to program-libs/concurrent-merkle-tree/src/changelog.rs
diff --git a/merkle-tree/concurrent/src/copy.rs b/program-libs/concurrent-merkle-tree/src/copy.rs
similarity index 100%
rename from merkle-tree/concurrent/src/copy.rs
rename to program-libs/concurrent-merkle-tree/src/copy.rs
diff --git a/merkle-tree/concurrent/src/errors.rs b/program-libs/concurrent-merkle-tree/src/errors.rs
similarity index 100%
rename from merkle-tree/concurrent/src/errors.rs
rename to program-libs/concurrent-merkle-tree/src/errors.rs
diff --git a/merkle-tree/concurrent/src/event.rs b/program-libs/concurrent-merkle-tree/src/event.rs
similarity index 100%
rename from merkle-tree/concurrent/src/event.rs
rename to program-libs/concurrent-merkle-tree/src/event.rs
diff --git a/merkle-tree/concurrent/src/hash.rs b/program-libs/concurrent-merkle-tree/src/hash.rs
similarity index 100%
rename from merkle-tree/concurrent/src/hash.rs
rename to program-libs/concurrent-merkle-tree/src/hash.rs
diff --git a/merkle-tree/concurrent/src/lib.rs b/program-libs/concurrent-merkle-tree/src/lib.rs
similarity index 100%
rename from merkle-tree/concurrent/src/lib.rs
rename to program-libs/concurrent-merkle-tree/src/lib.rs
diff --git a/merkle-tree/concurrent/src/zero_copy.rs b/program-libs/concurrent-merkle-tree/src/zero_copy.rs
similarity index 100%
rename from merkle-tree/concurrent/src/zero_copy.rs
rename to program-libs/concurrent-merkle-tree/src/zero_copy.rs
diff --git a/merkle-tree/concurrent/tests/tests.rs b/program-libs/concurrent-merkle-tree/tests/tests.rs
similarity index 100%
rename from merkle-tree/concurrent/tests/tests.rs
rename to program-libs/concurrent-merkle-tree/tests/tests.rs
diff --git a/merkle-tree/hash-set/Cargo.toml b/program-libs/hash-set/Cargo.toml
similarity index 81%
rename from merkle-tree/hash-set/Cargo.toml
rename to program-libs/hash-set/Cargo.toml
index 95875de996..658be35ef6 100644
--- a/merkle-tree/hash-set/Cargo.toml
+++ b/program-libs/hash-set/Cargo.toml
@@ -10,13 +10,13 @@ edition = "2021"
 solana = ["solana-program"]
 
 [dependencies]
-light-utils = { path = "../../utils", version = "1.1.0" }
+light-utils = { workspace = true }
 num-bigint = "0.4"
 num-traits = "0.2"
 solana-program = { workspace = true, optional = true }
 thiserror = "1.0"
 [target.'cfg(target_os = "solana")'.dependencies]
-light-heap = { path = "../../heap", version = "1.1.0" }
+light-heap = { workspace = true }
 
 [dev-dependencies]
 ark-bn254 = "0.4"
diff --git a/merkle-tree/hash-set/src/lib.rs b/program-libs/hash-set/src/lib.rs
similarity index 100%
rename from merkle-tree/hash-set/src/lib.rs
rename to program-libs/hash-set/src/lib.rs
diff --git a/merkle-tree/hash-set/src/zero_copy.rs b/program-libs/hash-set/src/zero_copy.rs
similarity index 100%
rename from merkle-tree/hash-set/src/zero_copy.rs
rename to program-libs/hash-set/src/zero_copy.rs
diff --git a/merkle-tree/hasher/Cargo.toml b/program-libs/hasher/Cargo.toml
similarity index 100%
rename from merkle-tree/hasher/Cargo.toml
rename to program-libs/hasher/Cargo.toml
diff --git a/merkle-tree/hasher/src/bytes.rs b/program-libs/hasher/src/bytes.rs
similarity index 100%
rename from merkle-tree/hasher/src/bytes.rs
rename to program-libs/hasher/src/bytes.rs
diff --git a/merkle-tree/hasher/src/errors.rs b/program-libs/hasher/src/errors.rs
similarity index 100%
rename from merkle-tree/hasher/src/errors.rs
rename to program-libs/hasher/src/errors.rs
diff --git a/merkle-tree/hasher/src/keccak.rs b/program-libs/hasher/src/keccak.rs
similarity index 100%
rename from merkle-tree/hasher/src/keccak.rs
rename to program-libs/hasher/src/keccak.rs
diff --git a/merkle-tree/hasher/src/lib.rs b/program-libs/hasher/src/lib.rs
similarity index 100%
rename from merkle-tree/hasher/src/lib.rs
rename to program-libs/hasher/src/lib.rs
diff --git a/merkle-tree/hasher/src/poseidon.rs b/program-libs/hasher/src/poseidon.rs
similarity index 100%
rename from merkle-tree/hasher/src/poseidon.rs
rename to program-libs/hasher/src/poseidon.rs
diff --git a/merkle-tree/hasher/src/sha256.rs b/program-libs/hasher/src/sha256.rs
similarity index 100%
rename from merkle-tree/hasher/src/sha256.rs
rename to program-libs/hasher/src/sha256.rs
diff --git a/merkle-tree/hasher/src/syscalls/definitions.rs b/program-libs/hasher/src/syscalls/definitions.rs
similarity index 100%
rename from merkle-tree/hasher/src/syscalls/definitions.rs
rename to program-libs/hasher/src/syscalls/definitions.rs
diff --git a/merkle-tree/hasher/src/syscalls/mod.rs b/program-libs/hasher/src/syscalls/mod.rs
similarity index 100%
rename from merkle-tree/hasher/src/syscalls/mod.rs
rename to program-libs/hasher/src/syscalls/mod.rs
diff --git a/merkle-tree/hasher/src/zero_bytes/keccak.rs b/program-libs/hasher/src/zero_bytes/keccak.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_bytes/keccak.rs
rename to program-libs/hasher/src/zero_bytes/keccak.rs
diff --git a/merkle-tree/hasher/src/zero_bytes/mod.rs b/program-libs/hasher/src/zero_bytes/mod.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_bytes/mod.rs
rename to program-libs/hasher/src/zero_bytes/mod.rs
diff --git a/merkle-tree/hasher/src/zero_bytes/poseidon.rs b/program-libs/hasher/src/zero_bytes/poseidon.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_bytes/poseidon.rs
rename to program-libs/hasher/src/zero_bytes/poseidon.rs
diff --git a/merkle-tree/hasher/src/zero_bytes/sha256.rs b/program-libs/hasher/src/zero_bytes/sha256.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_bytes/sha256.rs
rename to program-libs/hasher/src/zero_bytes/sha256.rs
diff --git a/merkle-tree/hasher/src/zero_indexed_leaf/keccak.rs b/program-libs/hasher/src/zero_indexed_leaf/keccak.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_indexed_leaf/keccak.rs
rename to program-libs/hasher/src/zero_indexed_leaf/keccak.rs
diff --git a/merkle-tree/hasher/src/zero_indexed_leaf/mod.rs b/program-libs/hasher/src/zero_indexed_leaf/mod.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_indexed_leaf/mod.rs
rename to program-libs/hasher/src/zero_indexed_leaf/mod.rs
diff --git a/merkle-tree/hasher/src/zero_indexed_leaf/poseidon.rs b/program-libs/hasher/src/zero_indexed_leaf/poseidon.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_indexed_leaf/poseidon.rs
rename to program-libs/hasher/src/zero_indexed_leaf/poseidon.rs
diff --git a/merkle-tree/hasher/src/zero_indexed_leaf/sha256.rs b/program-libs/hasher/src/zero_indexed_leaf/sha256.rs
similarity index 100%
rename from merkle-tree/hasher/src/zero_indexed_leaf/sha256.rs
rename to program-libs/hasher/src/zero_indexed_leaf/sha256.rs
diff --git a/heap/Cargo.toml b/program-libs/heap/Cargo.toml
similarity index 100%
rename from heap/Cargo.toml
rename to program-libs/heap/Cargo.toml
diff --git a/heap/src/bench.rs b/program-libs/heap/src/bench.rs
similarity index 100%
rename from heap/src/bench.rs
rename to program-libs/heap/src/bench.rs
diff --git a/heap/src/lib.rs b/program-libs/heap/src/lib.rs
similarity index 100%
rename from heap/src/lib.rs
rename to program-libs/heap/src/lib.rs
diff --git a/merkle-tree/indexed/Cargo.toml b/program-libs/indexed-merkle-tree/Cargo.toml
similarity index 66%
rename from merkle-tree/indexed/Cargo.toml
rename to program-libs/indexed-merkle-tree/Cargo.toml
index bd482e8630..222098e07c 100644
--- a/merkle-tree/indexed/Cargo.toml
+++ b/program-libs/indexed-merkle-tree/Cargo.toml
@@ -14,11 +14,11 @@ solana = [
 
 [dependencies]
 borsh = { version = "0.10" }
-light-bounded-vec = { path = "../bounded-vec", version = "1.1.0" }
-light-hasher = { path = "../hasher", version = "1.1.0" }
-light-concurrent-merkle-tree = { path = "../concurrent", version = "1.1.0" }
-light-merkle-tree-reference = { path = "../reference", version = "1.1.0" }
-light-utils = { path = "../../utils", version = "1.1.0" }
+light-bounded-vec = { workspace = true }
+light-hasher = { workspace = true }
+light-concurrent-merkle-tree = { workspace = true }
+light-merkle-tree-reference = { workspace = true }
+light-utils = { workspace = true }
 memoffset = "0.9"
 num-bigint = "0.4"
 num-traits = "0.2"
diff --git a/merkle-tree/indexed/src/array.rs b/program-libs/indexed-merkle-tree/src/array.rs
similarity index 100%
rename from merkle-tree/indexed/src/array.rs
rename to program-libs/indexed-merkle-tree/src/array.rs
diff --git a/merkle-tree/indexed/src/changelog.rs b/program-libs/indexed-merkle-tree/src/changelog.rs
similarity index 100%
rename from merkle-tree/indexed/src/changelog.rs
rename to program-libs/indexed-merkle-tree/src/changelog.rs
diff --git a/merkle-tree/indexed/src/copy.rs b/program-libs/indexed-merkle-tree/src/copy.rs
similarity index 100%
rename from merkle-tree/indexed/src/copy.rs
rename to program-libs/indexed-merkle-tree/src/copy.rs
diff --git a/merkle-tree/indexed/src/errors.rs b/program-libs/indexed-merkle-tree/src/errors.rs
similarity index 100%
rename from merkle-tree/indexed/src/errors.rs
rename to program-libs/indexed-merkle-tree/src/errors.rs
diff --git a/merkle-tree/indexed/src/lib.rs b/program-libs/indexed-merkle-tree/src/lib.rs
similarity index 100%
rename from merkle-tree/indexed/src/lib.rs
rename to program-libs/indexed-merkle-tree/src/lib.rs
diff --git a/merkle-tree/indexed/src/reference.rs b/program-libs/indexed-merkle-tree/src/reference.rs
similarity index 100%
rename from merkle-tree/indexed/src/reference.rs
rename to program-libs/indexed-merkle-tree/src/reference.rs
diff --git a/merkle-tree/indexed/src/zero_copy.rs b/program-libs/indexed-merkle-tree/src/zero_copy.rs
similarity index 100%
rename from merkle-tree/indexed/src/zero_copy.rs
rename to program-libs/indexed-merkle-tree/src/zero_copy.rs
diff --git a/merkle-tree/indexed/tests/tests.rs b/program-libs/indexed-merkle-tree/tests/tests.rs
similarity index 100%
rename from merkle-tree/indexed/tests/tests.rs
rename to program-libs/indexed-merkle-tree/tests/tests.rs
diff --git a/macros/light-sdk-macros/Cargo.lock b/program-libs/macros/Cargo.lock
similarity index 100%
rename from macros/light-sdk-macros/Cargo.lock
rename to program-libs/macros/Cargo.lock
diff --git a/macros/light/Cargo.toml b/program-libs/macros/Cargo.toml
similarity index 74%
rename from macros/light/Cargo.toml
rename to program-libs/macros/Cargo.toml
index d08b411a3c..e0e152fd34 100644
--- a/macros/light/Cargo.toml
+++ b/program-libs/macros/Cargo.toml
@@ -12,10 +12,10 @@ proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
 
-light-hasher = { path = "../../merkle-tree/hasher", version = "1.1.0" }
+light-hasher = { workspace = true }
 
 [dev-dependencies]
-light-utils = { path = "../../utils", version = "1.1.0" }
+light-utils = { workspace = true }
 
 [lib]
 proc-macro = true
diff --git a/macros/light/README.md b/program-libs/macros/README.md
similarity index 100%
rename from macros/light/README.md
rename to program-libs/macros/README.md
diff --git a/macros/light/src/lib.rs b/program-libs/macros/src/lib.rs
similarity index 100%
rename from macros/light/src/lib.rs
rename to program-libs/macros/src/lib.rs
diff --git a/macros/light/src/pubkey.rs b/program-libs/macros/src/pubkey.rs
similarity index 100%
rename from macros/light/src/pubkey.rs
rename to program-libs/macros/src/pubkey.rs
diff --git a/merkle-tree/metadata/Cargo.toml b/program-libs/merkle-tree-metadata/Cargo.toml
similarity index 100%
rename from merkle-tree/metadata/Cargo.toml
rename to program-libs/merkle-tree-metadata/Cargo.toml
diff --git a/merkle-tree/metadata/src/access.rs b/program-libs/merkle-tree-metadata/src/access.rs
similarity index 100%
rename from merkle-tree/metadata/src/access.rs
rename to program-libs/merkle-tree-metadata/src/access.rs
diff --git a/merkle-tree/metadata/src/errors.rs b/program-libs/merkle-tree-metadata/src/errors.rs
similarity index 100%
rename from merkle-tree/metadata/src/errors.rs
rename to program-libs/merkle-tree-metadata/src/errors.rs
diff --git a/merkle-tree/metadata/src/lib.rs b/program-libs/merkle-tree-metadata/src/lib.rs
similarity index 100%
rename from merkle-tree/metadata/src/lib.rs
rename to program-libs/merkle-tree-metadata/src/lib.rs
diff --git a/merkle-tree/metadata/src/merkle_tree.rs b/program-libs/merkle-tree-metadata/src/merkle_tree.rs
similarity index 100%
rename from merkle-tree/metadata/src/merkle_tree.rs
rename to program-libs/merkle-tree-metadata/src/merkle_tree.rs
diff --git a/merkle-tree/metadata/src/queue.rs b/program-libs/merkle-tree-metadata/src/queue.rs
similarity index 100%
rename from merkle-tree/metadata/src/queue.rs
rename to program-libs/merkle-tree-metadata/src/queue.rs
diff --git a/merkle-tree/metadata/src/rollover.rs b/program-libs/merkle-tree-metadata/src/rollover.rs
similarity index 100%
rename from merkle-tree/metadata/src/rollover.rs
rename to program-libs/merkle-tree-metadata/src/rollover.rs
diff --git a/merkle-tree/metadata/src/utils.rs b/program-libs/merkle-tree-metadata/src/utils.rs
similarity index 100%
rename from merkle-tree/metadata/src/utils.rs
rename to program-libs/merkle-tree-metadata/src/utils.rs
diff --git a/utils/Cargo.toml b/program-libs/utils/Cargo.toml
similarity index 87%
rename from utils/Cargo.toml
rename to program-libs/utils/Cargo.toml
index e2ad7e3d9c..acfd562e97 100644
--- a/utils/Cargo.toml
+++ b/program-libs/utils/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0"
 ark-ff = "0.4"
-light-bounded-vec = { version = "1.1.0", path = "../merkle-tree/bounded-vec" }
+light-bounded-vec = { workspace = true }
 light-hasher = {workspace = true}
 num-bigint = { version = "0.4", features = ["rand"] }
 thiserror = "1.0"
diff --git a/utils/src/account.rs b/program-libs/utils/src/account.rs
similarity index 100%
rename from utils/src/account.rs
rename to program-libs/utils/src/account.rs
diff --git a/utils/src/bigint.rs b/program-libs/utils/src/bigint.rs
similarity index 100%
rename from utils/src/bigint.rs
rename to program-libs/utils/src/bigint.rs
diff --git a/utils/src/fee.rs b/program-libs/utils/src/fee.rs
similarity index 100%
rename from utils/src/fee.rs
rename to program-libs/utils/src/fee.rs
diff --git a/utils/src/hashchain.rs b/program-libs/utils/src/hashchain.rs
similarity index 100%
rename from utils/src/hashchain.rs
rename to program-libs/utils/src/hashchain.rs
diff --git a/utils/src/lib.rs b/program-libs/utils/src/lib.rs
similarity index 100%
rename from utils/src/lib.rs
rename to program-libs/utils/src/lib.rs
diff --git a/utils/src/prime.rs b/program-libs/utils/src/prime.rs
similarity index 100%
rename from utils/src/prime.rs
rename to program-libs/utils/src/prime.rs
diff --git a/utils/src/rand.rs b/program-libs/utils/src/rand.rs
similarity index 100%
rename from utils/src/rand.rs
rename to program-libs/utils/src/rand.rs
diff --git a/circuit-lib/light-prover-client/.gitignore b/program-libs/verifier/.gitignore
similarity index 100%
rename from circuit-lib/light-prover-client/.gitignore
rename to program-libs/verifier/.gitignore
diff --git a/circuit-lib/verifier/Cargo.toml b/program-libs/verifier/Cargo.toml
similarity index 89%
rename from circuit-lib/verifier/Cargo.toml
rename to program-libs/verifier/Cargo.toml
index 1b7c23e5e0..809ba950ce 100644
--- a/circuit-lib/verifier/Cargo.toml
+++ b/program-libs/verifier/Cargo.toml
@@ -19,7 +19,7 @@ light-utils = { workspace = true }
 [dev-dependencies]
 tokio = { workspace = true }
 reqwest = {  version = "0.11.24", features = ["json", "rustls-tls"]  }
-light-prover-client = { path = "../light-prover-client", version = "1.2.0" }
+light-prover-client = { workspace = true }
 serial_test = "3.2.0"
 
 [lints.rust.unexpected_cfgs]
diff --git a/circuit-lib/verifier/src/lib.rs b/program-libs/verifier/src/lib.rs
similarity index 100%
rename from circuit-lib/verifier/src/lib.rs
rename to program-libs/verifier/src/lib.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/address_append_40_1.rs b/program-libs/verifier/src/verifying_keys/address_append_40_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/address_append_40_1.rs
rename to program-libs/verifier/src/verifying_keys/address_append_40_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/address_append_40_10.rs b/program-libs/verifier/src/verifying_keys/address_append_40_10.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/address_append_40_10.rs
rename to program-libs/verifier/src/verifying_keys/address_append_40_10.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/address_append_40_100.rs b/program-libs/verifier/src/verifying_keys/address_append_40_100.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/address_append_40_100.rs
rename to program-libs/verifier/src/verifying_keys/address_append_40_100.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/address_append_40_1000.rs b/program-libs/verifier/src/verifying_keys/address_append_40_1000.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/address_append_40_1000.rs
rename to program-libs/verifier/src/verifying_keys/address_append_40_1000.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/address_append_40_250.rs b/program-libs/verifier/src/verifying_keys/address_append_40_250.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/address_append_40_250.rs
rename to program-libs/verifier/src/verifying_keys/address_append_40_250.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/address_append_40_500.rs b/program-libs/verifier/src/verifying_keys/address_append_40_500.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/address_append_40_500.rs
rename to program-libs/verifier/src/verifying_keys/address_append_40_500.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_10.rs b/program-libs/verifier/src/verifying_keys/append_with_proofs_32_10.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_10.rs
rename to program-libs/verifier/src/verifying_keys/append_with_proofs_32_10.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_100.rs b/program-libs/verifier/src/verifying_keys/append_with_proofs_32_100.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_100.rs
rename to program-libs/verifier/src/verifying_keys/append_with_proofs_32_100.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_1000.rs b/program-libs/verifier/src/verifying_keys/append_with_proofs_32_1000.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_1000.rs
rename to program-libs/verifier/src/verifying_keys/append_with_proofs_32_1000.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_250.rs b/program-libs/verifier/src/verifying_keys/append_with_proofs_32_250.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_250.rs
rename to program-libs/verifier/src/verifying_keys/append_with_proofs_32_250.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_500.rs b/program-libs/verifier/src/verifying_keys/append_with_proofs_32_500.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_500.rs
rename to program-libs/verifier/src/verifying_keys/append_with_proofs_32_500.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_1_1.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_1_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_1_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_1_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_1_2.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_1_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_1_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_1_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_2_1.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_2_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_2_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_2_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_2_2.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_2_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_2_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_2_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_3_1.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_3_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_3_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_3_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_3_2.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_3_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_3_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_3_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_4_1.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_4_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_4_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_4_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_26_26_4_2.rs b/program-libs/verifier/src/verifying_keys/combined_26_26_4_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_26_26_4_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_26_26_4_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_1_1.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_1_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_1_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_1_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_1_2.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_1_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_1_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_1_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_1_3.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_1_3.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_1_3.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_1_3.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_1_4.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_1_4.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_1_4.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_1_4.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_2_1.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_2_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_2_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_2_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_2_2.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_2_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_2_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_2_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_2_3.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_2_3.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_2_3.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_2_3.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_2_4.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_2_4.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_2_4.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_2_4.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_3_1.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_3_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_3_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_3_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_3_2.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_3_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_3_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_3_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_3_3.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_3_3.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_3_3.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_3_3.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_3_4.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_3_4.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_3_4.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_3_4.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_4_1.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_4_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_4_1.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_4_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_4_2.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_4_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_4_2.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_4_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_4_3.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_4_3.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_4_3.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_4_3.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/combined_32_40_4_4.rs b/program-libs/verifier/src/verifying_keys/combined_32_40_4_4.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/combined_32_40_4_4.rs
rename to program-libs/verifier/src/verifying_keys/combined_32_40_4_4.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_26_1.rs b/program-libs/verifier/src/verifying_keys/inclusion_26_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_26_1.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_26_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_26_2.rs b/program-libs/verifier/src/verifying_keys/inclusion_26_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_26_2.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_26_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_26_3.rs b/program-libs/verifier/src/verifying_keys/inclusion_26_3.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_26_3.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_26_3.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_26_4.rs b/program-libs/verifier/src/verifying_keys/inclusion_26_4.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_26_4.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_26_4.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_26_8.rs b/program-libs/verifier/src/verifying_keys/inclusion_26_8.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_26_8.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_26_8.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_32_1.rs b/program-libs/verifier/src/verifying_keys/inclusion_32_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_32_1.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_32_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_32_2.rs b/program-libs/verifier/src/verifying_keys/inclusion_32_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_32_2.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_32_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_32_3.rs b/program-libs/verifier/src/verifying_keys/inclusion_32_3.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_32_3.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_32_3.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_32_4.rs b/program-libs/verifier/src/verifying_keys/inclusion_32_4.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_32_4.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_32_4.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/inclusion_32_8.rs b/program-libs/verifier/src/verifying_keys/inclusion_32_8.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/inclusion_32_8.rs
rename to program-libs/verifier/src/verifying_keys/inclusion_32_8.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/mod.rs b/program-libs/verifier/src/verifying_keys/mod.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/mod.rs
rename to program-libs/verifier/src/verifying_keys/mod.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/non_inclusion_26_1.rs b/program-libs/verifier/src/verifying_keys/non_inclusion_26_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/non_inclusion_26_1.rs
rename to program-libs/verifier/src/verifying_keys/non_inclusion_26_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/non_inclusion_26_2.rs b/program-libs/verifier/src/verifying_keys/non_inclusion_26_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/non_inclusion_26_2.rs
rename to program-libs/verifier/src/verifying_keys/non_inclusion_26_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/non_inclusion_40_1.rs b/program-libs/verifier/src/verifying_keys/non_inclusion_40_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/non_inclusion_40_1.rs
rename to program-libs/verifier/src/verifying_keys/non_inclusion_40_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/non_inclusion_40_2.rs b/program-libs/verifier/src/verifying_keys/non_inclusion_40_2.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/non_inclusion_40_2.rs
rename to program-libs/verifier/src/verifying_keys/non_inclusion_40_2.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/non_inclusion_40_3.rs b/program-libs/verifier/src/verifying_keys/non_inclusion_40_3.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/non_inclusion_40_3.rs
rename to program-libs/verifier/src/verifying_keys/non_inclusion_40_3.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/non_inclusion_40_4.rs b/program-libs/verifier/src/verifying_keys/non_inclusion_40_4.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/non_inclusion_40_4.rs
rename to program-libs/verifier/src/verifying_keys/non_inclusion_40_4.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/non_inclusion_40_8.rs b/program-libs/verifier/src/verifying_keys/non_inclusion_40_8.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/non_inclusion_40_8.rs
rename to program-libs/verifier/src/verifying_keys/non_inclusion_40_8.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/update_32_1.rs b/program-libs/verifier/src/verifying_keys/update_32_1.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/update_32_1.rs
rename to program-libs/verifier/src/verifying_keys/update_32_1.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/update_32_10.rs b/program-libs/verifier/src/verifying_keys/update_32_10.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/update_32_10.rs
rename to program-libs/verifier/src/verifying_keys/update_32_10.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/update_32_100.rs b/program-libs/verifier/src/verifying_keys/update_32_100.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/update_32_100.rs
rename to program-libs/verifier/src/verifying_keys/update_32_100.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/update_32_1000.rs b/program-libs/verifier/src/verifying_keys/update_32_1000.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/update_32_1000.rs
rename to program-libs/verifier/src/verifying_keys/update_32_1000.rs
diff --git a/circuit-lib/verifier/src/verifying_keys/update_32_500.rs b/program-libs/verifier/src/verifying_keys/update_32_500.rs
similarity index 100%
rename from circuit-lib/verifier/src/verifying_keys/update_32_500.rs
rename to program-libs/verifier/src/verifying_keys/update_32_500.rs
diff --git a/circuit-lib/verifier/tests/test.rs b/program-libs/verifier/tests/test.rs
similarity index 100%
rename from circuit-lib/verifier/tests/test.rs
rename to program-libs/verifier/tests/test.rs
diff --git a/test-programs/account-compression-test/Cargo.toml b/program-tests/account-compression-test/Cargo.toml
similarity index 64%
rename from test-programs/account-compression-test/Cargo.toml
rename to program-tests/account-compression-test/Cargo.toml
index 4d73c37342..f902ce92b8 100644
--- a/test-programs/account-compression-test/Cargo.toml
+++ b/program-tests/account-compression-test/Cargo.toml
@@ -23,11 +23,11 @@ default = ["custom-heap"]
 ark-bn254 = "0.4.0"
 ark-ff = "0.4.0"
 solana-program-test =  { workspace = true}
-light-test-utils = { version = "1.2.0", path = "../../test-utils", features=["devenv"] }
+light-test-utils = { workspace = true, features=["devenv"] }
 light-program-test = { workspace = true, features = ["devenv"] }
 reqwest = "0.11.26"
 tokio = { workspace = true }
-light-prover-client = {path = "../../circuit-lib/light-prover-client" }
+light-prover-client = {workspace = true }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 spl-token = { workspace = true }
@@ -36,14 +36,14 @@ anchor-lang = { workspace = true }
 light-compressed-token = { workspace = true }
 light-system-program = { workspace = true }
 account-compression = { workspace = true }
-light-hasher = {path = "../../merkle-tree/hasher"}
+light-hasher = {workspace = true}
 light-hash-set = { workspace = true}
-light-concurrent-merkle-tree = {path = "../../merkle-tree/concurrent"}
-light-indexed-merkle-tree = {path = "../../merkle-tree/indexed"}
-light-merkle-tree-reference = {path = "../../merkle-tree/reference"}
-light-bounded-vec = {path = "../../merkle-tree/bounded-vec"}
-light-utils = {path = "../../utils"}
-light-verifier = {path = "../../circuit-lib/verifier"}
+light-concurrent-merkle-tree = {workspace = true}
+light-indexed-merkle-tree = {workspace = true}
+light-merkle-tree-reference = {workspace = true}
+light-bounded-vec = {workspace = true}
+light-utils = {workspace = true}
+light-verifier = {workspace = true}
 rand = "0.8"
 solana-cli-output = { workspace = true }
 serde_json = "1.0.114"
@@ -51,6 +51,6 @@ solana-sdk = { workspace = true }
 thiserror = "1.0"
 memoffset = "0.9.1"
 serial_test = "3.1.1"
-light-bloom-filter = {path = "../../merkle-tree/bloom-filter"}
+light-bloom-filter = { workspace = true }
 light-batched-merkle-tree = { workspace = true }
 light-merkle-tree-metadata = { workspace = true }
\ No newline at end of file
diff --git a/test-programs/account-compression-test/Xargo.toml b/program-tests/account-compression-test/Xargo.toml
similarity index 100%
rename from test-programs/account-compression-test/Xargo.toml
rename to program-tests/account-compression-test/Xargo.toml
diff --git a/test-programs/account-compression-test/src/lib.rs b/program-tests/account-compression-test/src/lib.rs
similarity index 100%
rename from test-programs/account-compression-test/src/lib.rs
rename to program-tests/account-compression-test/src/lib.rs
diff --git a/test-programs/account-compression-test/tests/address_merkle_tree_tests.rs b/program-tests/account-compression-test/tests/address_merkle_tree_tests.rs
similarity index 100%
rename from test-programs/account-compression-test/tests/address_merkle_tree_tests.rs
rename to program-tests/account-compression-test/tests/address_merkle_tree_tests.rs
diff --git a/test-programs/account-compression-test/tests/batched_merkle_tree_test.rs b/program-tests/account-compression-test/tests/batched_merkle_tree_test.rs
similarity index 100%
rename from test-programs/account-compression-test/tests/batched_merkle_tree_test.rs
rename to program-tests/account-compression-test/tests/batched_merkle_tree_test.rs
diff --git a/test-programs/account-compression-test/tests/group_authority_tests.rs b/program-tests/account-compression-test/tests/group_authority_tests.rs
similarity index 100%
rename from test-programs/account-compression-test/tests/group_authority_tests.rs
rename to program-tests/account-compression-test/tests/group_authority_tests.rs
diff --git a/test-programs/account-compression-test/tests/merkle_tree_tests.rs b/program-tests/account-compression-test/tests/merkle_tree_tests.rs
similarity index 100%
rename from test-programs/account-compression-test/tests/merkle_tree_tests.rs
rename to program-tests/account-compression-test/tests/merkle_tree_tests.rs
diff --git a/test-programs/compressed-token-test/Cargo.toml b/program-tests/compressed-token-test/Cargo.toml
similarity index 71%
rename from test-programs/compressed-token-test/Cargo.toml
rename to program-tests/compressed-token-test/Cargo.toml
index 46f6b42a84..99be0fe0b3 100644
--- a/test-programs/compressed-token-test/Cargo.toml
+++ b/program-tests/compressed-token-test/Cargo.toml
@@ -22,21 +22,21 @@ anchor-lang = { workspace = true }
 light-compressed-token = { workspace = true }
 light-system-program = { workspace = true }
 account-compression = { workspace = true }
-light-hasher = {path = "../../merkle-tree/hasher"}
-light-concurrent-merkle-tree = {path = "../../merkle-tree/concurrent"}
-light-utils = {path = "../../utils"}
-light-verifier = {path = "../../circuit-lib/verifier"}
+light-hasher = {workspace = true}
+light-concurrent-merkle-tree = {workspace = true}
+light-utils = {workspace = true}
+light-verifier = {workspace = true}
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 solana-sdk = { workspace = true }
 
 [dev-dependencies]
 solana-program-test = { workspace = true }
-light-test-utils = { version = "1.2.0", path = "../../test-utils", features=["devenv"] }
+light-test-utils = { workspace = true, features=["devenv"] }
 light-program-test = { workspace = true, features = ["devenv"] }
 reqwest = "0.11.26"
 tokio = { workspace = true }
-light-prover-client = {path = "../../circuit-lib/light-prover-client" }
+light-prover-client = {workspace = true }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 spl-token = { workspace = true }
diff --git a/test-programs/compressed-token-test/Xargo.toml b/program-tests/compressed-token-test/Xargo.toml
similarity index 100%
rename from test-programs/compressed-token-test/Xargo.toml
rename to program-tests/compressed-token-test/Xargo.toml
diff --git a/test-programs/compressed-token-test/src/lib.rs b/program-tests/compressed-token-test/src/lib.rs
similarity index 100%
rename from test-programs/compressed-token-test/src/lib.rs
rename to program-tests/compressed-token-test/src/lib.rs
diff --git a/test-programs/compressed-token-test/tests/test.rs b/program-tests/compressed-token-test/tests/test.rs
similarity index 100%
rename from test-programs/compressed-token-test/tests/test.rs
rename to program-tests/compressed-token-test/tests/test.rs
diff --git a/test-programs/create-address-test-program/Cargo.toml b/program-tests/create-address-test-program/Cargo.toml
similarity index 80%
rename from test-programs/create-address-test-program/Cargo.toml
rename to program-tests/create-address-test-program/Cargo.toml
index e918d5f547..49ce7d676e 100644
--- a/test-programs/create-address-test-program/Cargo.toml
+++ b/program-tests/create-address-test-program/Cargo.toml
@@ -23,5 +23,5 @@ default = ["custom-heap"]
 anchor-lang = { workspace = true }
 light-system-program = { workspace = true, features = ["cpi"] }
 account-compression = { workspace = true  , features = ["cpi"]}
-light-hasher = { path = "../../merkle-tree/hasher", version = "1.1.0", features = ["solana"] }
-light-utils = { path = "../../utils", version = "1.1.0" }
+light-hasher = { workspace = true, features = ["solana"] }
+light-utils = { workspace = true }
diff --git a/test-programs/create-address-test-program/Xargo.toml b/program-tests/create-address-test-program/Xargo.toml
similarity index 100%
rename from test-programs/create-address-test-program/Xargo.toml
rename to program-tests/create-address-test-program/Xargo.toml
diff --git a/test-programs/create-address-test-program/src/create_pda.rs b/program-tests/create-address-test-program/src/create_pda.rs
similarity index 100%
rename from test-programs/create-address-test-program/src/create_pda.rs
rename to program-tests/create-address-test-program/src/create_pda.rs
diff --git a/test-programs/create-address-test-program/src/lib.rs b/program-tests/create-address-test-program/src/lib.rs
similarity index 100%
rename from test-programs/create-address-test-program/src/lib.rs
rename to program-tests/create-address-test-program/src/lib.rs
diff --git a/test-programs/e2e-test/Cargo.toml b/program-tests/e2e-test/Cargo.toml
similarity index 67%
rename from test-programs/e2e-test/Cargo.toml
rename to program-tests/e2e-test/Cargo.toml
index 8220b0aaef..421c1bcd75 100644
--- a/test-programs/e2e-test/Cargo.toml
+++ b/program-tests/e2e-test/Cargo.toml
@@ -23,12 +23,12 @@ light-compressed-token = { workspace = true }
 light-registry = { workspace = true }
 light-system-program = { workspace = true }
 account-compression = { workspace = true  }
-light-hasher = {path = "../../merkle-tree/hasher"}
-light-concurrent-merkle-tree = {path = "../../merkle-tree/concurrent"}
-light-indexed-merkle-tree = {path = "../../merkle-tree/indexed"}
-light-merkle-tree-reference = {path = "../../merkle-tree/reference"}
-light-utils = {path = "../../utils"}
-light-verifier = {path = "../../circuit-lib/verifier"}
+light-hasher = {workspace = true}
+light-concurrent-merkle-tree = {workspace = true}
+light-indexed-merkle-tree = {workspace = true}
+light-merkle-tree-reference = {workspace = true}
+light-utils = {workspace = true}
+light-verifier = {workspace = true}
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 solana-sdk = { workspace = true }
@@ -36,11 +36,11 @@ solana-client = { workspace = true }
 
 [dev-dependencies]
 solana-program-test = { workspace = true }
-light-test-utils = { version = "1.2.0", path = "../../test-utils", features=["devenv"] }
+light-test-utils = { workspace = true, features=["devenv"] }
 light-program-test = { workspace = true, features = ["devenv"] }
 reqwest = "0.11.26"
 tokio = { workspace = true }
-light-prover-client = {path = "../../circuit-lib/light-prover-client" }
+light-prover-client = {workspace = true }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 spl-token = { workspace = true }
diff --git a/test-programs/e2e-test/Xargo.toml b/program-tests/e2e-test/Xargo.toml
similarity index 100%
rename from test-programs/e2e-test/Xargo.toml
rename to program-tests/e2e-test/Xargo.toml
diff --git a/test-programs/e2e-test/src/lib.rs b/program-tests/e2e-test/src/lib.rs
similarity index 100%
rename from test-programs/e2e-test/src/lib.rs
rename to program-tests/e2e-test/src/lib.rs
diff --git a/test-programs/e2e-test/tests/test.rs b/program-tests/e2e-test/tests/test.rs
similarity index 100%
rename from test-programs/e2e-test/tests/test.rs
rename to program-tests/e2e-test/tests/test.rs
diff --git a/merkle-tree/reference/Cargo.toml b/program-tests/merkle-tree/Cargo.toml
similarity index 72%
rename from merkle-tree/reference/Cargo.toml
rename to program-tests/merkle-tree/Cargo.toml
index 8478f765d1..f548b34aff 100644
--- a/merkle-tree/reference/Cargo.toml
+++ b/program-tests/merkle-tree/Cargo.toml
@@ -7,8 +7,8 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-light-bounded-vec = { path = "../bounded-vec", version = "1.1.0" }
-light-hasher = { path = "../hasher", version = "1.1.0" }
+light-bounded-vec = { workspace = true }
+light-hasher = { workspace = true }
 thiserror = "1.0"
 log = "0.4.20"
 num-bigint = "0.4"
diff --git a/merkle-tree/reference/src/lib.rs b/program-tests/merkle-tree/src/lib.rs
similarity index 100%
rename from merkle-tree/reference/src/lib.rs
rename to program-tests/merkle-tree/src/lib.rs
diff --git a/merkle-tree/reference/src/sparse_merkle_tree.rs b/program-tests/merkle-tree/src/sparse_merkle_tree.rs
similarity index 100%
rename from merkle-tree/reference/src/sparse_merkle_tree.rs
rename to program-tests/merkle-tree/src/sparse_merkle_tree.rs
diff --git a/merkle-tree/reference/tests/tests.rs b/program-tests/merkle-tree/tests/tests.rs
similarity index 100%
rename from merkle-tree/reference/tests/tests.rs
rename to program-tests/merkle-tree/tests/tests.rs
diff --git a/test-programs/package.json b/program-tests/package.json
similarity index 90%
rename from test-programs/package.json
rename to program-tests/package.json
index f413e913cf..cfb09042fb 100644
--- a/test-programs/package.json
+++ b/program-tests/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@lightprotocol/test-programs",
+  "name": "@lightprotocol/program-tests",
   "version": "0.1.0",
   "license": "Apache-2.0",
   "description": "Test programs for Light Protocol uses test-sbf to build because build-sbf -- -p creates an infinite loop.",
diff --git a/test-programs/registry-test/Cargo.toml b/program-tests/registry-test/Cargo.toml
similarity index 69%
rename from test-programs/registry-test/Cargo.toml
rename to program-tests/registry-test/Cargo.toml
index b2e08ba7b2..f1419087f5 100644
--- a/test-programs/registry-test/Cargo.toml
+++ b/program-tests/registry-test/Cargo.toml
@@ -22,11 +22,11 @@ default = ["custom-heap"]
 
 [dev-dependencies]
 solana-program-test = { workspace = true }
-light-test-utils = { version = "1.2.0", path = "../../test-utils", features=["devenv"] }
+light-test-utils = { workspace = true, features=["devenv"] }
 light-program-test = { workspace = true, features = ["devenv"] }
 reqwest = "0.11.26"
 tokio = { workspace = true }
-light-prover-client = {path = "../../circuit-lib/light-prover-client", features = ["devenv"] }
+light-prover-client = {workspace = true, features = ["devenv"] }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 spl-token = { workspace = true }
@@ -37,11 +37,11 @@ light-registry = { workspace = true }
 light-compressed-token = { workspace = true }
 light-system-program = { workspace = true }
 account-compression = { workspace = true  }
-light-hasher = {path = "../../merkle-tree/hasher"}
-light-concurrent-merkle-tree = {path = "../../merkle-tree/concurrent"}
-light-indexed-merkle-tree = {path = "../../merkle-tree/indexed"}
-light-utils = {path = "../../utils"}
-light-verifier = {path = "../../circuit-lib/verifier"}
+light-hasher = {workspace = true}
+light-concurrent-merkle-tree = {workspace = true}
+light-indexed-merkle-tree = {workspace = true}
+light-utils = {workspace = true}
+light-verifier = {workspace = true}
 solana-cli-output = { workspace = true }
 serde_json = "1.0.133"
 solana-sdk = { workspace = true }
diff --git a/test-programs/registry-test/Xargo.toml b/program-tests/registry-test/Xargo.toml
similarity index 100%
rename from test-programs/registry-test/Xargo.toml
rename to program-tests/registry-test/Xargo.toml
diff --git a/test-programs/registry-test/src/lib.rs b/program-tests/registry-test/src/lib.rs
similarity index 100%
rename from test-programs/registry-test/src/lib.rs
rename to program-tests/registry-test/src/lib.rs
diff --git a/test-programs/registry-test/tests/tests.rs b/program-tests/registry-test/tests/tests.rs
similarity index 100%
rename from test-programs/registry-test/tests/tests.rs
rename to program-tests/registry-test/tests/tests.rs
diff --git a/test-programs/sdk-test-program/.gitignore b/program-tests/sdk-test-program/.gitignore
similarity index 100%
rename from test-programs/sdk-test-program/.gitignore
rename to program-tests/sdk-test-program/.gitignore
diff --git a/test-programs/sdk-test-program/.prettierignore b/program-tests/sdk-test-program/.prettierignore
similarity index 100%
rename from test-programs/sdk-test-program/.prettierignore
rename to program-tests/sdk-test-program/.prettierignore
diff --git a/test-programs/sdk-test-program/Anchor.toml b/program-tests/sdk-test-program/Anchor.toml
similarity index 100%
rename from test-programs/sdk-test-program/Anchor.toml
rename to program-tests/sdk-test-program/Anchor.toml
diff --git a/test-programs/sdk-test-program/README.md b/program-tests/sdk-test-program/README.md
similarity index 100%
rename from test-programs/sdk-test-program/README.md
rename to program-tests/sdk-test-program/README.md
diff --git a/test-programs/sdk-test-program/package.json b/program-tests/sdk-test-program/package.json
similarity index 100%
rename from test-programs/sdk-test-program/package.json
rename to program-tests/sdk-test-program/package.json
diff --git a/test-programs/sdk-test-program/programs/sdk-test/Cargo.toml b/program-tests/sdk-test-program/programs/sdk-test/Cargo.toml
similarity index 91%
rename from test-programs/sdk-test-program/programs/sdk-test/Cargo.toml
rename to program-tests/sdk-test-program/programs/sdk-test/Cargo.toml
index 00a68fccf5..7366f03911 100644
--- a/test-programs/sdk-test-program/programs/sdk-test/Cargo.toml
+++ b/program-tests/sdk-test-program/programs/sdk-test/Cargo.toml
@@ -36,6 +36,6 @@ solana-sdk = { workspace = true }
 [dev-dependencies]
 light-client = { workspace = true , features = ["devenv"]}
 light-program-test = { workspace = true, features = ["devenv"] }
-light-test-utils = { path = "../../../../test-utils", version = "1.2.0", features = ["devenv"] }
+light-test-utils = { workspace = true, features = ["devenv"] }
 solana-program-test = { workspace = true }
 tokio = { workspace = true }
diff --git a/test-programs/sdk-test-program/programs/sdk-test/Xargo.toml b/program-tests/sdk-test-program/programs/sdk-test/Xargo.toml
similarity index 100%
rename from test-programs/sdk-test-program/programs/sdk-test/Xargo.toml
rename to program-tests/sdk-test-program/programs/sdk-test/Xargo.toml
diff --git a/test-programs/sdk-test-program/programs/sdk-test/src/lib.rs b/program-tests/sdk-test-program/programs/sdk-test/src/lib.rs
similarity index 100%
rename from test-programs/sdk-test-program/programs/sdk-test/src/lib.rs
rename to program-tests/sdk-test-program/programs/sdk-test/src/lib.rs
diff --git a/test-programs/sdk-test-program/programs/sdk-test/tests/test.rs b/program-tests/sdk-test-program/programs/sdk-test/tests/test.rs
similarity index 100%
rename from test-programs/sdk-test-program/programs/sdk-test/tests/test.rs
rename to program-tests/sdk-test-program/programs/sdk-test/tests/test.rs
diff --git a/test-programs/sdk-test-program/tsconfig.json b/program-tests/sdk-test-program/tsconfig.json
similarity index 100%
rename from test-programs/sdk-test-program/tsconfig.json
rename to program-tests/sdk-test-program/tsconfig.json
diff --git a/test-programs/system-cpi-test/Cargo.toml b/program-tests/system-cpi-test/Cargo.toml
similarity index 77%
rename from test-programs/system-cpi-test/Cargo.toml
rename to program-tests/system-cpi-test/Cargo.toml
index 10f7bc28e2..ae88d8e84d 100644
--- a/test-programs/system-cpi-test/Cargo.toml
+++ b/program-tests/system-cpi-test/Cargo.toml
@@ -26,8 +26,8 @@ light-compressed-token = { workspace = true }
 light-system-program = { workspace = true }
 light-registry = { workspace = true }
 account-compression = { workspace = true  }
-light-hasher = { path = "../../merkle-tree/hasher", version = "1.1.0" }
-light-utils = { path = "../../utils", version = "1.1.0" }
+light-hasher = { workspace = true }
+light-utils = { workspace = true }
 light-batched-merkle-tree = { workspace = true }
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
@@ -36,11 +36,11 @@ solana-sdk = { workspace = true }
 [dev-dependencies]
 solana-program-test = { workspace = true }
 light-program-test = { workspace = true, features=["devenv"]}
-light-test-utils = { version = "1.2.0", path = "../../test-utils", features=["devenv"] }
+light-test-utils = { workspace = true, features=["devenv"] }
 reqwest = "0.11.26"
 tokio = { workspace = true }
-light-prover-client = { path = "../../circuit-lib/light-prover-client", version = "1.2.0" }
-light-verifier = { path = "../../circuit-lib/verifier", version = "1.1.0" }
+light-prover-client = { workspace = true }
+light-verifier = { workspace = true }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 spl-token = { workspace = true }
diff --git a/test-programs/system-cpi-test/Xargo.toml b/program-tests/system-cpi-test/Xargo.toml
similarity index 100%
rename from test-programs/system-cpi-test/Xargo.toml
rename to program-tests/system-cpi-test/Xargo.toml
diff --git a/test-programs/system-cpi-test/src/create_pda.rs b/program-tests/system-cpi-test/src/create_pda.rs
similarity index 100%
rename from test-programs/system-cpi-test/src/create_pda.rs
rename to program-tests/system-cpi-test/src/create_pda.rs
diff --git a/test-programs/system-cpi-test/src/invalidate_not_owned_account.rs b/program-tests/system-cpi-test/src/invalidate_not_owned_account.rs
similarity index 100%
rename from test-programs/system-cpi-test/src/invalidate_not_owned_account.rs
rename to program-tests/system-cpi-test/src/invalidate_not_owned_account.rs
diff --git a/test-programs/system-cpi-test/src/lib.rs b/program-tests/system-cpi-test/src/lib.rs
similarity index 100%
rename from test-programs/system-cpi-test/src/lib.rs
rename to program-tests/system-cpi-test/src/lib.rs
diff --git a/test-programs/system-cpi-test/src/sdk.rs b/program-tests/system-cpi-test/src/sdk.rs
similarity index 100%
rename from test-programs/system-cpi-test/src/sdk.rs
rename to program-tests/system-cpi-test/src/sdk.rs
diff --git a/test-programs/system-cpi-test/tests/test.rs b/program-tests/system-cpi-test/tests/test.rs
similarity index 100%
rename from test-programs/system-cpi-test/tests/test.rs
rename to program-tests/system-cpi-test/tests/test.rs
diff --git a/test-programs/system-cpi-test/tests/test_program_owned_trees.rs b/program-tests/system-cpi-test/tests/test_program_owned_trees.rs
similarity index 100%
rename from test-programs/system-cpi-test/tests/test_program_owned_trees.rs
rename to program-tests/system-cpi-test/tests/test_program_owned_trees.rs
diff --git a/test-programs/system-test/Cargo.toml b/program-tests/system-test/Cargo.toml
similarity index 70%
rename from test-programs/system-test/Cargo.toml
rename to program-tests/system-test/Cargo.toml
index 04f5e923cd..9cbbe55c35 100644
--- a/test-programs/system-test/Cargo.toml
+++ b/program-tests/system-test/Cargo.toml
@@ -23,10 +23,10 @@ default = ["custom-heap"]
 [dev-dependencies]
 solana-program-test = { workspace = true }
 light-program-test = { workspace = true, features=["devenv"] }
-light-test-utils = { version = "1.2.0", path = "../../test-utils", features=["devenv"]}
+light-test-utils = { workspace = true, features=["devenv"]}
 reqwest = "0.11.26"
 tokio = { workspace = true }
-light-prover-client = {path = "../../circuit-lib/light-prover-client" }
+light-prover-client = {workspace = true }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 spl-token = { workspace = true }
@@ -35,11 +35,11 @@ anchor-lang = { workspace = true }
 light-compressed-token = { workspace = true }
 light-system-program = { workspace = true }
 account-compression = { workspace = true  }
-light-hasher = {path = "../../merkle-tree/hasher"}
-light-concurrent-merkle-tree = {path = "../../merkle-tree/concurrent"}
-light-indexed-merkle-tree = {path = "../../merkle-tree/indexed"}
-light-utils = {path = "../../utils"}
-light-verifier = {path = "../../circuit-lib/verifier"}
+light-hasher = {workspace = true}
+light-concurrent-merkle-tree = {workspace = true}
+light-indexed-merkle-tree = {workspace = true}
+light-utils = {workspace = true}
+light-verifier = {workspace = true}
 light-registry = { workspace = true}
 solana-cli-output = { workspace = true }
 serde_json = "1.0.133"
diff --git a/test-programs/system-test/Xargo.toml b/program-tests/system-test/Xargo.toml
similarity index 100%
rename from test-programs/system-test/Xargo.toml
rename to program-tests/system-test/Xargo.toml
diff --git a/test-programs/system-test/src/lib.rs b/program-tests/system-test/src/lib.rs
similarity index 100%
rename from test-programs/system-test/src/lib.rs
rename to program-tests/system-test/src/lib.rs
diff --git a/test-programs/system-test/tests/test.rs b/program-tests/system-test/tests/test.rs
similarity index 100%
rename from test-programs/system-test/tests/test.rs
rename to program-tests/system-test/tests/test.rs
diff --git a/test-utils/Cargo.toml b/program-tests/utils/Cargo.toml
similarity index 69%
rename from test-utils/Cargo.toml
rename to program-tests/utils/Cargo.toml
index e9851f337f..6fdf366af1 100644
--- a/test-utils/Cargo.toml
+++ b/program-tests/utils/Cargo.toml
@@ -22,7 +22,7 @@ solana-program-test = { workspace = true }
 solana-sdk = { workspace = true }
 solana-client = { workspace = true }
 thiserror = "1.0"
-light-macros = { path = "../macros/light", version = "1.1.0" }
+light-macros = { workspace = true }
 account-compression = { workspace = true  }
 light-compressed-token = { workspace = true  }
 light-system-program = { workspace = true  }
@@ -30,14 +30,14 @@ light-registry = { workspace = true }
 spl-token = { workspace = true, features = ["no-entrypoint"] }
 solana-transaction-status = { workspace = true }
 tokio = { workspace = true }
-light-prover-client = { path = "../circuit-lib/light-prover-client", version = "1.2.0" }
+light-prover-client = { workspace = true }
 reqwest = "0.11.26"
-light-hasher = { version = "1.1.0", path = "../merkle-tree/hasher" }
-light-merkle-tree-reference = { version = "1.1.0", path = "../merkle-tree/reference" }
-light-concurrent-merkle-tree = { version = "1.1.0", path = "../merkle-tree/concurrent" }
-light-indexed-merkle-tree = { path = "../merkle-tree/indexed/", version = "1.1.0" }
-light-verifier = { path = "../circuit-lib/verifier", version = "1.1.0" }
-light-utils = { path = "../utils", version = "1.1.0" }
+light-hasher = { workspace = true }
+light-merkle-tree-reference = { workspace = true }
+light-concurrent-merkle-tree = { workspace = true }
+light-indexed-merkle-tree = { workspace = true }
+light-verifier = { workspace = true }
+light-utils = { workspace = true }
 light-program-test = { workspace =  true }
 forester-utils = { workspace = true }
 memoffset = "0.9.1"
diff --git a/test-utils/src/address.rs b/program-tests/utils/src/address.rs
similarity index 100%
rename from test-utils/src/address.rs
rename to program-tests/utils/src/address.rs
diff --git a/test-utils/src/address_tree_rollover.rs b/program-tests/utils/src/address_tree_rollover.rs
similarity index 100%
rename from test-utils/src/address_tree_rollover.rs
rename to program-tests/utils/src/address_tree_rollover.rs
diff --git a/test-utils/src/assert_address_merkle_tree.rs b/program-tests/utils/src/assert_address_merkle_tree.rs
similarity index 100%
rename from test-utils/src/assert_address_merkle_tree.rs
rename to program-tests/utils/src/assert_address_merkle_tree.rs
diff --git a/test-utils/src/assert_compressed_tx.rs b/program-tests/utils/src/assert_compressed_tx.rs
similarity index 100%
rename from test-utils/src/assert_compressed_tx.rs
rename to program-tests/utils/src/assert_compressed_tx.rs
diff --git a/test-utils/src/assert_epoch.rs b/program-tests/utils/src/assert_epoch.rs
similarity index 100%
rename from test-utils/src/assert_epoch.rs
rename to program-tests/utils/src/assert_epoch.rs
diff --git a/test-utils/src/assert_merkle_tree.rs b/program-tests/utils/src/assert_merkle_tree.rs
similarity index 100%
rename from test-utils/src/assert_merkle_tree.rs
rename to program-tests/utils/src/assert_merkle_tree.rs
diff --git a/test-utils/src/assert_queue.rs b/program-tests/utils/src/assert_queue.rs
similarity index 100%
rename from test-utils/src/assert_queue.rs
rename to program-tests/utils/src/assert_queue.rs
diff --git a/test-utils/src/assert_rollover.rs b/program-tests/utils/src/assert_rollover.rs
similarity index 100%
rename from test-utils/src/assert_rollover.rs
rename to program-tests/utils/src/assert_rollover.rs
diff --git a/test-utils/src/assert_token_tx.rs b/program-tests/utils/src/assert_token_tx.rs
similarity index 100%
rename from test-utils/src/assert_token_tx.rs
rename to program-tests/utils/src/assert_token_tx.rs
diff --git a/test-utils/src/create_address_test_program_sdk.rs b/program-tests/utils/src/create_address_test_program_sdk.rs
similarity index 100%
rename from test-utils/src/create_address_test_program_sdk.rs
rename to program-tests/utils/src/create_address_test_program_sdk.rs
diff --git a/test-utils/src/e2e_test_env.rs b/program-tests/utils/src/e2e_test_env.rs
similarity index 100%
rename from test-utils/src/e2e_test_env.rs
rename to program-tests/utils/src/e2e_test_env.rs
diff --git a/test-utils/src/indexer/mod.rs b/program-tests/utils/src/indexer/mod.rs
similarity index 100%
rename from test-utils/src/indexer/mod.rs
rename to program-tests/utils/src/indexer/mod.rs
diff --git a/test-utils/src/indexer/test_indexer.rs b/program-tests/utils/src/indexer/test_indexer.rs
similarity index 100%
rename from test-utils/src/indexer/test_indexer.rs
rename to program-tests/utils/src/indexer/test_indexer.rs
diff --git a/test-utils/src/lib.rs b/program-tests/utils/src/lib.rs
similarity index 100%
rename from test-utils/src/lib.rs
rename to program-tests/utils/src/lib.rs
diff --git a/test-utils/src/spl.rs b/program-tests/utils/src/spl.rs
similarity index 100%
rename from test-utils/src/spl.rs
rename to program-tests/utils/src/spl.rs
diff --git a/test-utils/src/state_tree_rollover.rs b/program-tests/utils/src/state_tree_rollover.rs
similarity index 100%
rename from test-utils/src/state_tree_rollover.rs
rename to program-tests/utils/src/state_tree_rollover.rs
diff --git a/test-utils/src/system_program.rs b/program-tests/utils/src/system_program.rs
similarity index 100%
rename from test-utils/src/system_program.rs
rename to program-tests/utils/src/system_program.rs
diff --git a/test-utils/src/test_forester.rs b/program-tests/utils/src/test_forester.rs
similarity index 100%
rename from test-utils/src/test_forester.rs
rename to program-tests/utils/src/test_forester.rs
diff --git a/programs/account-compression/Cargo.toml b/programs/account-compression/Cargo.toml
index d2aece563f..0611c6afe6 100644
--- a/programs/account-compression/Cargo.toml
+++ b/programs/account-compression/Cargo.toml
@@ -24,21 +24,21 @@ test = []
 
 
 [dependencies]
-aligned-sized = { version = "1.1.0", path = "../../macros/aligned-sized" }
+aligned-sized = { workspace = true }
 anchor-lang = { workspace = true }
 bytemuck = { version = "1.17", features = ["min_const_generics"] }
-light-bounded-vec = { version = "1.1.0", path = "../../merkle-tree/bounded-vec", features = ["solana"] }
+light-bounded-vec = { workspace = true, features = ["solana"] }
 light-hash-set = { workspace = true, features = ["solana"] }
-light-hasher = { version = "1.1.0", path = "../../merkle-tree/hasher", features = ["solana"] }
-light-heap = { version = "1.1.0", path = "../../heap", optional = true }
-light-concurrent-merkle-tree = { version = "1.1.0", path = "../../merkle-tree/concurrent", features = ["solana"] }
-light-indexed-merkle-tree = { version = "1.1.0", path = "../../merkle-tree/indexed", features = ["solana"] }
-light-utils = { version = "1.0.0", path = "../../utils" }
-light-bloom-filter = { version = "0.1.0", path = "../../merkle-tree/bloom-filter", features = ["solana"] }
+light-hasher = { workspace = true, features = ["solana"] }
+light-heap = { workspace = true, optional = true }
+light-concurrent-merkle-tree = { workspace = true, features = ["solana"] }
+light-indexed-merkle-tree = { workspace = true, features = ["solana"] }
+light-utils = { workspace = true }
+light-bloom-filter = { workspace = true, features = ["solana"] }
 num-bigint = "0.4"
 num-traits = "0.2.19"
 solana-security-txt = "1.1.0"
-light-verifier = { version = "1.0.0", path = "../../circuit-lib/verifier", features = ["solana"] }
+light-verifier = { workspace = true, features = ["solana"] }
 light-batched-merkle-tree = {workspace = true, features = ["solana"] }
 light-merkle-tree-metadata = {workspace = true, features = ["anchor"] }
 
@@ -47,7 +47,7 @@ solana-sdk = { workspace = true }
 
 [dev-dependencies]
 rand = "0.8.5"
-light-prover-client = { version = "1.2.0", path = "../../circuit-lib/light-prover-client", features = ["gnark"] }
-light-merkle-tree-reference = { version = "1.1.0", path = "../../merkle-tree/reference" }
+light-prover-client = { workspace = true, features = ["gnark"] }
+light-merkle-tree-reference = { workspace = true }
 tokio = { version = "1.16.1" }
 serial_test = "3.1.1"
\ No newline at end of file
diff --git a/programs/compressed-token/Cargo.toml b/programs/compressed-token/Cargo.toml
index 38d8e4827a..e7d4cbf94a 100644
--- a/programs/compressed-token/Cargo.toml
+++ b/programs/compressed-token/Cargo.toml
@@ -26,13 +26,13 @@ idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"]
 anchor-lang = { workspace = true }
 anchor-spl = { workspace = true }
 spl-token = { workspace = true, features = ["no-entrypoint"]}
-aligned-sized = { version = "1.1.0", path = "../../macros/aligned-sized" }
-account-compression = { version = "1.2.0", path = "../account-compression", features = ["cpi", "no-idl"] }
-light-system-program = { version = "1.2.0", path = "../system", features = ["cpi"] }
+aligned-sized = { workspace = true }
+account-compression = { workspace = true, features = ["cpi", "no-idl"] }
+light-system-program = { workspace = true, features = ["cpi"] }
 solana-security-txt = "1.1.0"
-light-hasher = { version = "1.1.0", path = "../../merkle-tree/hasher" }
-light-heap = { version = "1.1.0", path = "../../heap", optional = true }
-light-utils = { version = "1.1.0", path = "../../utils" }
+light-hasher = { workspace = true }
+light-heap = { workspace = true, optional = true }
+light-utils = { workspace = true }
 spl-token-2022 = { workspace = true }
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 solana-sdk = { workspace = true }
diff --git a/programs/registry/Cargo.toml b/programs/registry/Cargo.toml
index 8c567d0747..1f07d80801 100644
--- a/programs/registry/Cargo.toml
+++ b/programs/registry/Cargo.toml
@@ -23,11 +23,11 @@ bench-sbf = []
 sdk = []
 
 [dependencies]
-aligned-sized = { version = "1.1.0", path = "../../macros/aligned-sized" }
+aligned-sized = { workspace = true }
 anchor-lang = { workspace = true , features = ["init-if-needed"]}
-light-heap = { version = "1.1.0", path = "../../heap", optional = true }
+light-heap = { workspace = true, optional = true }
 account-compression = { workspace =  true  }
-light-system-program = { version = "1.2.0", path = "../system", features = ["cpi"]  }
+light-system-program = { workspace = true , features = ["cpi"]  }
 solana-security-txt = "1.1.0"
 light-merkle-tree-metadata = { workspace = true }
 light-batched-merkle-tree = { workspace = true }
diff --git a/programs/system/Cargo.toml b/programs/system/Cargo.toml
index f7f8250071..f63a903d3a 100644
--- a/programs/system/Cargo.toml
+++ b/programs/system/Cargo.toml
@@ -22,17 +22,17 @@ idl-build = ["anchor-lang/idl-build"]
 
 
 [dependencies]
-aligned-sized = { version = "1.1.0", path = "../../macros/aligned-sized" }
+aligned-sized = { workspace = true }
 anchor-lang = { workspace = true }
-light-hasher = { version = "1.1.0", path = "../../merkle-tree/hasher" }
-light-heap = { version = "1.1.0", path = "../../heap", optional = true }
-light-macros = { path = "../../macros/light", version = "1.1.0" }
-light-concurrent-merkle-tree = { path = "../../merkle-tree/concurrent", version = "1.1.0" }
-light-indexed-merkle-tree = { path = "../../merkle-tree/indexed", version = "1.1.0" }
+light-hasher = { workspace = true }
+light-heap = { workspace = true, optional = true }
+light-macros = { workspace = true }
+light-concurrent-merkle-tree = { workspace = true }
+light-indexed-merkle-tree = { workspace = true }
 account-compression = { workspace =  true }
-light-utils = { version = "1.1.0", path = "../../utils" }
+light-utils = { workspace = true }
 groth16-solana = "0.0.3"
-light-verifier = { path = "../../circuit-lib/verifier", version = "1.1.0", features = ["solana"] }
+light-verifier = { workspace = true, features = ["solana"] }
 solana-security-txt = "1.1.0"
 light-batched-merkle-tree = {workspace = true, features = ["solana"] }
 
diff --git a/circuit-lib/verifier/.gitignore b/prover/client/.gitignore
similarity index 100%
rename from circuit-lib/verifier/.gitignore
rename to prover/client/.gitignore
diff --git a/circuit-lib/light-prover-client/Cargo.toml b/prover/client/Cargo.toml
similarity index 71%
rename from circuit-lib/light-prover-client/Cargo.toml
rename to prover/client/Cargo.toml
index 0e4451f56e..4bb6f38e47 100644
--- a/circuit-lib/light-prover-client/Cargo.toml
+++ b/prover/client/Cargo.toml
@@ -14,12 +14,12 @@ devenv = []
 [dependencies]
 
 # light local deps
-light-merkle-tree-reference = { path = "../../merkle-tree/reference", version = "1.1.0" }
-light-hasher = { path = "../../merkle-tree/hasher", version = "1.1.0" }
-light-indexed-merkle-tree = { path = "../../merkle-tree/indexed", version = "1.1.0" }
-light-concurrent-merkle-tree = { path = "../../merkle-tree/concurrent", version = "1.1.0" }
-light-bounded-vec = { path = "../../merkle-tree/bounded-vec", version = "1.1.0" }
-light-utils = { path = "../../utils", version = "1.1.0" }
+light-merkle-tree-reference = { workspace = true }
+light-hasher = { workspace = true }
+light-indexed-merkle-tree = { workspace = true }
+light-concurrent-merkle-tree = { workspace = true }
+light-bounded-vec = { workspace = true }
+light-utils = { workspace = true }
 # ark dependencies
 ark-serialize = "0.4.2"
 ark-bn254 = { version = "0.4" }
diff --git a/circuit-lib/light-prover-client/scripts/rapidsnark_bench.sh b/prover/client/scripts/rapidsnark_bench.sh
similarity index 100%
rename from circuit-lib/light-prover-client/scripts/rapidsnark_bench.sh
rename to prover/client/scripts/rapidsnark_bench.sh
diff --git a/circuit-lib/light-prover-client/src/batch_address_append.rs b/prover/client/src/batch_address_append.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/batch_address_append.rs
rename to prover/client/src/batch_address_append.rs
diff --git a/circuit-lib/light-prover-client/src/batch_append_with_proofs.rs b/prover/client/src/batch_append_with_proofs.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/batch_append_with_proofs.rs
rename to prover/client/src/batch_append_with_proofs.rs
diff --git a/circuit-lib/light-prover-client/src/batch_append_with_subtrees.rs b/prover/client/src/batch_append_with_subtrees.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/batch_append_with_subtrees.rs
rename to prover/client/src/batch_append_with_subtrees.rs
diff --git a/circuit-lib/light-prover-client/src/batch_update.rs b/prover/client/src/batch_update.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/batch_update.rs
rename to prover/client/src/batch_update.rs
diff --git a/circuit-lib/light-prover-client/src/combined/merkle_combined_proof_inputs.rs b/prover/client/src/combined/merkle_combined_proof_inputs.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/combined/merkle_combined_proof_inputs.rs
rename to prover/client/src/combined/merkle_combined_proof_inputs.rs
diff --git a/circuit-lib/light-prover-client/src/combined/mod.rs b/prover/client/src/combined/mod.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/combined/mod.rs
rename to prover/client/src/combined/mod.rs
diff --git a/circuit-lib/light-prover-client/src/combined_legacy/merkle_combined_proof_inputs.rs b/prover/client/src/combined_legacy/merkle_combined_proof_inputs.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/combined_legacy/merkle_combined_proof_inputs.rs
rename to prover/client/src/combined_legacy/merkle_combined_proof_inputs.rs
diff --git a/circuit-lib/light-prover-client/src/combined_legacy/mod.rs b/prover/client/src/combined_legacy/mod.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/combined_legacy/mod.rs
rename to prover/client/src/combined_legacy/mod.rs
diff --git a/circuit-lib/light-prover-client/src/errors.rs b/prover/client/src/errors.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/errors.rs
rename to prover/client/src/errors.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/batch_address_append_json_formatter.rs b/prover/client/src/gnark/batch_address_append_json_formatter.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/batch_address_append_json_formatter.rs
rename to prover/client/src/gnark/batch_address_append_json_formatter.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/batch_append_with_proofs_json_formatter.rs b/prover/client/src/gnark/batch_append_with_proofs_json_formatter.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/batch_append_with_proofs_json_formatter.rs
rename to prover/client/src/gnark/batch_append_with_proofs_json_formatter.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/batch_append_with_subtrees_json_formatter.rs b/prover/client/src/gnark/batch_append_with_subtrees_json_formatter.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/batch_append_with_subtrees_json_formatter.rs
rename to prover/client/src/gnark/batch_append_with_subtrees_json_formatter.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/batch_update_json_formatter.rs b/prover/client/src/gnark/batch_update_json_formatter.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/batch_update_json_formatter.rs
rename to prover/client/src/gnark/batch_update_json_formatter.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/combined_json_formatter.rs b/prover/client/src/gnark/combined_json_formatter.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/combined_json_formatter.rs
rename to prover/client/src/gnark/combined_json_formatter.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/combined_json_formatter_legacy.rs b/prover/client/src/gnark/combined_json_formatter_legacy.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/combined_json_formatter_legacy.rs
rename to prover/client/src/gnark/combined_json_formatter_legacy.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/constants.rs b/prover/client/src/gnark/constants.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/constants.rs
rename to prover/client/src/gnark/constants.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/helpers.rs b/prover/client/src/gnark/helpers.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/helpers.rs
rename to prover/client/src/gnark/helpers.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/inclusion_json_formatter.rs b/prover/client/src/gnark/inclusion_json_formatter.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/inclusion_json_formatter.rs
rename to prover/client/src/gnark/inclusion_json_formatter.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/inclusion_json_formatter_legacy.rs b/prover/client/src/gnark/inclusion_json_formatter_legacy.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/inclusion_json_formatter_legacy.rs
rename to prover/client/src/gnark/inclusion_json_formatter_legacy.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/mod.rs b/prover/client/src/gnark/mod.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/mod.rs
rename to prover/client/src/gnark/mod.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/non_inclusion_json_formatter.rs b/prover/client/src/gnark/non_inclusion_json_formatter.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/non_inclusion_json_formatter.rs
rename to prover/client/src/gnark/non_inclusion_json_formatter.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/non_inclusion_json_formatter_legacy.rs b/prover/client/src/gnark/non_inclusion_json_formatter_legacy.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/non_inclusion_json_formatter_legacy.rs
rename to prover/client/src/gnark/non_inclusion_json_formatter_legacy.rs
diff --git a/circuit-lib/light-prover-client/src/gnark/proof_helpers.rs b/prover/client/src/gnark/proof_helpers.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/gnark/proof_helpers.rs
rename to prover/client/src/gnark/proof_helpers.rs
diff --git a/circuit-lib/light-prover-client/src/helpers.rs b/prover/client/src/helpers.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/helpers.rs
rename to prover/client/src/helpers.rs
diff --git a/circuit-lib/light-prover-client/src/inclusion/merkle_inclusion_proof_inputs.rs b/prover/client/src/inclusion/merkle_inclusion_proof_inputs.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/inclusion/merkle_inclusion_proof_inputs.rs
rename to prover/client/src/inclusion/merkle_inclusion_proof_inputs.rs
diff --git a/circuit-lib/light-prover-client/src/inclusion/merkle_tree_info.rs b/prover/client/src/inclusion/merkle_tree_info.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/inclusion/merkle_tree_info.rs
rename to prover/client/src/inclusion/merkle_tree_info.rs
diff --git a/circuit-lib/light-prover-client/src/inclusion/mod.rs b/prover/client/src/inclusion/mod.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/inclusion/mod.rs
rename to prover/client/src/inclusion/mod.rs
diff --git a/circuit-lib/light-prover-client/src/inclusion_legacy/merkle_inclusion_proof_inputs.rs b/prover/client/src/inclusion_legacy/merkle_inclusion_proof_inputs.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/inclusion_legacy/merkle_inclusion_proof_inputs.rs
rename to prover/client/src/inclusion_legacy/merkle_inclusion_proof_inputs.rs
diff --git a/circuit-lib/light-prover-client/src/inclusion_legacy/mod.rs b/prover/client/src/inclusion_legacy/mod.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/inclusion_legacy/mod.rs
rename to prover/client/src/inclusion_legacy/mod.rs
diff --git a/circuit-lib/light-prover-client/src/indexed_changelog.rs b/prover/client/src/indexed_changelog.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/indexed_changelog.rs
rename to prover/client/src/indexed_changelog.rs
diff --git a/circuit-lib/light-prover-client/src/init_merkle_tree.rs b/prover/client/src/init_merkle_tree.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/init_merkle_tree.rs
rename to prover/client/src/init_merkle_tree.rs
diff --git a/circuit-lib/light-prover-client/src/lib.rs b/prover/client/src/lib.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/lib.rs
rename to prover/client/src/lib.rs
diff --git a/circuit-lib/light-prover-client/src/mock_batched_forester.rs b/prover/client/src/mock_batched_forester.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/mock_batched_forester.rs
rename to prover/client/src/mock_batched_forester.rs
diff --git a/circuit-lib/light-prover-client/src/non_inclusion/merkle_non_inclusion_proof_inputs.rs b/prover/client/src/non_inclusion/merkle_non_inclusion_proof_inputs.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/non_inclusion/merkle_non_inclusion_proof_inputs.rs
rename to prover/client/src/non_inclusion/merkle_non_inclusion_proof_inputs.rs
diff --git a/circuit-lib/light-prover-client/src/non_inclusion/mod.rs b/prover/client/src/non_inclusion/mod.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/non_inclusion/mod.rs
rename to prover/client/src/non_inclusion/mod.rs
diff --git a/circuit-lib/light-prover-client/src/non_inclusion_legacy/merkle_non_inclusion_proof_inputs.rs b/prover/client/src/non_inclusion_legacy/merkle_non_inclusion_proof_inputs.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/non_inclusion_legacy/merkle_non_inclusion_proof_inputs.rs
rename to prover/client/src/non_inclusion_legacy/merkle_non_inclusion_proof_inputs.rs
diff --git a/circuit-lib/light-prover-client/src/non_inclusion_legacy/mod.rs b/prover/client/src/non_inclusion_legacy/mod.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/non_inclusion_legacy/mod.rs
rename to prover/client/src/non_inclusion_legacy/mod.rs
diff --git a/circuit-lib/light-prover-client/src/prove_utils.rs b/prover/client/src/prove_utils.rs
similarity index 100%
rename from circuit-lib/light-prover-client/src/prove_utils.rs
rename to prover/client/src/prove_utils.rs
diff --git a/circuit-lib/light-prover-client/tests/gnark.rs b/prover/client/tests/gnark.rs
similarity index 100%
rename from circuit-lib/light-prover-client/tests/gnark.rs
rename to prover/client/tests/gnark.rs
diff --git a/light-prover/.gitignore b/prover/server/.gitignore
similarity index 100%
rename from light-prover/.gitignore
rename to prover/server/.gitignore
diff --git a/light-prover/Dockerfile b/prover/server/Dockerfile
similarity index 100%
rename from light-prover/Dockerfile
rename to prover/server/Dockerfile
diff --git a/light-prover/LICENSE b/prover/server/LICENSE
similarity index 100%
rename from light-prover/LICENSE
rename to prover/server/LICENSE
diff --git a/light-prover/README.md b/prover/server/README.md
similarity index 100%
rename from light-prover/README.md
rename to prover/server/README.md
diff --git a/light-prover/bench.sh b/prover/server/bench.sh
similarity index 100%
rename from light-prover/bench.sh
rename to prover/server/bench.sh
diff --git a/light-prover/formal-verification/.gitignore b/prover/server/formal-verification/.gitignore
similarity index 100%
rename from light-prover/formal-verification/.gitignore
rename to prover/server/formal-verification/.gitignore
diff --git a/light-prover/formal-verification/FormalVerification/Circuit.lean b/prover/server/formal-verification/FormalVerification/Circuit.lean
similarity index 100%
rename from light-prover/formal-verification/FormalVerification/Circuit.lean
rename to prover/server/formal-verification/FormalVerification/Circuit.lean
diff --git a/light-prover/formal-verification/FormalVerification/Lemmas.lean b/prover/server/formal-verification/FormalVerification/Lemmas.lean
similarity index 100%
rename from light-prover/formal-verification/FormalVerification/Lemmas.lean
rename to prover/server/formal-verification/FormalVerification/Lemmas.lean
diff --git a/light-prover/formal-verification/FormalVerification/Merkle.lean b/prover/server/formal-verification/FormalVerification/Merkle.lean
similarity index 100%
rename from light-prover/formal-verification/FormalVerification/Merkle.lean
rename to prover/server/formal-verification/FormalVerification/Merkle.lean
diff --git a/light-prover/formal-verification/FormalVerification/Poseidon.lean b/prover/server/formal-verification/FormalVerification/Poseidon.lean
similarity index 100%
rename from light-prover/formal-verification/FormalVerification/Poseidon.lean
rename to prover/server/formal-verification/FormalVerification/Poseidon.lean
diff --git a/light-prover/formal-verification/FormalVerification/RangeTree.lean b/prover/server/formal-verification/FormalVerification/RangeTree.lean
similarity index 100%
rename from light-prover/formal-verification/FormalVerification/RangeTree.lean
rename to prover/server/formal-verification/FormalVerification/RangeTree.lean
diff --git a/light-prover/formal-verification/FormalVerification/Rangecheck.lean b/prover/server/formal-verification/FormalVerification/Rangecheck.lean
similarity index 100%
rename from light-prover/formal-verification/FormalVerification/Rangecheck.lean
rename to prover/server/formal-verification/FormalVerification/Rangecheck.lean
diff --git a/light-prover/formal-verification/Main.lean b/prover/server/formal-verification/Main.lean
similarity index 100%
rename from light-prover/formal-verification/Main.lean
rename to prover/server/formal-verification/Main.lean
diff --git a/light-prover/formal-verification/lake-manifest.json b/prover/server/formal-verification/lake-manifest.json
similarity index 100%
rename from light-prover/formal-verification/lake-manifest.json
rename to prover/server/formal-verification/lake-manifest.json
diff --git a/light-prover/formal-verification/lakefile.lean b/prover/server/formal-verification/lakefile.lean
similarity index 100%
rename from light-prover/formal-verification/lakefile.lean
rename to prover/server/formal-verification/lakefile.lean
diff --git a/light-prover/formal-verification/lean-toolchain b/prover/server/formal-verification/lean-toolchain
similarity index 100%
rename from light-prover/formal-verification/lean-toolchain
rename to prover/server/formal-verification/lean-toolchain
diff --git a/light-prover/go.mod b/prover/server/go.mod
similarity index 100%
rename from light-prover/go.mod
rename to prover/server/go.mod
diff --git a/light-prover/go.sum b/prover/server/go.sum
similarity index 100%
rename from light-prover/go.sum
rename to prover/server/go.sum
diff --git a/light-prover/integration_test.go b/prover/server/integration_test.go
similarity index 100%
rename from light-prover/integration_test.go
rename to prover/server/integration_test.go
diff --git a/light-prover/logging/logger.go b/prover/server/logging/logger.go
similarity index 100%
rename from light-prover/logging/logger.go
rename to prover/server/logging/logger.go
diff --git a/light-prover/main.go b/prover/server/main.go
similarity index 100%
rename from light-prover/main.go
rename to prover/server/main.go
diff --git a/light-prover/merkle-tree/indexed_merkle_tree.go b/prover/server/merkle-tree/indexed_merkle_tree.go
similarity index 100%
rename from light-prover/merkle-tree/indexed_merkle_tree.go
rename to prover/server/merkle-tree/indexed_merkle_tree.go
diff --git a/light-prover/merkle-tree/indexed_merkle_tree_test.go b/prover/server/merkle-tree/indexed_merkle_tree_test.go
similarity index 100%
rename from light-prover/merkle-tree/indexed_merkle_tree_test.go
rename to prover/server/merkle-tree/indexed_merkle_tree_test.go
diff --git a/light-prover/merkle-tree/merkle_tree.go b/prover/server/merkle-tree/merkle_tree.go
similarity index 100%
rename from light-prover/merkle-tree/merkle_tree.go
rename to prover/server/merkle-tree/merkle_tree.go
diff --git a/light-prover/merkle-tree/merkle_tree_test.go b/prover/server/merkle-tree/merkle_tree_test.go
similarity index 100%
rename from light-prover/merkle-tree/merkle_tree_test.go
rename to prover/server/merkle-tree/merkle_tree_test.go
diff --git a/light-prover/merkle-tree/zero_bytes.go b/prover/server/merkle-tree/zero_bytes.go
similarity index 100%
rename from light-prover/merkle-tree/zero_bytes.go
rename to prover/server/merkle-tree/zero_bytes.go
diff --git a/light-prover/prover/batch_address_append_circuit.go b/prover/server/prover/batch_address_append_circuit.go
similarity index 100%
rename from light-prover/prover/batch_address_append_circuit.go
rename to prover/server/prover/batch_address_append_circuit.go
diff --git a/light-prover/prover/batch_address_append_circuit_test.go b/prover/server/prover/batch_address_append_circuit_test.go
similarity index 100%
rename from light-prover/prover/batch_address_append_circuit_test.go
rename to prover/server/prover/batch_address_append_circuit_test.go
diff --git a/light-prover/prover/batch_append_with_proofs_circuit.go b/prover/server/prover/batch_append_with_proofs_circuit.go
similarity index 100%
rename from light-prover/prover/batch_append_with_proofs_circuit.go
rename to prover/server/prover/batch_append_with_proofs_circuit.go
diff --git a/light-prover/prover/batch_append_with_proofs_circuit_test.go b/prover/server/prover/batch_append_with_proofs_circuit_test.go
similarity index 100%
rename from light-prover/prover/batch_append_with_proofs_circuit_test.go
rename to prover/server/prover/batch_append_with_proofs_circuit_test.go
diff --git a/light-prover/prover/batch_append_with_subtrees_circuit.go b/prover/server/prover/batch_append_with_subtrees_circuit.go
similarity index 100%
rename from light-prover/prover/batch_append_with_subtrees_circuit.go
rename to prover/server/prover/batch_append_with_subtrees_circuit.go
diff --git a/light-prover/prover/batch_append_with_subtrees_circuit_test.go b/prover/server/prover/batch_append_with_subtrees_circuit_test.go
similarity index 100%
rename from light-prover/prover/batch_append_with_subtrees_circuit_test.go
rename to prover/server/prover/batch_append_with_subtrees_circuit_test.go
diff --git a/light-prover/prover/batch_circuit_helpers.go b/prover/server/prover/batch_circuit_helpers.go
similarity index 100%
rename from light-prover/prover/batch_circuit_helpers.go
rename to prover/server/prover/batch_circuit_helpers.go
diff --git a/light-prover/prover/batch_update_circuit.go b/prover/server/prover/batch_update_circuit.go
similarity index 100%
rename from light-prover/prover/batch_update_circuit.go
rename to prover/server/prover/batch_update_circuit.go
diff --git a/light-prover/prover/batch_update_circuit_test.go b/prover/server/prover/batch_update_circuit_test.go
similarity index 100%
rename from light-prover/prover/batch_update_circuit_test.go
rename to prover/server/prover/batch_update_circuit_test.go
diff --git a/light-prover/prover/circuit_builder.go b/prover/server/prover/circuit_builder.go
similarity index 100%
rename from light-prover/prover/circuit_builder.go
rename to prover/server/prover/circuit_builder.go
diff --git a/light-prover/prover/circuit_utils.go b/prover/server/prover/circuit_utils.go
similarity index 100%
rename from light-prover/prover/circuit_utils.go
rename to prover/server/prover/circuit_utils.go
diff --git a/light-prover/prover/combined_circuit.go b/prover/server/prover/combined_circuit.go
similarity index 100%
rename from light-prover/prover/combined_circuit.go
rename to prover/server/prover/combined_circuit.go
diff --git a/light-prover/prover/combined_proving_system.go b/prover/server/prover/combined_proving_system.go
similarity index 100%
rename from light-prover/prover/combined_proving_system.go
rename to prover/server/prover/combined_proving_system.go
diff --git a/light-prover/prover/combined_proving_system_legacy.go b/prover/server/prover/combined_proving_system_legacy.go
similarity index 100%
rename from light-prover/prover/combined_proving_system_legacy.go
rename to prover/server/prover/combined_proving_system_legacy.go
diff --git a/light-prover/prover/combined_test.go b/prover/server/prover/combined_test.go
similarity index 100%
rename from light-prover/prover/combined_test.go
rename to prover/server/prover/combined_test.go
diff --git a/light-prover/prover/extractor.go b/prover/server/prover/extractor.go
similarity index 100%
rename from light-prover/prover/extractor.go
rename to prover/server/prover/extractor.go
diff --git a/light-prover/prover/inclusion_circuit.go b/prover/server/prover/inclusion_circuit.go
similarity index 100%
rename from light-prover/prover/inclusion_circuit.go
rename to prover/server/prover/inclusion_circuit.go
diff --git a/light-prover/prover/inclusion_proving_system.go b/prover/server/prover/inclusion_proving_system.go
similarity index 100%
rename from light-prover/prover/inclusion_proving_system.go
rename to prover/server/prover/inclusion_proving_system.go
diff --git a/light-prover/prover/inclusion_proving_system_legacy.go b/prover/server/prover/inclusion_proving_system_legacy.go
similarity index 100%
rename from light-prover/prover/inclusion_proving_system_legacy.go
rename to prover/server/prover/inclusion_proving_system_legacy.go
diff --git a/light-prover/prover/inclusion_test.go b/prover/server/prover/inclusion_test.go
similarity index 100%
rename from light-prover/prover/inclusion_test.go
rename to prover/server/prover/inclusion_test.go
diff --git a/light-prover/prover/is_less_test.go b/prover/server/prover/is_less_test.go
similarity index 100%
rename from light-prover/prover/is_less_test.go
rename to prover/server/prover/is_less_test.go
diff --git a/light-prover/prover/leaf_hash_gadget_test.go b/prover/server/prover/leaf_hash_gadget_test.go
similarity index 100%
rename from light-prover/prover/leaf_hash_gadget_test.go
rename to prover/server/prover/leaf_hash_gadget_test.go
diff --git a/light-prover/prover/marshal.go b/prover/server/prover/marshal.go
similarity index 100%
rename from light-prover/prover/marshal.go
rename to prover/server/prover/marshal.go
diff --git a/light-prover/prover/marshal_batch_address_append.go b/prover/server/prover/marshal_batch_address_append.go
similarity index 100%
rename from light-prover/prover/marshal_batch_address_append.go
rename to prover/server/prover/marshal_batch_address_append.go
diff --git a/light-prover/prover/marshal_batch_append_with_proofs.go b/prover/server/prover/marshal_batch_append_with_proofs.go
similarity index 100%
rename from light-prover/prover/marshal_batch_append_with_proofs.go
rename to prover/server/prover/marshal_batch_append_with_proofs.go
diff --git a/light-prover/prover/marshal_batch_append_with_subtrees.go b/prover/server/prover/marshal_batch_append_with_subtrees.go
similarity index 100%
rename from light-prover/prover/marshal_batch_append_with_subtrees.go
rename to prover/server/prover/marshal_batch_append_with_subtrees.go
diff --git a/light-prover/prover/marshal_combined.go b/prover/server/prover/marshal_combined.go
similarity index 100%
rename from light-prover/prover/marshal_combined.go
rename to prover/server/prover/marshal_combined.go
diff --git a/light-prover/prover/marshal_combined_legacy.go b/prover/server/prover/marshal_combined_legacy.go
similarity index 100%
rename from light-prover/prover/marshal_combined_legacy.go
rename to prover/server/prover/marshal_combined_legacy.go
diff --git a/light-prover/prover/marshal_inclusion.go b/prover/server/prover/marshal_inclusion.go
similarity index 100%
rename from light-prover/prover/marshal_inclusion.go
rename to prover/server/prover/marshal_inclusion.go
diff --git a/light-prover/prover/marshal_inclusion_legacy.go b/prover/server/prover/marshal_inclusion_legacy.go
similarity index 100%
rename from light-prover/prover/marshal_inclusion_legacy.go
rename to prover/server/prover/marshal_inclusion_legacy.go
diff --git a/light-prover/prover/marshal_non_inclusion.go b/prover/server/prover/marshal_non_inclusion.go
similarity index 100%
rename from light-prover/prover/marshal_non_inclusion.go
rename to prover/server/prover/marshal_non_inclusion.go
diff --git a/light-prover/prover/marshal_non_inclusion_legacy.go b/prover/server/prover/marshal_non_inclusion_legacy.go
similarity index 100%
rename from light-prover/prover/marshal_non_inclusion_legacy.go
rename to prover/server/prover/marshal_non_inclusion_legacy.go
diff --git a/light-prover/prover/marshal_update.go b/prover/server/prover/marshal_update.go
similarity index 100%
rename from light-prover/prover/marshal_update.go
rename to prover/server/prover/marshal_update.go
diff --git a/light-prover/prover/non_inclusion_circuit.go b/prover/server/prover/non_inclusion_circuit.go
similarity index 100%
rename from light-prover/prover/non_inclusion_circuit.go
rename to prover/server/prover/non_inclusion_circuit.go
diff --git a/light-prover/prover/non_inclusion_proving_system.go b/prover/server/prover/non_inclusion_proving_system.go
similarity index 100%
rename from light-prover/prover/non_inclusion_proving_system.go
rename to prover/server/prover/non_inclusion_proving_system.go
diff --git a/light-prover/prover/non_inclusion_proving_system_legacy.go b/prover/server/prover/non_inclusion_proving_system_legacy.go
similarity index 100%
rename from light-prover/prover/non_inclusion_proving_system_legacy.go
rename to prover/server/prover/non_inclusion_proving_system_legacy.go
diff --git a/light-prover/prover/non_inclusion_test.go b/prover/server/prover/non_inclusion_test.go
similarity index 100%
rename from light-prover/prover/non_inclusion_test.go
rename to prover/server/prover/non_inclusion_test.go
diff --git a/light-prover/prover/poseidon/constants.go b/prover/server/prover/poseidon/constants.go
similarity index 100%
rename from light-prover/prover/poseidon/constants.go
rename to prover/server/prover/poseidon/constants.go
diff --git a/light-prover/prover/poseidon/poseidon.go b/prover/server/prover/poseidon/poseidon.go
similarity index 100%
rename from light-prover/prover/poseidon/poseidon.go
rename to prover/server/prover/poseidon/poseidon.go
diff --git a/light-prover/prover/poseidon/poseidon_test.go b/prover/server/prover/poseidon/poseidon_test.go
similarity index 100%
rename from light-prover/prover/poseidon/poseidon_test.go
rename to prover/server/prover/poseidon/poseidon_test.go
diff --git a/light-prover/prover/proving_keys_utils.go b/prover/server/prover/proving_keys_utils.go
similarity index 100%
rename from light-prover/prover/proving_keys_utils.go
rename to prover/server/prover/proving_keys_utils.go
diff --git a/light-prover/prover/string_utils.go b/prover/server/prover/string_utils.go
similarity index 100%
rename from light-prover/prover/string_utils.go
rename to prover/server/prover/string_utils.go
diff --git a/light-prover/prover/test_data_generator_test.go b/prover/server/prover/test_data_generator_test.go
similarity index 100%
rename from light-prover/prover/test_data_generator_test.go
rename to prover/server/prover/test_data_generator_test.go
diff --git a/light-prover/prover/test_data_helpers.go b/prover/server/prover/test_data_helpers.go
similarity index 100%
rename from light-prover/prover/test_data_helpers.go
rename to prover/server/prover/test_data_helpers.go
diff --git a/light-prover/scripts/download_keys.sh b/prover/server/scripts/download_keys.sh
similarity index 98%
rename from light-prover/scripts/download_keys.sh
rename to prover/server/scripts/download_keys.sh
index 7d8eb745ba..2e5e013bb5 100755
--- a/light-prover/scripts/download_keys.sh
+++ b/prover/server/scripts/download_keys.sh
@@ -4,7 +4,7 @@ set -e
 
 # Configuration
 ROOT_DIR="$(git rev-parse --show-toplevel)"
-KEYS_DIR="${ROOT_DIR}/light-prover/proving-keys"
+KEYS_DIR="${ROOT_DIR}/prover/server/proving-keys"
 BASE_URL="https://light.fra1.cdn.digitaloceanspaces.com/proving-keys"
 CHECKSUM_URL="${BASE_URL}/CHECKSUM"
 MAX_RETRIES=3
diff --git a/light-prover/scripts/generate_checksums.py b/prover/server/scripts/generate_checksums.py
similarity index 100%
rename from light-prover/scripts/generate_checksums.py
rename to prover/server/scripts/generate_checksums.py
diff --git a/light-prover/scripts/generate_keys.sh b/prover/server/scripts/generate_keys.sh
similarity index 99%
rename from light-prover/scripts/generate_keys.sh
rename to prover/server/scripts/generate_keys.sh
index 0fe81f423f..ef233d88e7 100755
--- a/light-prover/scripts/generate_keys.sh
+++ b/prover/server/scripts/generate_keys.sh
@@ -4,7 +4,7 @@ declare -a HEIGHTS=("40")
 DEFAULT_STATE_HEIGHT="26"
 DEFAULT_ADDRESS_HEIGHT="40"
 PROVING_KEYS_DIR="./proving-keys"
-VERIFIER_DIR="../circuit-lib/verifier/src/verifying_keys"
+VERIFIER_DIR="../program-libs/verifier/src/verifying_keys"
 
 gnark() {
     local args=("$@")
diff --git a/light-prover/scripts/rate_detection.sh b/prover/server/scripts/rate_detection.sh
similarity index 100%
rename from light-prover/scripts/rate_detection.sh
rename to prover/server/scripts/rate_detection.sh
diff --git a/light-prover/scripts/server.sh b/prover/server/scripts/server.sh
similarity index 100%
rename from light-prover/scripts/server.sh
rename to prover/server/scripts/server.sh
diff --git a/light-prover/scripts/stress_load.sh b/prover/server/scripts/stress_load.sh
similarity index 100%
rename from light-prover/scripts/stress_load.sh
rename to prover/server/scripts/stress_load.sh
diff --git a/light-prover/scripts/targets.txt b/prover/server/scripts/targets.txt
similarity index 100%
rename from light-prover/scripts/targets.txt
rename to prover/server/scripts/targets.txt
diff --git a/light-prover/server/job.go b/prover/server/server/job.go
similarity index 100%
rename from light-prover/server/job.go
rename to prover/server/server/job.go
diff --git a/light-prover/server/server.go b/prover/server/server/server.go
similarity index 100%
rename from light-prover/server/server.go
rename to prover/server/server/server.go
diff --git a/light-prover/test-data/combined.csv b/prover/server/test-data/combined.csv
similarity index 100%
rename from light-prover/test-data/combined.csv
rename to prover/server/test-data/combined.csv
diff --git a/light-prover/test-data/inclusion.csv b/prover/server/test-data/inclusion.csv
similarity index 100%
rename from light-prover/test-data/inclusion.csv
rename to prover/server/test-data/inclusion.csv
diff --git a/light-prover/test-data/non_inclusion.csv b/prover/server/test-data/non_inclusion.csv
similarity index 100%
rename from light-prover/test-data/non_inclusion.csv
rename to prover/server/test-data/non_inclusion.csv
diff --git a/scripts/getAccountState.sh b/scripts/getAccountState.sh
index e2e19db118..9183c70622 100755
--- a/scripts/getAccountState.sh
+++ b/scripts/getAccountState.sh
@@ -7,4 +7,4 @@
 # group_pda
 # 
 # to add more accounts to regenerate, add them to setup_test_programs_with_accounts and test script
-cd test-programs/system-test && cargo test-sbf regenerate_accounts -- --ignored --nocapture && cd -
+cd program-tests/system-test && cargo test-sbf regenerate_accounts -- --ignored --nocapture && cd -
diff --git a/scripts/install.sh b/scripts/install.sh
index 467072c2c1..90fe782aa1 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -172,7 +172,7 @@ download_gnark_keys() {
     if ! is_installed "gnark_keys"; then
         echo "Downloading gnark keys..."
         ROOT_DIR="$(git rev-parse --show-toplevel)"
-        "${ROOT_DIR}/light-prover/scripts/download_keys.sh" "$key_type"
+        "${ROOT_DIR}/prover/server/scripts/download_keys.sh" "$key_type"
         log "gnark_keys"
     fi
 }
diff --git a/scripts/tsc-create-r1cs.sh b/scripts/tsc-create-r1cs.sh
index b6d488b3cc..21be3d44c6 100755
--- a/scripts/tsc-create-r1cs.sh
+++ b/scripts/tsc-create-r1cs.sh
@@ -39,7 +39,7 @@ generate_r1cs() {
     local height=$4
     local output_file=$5
 
-    ./light-prover/light-prover r1cs \
+    ./prover/server/light-prover r1cs \
         --circuit "$circuit" \
         --inclusion-compressed-accounts "$inclusion_accounts" \
         --non-inclusion-compressed-accounts "$non_inclusion_accounts" \
@@ -56,7 +56,7 @@ for accounts in 1 2 3 4 8; do
     generate_r1cs "inclusion" "$accounts" "0" "26" "inclusion_26_${accounts}_contribution_0.r1cs"
     ./../semaphore-mtb-setup/semaphore-mtb-setup p2n "$REPO_ROOT/ceremony/17.ph1" "$OUTPUT_DIR/inclusion_26_${accounts}_contribution_0.r1cs" "$OUTPUT_DIR/inclusion_26_${accounts}_dummy.ph1"
     ./../semaphore-mtb-setup/semaphore-mtb-setup key "${PH2_DIR}inclusion_26_${accounts}_badcryptobitch_contribution_16.ph2"
-    ./light-prover/light-prover import-setup --circuit "inclusion" --inclusion-compressed-accounts "$accounts" --inclusion-tree-height 26 --pk ./../pk --vk ./../vk --output ./light-prover/proving-keys/inclusion_26_${accounts}.key
+    ./prover/server/light-prover import-setup --circuit "inclusion" --inclusion-compressed-accounts "$accounts" --inclusion-tree-height 26 --pk ./../pk --vk ./../vk --output ./prover/server/proving-keys/inclusion_26_${accounts}.key
 done
 
 # Generate R1CS for non-inclusion circuits
@@ -64,7 +64,7 @@ for accounts in 1 2; do
     generate_r1cs "non-inclusion" "0" "$accounts" "26" "non-inclusion_26_${accounts}_contribution_0.r1cs"
     ./../semaphore-mtb-setup/semaphore-mtb-setup p2n "$REPO_ROOT/ceremony/17.ph1" "$OUTPUT_DIR/non-inclusion_26_${accounts}_contribution_0.r1cs" "$OUTPUT_DIR/non_inclusion_26_${accounts}_dummy.ph1"
     ./../semaphore-mtb-setup/semaphore-mtb-setup key "${PH2_DIR}non-inclusion_26_${accounts}_badcryptobitch_contribution_16.ph2"
-    ./light-prover/light-prover import-setup --circuit "non-inclusion" --non-inclusion-compressed-accounts "$accounts" --non-inclusion-tree-height 26 --pk ./../pk --vk ./../vk --output ./light-prover/proving-keys/non-inclusion_26_${accounts}.key
+    ./prover/server/light-prover import-setup --circuit "non-inclusion" --non-inclusion-compressed-accounts "$accounts" --non-inclusion-tree-height 26 --pk ./../pk --vk ./../vk --output ./prover/server/proving-keys/non-inclusion_26_${accounts}.key
 done
 
 # Generate R1CS for combined circuits
@@ -73,6 +73,6 @@ for inclusion_accounts in  2 3 4; do
         generate_r1cs "combined" "$inclusion_accounts" "$non_inclusion_accounts" "26" "combined_26_${inclusion_accounts}_${non_inclusion_accounts}_contribution_0.r1cs"
         ./../semaphore-mtb-setup/semaphore-mtb-setup p2n "$REPO_ROOT/ceremony/17.ph1" "$OUTPUT_DIR/combined_26_${inclusion_accounts}_${non_inclusion_accounts}_contribution_0.r1cs" "$OUTPUT_DIR/combined_26_${inclusion_accounts}_${non_inclusion_accounts}_dummy.ph1"
         ./../semaphore-mtb-setup/semaphore-mtb-setup key "${PH2_DIR}combined_26_${inclusion_accounts}_${non_inclusion_accounts}_badcryptobitch_contribution_16.ph2"
-        ./light-prover/light-prover import-setup --circuit "combined" --inclusion-compressed-accounts "$inclusion_accounts" --inclusion-tree-height 26 --non-inclusion-compressed-accounts "$non_inclusion_accounts" --non-inclusion-tree-height 26 --pk ./../pk --vk ./../vk --output ./light-prover/proving-keys/combined_26_${inclusion_accounts}_${non_inclusion_accounts}.key
+        ./prover/server/light-prover import-setup --circuit "combined" --inclusion-compressed-accounts "$inclusion_accounts" --inclusion-tree-height 26 --non-inclusion-compressed-accounts "$non_inclusion_accounts" --non-inclusion-tree-height 26 --pk ./../pk --vk ./../vk --output ./prover/server/proving-keys/combined_26_${inclusion_accounts}_${non_inclusion_accounts}.key
     done
 done
diff --git a/client/Cargo.toml b/sdk-libs/client/Cargo.toml
similarity index 93%
rename from client/Cargo.toml
rename to sdk-libs/client/Cargo.toml
index cb3567316a..63849ee002 100644
--- a/client/Cargo.toml
+++ b/sdk-libs/client/Cargo.toml
@@ -35,7 +35,7 @@ num-traits = { workspace = true }
 reqwest = { workspace = true }
 
 [dev-dependencies]
-light-test-utils = { version = "1.2.0", path = "../test-utils", features=["devenv"]}
+light-test-utils = { workspace = true, features=["devenv"]}
 light-program-test = { workspace = true }
 light-system-program = { workspace = true }
 light-compressed-token = { workspace = true }
diff --git a/client/src/indexer/mod.rs b/sdk-libs/client/src/indexer/mod.rs
similarity index 100%
rename from client/src/indexer/mod.rs
rename to sdk-libs/client/src/indexer/mod.rs
diff --git a/client/src/lib.rs b/sdk-libs/client/src/lib.rs
similarity index 100%
rename from client/src/lib.rs
rename to sdk-libs/client/src/lib.rs
diff --git a/client/src/photon_rpc/error.rs b/sdk-libs/client/src/photon_rpc/error.rs
similarity index 100%
rename from client/src/photon_rpc/error.rs
rename to sdk-libs/client/src/photon_rpc/error.rs
diff --git a/client/src/photon_rpc/mod.rs b/sdk-libs/client/src/photon_rpc/mod.rs
similarity index 100%
rename from client/src/photon_rpc/mod.rs
rename to sdk-libs/client/src/photon_rpc/mod.rs
diff --git a/client/src/photon_rpc/models.rs b/sdk-libs/client/src/photon_rpc/models.rs
similarity index 100%
rename from client/src/photon_rpc/models.rs
rename to sdk-libs/client/src/photon_rpc/models.rs
diff --git a/client/src/photon_rpc/photon_client.rs b/sdk-libs/client/src/photon_rpc/photon_client.rs
similarity index 100%
rename from client/src/photon_rpc/photon_client.rs
rename to sdk-libs/client/src/photon_rpc/photon_client.rs
diff --git a/client/src/photon_rpc/types.rs b/sdk-libs/client/src/photon_rpc/types.rs
similarity index 100%
rename from client/src/photon_rpc/types.rs
rename to sdk-libs/client/src/photon_rpc/types.rs
diff --git a/client/src/rpc/errors.rs b/sdk-libs/client/src/rpc/errors.rs
similarity index 100%
rename from client/src/rpc/errors.rs
rename to sdk-libs/client/src/rpc/errors.rs
diff --git a/client/src/rpc/merkle_tree.rs b/sdk-libs/client/src/rpc/merkle_tree.rs
similarity index 100%
rename from client/src/rpc/merkle_tree.rs
rename to sdk-libs/client/src/rpc/merkle_tree.rs
diff --git a/client/src/rpc/mod.rs b/sdk-libs/client/src/rpc/mod.rs
similarity index 100%
rename from client/src/rpc/mod.rs
rename to sdk-libs/client/src/rpc/mod.rs
diff --git a/client/src/rpc/rpc_connection.rs b/sdk-libs/client/src/rpc/rpc_connection.rs
similarity index 100%
rename from client/src/rpc/rpc_connection.rs
rename to sdk-libs/client/src/rpc/rpc_connection.rs
diff --git a/client/src/rpc/solana_rpc.rs b/sdk-libs/client/src/rpc/solana_rpc.rs
similarity index 100%
rename from client/src/rpc/solana_rpc.rs
rename to sdk-libs/client/src/rpc/solana_rpc.rs
diff --git a/client/src/rpc_pool.rs b/sdk-libs/client/src/rpc_pool.rs
similarity index 100%
rename from client/src/rpc_pool.rs
rename to sdk-libs/client/src/rpc_pool.rs
diff --git a/client/src/transaction_params.rs b/sdk-libs/client/src/transaction_params.rs
similarity index 100%
rename from client/src/transaction_params.rs
rename to sdk-libs/client/src/transaction_params.rs
diff --git a/client/tests/rpc_client.rs b/sdk-libs/client/tests/rpc_client.rs
similarity index 100%
rename from client/tests/rpc_client.rs
rename to sdk-libs/client/tests/rpc_client.rs
diff --git a/macros/light/Cargo.lock b/sdk-libs/macros/Cargo.lock
similarity index 100%
rename from macros/light/Cargo.lock
rename to sdk-libs/macros/Cargo.lock
diff --git a/macros/light-sdk-macros/Cargo.toml b/sdk-libs/macros/Cargo.toml
similarity index 76%
rename from macros/light-sdk-macros/Cargo.toml
rename to sdk-libs/macros/Cargo.toml
index acad488515..f7ce43426b 100644
--- a/macros/light-sdk-macros/Cargo.toml
+++ b/sdk-libs/macros/Cargo.toml
@@ -12,10 +12,10 @@ proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
 
-light-hasher = { path = "../../merkle-tree/hasher", version = "1.1.0" }
+light-hasher = { workspace = true }
 
 [dev-dependencies]
-light-utils = { path = "../../utils", version = "1.1.0" }
+light-utils = { workspace = true }
 prettyplease = "0.2.25"
 
 [lib]
diff --git a/macros/light-sdk-macros/README.md b/sdk-libs/macros/README.md
similarity index 100%
rename from macros/light-sdk-macros/README.md
rename to sdk-libs/macros/README.md
diff --git a/macros/light-sdk-macros/src/account.rs b/sdk-libs/macros/src/account.rs
similarity index 100%
rename from macros/light-sdk-macros/src/account.rs
rename to sdk-libs/macros/src/account.rs
diff --git a/macros/light-sdk-macros/src/accounts.rs b/sdk-libs/macros/src/accounts.rs
similarity index 100%
rename from macros/light-sdk-macros/src/accounts.rs
rename to sdk-libs/macros/src/accounts.rs
diff --git a/macros/light-sdk-macros/src/discriminator.rs b/sdk-libs/macros/src/discriminator.rs
similarity index 100%
rename from macros/light-sdk-macros/src/discriminator.rs
rename to sdk-libs/macros/src/discriminator.rs
diff --git a/macros/light-sdk-macros/src/hasher.rs b/sdk-libs/macros/src/hasher.rs
similarity index 100%
rename from macros/light-sdk-macros/src/hasher.rs
rename to sdk-libs/macros/src/hasher.rs
diff --git a/macros/light-sdk-macros/src/lib.rs b/sdk-libs/macros/src/lib.rs
similarity index 100%
rename from macros/light-sdk-macros/src/lib.rs
rename to sdk-libs/macros/src/lib.rs
diff --git a/macros/light-sdk-macros/src/program.rs b/sdk-libs/macros/src/program.rs
similarity index 100%
rename from macros/light-sdk-macros/src/program.rs
rename to sdk-libs/macros/src/program.rs
diff --git a/macros/light-sdk-macros/src/traits.rs b/sdk-libs/macros/src/traits.rs
similarity index 100%
rename from macros/light-sdk-macros/src/traits.rs
rename to sdk-libs/macros/src/traits.rs
diff --git a/macros/light-sdk-macros/tests/hasher.rs b/sdk-libs/macros/tests/hasher.rs
similarity index 100%
rename from macros/light-sdk-macros/tests/hasher.rs
rename to sdk-libs/macros/tests/hasher.rs
diff --git a/photon-api/.gitignore b/sdk-libs/photon-api/.gitignore
similarity index 100%
rename from photon-api/.gitignore
rename to sdk-libs/photon-api/.gitignore
diff --git a/photon-api/.openapi-generator-ignore b/sdk-libs/photon-api/.openapi-generator-ignore
similarity index 100%
rename from photon-api/.openapi-generator-ignore
rename to sdk-libs/photon-api/.openapi-generator-ignore
diff --git a/photon-api/.openapi-generator/FILES b/sdk-libs/photon-api/.openapi-generator/FILES
similarity index 100%
rename from photon-api/.openapi-generator/FILES
rename to sdk-libs/photon-api/.openapi-generator/FILES
diff --git a/photon-api/.openapi-generator/VERSION b/sdk-libs/photon-api/.openapi-generator/VERSION
similarity index 100%
rename from photon-api/.openapi-generator/VERSION
rename to sdk-libs/photon-api/.openapi-generator/VERSION
diff --git a/photon-api/.travis.yml b/sdk-libs/photon-api/.travis.yml
similarity index 100%
rename from photon-api/.travis.yml
rename to sdk-libs/photon-api/.travis.yml
diff --git a/photon-api/Cargo.toml b/sdk-libs/photon-api/Cargo.toml
similarity index 100%
rename from photon-api/Cargo.toml
rename to sdk-libs/photon-api/Cargo.toml
diff --git a/photon-api/README.md b/sdk-libs/photon-api/README.md
similarity index 100%
rename from photon-api/README.md
rename to sdk-libs/photon-api/README.md
diff --git a/photon-api/docs/Account.md b/sdk-libs/photon-api/docs/Account.md
similarity index 100%
rename from photon-api/docs/Account.md
rename to sdk-libs/photon-api/docs/Account.md
diff --git a/photon-api/docs/AccountData.md b/sdk-libs/photon-api/docs/AccountData.md
similarity index 100%
rename from photon-api/docs/AccountData.md
rename to sdk-libs/photon-api/docs/AccountData.md
diff --git a/photon-api/docs/AccountList.md b/sdk-libs/photon-api/docs/AccountList.md
similarity index 100%
rename from photon-api/docs/AccountList.md
rename to sdk-libs/photon-api/docs/AccountList.md
diff --git a/photon-api/docs/AccountState.md b/sdk-libs/photon-api/docs/AccountState.md
similarity index 100%
rename from photon-api/docs/AccountState.md
rename to sdk-libs/photon-api/docs/AccountState.md
diff --git a/photon-api/docs/AccountWithOptionalTokenData.md b/sdk-libs/photon-api/docs/AccountWithOptionalTokenData.md
similarity index 100%
rename from photon-api/docs/AccountWithOptionalTokenData.md
rename to sdk-libs/photon-api/docs/AccountWithOptionalTokenData.md
diff --git a/photon-api/docs/AddressWithTree.md b/sdk-libs/photon-api/docs/AddressWithTree.md
similarity index 100%
rename from photon-api/docs/AddressWithTree.md
rename to sdk-libs/photon-api/docs/AddressWithTree.md
diff --git a/photon-api/docs/CompressedProof.md b/sdk-libs/photon-api/docs/CompressedProof.md
similarity index 100%
rename from photon-api/docs/CompressedProof.md
rename to sdk-libs/photon-api/docs/CompressedProof.md
diff --git a/photon-api/docs/CompressedProofWithContext.md b/sdk-libs/photon-api/docs/CompressedProofWithContext.md
similarity index 100%
rename from photon-api/docs/CompressedProofWithContext.md
rename to sdk-libs/photon-api/docs/CompressedProofWithContext.md
diff --git a/photon-api/docs/Context.md b/sdk-libs/photon-api/docs/Context.md
similarity index 100%
rename from photon-api/docs/Context.md
rename to sdk-libs/photon-api/docs/Context.md
diff --git a/photon-api/docs/DataSlice.md b/sdk-libs/photon-api/docs/DataSlice.md
similarity index 100%
rename from photon-api/docs/DataSlice.md
rename to sdk-libs/photon-api/docs/DataSlice.md
diff --git a/photon-api/docs/DefaultApi.md b/sdk-libs/photon-api/docs/DefaultApi.md
similarity index 100%
rename from photon-api/docs/DefaultApi.md
rename to sdk-libs/photon-api/docs/DefaultApi.md
diff --git a/photon-api/docs/FilterSelector.md b/sdk-libs/photon-api/docs/FilterSelector.md
similarity index 100%
rename from photon-api/docs/FilterSelector.md
rename to sdk-libs/photon-api/docs/FilterSelector.md
diff --git a/photon-api/docs/GetCompressedAccountBalancePost200Response.md b/sdk-libs/photon-api/docs/GetCompressedAccountBalancePost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountBalancePost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountBalancePost200Response.md
diff --git a/photon-api/docs/GetCompressedAccountBalancePost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressedAccountBalancePost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountBalancePost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountBalancePost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressedAccountBalancePostRequest.md b/sdk-libs/photon-api/docs/GetCompressedAccountBalancePostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountBalancePostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountBalancePostRequest.md
diff --git a/photon-api/docs/GetCompressedAccountPost200Response.md b/sdk-libs/photon-api/docs/GetCompressedAccountPost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountPost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountPost200Response.md
diff --git a/photon-api/docs/GetCompressedAccountPost200ResponseError.md b/sdk-libs/photon-api/docs/GetCompressedAccountPost200ResponseError.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountPost200ResponseError.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountPost200ResponseError.md
diff --git a/photon-api/docs/GetCompressedAccountPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressedAccountPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountPost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressedAccountPost429Response.md b/sdk-libs/photon-api/docs/GetCompressedAccountPost429Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountPost429Response.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountPost429Response.md
diff --git a/photon-api/docs/GetCompressedAccountPostRequest.md b/sdk-libs/photon-api/docs/GetCompressedAccountPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountPostRequest.md
diff --git a/photon-api/docs/GetCompressedAccountPostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressedAccountPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountPostRequestParams.md
diff --git a/photon-api/docs/GetCompressedAccountProofPost200Response.md b/sdk-libs/photon-api/docs/GetCompressedAccountProofPost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountProofPost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountProofPost200Response.md
diff --git a/photon-api/docs/GetCompressedAccountProofPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressedAccountProofPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountProofPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountProofPost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressedAccountProofPostRequest.md b/sdk-libs/photon-api/docs/GetCompressedAccountProofPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountProofPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountProofPostRequest.md
diff --git a/photon-api/docs/GetCompressedAccountProofPostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressedAccountProofPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountProofPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountProofPostRequestParams.md
diff --git a/photon-api/docs/GetCompressedAccountsByOwnerPost200Response.md b/sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountsByOwnerPost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPost200Response.md
diff --git a/photon-api/docs/GetCompressedAccountsByOwnerPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountsByOwnerPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressedAccountsByOwnerPostRequest.md b/sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountsByOwnerPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPostRequest.md
diff --git a/photon-api/docs/GetCompressedAccountsByOwnerPostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressedAccountsByOwnerPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressedAccountsByOwnerPostRequestParams.md
diff --git a/photon-api/docs/GetCompressedBalanceByOwnerPostRequest.md b/sdk-libs/photon-api/docs/GetCompressedBalanceByOwnerPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedBalanceByOwnerPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedBalanceByOwnerPostRequest.md
diff --git a/photon-api/docs/GetCompressedBalanceByOwnerPostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressedBalanceByOwnerPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressedBalanceByOwnerPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressedBalanceByOwnerPostRequestParams.md
diff --git a/photon-api/docs/GetCompressedTokenAccountBalancePost200Response.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountBalancePost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountBalancePost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountBalancePost200Response.md
diff --git a/photon-api/docs/GetCompressedTokenAccountBalancePost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountBalancePost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountBalancePost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountBalancePost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressedTokenAccountBalancePostRequest.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountBalancePostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountBalancePostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountBalancePostRequest.md
diff --git a/photon-api/docs/GetCompressedTokenAccountsByDelegatePost200Response.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountsByDelegatePost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePost200Response.md
diff --git a/photon-api/docs/GetCompressedTokenAccountsByDelegatePost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountsByDelegatePost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequest.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequest.md
diff --git a/photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountsByDelegatePostRequestParams.md
diff --git a/photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequest.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequest.md
diff --git a/photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenAccountsByOwnerPostRequestParams.md
diff --git a/photon-api/docs/GetCompressedTokenBalancesByOwnerPost200Response.md b/sdk-libs/photon-api/docs/GetCompressedTokenBalancesByOwnerPost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenBalancesByOwnerPost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenBalancesByOwnerPost200Response.md
diff --git a/photon-api/docs/GetCompressedTokenBalancesByOwnerPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressedTokenBalancesByOwnerPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenBalancesByOwnerPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenBalancesByOwnerPost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressedTokenBalancesByOwnerPostRequest.md b/sdk-libs/photon-api/docs/GetCompressedTokenBalancesByOwnerPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressedTokenBalancesByOwnerPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressedTokenBalancesByOwnerPostRequest.md
diff --git a/photon-api/docs/GetCompressionSignaturesForAccountPost200Response.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForAccountPost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForAccountPost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForAccountPost200Response.md
diff --git a/photon-api/docs/GetCompressionSignaturesForAccountPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForAccountPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForAccountPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForAccountPost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressionSignaturesForAccountPostRequest.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForAccountPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForAccountPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForAccountPostRequest.md
diff --git a/photon-api/docs/GetCompressionSignaturesForAddressPost200Response.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPost200Response.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForAddressPost200Response.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPost200Response.md
diff --git a/photon-api/docs/GetCompressionSignaturesForAddressPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForAddressPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPost200ResponseResult.md
diff --git a/photon-api/docs/GetCompressionSignaturesForAddressPostRequest.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForAddressPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPostRequest.md
diff --git a/photon-api/docs/GetCompressionSignaturesForAddressPostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForAddressPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForAddressPostRequestParams.md
diff --git a/photon-api/docs/GetCompressionSignaturesForOwnerPostRequest.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForOwnerPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForOwnerPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForOwnerPostRequest.md
diff --git a/photon-api/docs/GetCompressionSignaturesForOwnerPostRequestParams.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForOwnerPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForOwnerPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForOwnerPostRequestParams.md
diff --git a/photon-api/docs/GetCompressionSignaturesForTokenOwnerPostRequest.md b/sdk-libs/photon-api/docs/GetCompressionSignaturesForTokenOwnerPostRequest.md
similarity index 100%
rename from photon-api/docs/GetCompressionSignaturesForTokenOwnerPostRequest.md
rename to sdk-libs/photon-api/docs/GetCompressionSignaturesForTokenOwnerPostRequest.md
diff --git a/photon-api/docs/GetIndexerHealthPost200Response.md b/sdk-libs/photon-api/docs/GetIndexerHealthPost200Response.md
similarity index 100%
rename from photon-api/docs/GetIndexerHealthPost200Response.md
rename to sdk-libs/photon-api/docs/GetIndexerHealthPost200Response.md
diff --git a/photon-api/docs/GetIndexerHealthPostRequest.md b/sdk-libs/photon-api/docs/GetIndexerHealthPostRequest.md
similarity index 100%
rename from photon-api/docs/GetIndexerHealthPostRequest.md
rename to sdk-libs/photon-api/docs/GetIndexerHealthPostRequest.md
diff --git a/photon-api/docs/GetIndexerSlotPost200Response.md b/sdk-libs/photon-api/docs/GetIndexerSlotPost200Response.md
similarity index 100%
rename from photon-api/docs/GetIndexerSlotPost200Response.md
rename to sdk-libs/photon-api/docs/GetIndexerSlotPost200Response.md
diff --git a/photon-api/docs/GetIndexerSlotPostRequest.md b/sdk-libs/photon-api/docs/GetIndexerSlotPostRequest.md
similarity index 100%
rename from photon-api/docs/GetIndexerSlotPostRequest.md
rename to sdk-libs/photon-api/docs/GetIndexerSlotPostRequest.md
diff --git a/photon-api/docs/GetLatestCompressionSignaturesPostRequest.md b/sdk-libs/photon-api/docs/GetLatestCompressionSignaturesPostRequest.md
similarity index 100%
rename from photon-api/docs/GetLatestCompressionSignaturesPostRequest.md
rename to sdk-libs/photon-api/docs/GetLatestCompressionSignaturesPostRequest.md
diff --git a/photon-api/docs/GetLatestCompressionSignaturesPostRequestParams.md b/sdk-libs/photon-api/docs/GetLatestCompressionSignaturesPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetLatestCompressionSignaturesPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetLatestCompressionSignaturesPostRequestParams.md
diff --git a/photon-api/docs/GetLatestNonVotingSignaturesPost200Response.md b/sdk-libs/photon-api/docs/GetLatestNonVotingSignaturesPost200Response.md
similarity index 100%
rename from photon-api/docs/GetLatestNonVotingSignaturesPost200Response.md
rename to sdk-libs/photon-api/docs/GetLatestNonVotingSignaturesPost200Response.md
diff --git a/photon-api/docs/GetLatestNonVotingSignaturesPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetLatestNonVotingSignaturesPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetLatestNonVotingSignaturesPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetLatestNonVotingSignaturesPost200ResponseResult.md
diff --git a/photon-api/docs/GetLatestNonVotingSignaturesPostRequest.md b/sdk-libs/photon-api/docs/GetLatestNonVotingSignaturesPostRequest.md
similarity index 100%
rename from photon-api/docs/GetLatestNonVotingSignaturesPostRequest.md
rename to sdk-libs/photon-api/docs/GetLatestNonVotingSignaturesPostRequest.md
diff --git a/photon-api/docs/GetMultipleCompressedAccountProofsPost200Response.md b/sdk-libs/photon-api/docs/GetMultipleCompressedAccountProofsPost200Response.md
similarity index 100%
rename from photon-api/docs/GetMultipleCompressedAccountProofsPost200Response.md
rename to sdk-libs/photon-api/docs/GetMultipleCompressedAccountProofsPost200Response.md
diff --git a/photon-api/docs/GetMultipleCompressedAccountProofsPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetMultipleCompressedAccountProofsPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetMultipleCompressedAccountProofsPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetMultipleCompressedAccountProofsPost200ResponseResult.md
diff --git a/photon-api/docs/GetMultipleCompressedAccountProofsPostRequest.md b/sdk-libs/photon-api/docs/GetMultipleCompressedAccountProofsPostRequest.md
similarity index 100%
rename from photon-api/docs/GetMultipleCompressedAccountProofsPostRequest.md
rename to sdk-libs/photon-api/docs/GetMultipleCompressedAccountProofsPostRequest.md
diff --git a/photon-api/docs/GetMultipleCompressedAccountsPost200Response.md b/sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPost200Response.md
similarity index 100%
rename from photon-api/docs/GetMultipleCompressedAccountsPost200Response.md
rename to sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPost200Response.md
diff --git a/photon-api/docs/GetMultipleCompressedAccountsPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetMultipleCompressedAccountsPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPost200ResponseResult.md
diff --git a/photon-api/docs/GetMultipleCompressedAccountsPostRequest.md b/sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPostRequest.md
similarity index 100%
rename from photon-api/docs/GetMultipleCompressedAccountsPostRequest.md
rename to sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPostRequest.md
diff --git a/photon-api/docs/GetMultipleCompressedAccountsPostRequestParams.md b/sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetMultipleCompressedAccountsPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetMultipleCompressedAccountsPostRequestParams.md
diff --git a/photon-api/docs/GetMultipleNewAddressProofsPost200Response.md b/sdk-libs/photon-api/docs/GetMultipleNewAddressProofsPost200Response.md
similarity index 100%
rename from photon-api/docs/GetMultipleNewAddressProofsPost200Response.md
rename to sdk-libs/photon-api/docs/GetMultipleNewAddressProofsPost200Response.md
diff --git a/photon-api/docs/GetMultipleNewAddressProofsPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetMultipleNewAddressProofsPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetMultipleNewAddressProofsPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetMultipleNewAddressProofsPost200ResponseResult.md
diff --git a/photon-api/docs/GetMultipleNewAddressProofsPostRequest.md b/sdk-libs/photon-api/docs/GetMultipleNewAddressProofsPostRequest.md
similarity index 100%
rename from photon-api/docs/GetMultipleNewAddressProofsPostRequest.md
rename to sdk-libs/photon-api/docs/GetMultipleNewAddressProofsPostRequest.md
diff --git a/photon-api/docs/GetMultipleNewAddressProofsV2PostRequest.md b/sdk-libs/photon-api/docs/GetMultipleNewAddressProofsV2PostRequest.md
similarity index 100%
rename from photon-api/docs/GetMultipleNewAddressProofsV2PostRequest.md
rename to sdk-libs/photon-api/docs/GetMultipleNewAddressProofsV2PostRequest.md
diff --git a/photon-api/docs/GetTransactionWithCompressionInfoPost200Response.md b/sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPost200Response.md
similarity index 100%
rename from photon-api/docs/GetTransactionWithCompressionInfoPost200Response.md
rename to sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPost200Response.md
diff --git a/photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResult.md
diff --git a/photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResultCompressionInfo.md b/sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResultCompressionInfo.md
similarity index 100%
rename from photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResultCompressionInfo.md
rename to sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPost200ResponseResultCompressionInfo.md
diff --git a/photon-api/docs/GetTransactionWithCompressionInfoPostRequest.md b/sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPostRequest.md
similarity index 100%
rename from photon-api/docs/GetTransactionWithCompressionInfoPostRequest.md
rename to sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPostRequest.md
diff --git a/photon-api/docs/GetTransactionWithCompressionInfoPostRequestParams.md b/sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetTransactionWithCompressionInfoPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetTransactionWithCompressionInfoPostRequestParams.md
diff --git a/photon-api/docs/GetValidityProofPost200Response.md b/sdk-libs/photon-api/docs/GetValidityProofPost200Response.md
similarity index 100%
rename from photon-api/docs/GetValidityProofPost200Response.md
rename to sdk-libs/photon-api/docs/GetValidityProofPost200Response.md
diff --git a/photon-api/docs/GetValidityProofPost200ResponseResult.md b/sdk-libs/photon-api/docs/GetValidityProofPost200ResponseResult.md
similarity index 100%
rename from photon-api/docs/GetValidityProofPost200ResponseResult.md
rename to sdk-libs/photon-api/docs/GetValidityProofPost200ResponseResult.md
diff --git a/photon-api/docs/GetValidityProofPostRequest.md b/sdk-libs/photon-api/docs/GetValidityProofPostRequest.md
similarity index 100%
rename from photon-api/docs/GetValidityProofPostRequest.md
rename to sdk-libs/photon-api/docs/GetValidityProofPostRequest.md
diff --git a/photon-api/docs/GetValidityProofPostRequestParams.md b/sdk-libs/photon-api/docs/GetValidityProofPostRequestParams.md
similarity index 100%
rename from photon-api/docs/GetValidityProofPostRequestParams.md
rename to sdk-libs/photon-api/docs/GetValidityProofPostRequestParams.md
diff --git a/photon-api/docs/Memcmp.md b/sdk-libs/photon-api/docs/Memcmp.md
similarity index 100%
rename from photon-api/docs/Memcmp.md
rename to sdk-libs/photon-api/docs/Memcmp.md
diff --git a/photon-api/docs/MerkleContextWithNewAddressProof.md b/sdk-libs/photon-api/docs/MerkleContextWithNewAddressProof.md
similarity index 100%
rename from photon-api/docs/MerkleContextWithNewAddressProof.md
rename to sdk-libs/photon-api/docs/MerkleContextWithNewAddressProof.md
diff --git a/photon-api/docs/MerkleProofWithContext.md b/sdk-libs/photon-api/docs/MerkleProofWithContext.md
similarity index 100%
rename from photon-api/docs/MerkleProofWithContext.md
rename to sdk-libs/photon-api/docs/MerkleProofWithContext.md
diff --git a/photon-api/docs/PaginatedAccountList.md b/sdk-libs/photon-api/docs/PaginatedAccountList.md
similarity index 100%
rename from photon-api/docs/PaginatedAccountList.md
rename to sdk-libs/photon-api/docs/PaginatedAccountList.md
diff --git a/photon-api/docs/PaginatedSignatureInfoList.md b/sdk-libs/photon-api/docs/PaginatedSignatureInfoList.md
similarity index 100%
rename from photon-api/docs/PaginatedSignatureInfoList.md
rename to sdk-libs/photon-api/docs/PaginatedSignatureInfoList.md
diff --git a/photon-api/docs/SignatureInfo.md b/sdk-libs/photon-api/docs/SignatureInfo.md
similarity index 100%
rename from photon-api/docs/SignatureInfo.md
rename to sdk-libs/photon-api/docs/SignatureInfo.md
diff --git a/photon-api/docs/SignatureInfoList.md b/sdk-libs/photon-api/docs/SignatureInfoList.md
similarity index 100%
rename from photon-api/docs/SignatureInfoList.md
rename to sdk-libs/photon-api/docs/SignatureInfoList.md
diff --git a/photon-api/docs/SignatureInfoListWithError.md b/sdk-libs/photon-api/docs/SignatureInfoListWithError.md
similarity index 100%
rename from photon-api/docs/SignatureInfoListWithError.md
rename to sdk-libs/photon-api/docs/SignatureInfoListWithError.md
diff --git a/photon-api/docs/SignatureInfoWithError.md b/sdk-libs/photon-api/docs/SignatureInfoWithError.md
similarity index 100%
rename from photon-api/docs/SignatureInfoWithError.md
rename to sdk-libs/photon-api/docs/SignatureInfoWithError.md
diff --git a/photon-api/docs/TokenAcccount.md b/sdk-libs/photon-api/docs/TokenAcccount.md
similarity index 100%
rename from photon-api/docs/TokenAcccount.md
rename to sdk-libs/photon-api/docs/TokenAcccount.md
diff --git a/photon-api/docs/TokenAccountBalance.md b/sdk-libs/photon-api/docs/TokenAccountBalance.md
similarity index 100%
rename from photon-api/docs/TokenAccountBalance.md
rename to sdk-libs/photon-api/docs/TokenAccountBalance.md
diff --git a/photon-api/docs/TokenAccountList.md b/sdk-libs/photon-api/docs/TokenAccountList.md
similarity index 100%
rename from photon-api/docs/TokenAccountList.md
rename to sdk-libs/photon-api/docs/TokenAccountList.md
diff --git a/photon-api/docs/TokenBalance.md b/sdk-libs/photon-api/docs/TokenBalance.md
similarity index 100%
rename from photon-api/docs/TokenBalance.md
rename to sdk-libs/photon-api/docs/TokenBalance.md
diff --git a/photon-api/docs/TokenBalanceList.md b/sdk-libs/photon-api/docs/TokenBalanceList.md
similarity index 100%
rename from photon-api/docs/TokenBalanceList.md
rename to sdk-libs/photon-api/docs/TokenBalanceList.md
diff --git a/photon-api/docs/TokenData.md b/sdk-libs/photon-api/docs/TokenData.md
similarity index 100%
rename from photon-api/docs/TokenData.md
rename to sdk-libs/photon-api/docs/TokenData.md
diff --git a/photon-api/git_push.sh b/sdk-libs/photon-api/git_push.sh
similarity index 100%
rename from photon-api/git_push.sh
rename to sdk-libs/photon-api/git_push.sh
diff --git a/photon-api/src/apis/configuration.rs b/sdk-libs/photon-api/src/apis/configuration.rs
similarity index 100%
rename from photon-api/src/apis/configuration.rs
rename to sdk-libs/photon-api/src/apis/configuration.rs
diff --git a/photon-api/src/apis/default_api.rs b/sdk-libs/photon-api/src/apis/default_api.rs
similarity index 100%
rename from photon-api/src/apis/default_api.rs
rename to sdk-libs/photon-api/src/apis/default_api.rs
diff --git a/photon-api/src/apis/mod.rs b/sdk-libs/photon-api/src/apis/mod.rs
similarity index 100%
rename from photon-api/src/apis/mod.rs
rename to sdk-libs/photon-api/src/apis/mod.rs
diff --git a/photon-api/src/lib.rs b/sdk-libs/photon-api/src/lib.rs
similarity index 100%
rename from photon-api/src/lib.rs
rename to sdk-libs/photon-api/src/lib.rs
diff --git a/photon-api/src/models/_get_compressed_account_balance_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_balance_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_balance_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_balance_post_200_response.rs
diff --git a/photon-api/src/models/_get_compressed_account_balance_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_balance_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_balance_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_balance_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compressed_account_balance_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_balance_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_balance_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_balance_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_account_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_post_200_response.rs
diff --git a/photon-api/src/models/_get_compressed_account_post_200_response_error.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_post_200_response_error.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_post_200_response_error.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_post_200_response_error.rs
diff --git a/photon-api/src/models/_get_compressed_account_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compressed_account_post_429_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_post_429_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_post_429_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_post_429_response.rs
diff --git a/photon-api/src/models/_get_compressed_account_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_account_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_post_request_params.rs
diff --git a/photon-api/src/models/_get_compressed_account_proof_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_proof_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_200_response.rs
diff --git a/photon-api/src/models/_get_compressed_account_proof_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_proof_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compressed_account_proof_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_proof_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_account_proof_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_account_proof_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_account_proof_post_request_params.rs
diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response.rs
diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_accounts_by_owner_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_accounts_by_owner_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_accounts_by_owner_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_accounts_by_owner_post_request_params.rs
diff --git a/photon-api/src/models/_get_compressed_balance_by_owner_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_balance_by_owner_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_balance_by_owner_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_balance_by_owner_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_balance_by_owner_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compressed_balance_by_owner_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_balance_by_owner_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_balance_by_owner_post_request_params.rs
diff --git a/photon-api/src/models/_get_compressed_token_account_balance_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_account_balance_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_account_balance_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_account_balance_post_200_response.rs
diff --git a/photon-api/src/models/_get_compressed_token_account_balance_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_account_balance_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_account_balance_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_account_balance_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compressed_token_account_balance_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_account_balance_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_account_balance_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_account_balance_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response.rs
diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_delegate_post_request_params.rs
diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request.rs
diff --git a/photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_accounts_by_owner_post_request_params.rs
diff --git a/photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response.rs
diff --git a/photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_balances_by_owner_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compressed_token_balances_by_owner_post_request.rs b/sdk-libs/photon-api/src/models/_get_compressed_token_balances_by_owner_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compressed_token_balances_by_owner_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compressed_token_balances_by_owner_post_request.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_account_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_account_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_account_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_account_post_200_response.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_account_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_account_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_account_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_account_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_account_post_request.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_account_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_account_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_account_post_request.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_address_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_address_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_200_response.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_address_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_address_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_address_post_request.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_address_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_request.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_address_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_address_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_address_post_request_params.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_owner_post_request.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_owner_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_owner_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_owner_post_request.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_owner_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_owner_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_owner_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_owner_post_request_params.rs
diff --git a/photon-api/src/models/_get_compression_signatures_for_token_owner_post_request.rs b/sdk-libs/photon-api/src/models/_get_compression_signatures_for_token_owner_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_compression_signatures_for_token_owner_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_compression_signatures_for_token_owner_post_request.rs
diff --git a/photon-api/src/models/_get_indexer_health_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_indexer_health_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_indexer_health_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_indexer_health_post_200_response.rs
diff --git a/photon-api/src/models/_get_indexer_health_post_request.rs b/sdk-libs/photon-api/src/models/_get_indexer_health_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_indexer_health_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_indexer_health_post_request.rs
diff --git a/photon-api/src/models/_get_indexer_slot_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_indexer_slot_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_indexer_slot_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_indexer_slot_post_200_response.rs
diff --git a/photon-api/src/models/_get_indexer_slot_post_request.rs b/sdk-libs/photon-api/src/models/_get_indexer_slot_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_indexer_slot_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_indexer_slot_post_request.rs
diff --git a/photon-api/src/models/_get_latest_compression_signatures_post_request.rs b/sdk-libs/photon-api/src/models/_get_latest_compression_signatures_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_latest_compression_signatures_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_latest_compression_signatures_post_request.rs
diff --git a/photon-api/src/models/_get_latest_compression_signatures_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_latest_compression_signatures_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_latest_compression_signatures_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_latest_compression_signatures_post_request_params.rs
diff --git a/photon-api/src/models/_get_latest_non_voting_signatures_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_latest_non_voting_signatures_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_latest_non_voting_signatures_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_latest_non_voting_signatures_post_200_response.rs
diff --git a/photon-api/src/models/_get_latest_non_voting_signatures_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_latest_non_voting_signatures_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_latest_non_voting_signatures_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_latest_non_voting_signatures_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_latest_non_voting_signatures_post_request.rs b/sdk-libs/photon-api/src/models/_get_latest_non_voting_signatures_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_latest_non_voting_signatures_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_latest_non_voting_signatures_post_request.rs
diff --git a/photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response.rs
diff --git a/photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_compressed_account_proofs_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_multiple_compressed_account_proofs_post_request.rs b/sdk-libs/photon-api/src/models/_get_multiple_compressed_account_proofs_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_compressed_account_proofs_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_compressed_account_proofs_post_request.rs
diff --git a/photon-api/src/models/_get_multiple_compressed_accounts_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_compressed_accounts_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_200_response.rs
diff --git a/photon-api/src/models/_get_multiple_compressed_accounts_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_compressed_accounts_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_multiple_compressed_accounts_post_request.rs b/sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_compressed_accounts_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_request.rs
diff --git a/photon-api/src/models/_get_multiple_compressed_accounts_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_compressed_accounts_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_compressed_accounts_post_request_params.rs
diff --git a/photon-api/src/models/_get_multiple_new_address_proofs_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_new_address_proofs_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_post_200_response.rs
diff --git a/photon-api/src/models/_get_multiple_new_address_proofs_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_new_address_proofs_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_multiple_new_address_proofs_post_request.rs b/sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_new_address_proofs_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_post_request.rs
diff --git a/photon-api/src/models/_get_multiple_new_address_proofs_v2_post_request.rs b/sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_v2_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_multiple_new_address_proofs_v2_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_multiple_new_address_proofs_v2_post_request.rs
diff --git a/photon-api/src/models/_get_transaction_with_compression_info_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_transaction_with_compression_info_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_200_response.rs
diff --git a/photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result_compression_info.rs b/sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result_compression_info.rs
similarity index 100%
rename from photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result_compression_info.rs
rename to sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_200_response_result_compression_info.rs
diff --git a/photon-api/src/models/_get_transaction_with_compression_info_post_request.rs b/sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_transaction_with_compression_info_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_request.rs
diff --git a/photon-api/src/models/_get_transaction_with_compression_info_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_transaction_with_compression_info_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_transaction_with_compression_info_post_request_params.rs
diff --git a/photon-api/src/models/_get_validity_proof_post_200_response.rs b/sdk-libs/photon-api/src/models/_get_validity_proof_post_200_response.rs
similarity index 100%
rename from photon-api/src/models/_get_validity_proof_post_200_response.rs
rename to sdk-libs/photon-api/src/models/_get_validity_proof_post_200_response.rs
diff --git a/photon-api/src/models/_get_validity_proof_post_200_response_result.rs b/sdk-libs/photon-api/src/models/_get_validity_proof_post_200_response_result.rs
similarity index 100%
rename from photon-api/src/models/_get_validity_proof_post_200_response_result.rs
rename to sdk-libs/photon-api/src/models/_get_validity_proof_post_200_response_result.rs
diff --git a/photon-api/src/models/_get_validity_proof_post_request.rs b/sdk-libs/photon-api/src/models/_get_validity_proof_post_request.rs
similarity index 100%
rename from photon-api/src/models/_get_validity_proof_post_request.rs
rename to sdk-libs/photon-api/src/models/_get_validity_proof_post_request.rs
diff --git a/photon-api/src/models/_get_validity_proof_post_request_params.rs b/sdk-libs/photon-api/src/models/_get_validity_proof_post_request_params.rs
similarity index 100%
rename from photon-api/src/models/_get_validity_proof_post_request_params.rs
rename to sdk-libs/photon-api/src/models/_get_validity_proof_post_request_params.rs
diff --git a/photon-api/src/models/account.rs b/sdk-libs/photon-api/src/models/account.rs
similarity index 100%
rename from photon-api/src/models/account.rs
rename to sdk-libs/photon-api/src/models/account.rs
diff --git a/photon-api/src/models/account_data.rs b/sdk-libs/photon-api/src/models/account_data.rs
similarity index 100%
rename from photon-api/src/models/account_data.rs
rename to sdk-libs/photon-api/src/models/account_data.rs
diff --git a/photon-api/src/models/account_list.rs b/sdk-libs/photon-api/src/models/account_list.rs
similarity index 100%
rename from photon-api/src/models/account_list.rs
rename to sdk-libs/photon-api/src/models/account_list.rs
diff --git a/photon-api/src/models/account_state.rs b/sdk-libs/photon-api/src/models/account_state.rs
similarity index 100%
rename from photon-api/src/models/account_state.rs
rename to sdk-libs/photon-api/src/models/account_state.rs
diff --git a/photon-api/src/models/account_with_optional_token_data.rs b/sdk-libs/photon-api/src/models/account_with_optional_token_data.rs
similarity index 100%
rename from photon-api/src/models/account_with_optional_token_data.rs
rename to sdk-libs/photon-api/src/models/account_with_optional_token_data.rs
diff --git a/photon-api/src/models/address_with_tree.rs b/sdk-libs/photon-api/src/models/address_with_tree.rs
similarity index 100%
rename from photon-api/src/models/address_with_tree.rs
rename to sdk-libs/photon-api/src/models/address_with_tree.rs
diff --git a/photon-api/src/models/compressed_proof.rs b/sdk-libs/photon-api/src/models/compressed_proof.rs
similarity index 100%
rename from photon-api/src/models/compressed_proof.rs
rename to sdk-libs/photon-api/src/models/compressed_proof.rs
diff --git a/photon-api/src/models/compressed_proof_with_context.rs b/sdk-libs/photon-api/src/models/compressed_proof_with_context.rs
similarity index 100%
rename from photon-api/src/models/compressed_proof_with_context.rs
rename to sdk-libs/photon-api/src/models/compressed_proof_with_context.rs
diff --git a/photon-api/src/models/context.rs b/sdk-libs/photon-api/src/models/context.rs
similarity index 100%
rename from photon-api/src/models/context.rs
rename to sdk-libs/photon-api/src/models/context.rs
diff --git a/photon-api/src/models/data_slice.rs b/sdk-libs/photon-api/src/models/data_slice.rs
similarity index 100%
rename from photon-api/src/models/data_slice.rs
rename to sdk-libs/photon-api/src/models/data_slice.rs
diff --git a/photon-api/src/models/filter_selector.rs b/sdk-libs/photon-api/src/models/filter_selector.rs
similarity index 100%
rename from photon-api/src/models/filter_selector.rs
rename to sdk-libs/photon-api/src/models/filter_selector.rs
diff --git a/photon-api/src/models/memcmp.rs b/sdk-libs/photon-api/src/models/memcmp.rs
similarity index 100%
rename from photon-api/src/models/memcmp.rs
rename to sdk-libs/photon-api/src/models/memcmp.rs
diff --git a/photon-api/src/models/merkle_context_with_new_address_proof.rs b/sdk-libs/photon-api/src/models/merkle_context_with_new_address_proof.rs
similarity index 100%
rename from photon-api/src/models/merkle_context_with_new_address_proof.rs
rename to sdk-libs/photon-api/src/models/merkle_context_with_new_address_proof.rs
diff --git a/photon-api/src/models/merkle_proof_with_context.rs b/sdk-libs/photon-api/src/models/merkle_proof_with_context.rs
similarity index 100%
rename from photon-api/src/models/merkle_proof_with_context.rs
rename to sdk-libs/photon-api/src/models/merkle_proof_with_context.rs
diff --git a/photon-api/src/models/mod.rs b/sdk-libs/photon-api/src/models/mod.rs
similarity index 100%
rename from photon-api/src/models/mod.rs
rename to sdk-libs/photon-api/src/models/mod.rs
diff --git a/photon-api/src/models/paginated_account_list.rs b/sdk-libs/photon-api/src/models/paginated_account_list.rs
similarity index 100%
rename from photon-api/src/models/paginated_account_list.rs
rename to sdk-libs/photon-api/src/models/paginated_account_list.rs
diff --git a/photon-api/src/models/paginated_signature_info_list.rs b/sdk-libs/photon-api/src/models/paginated_signature_info_list.rs
similarity index 100%
rename from photon-api/src/models/paginated_signature_info_list.rs
rename to sdk-libs/photon-api/src/models/paginated_signature_info_list.rs
diff --git a/photon-api/src/models/signature_info.rs b/sdk-libs/photon-api/src/models/signature_info.rs
similarity index 100%
rename from photon-api/src/models/signature_info.rs
rename to sdk-libs/photon-api/src/models/signature_info.rs
diff --git a/photon-api/src/models/signature_info_list.rs b/sdk-libs/photon-api/src/models/signature_info_list.rs
similarity index 100%
rename from photon-api/src/models/signature_info_list.rs
rename to sdk-libs/photon-api/src/models/signature_info_list.rs
diff --git a/photon-api/src/models/signature_info_list_with_error.rs b/sdk-libs/photon-api/src/models/signature_info_list_with_error.rs
similarity index 100%
rename from photon-api/src/models/signature_info_list_with_error.rs
rename to sdk-libs/photon-api/src/models/signature_info_list_with_error.rs
diff --git a/photon-api/src/models/signature_info_with_error.rs b/sdk-libs/photon-api/src/models/signature_info_with_error.rs
similarity index 100%
rename from photon-api/src/models/signature_info_with_error.rs
rename to sdk-libs/photon-api/src/models/signature_info_with_error.rs
diff --git a/photon-api/src/models/token_acccount.rs b/sdk-libs/photon-api/src/models/token_acccount.rs
similarity index 100%
rename from photon-api/src/models/token_acccount.rs
rename to sdk-libs/photon-api/src/models/token_acccount.rs
diff --git a/photon-api/src/models/token_account_balance.rs b/sdk-libs/photon-api/src/models/token_account_balance.rs
similarity index 100%
rename from photon-api/src/models/token_account_balance.rs
rename to sdk-libs/photon-api/src/models/token_account_balance.rs
diff --git a/photon-api/src/models/token_account_list.rs b/sdk-libs/photon-api/src/models/token_account_list.rs
similarity index 100%
rename from photon-api/src/models/token_account_list.rs
rename to sdk-libs/photon-api/src/models/token_account_list.rs
diff --git a/photon-api/src/models/token_balance.rs b/sdk-libs/photon-api/src/models/token_balance.rs
similarity index 100%
rename from photon-api/src/models/token_balance.rs
rename to sdk-libs/photon-api/src/models/token_balance.rs
diff --git a/photon-api/src/models/token_balance_list.rs b/sdk-libs/photon-api/src/models/token_balance_list.rs
similarity index 100%
rename from photon-api/src/models/token_balance_list.rs
rename to sdk-libs/photon-api/src/models/token_balance_list.rs
diff --git a/photon-api/src/models/token_data.rs b/sdk-libs/photon-api/src/models/token_data.rs
similarity index 100%
rename from photon-api/src/models/token_data.rs
rename to sdk-libs/photon-api/src/models/token_data.rs
diff --git a/light-program-test/Cargo.toml b/sdk-libs/program-test/Cargo.toml
similarity index 100%
rename from light-program-test/Cargo.toml
rename to sdk-libs/program-test/Cargo.toml
diff --git a/light-program-test/src/env_accounts.rs b/sdk-libs/program-test/src/env_accounts.rs
similarity index 100%
rename from light-program-test/src/env_accounts.rs
rename to sdk-libs/program-test/src/env_accounts.rs
diff --git a/light-program-test/src/lib.rs b/sdk-libs/program-test/src/lib.rs
similarity index 100%
rename from light-program-test/src/lib.rs
rename to sdk-libs/program-test/src/lib.rs
diff --git a/light-program-test/src/test_batch_forester.rs b/sdk-libs/program-test/src/test_batch_forester.rs
similarity index 100%
rename from light-program-test/src/test_batch_forester.rs
rename to sdk-libs/program-test/src/test_batch_forester.rs
diff --git a/light-program-test/src/test_env.rs b/sdk-libs/program-test/src/test_env.rs
similarity index 100%
rename from light-program-test/src/test_env.rs
rename to sdk-libs/program-test/src/test_env.rs
diff --git a/light-program-test/src/test_indexer.rs b/sdk-libs/program-test/src/test_indexer.rs
similarity index 100%
rename from light-program-test/src/test_indexer.rs
rename to sdk-libs/program-test/src/test_indexer.rs
diff --git a/light-program-test/src/test_rpc.rs b/sdk-libs/program-test/src/test_rpc.rs
similarity index 100%
rename from light-program-test/src/test_rpc.rs
rename to sdk-libs/program-test/src/test_rpc.rs
diff --git a/sdk/Cargo.toml b/sdk-libs/sdk/Cargo.toml
similarity index 61%
rename from sdk/Cargo.toml
rename to sdk-libs/sdk/Cargo.toml
index 8a567cb284..93a48b9fab 100644
--- a/sdk/Cargo.toml
+++ b/sdk-libs/sdk/Cargo.toml
@@ -33,19 +33,19 @@ anchor-lang = { workspace = true }
 # Math and crypto
 num-bigint = { workspace = true }
 
-aligned-sized = { version = "1.1.0", path = "../macros/aligned-sized" }
-light-macros = { version = "1.1.0", path = "../macros/light" }
-light-sdk-macros = { version = "0.4.0", path = "../macros/light-sdk-macros" }
+aligned-sized = { workspace = true }
+light-macros = { workspace = true }
+light-sdk-macros = { workspace = true }
 bytemuck = "1.17"
-light-hasher = { version = "1.1.0", path = "../merkle-tree/hasher", features=["solana"] }
-light-heap = { version = "1.1.0", path = "../heap", optional = true }
+light-hasher = { workspace = true, features=["solana"] }
+light-heap = { workspace = true, optional = true }
 light-indexed-merkle-tree = { workspace = true }
 account-compression = { workspace = true , optional = true }
 light-system-program = { workspace = true , optional = true }
-light-concurrent-merkle-tree = { path = "../merkle-tree/concurrent", version = "1.1.0" }
-light-utils = { version = "1.1.0", path = "../utils" }
+light-concurrent-merkle-tree = { workspace = true }
+light-utils = { workspace = true }
 groth16-solana = "0.0.3"
-light-verifier = { path = "../circuit-lib/verifier", version = "1.1.0", features = ["solana"] }
+light-verifier = { workspace = true, features = ["solana"] }
 borsh = "0.10.0"
 
 [target.'cfg(not(target_os = "solana"))'.dependencies]
@@ -58,9 +58,9 @@ solana-program-test = { workspace = true }
 serde_json = "1.0.133"
 reqwest = "0.12"
 tokio = { workspace = true }
-light-prover-client = { version = "1.2.0", path = "../circuit-lib/light-prover-client" }
-light-merkle-tree-reference = { version = "1.1.0", path = "../merkle-tree/reference/" }
-light-indexed-merkle-tree = { version = "1.1.0", path = "../merkle-tree/indexed/" }
+light-prover-client = { workspace = true }
+light-merkle-tree-reference = { workspace = true }
+light-indexed-merkle-tree = { workspace = true }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 lazy_static = "1.4.0"
diff --git a/sdk/Xargo.toml b/sdk-libs/sdk/Xargo.toml
similarity index 100%
rename from sdk/Xargo.toml
rename to sdk-libs/sdk/Xargo.toml
diff --git a/sdk/readme.md b/sdk-libs/sdk/readme.md
similarity index 100%
rename from sdk/readme.md
rename to sdk-libs/sdk/readme.md
diff --git a/sdk/src/account.rs b/sdk-libs/sdk/src/account.rs
similarity index 100%
rename from sdk/src/account.rs
rename to sdk-libs/sdk/src/account.rs
diff --git a/sdk/src/account_info.rs b/sdk-libs/sdk/src/account_info.rs
similarity index 100%
rename from sdk/src/account_info.rs
rename to sdk-libs/sdk/src/account_info.rs
diff --git a/sdk/src/account_meta.rs b/sdk-libs/sdk/src/account_meta.rs
similarity index 100%
rename from sdk/src/account_meta.rs
rename to sdk-libs/sdk/src/account_meta.rs
diff --git a/sdk/src/address.rs b/sdk-libs/sdk/src/address.rs
similarity index 100%
rename from sdk/src/address.rs
rename to sdk-libs/sdk/src/address.rs
diff --git a/sdk/src/compressed_account.rs b/sdk-libs/sdk/src/compressed_account.rs
similarity index 100%
rename from sdk/src/compressed_account.rs
rename to sdk-libs/sdk/src/compressed_account.rs
diff --git a/sdk/src/constants.rs b/sdk-libs/sdk/src/constants.rs
similarity index 100%
rename from sdk/src/constants.rs
rename to sdk-libs/sdk/src/constants.rs
diff --git a/sdk/src/context.rs b/sdk-libs/sdk/src/context.rs
similarity index 100%
rename from sdk/src/context.rs
rename to sdk-libs/sdk/src/context.rs
diff --git a/sdk/src/error.rs b/sdk-libs/sdk/src/error.rs
similarity index 100%
rename from sdk/src/error.rs
rename to sdk-libs/sdk/src/error.rs
diff --git a/sdk/src/event.rs b/sdk-libs/sdk/src/event.rs
similarity index 100%
rename from sdk/src/event.rs
rename to sdk-libs/sdk/src/event.rs
diff --git a/sdk/src/instruction_data.rs b/sdk-libs/sdk/src/instruction_data.rs
similarity index 100%
rename from sdk/src/instruction_data.rs
rename to sdk-libs/sdk/src/instruction_data.rs
diff --git a/sdk/src/legacy.rs b/sdk-libs/sdk/src/legacy.rs
similarity index 100%
rename from sdk/src/legacy.rs
rename to sdk-libs/sdk/src/legacy.rs
diff --git a/sdk/src/lib.rs b/sdk-libs/sdk/src/lib.rs
similarity index 100%
rename from sdk/src/lib.rs
rename to sdk-libs/sdk/src/lib.rs
diff --git a/sdk/src/merkle_context.rs b/sdk-libs/sdk/src/merkle_context.rs
similarity index 100%
rename from sdk/src/merkle_context.rs
rename to sdk-libs/sdk/src/merkle_context.rs
diff --git a/sdk/src/program_merkle_context.rs b/sdk-libs/sdk/src/program_merkle_context.rs
similarity index 100%
rename from sdk/src/program_merkle_context.rs
rename to sdk-libs/sdk/src/program_merkle_context.rs
diff --git a/sdk/src/proof.rs b/sdk-libs/sdk/src/proof.rs
similarity index 100%
rename from sdk/src/proof.rs
rename to sdk-libs/sdk/src/proof.rs
diff --git a/sdk/src/state.rs b/sdk-libs/sdk/src/state.rs
similarity index 100%
rename from sdk/src/state.rs
rename to sdk-libs/sdk/src/state.rs
diff --git a/sdk/src/token.rs b/sdk-libs/sdk/src/token.rs
similarity index 100%
rename from sdk/src/token.rs
rename to sdk-libs/sdk/src/token.rs
diff --git a/sdk/src/traits.rs b/sdk-libs/sdk/src/traits.rs
similarity index 100%
rename from sdk/src/traits.rs
rename to sdk-libs/sdk/src/traits.rs
diff --git a/sdk/src/transfer.rs b/sdk-libs/sdk/src/transfer.rs
similarity index 100%
rename from sdk/src/transfer.rs
rename to sdk-libs/sdk/src/transfer.rs
diff --git a/sdk/src/utils.rs b/sdk-libs/sdk/src/utils.rs
similarity index 100%
rename from sdk/src/utils.rs
rename to sdk-libs/sdk/src/utils.rs
diff --git a/sdk/src/verify.rs b/sdk-libs/sdk/src/verify.rs
similarity index 100%
rename from sdk/src/verify.rs
rename to sdk-libs/sdk/src/verify.rs
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index ba5472e680..cbb53a7828 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -10,11 +10,11 @@ ark-bn254 = "0.4"
 ark-ff = "0.4"
 clap = { version = "4", features = ["derive"] }
 groth16-solana = "0.0.3"
-light-concurrent-merkle-tree = { path = "../merkle-tree/concurrent", version = "1.1.0" }
+light-concurrent-merkle-tree = { workspace = true }
 light-hash-set = { workspace = true }
-light-hasher = { path = "../merkle-tree/hasher", version = "1.1.0" }
-light-indexed-merkle-tree = { path = "../merkle-tree/indexed", version = "1.1.0" }
-light-utils = { path = "../utils", version = "1.1.0" }
+light-hasher = { workspace = true }
+light-indexed-merkle-tree = { workspace = true }
+light-utils = { workspace = true }
 num-bigint = "0.4"
 rand = "0.8"
 quote = "1.0"