diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 9fa26d4..d1e6d11 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -24,33 +24,33 @@ jobs:
         run: rustup target add wasm32-unknown-unknown
 
       - name: Run format check for `shielder/cli`
-        run: cd shielder/cli/ && cargo fmt --all --check
+        run: cd legacy-shielder/cli/ && cargo fmt --all --check
 
       - name: Run clippy for `shielder/cli`
-        run: cd shielder/cli/ && cargo clippy --all-features -- --no-deps -D warnings
+        run: cd legacy-shielder/cli/ && cargo clippy --all-features -- --no-deps -D warnings
 
       - name: Run tests  for `shielder/cli`
-        run: cd shielder/cli/ && cargo test
+        run: cd legacy-shielder/cli/ && cargo test
 
 
       - name: Run format check for `shielder/contract`
-        run: cd shielder/contract/ && cargo fmt --all --check
+        run: cd legacy-shielder/contract/ && cargo fmt --all --check
 
       - name: Run clippy for `shielder/contract`
-        run: cd shielder/contract/ && cargo clippy --all-features -- --no-deps -D warnings
+        run: cd legacy-shielder/contract/ && cargo clippy --all-features -- --no-deps -D warnings
 
       - name: Run tests  for `shielder/contract`
-        run: cd shielder/contract/ && cargo test
+        run: cd legacy-shielder/contract/ && cargo test
 
 
       - name: Run format check for `shielder/public_token`
-        run: cd shielder/public_token/ && cargo fmt --all --check
+        run: cd legacy-shielder/public_token/ && cargo fmt --all --check
 
       - name: Run clippy for `shielder/public_token`
-        run: cd shielder/public_token/ && cargo clippy --all-features -- --no-deps -D warnings
+        run: cd legacy-shielder/public_token/ && cargo clippy --all-features -- --no-deps -D warnings
 
       - name: Run tests  for `shielder/public_token`
-        run: cd shielder/public_token/ && cargo test
+        run: cd legacy-shielder/public_token/ && cargo test
 
   build-contracts:
     runs-on: [self-hosted, Linux, X64, large]
@@ -73,7 +73,7 @@ jobs:
             -v ${{ github.workspace }}:/code \
             --platform linux/amd64           \
             ${{ env.DOCKER_IMAGE }}         \
-            cargo contract build --manifest-path shielder/public_token/Cargo.toml
+            cargo contract build --manifest-path legacy-shielder/public_token/Cargo.toml
 
       - name: Build shielder contract
         run: |
@@ -81,4 +81,4 @@ jobs:
             -v ${{ github.workspace }}:/code \
             --platform linux/amd64           \
             ${{ env.DOCKER_IMAGE }}         \
-            cargo contract build --manifest-path shielder/contract/Cargo.toml
+            cargo contract build --manifest-path legacy-shielder/contract/Cargo.toml
diff --git a/README.md b/README.md
index f95f9cb..3d313e7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This repository is a collection of smart-contract applications based on ZK-SNARK
 
 Included:
 
-- [shielder](shielder/) - shielding and unshielding PSP22 tokens
+- [shielder](legacy-shielder/) - shielding and unshielding PSP22 tokens
 
 ## License
 
