diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 384e83b..d94898c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,5 +11,6 @@ jobs:
       - uses: software-mansion/setup-scarb@v1
         with:
           scarb-version: "2.6.4"
+      - run: cd starknet
       - run: scarb fmt --check
       - run: scarb build
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3155a8d..d7d5080 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,4 +11,5 @@ jobs:
       - uses: software-mansion/setup-scarb@v1
         with:
           scarb-version: "2.6.4"
+      - run: cd starknet
       - run: snforge test
\ No newline at end of file
diff --git a/.tool-versions b/starknet/.tool-versions
similarity index 100%
rename from .tool-versions
rename to starknet/.tool-versions
diff --git a/Scarb.toml b/starknet/Scarb.toml
similarity index 100%
rename from Scarb.toml
rename to starknet/Scarb.toml
diff --git a/src/L1_headers_store/contract.cairo b/starknet/src/L1_headers_store/contract.cairo
similarity index 100%
rename from src/L1_headers_store/contract.cairo
rename to starknet/src/L1_headers_store/contract.cairo
diff --git a/src/L1_headers_store/interface.cairo b/starknet/src/L1_headers_store/interface.cairo
similarity index 100%
rename from src/L1_headers_store/interface.cairo
rename to starknet/src/L1_headers_store/interface.cairo
diff --git a/src/L1_messages_proxy/contract.cairo b/starknet/src/L1_messages_proxy/contract.cairo
similarity index 100%
rename from src/L1_messages_proxy/contract.cairo
rename to starknet/src/L1_messages_proxy/contract.cairo
diff --git a/src/L1_messages_proxy/interface.cairo b/starknet/src/L1_messages_proxy/interface.cairo
similarity index 100%
rename from src/L1_messages_proxy/interface.cairo
rename to starknet/src/L1_messages_proxy/interface.cairo
diff --git a/src/fact_registry/contract.cairo b/starknet/src/fact_registry/contract.cairo
similarity index 100%
rename from src/fact_registry/contract.cairo
rename to starknet/src/fact_registry/contract.cairo
diff --git a/src/fact_registry/interface.cairo b/starknet/src/fact_registry/interface.cairo
similarity index 100%
rename from src/fact_registry/interface.cairo
rename to starknet/src/fact_registry/interface.cairo
diff --git a/src/lib.cairo b/starknet/src/lib.cairo
similarity index 100%
rename from src/lib.cairo
rename to starknet/src/lib.cairo
diff --git a/src/library/array_utils.cairo b/starknet/src/library/array_utils.cairo
similarity index 100%
rename from src/library/array_utils.cairo
rename to starknet/src/library/array_utils.cairo
diff --git a/src/library/bitshift.cairo b/starknet/src/library/bitshift.cairo
similarity index 100%
rename from src/library/bitshift.cairo
rename to starknet/src/library/bitshift.cairo
diff --git a/src/library/keccak256.cairo b/starknet/src/library/keccak256.cairo
similarity index 100%
rename from src/library/keccak256.cairo
rename to starknet/src/library/keccak256.cairo
diff --git a/src/library/keccak_utils.cairo b/starknet/src/library/keccak_utils.cairo
similarity index 100%
rename from src/library/keccak_utils.cairo
rename to starknet/src/library/keccak_utils.cairo
diff --git a/src/library/math_utils.cairo b/starknet/src/library/math_utils.cairo
similarity index 100%
rename from src/library/math_utils.cairo
rename to starknet/src/library/math_utils.cairo
diff --git a/src/library/merkle_patricia_utils.cairo b/starknet/src/library/merkle_patricia_utils.cairo
similarity index 100%
rename from src/library/merkle_patricia_utils.cairo
rename to starknet/src/library/merkle_patricia_utils.cairo
diff --git a/src/library/rlp_utils.cairo b/starknet/src/library/rlp_utils.cairo
similarity index 100%
rename from src/library/rlp_utils.cairo
rename to starknet/src/library/rlp_utils.cairo
diff --git a/src/library/trie_proof.cairo b/starknet/src/library/trie_proof.cairo
similarity index 100%
rename from src/library/trie_proof.cairo
rename to starknet/src/library/trie_proof.cairo
diff --git a/src/library/words64_utils.cairo b/starknet/src/library/words64_utils.cairo
similarity index 100%
rename from src/library/words64_utils.cairo
rename to starknet/src/library/words64_utils.cairo
diff --git a/src/types.cairo b/starknet/src/types.cairo
similarity index 100%
rename from src/types.cairo
rename to starknet/src/types.cairo