diff --git a/shielder/Makefile b/legacy-shielder/Makefile
similarity index 100%
rename from shielder/Makefile
rename to legacy-shielder/Makefile
diff --git a/shielder/README.md b/legacy-shielder/README.md
similarity index 100%
rename from shielder/README.md
rename to legacy-shielder/README.md
diff --git a/shielder/cli/Cargo.lock b/legacy-shielder/cli/Cargo.lock
similarity index 100%
rename from shielder/cli/Cargo.lock
rename to legacy-shielder/cli/Cargo.lock
diff --git a/shielder/cli/Cargo.toml b/legacy-shielder/cli/Cargo.toml
similarity index 100%
rename from shielder/cli/Cargo.toml
rename to legacy-shielder/cli/Cargo.toml
diff --git a/shielder/cli/README.md b/legacy-shielder/cli/README.md
similarity index 100%
rename from shielder/cli/README.md
rename to legacy-shielder/cli/README.md
diff --git a/shielder/cli/src/app_state.rs b/legacy-shielder/cli/src/app_state.rs
similarity index 100%
rename from shielder/cli/src/app_state.rs
rename to legacy-shielder/cli/src/app_state.rs
diff --git a/shielder/cli/src/config.rs b/legacy-shielder/cli/src/config.rs
similarity index 100%
rename from shielder/cli/src/config.rs
rename to legacy-shielder/cli/src/config.rs
diff --git a/shielder/cli/src/contract.rs b/legacy-shielder/cli/src/contract.rs
similarity index 100%
rename from shielder/cli/src/contract.rs
rename to legacy-shielder/cli/src/contract.rs
diff --git a/shielder/cli/src/deposit.rs b/legacy-shielder/cli/src/deposit.rs
similarity index 100%
rename from shielder/cli/src/deposit.rs
rename to legacy-shielder/cli/src/deposit.rs
diff --git a/shielder/cli/src/ink_contract.rs b/legacy-shielder/cli/src/ink_contract.rs
similarity index 100%
rename from shielder/cli/src/ink_contract.rs
rename to legacy-shielder/cli/src/ink_contract.rs
diff --git a/shielder/cli/src/lib.rs b/legacy-shielder/cli/src/lib.rs
similarity index 100%
rename from shielder/cli/src/lib.rs
rename to legacy-shielder/cli/src/lib.rs
diff --git a/shielder/cli/src/main.rs b/legacy-shielder/cli/src/main.rs
similarity index 100%
rename from shielder/cli/src/main.rs
rename to legacy-shielder/cli/src/main.rs
diff --git a/shielder/cli/src/merge.rs b/legacy-shielder/cli/src/merge.rs
similarity index 100%
rename from shielder/cli/src/merge.rs
rename to legacy-shielder/cli/src/merge.rs
diff --git a/shielder/cli/src/state_file.rs b/legacy-shielder/cli/src/state_file.rs
similarity index 100%
rename from shielder/cli/src/state_file.rs
rename to legacy-shielder/cli/src/state_file.rs
diff --git a/shielder/cli/src/withdraw.rs b/legacy-shielder/cli/src/withdraw.rs
similarity index 100%
rename from shielder/cli/src/withdraw.rs
rename to legacy-shielder/cli/src/withdraw.rs
diff --git a/shielder/cli/tests/integration_tests.rs b/legacy-shielder/cli/tests/integration_tests.rs
similarity index 100%
rename from shielder/cli/tests/integration_tests.rs
rename to legacy-shielder/cli/tests/integration_tests.rs
diff --git a/shielder/cli/tests/psp22/mod.rs b/legacy-shielder/cli/tests/psp22/mod.rs
similarity index 100%
rename from shielder/cli/tests/psp22/mod.rs
rename to legacy-shielder/cli/tests/psp22/mod.rs
diff --git a/shielder/cli/tests/setup_local.sh b/legacy-shielder/cli/tests/setup_local.sh
similarity index 100%
rename from shielder/cli/tests/setup_local.sh
rename to legacy-shielder/cli/tests/setup_local.sh
diff --git a/shielder/cli/tests/shielder_wrapper/mod.rs b/legacy-shielder/cli/tests/shielder_wrapper/mod.rs
similarity index 100%
rename from shielder/cli/tests/shielder_wrapper/mod.rs
rename to legacy-shielder/cli/tests/shielder_wrapper/mod.rs
diff --git a/shielder/cli/tests/utils/mod.rs b/legacy-shielder/cli/tests/utils/mod.rs
similarity index 100%
rename from shielder/cli/tests/utils/mod.rs
rename to legacy-shielder/cli/tests/utils/mod.rs
diff --git a/shielder/contract/Cargo.lock b/legacy-shielder/contract/Cargo.lock
similarity index 100%
rename from shielder/contract/Cargo.lock
rename to legacy-shielder/contract/Cargo.lock
diff --git a/shielder/contract/Cargo.toml b/legacy-shielder/contract/Cargo.toml
similarity index 100%
rename from shielder/contract/Cargo.toml
rename to legacy-shielder/contract/Cargo.toml
diff --git a/shielder/contract/src/contract.rs b/legacy-shielder/contract/src/contract.rs
similarity index 100%
rename from shielder/contract/src/contract.rs
rename to legacy-shielder/contract/src/contract.rs
diff --git a/shielder/contract/src/error.rs b/legacy-shielder/contract/src/error.rs
similarity index 100%
rename from shielder/contract/src/error.rs
rename to legacy-shielder/contract/src/error.rs
diff --git a/shielder/contract/src/lib.rs b/legacy-shielder/contract/src/lib.rs
similarity index 100%
rename from shielder/contract/src/lib.rs
rename to legacy-shielder/contract/src/lib.rs
diff --git a/shielder/deploy/deploy.sh b/legacy-shielder/deploy/deploy.sh
similarity index 100%
rename from shielder/deploy/deploy.sh
rename to legacy-shielder/deploy/deploy.sh
diff --git a/shielder/deploy/docker-compose.yml b/legacy-shielder/deploy/docker-compose.yml
similarity index 100%
rename from shielder/deploy/docker-compose.yml
rename to legacy-shielder/deploy/docker-compose.yml
diff --git a/shielder/public_token/Cargo.lock b/legacy-shielder/public_token/Cargo.lock
similarity index 100%
rename from shielder/public_token/Cargo.lock
rename to legacy-shielder/public_token/Cargo.lock
diff --git a/shielder/public_token/Cargo.toml b/legacy-shielder/public_token/Cargo.toml
similarity index 100%
rename from shielder/public_token/Cargo.toml
rename to legacy-shielder/public_token/Cargo.toml
diff --git a/shielder/public_token/lib.rs b/legacy-shielder/public_token/lib.rs
similarity index 100%
rename from shielder/public_token/lib.rs
rename to legacy-shielder/public_token/lib.rs