diff --git a/.github/workflows/publish-pythnet-sdk.yml b/.github/workflows/publish-pythnet-sdk.yml
index 4106375e7a..10b384c656 100644
--- a/.github/workflows/publish-pythnet-sdk.yml
+++ b/.github/workflows/publish-pythnet-sdk.yml
@@ -15,4 +15,4 @@ jobs:
       - run: cargo publish --token ${CARGO_REGISTRY_TOKEN}
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
-        working-directory: "pythnet/pythnet_sdk"
+        working-directory: "sdks/pythnet_sdk/rust"
diff --git a/apps/fortuna/Cargo.toml b/apps/fortuna/Cargo.toml
index 96d4104339..56618a5d3d 100644
--- a/apps/fortuna/Cargo.toml
+++ b/apps/fortuna/Cargo.toml
@@ -16,7 +16,7 @@ ethers = { version = "2.0.14", features = ["ws"] }
 futures = { version = "0.3.28" }
 hex = "0.4.3"
 prometheus-client = { version = "0.21.2" }
-pythnet-sdk = { path = "../../pythnet/pythnet_sdk", features = ["strum"] }
+pythnet-sdk = { path = "../../sdks/pythnet_sdk/rust", features = ["strum"] }
 rand = "0.8.5"
 reqwest = { version = "0.11.22", features = ["json", "blocking"] }
 serde = { version = "1.0.188", features = ["derive"] }
diff --git a/apps/hermes/server/Cargo.toml b/apps/hermes/server/Cargo.toml
index b2a367efdd..ee8352e256 100644
--- a/apps/hermes/server/Cargo.toml
+++ b/apps/hermes/server/Cargo.toml
@@ -31,7 +31,7 @@ prometheus-client  = { version = "0.21.2" }
 prost              = { version = "0.12.1" }
 pyth-sdk           = { version = "0.8.0" }
 pyth-sdk-solana    = { version = "0.10.3" }
-pythnet-sdk        = { path = "../../../pythnet/pythnet_sdk/", version = "2.0.0", features = ["strum"] }
+pythnet-sdk        = { path = "../../../sdks/pythnet_sdk/rust", version = "2.0.0", features = ["strum"] }
 rand               = { version = "0.8.5" }
 reqwest            = { version = "0.11.14", features = ["blocking", "json"] }
 rust_decimal       = { version = "1.36.0" }
diff --git a/apps/hermes/server/Dockerfile b/apps/hermes/server/Dockerfile
index 25a69ea9c0..243abdd150 100644
--- a/apps/hermes/server/Dockerfile
+++ b/apps/hermes/server/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install --yes \
 # Build
 WORKDIR /src
 COPY apps/hermes/server apps/hermes/server
-COPY pythnet/pythnet_sdk pythnet/pythnet_sdk
+COPY sdks/pythnet_sdk/rust sdks/pythnet_sdk/rust
 
 
 WORKDIR /src/apps/hermes/server
diff --git a/pythnet/pythnet_sdk/.gitignore b/sdks/pythnet_sdk/rust/.gitignore
similarity index 100%
rename from pythnet/pythnet_sdk/.gitignore
rename to sdks/pythnet_sdk/rust/.gitignore
diff --git a/pythnet/pythnet_sdk/Cargo.toml b/sdks/pythnet_sdk/rust/Cargo.toml
similarity index 100%
rename from pythnet/pythnet_sdk/Cargo.toml
rename to sdks/pythnet_sdk/rust/Cargo.toml
diff --git a/pythnet/pythnet_sdk/examples/generate_pyth_data.rs b/sdks/pythnet_sdk/rust/examples/generate_pyth_data.rs
similarity index 100%
rename from pythnet/pythnet_sdk/examples/generate_pyth_data.rs
rename to sdks/pythnet_sdk/rust/examples/generate_pyth_data.rs
diff --git a/pythnet/pythnet_sdk/rust-toolchain b/sdks/pythnet_sdk/rust/rust-toolchain
similarity index 100%
rename from pythnet/pythnet_sdk/rust-toolchain
rename to sdks/pythnet_sdk/rust/rust-toolchain
diff --git a/pythnet/pythnet_sdk/src/accumulators.rs b/sdks/pythnet_sdk/rust/src/accumulators.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/accumulators.rs
rename to sdks/pythnet_sdk/rust/src/accumulators.rs
diff --git a/pythnet/pythnet_sdk/src/accumulators/merkle.rs b/sdks/pythnet_sdk/rust/src/accumulators/merkle.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/accumulators/merkle.rs
rename to sdks/pythnet_sdk/rust/src/accumulators/merkle.rs
diff --git a/pythnet/pythnet_sdk/src/accumulators/mul.rs b/sdks/pythnet_sdk/rust/src/accumulators/mul.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/accumulators/mul.rs
rename to sdks/pythnet_sdk/rust/src/accumulators/mul.rs
diff --git a/pythnet/pythnet_sdk/src/error.rs b/sdks/pythnet_sdk/rust/src/error.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/error.rs
rename to sdks/pythnet_sdk/rust/src/error.rs
diff --git a/pythnet/pythnet_sdk/src/hashers.rs b/sdks/pythnet_sdk/rust/src/hashers.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/hashers.rs
rename to sdks/pythnet_sdk/rust/src/hashers.rs
diff --git a/pythnet/pythnet_sdk/src/hashers/keccak256.rs b/sdks/pythnet_sdk/rust/src/hashers/keccak256.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/hashers/keccak256.rs
rename to sdks/pythnet_sdk/rust/src/hashers/keccak256.rs
diff --git a/pythnet/pythnet_sdk/src/hashers/keccak256_160.rs b/sdks/pythnet_sdk/rust/src/hashers/keccak256_160.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/hashers/keccak256_160.rs
rename to sdks/pythnet_sdk/rust/src/hashers/keccak256_160.rs
diff --git a/pythnet/pythnet_sdk/src/hashers/prime.rs b/sdks/pythnet_sdk/rust/src/hashers/prime.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/hashers/prime.rs
rename to sdks/pythnet_sdk/rust/src/hashers/prime.rs
diff --git a/pythnet/pythnet_sdk/src/lib.rs b/sdks/pythnet_sdk/rust/src/lib.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/lib.rs
rename to sdks/pythnet_sdk/rust/src/lib.rs
diff --git a/pythnet/pythnet_sdk/src/messages.rs b/sdks/pythnet_sdk/rust/src/messages.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/messages.rs
rename to sdks/pythnet_sdk/rust/src/messages.rs
diff --git a/pythnet/pythnet_sdk/src/test_utils/mod.rs b/sdks/pythnet_sdk/rust/src/test_utils/mod.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/test_utils/mod.rs
rename to sdks/pythnet_sdk/rust/src/test_utils/mod.rs
diff --git a/pythnet/pythnet_sdk/src/wire.rs b/sdks/pythnet_sdk/rust/src/wire.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/wire.rs
rename to sdks/pythnet_sdk/rust/src/wire.rs
diff --git a/pythnet/pythnet_sdk/src/wire/array.rs b/sdks/pythnet_sdk/rust/src/wire/array.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/wire/array.rs
rename to sdks/pythnet_sdk/rust/src/wire/array.rs
diff --git a/pythnet/pythnet_sdk/src/wire/de.rs b/sdks/pythnet_sdk/rust/src/wire/de.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/wire/de.rs
rename to sdks/pythnet_sdk/rust/src/wire/de.rs
diff --git a/pythnet/pythnet_sdk/src/wire/prefixed_vec.rs b/sdks/pythnet_sdk/rust/src/wire/prefixed_vec.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/wire/prefixed_vec.rs
rename to sdks/pythnet_sdk/rust/src/wire/prefixed_vec.rs
diff --git a/pythnet/pythnet_sdk/src/wire/ser.rs b/sdks/pythnet_sdk/rust/src/wire/ser.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/wire/ser.rs
rename to sdks/pythnet_sdk/rust/src/wire/ser.rs
diff --git a/pythnet/pythnet_sdk/src/wormhole.rs b/sdks/pythnet_sdk/rust/src/wormhole.rs
similarity index 100%
rename from pythnet/pythnet_sdk/src/wormhole.rs
rename to sdks/pythnet_sdk/rust/src/wormhole.rs
diff --git a/target_chains/cosmwasm/contracts/pyth/Cargo.toml b/target_chains/cosmwasm/contracts/pyth/Cargo.toml
index a8516a76a0..8f4ffd0734 100644
--- a/target_chains/cosmwasm/contracts/pyth/Cargo.toml
+++ b/target_chains/cosmwasm/contracts/pyth/Cargo.toml
@@ -39,12 +39,12 @@ byteorder = "1.4.3"
 cosmwasm-schema = "1.1.9"
 osmosis-std = "0.15.2"
 pyth-sdk-cw = { path = "../../sdk/rust" }
-pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk" }
+pythnet-sdk = { path = "../../../../sdks/pythnet_sdk/rust" }
 wormhole-cosmwasm =  {git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25"}
 
 [dev-dependencies]
 cosmwasm-vm = { version = "1.0.0", default-features = false }
 serde_json = "1.0"
-pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk", features = ["test-utils"] }
+pythnet-sdk = { path = "../../../../sdks/pythnet_sdk/rust", features = ["test-utils"] }
 serde_wormhole = "0.1.0"
 wormhole-vaas-serde = "0.1.0"
diff --git a/target_chains/fuel/contracts/Cargo.toml b/target_chains/fuel/contracts/Cargo.toml
index b427f3bcfc..adddbf7365 100644
--- a/target_chains/fuel/contracts/Cargo.toml
+++ b/target_chains/fuel/contracts/Cargo.toml
@@ -17,7 +17,7 @@ serde_json = "1.0.114"
 serde = "1.0.197"
 dotenv = "0.15.0"
 libsecp256k1 = "0.7.1"
-pythnet-sdk = { path = "../../../pythnet/pythnet_sdk", features = ["test-utils"] }
+pythnet-sdk = { path = "../../../sdks/pythnet_sdk/rust", features = ["test-utils"] }
 sha3 = "0.10.8"
 serde_wormhole = { version ="0.1.0" }
 wormhole-vaas-serde = { version = "0.1.0" }
diff --git a/target_chains/near/example/Cargo.toml b/target_chains/near/example/Cargo.toml
index 57c63664a9..b02b058a3f 100644
--- a/target_chains/near/example/Cargo.toml
+++ b/target_chains/near/example/Cargo.toml
@@ -15,7 +15,7 @@ hex                        = { version = "0.4.3" }
 near-sdk                   = { version = "5.5.0" }
 num-traits                 = { version = "0.2.15" }
 num-derive                 = { version = "0.3.3" }
-pythnet-sdk                = { path = "../../../pythnet/pythnet_sdk" }
+pythnet-sdk                = { path = "../../../sdks/pythnet_sdk/rust" }
 pyth-near                  = { path = "../receiver", features = ["library"] }
 strum                      = { version = "0.24.1", features = ["derive"] }
 thiserror                  = { version = "1.0.38" }
diff --git a/target_chains/near/receiver/Cargo.toml b/target_chains/near/receiver/Cargo.toml
index f90089a070..63be4d1b45 100644
--- a/target_chains/near/receiver/Cargo.toml
+++ b/target_chains/near/receiver/Cargo.toml
@@ -22,7 +22,7 @@ num-traits                 = { version = "0.2.15" }
 num-derive                 = { version = "0.3.3" }
 pyth-wormhole-attester-sdk = { path = "../../../wormhole_attester/sdk/rust" }
 pyth-sdk                   = { version = "0.7.0" }
-pythnet-sdk                = { path = "../../../pythnet/pythnet_sdk" }
+pythnet-sdk                = { path = "../../../sdks/pythnet_sdk/rust" }
 schemars                   = { version = "0.8.21" }
 serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
 strum                      = { version = "0.24.1", features = ["derive"] }
@@ -37,7 +37,7 @@ tokio                      = { version = "1.23.0", features = ["full"] }
 serde_wormhole             = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
 near-workspaces            = { version = "0.14.1" }
 wormhole-sdk               = { git = "https://github.com/wormhole-foundation/wormhole", tag="rust-sdk-2024-01-25" }
-pythnet-sdk                = { path = "../../../pythnet/pythnet_sdk", features = ["test-utils"] }
+pythnet-sdk                = { path = "../../../sdks/pythnet_sdk/rust", features = ["test-utils"] }
 near-sdk                   = { version = "*", features = ["unit-testing"] }
 
 
diff --git a/target_chains/solana/Dockerfile b/target_chains/solana/Dockerfile
index 0bf5658813..8bb3fa27c7 100644
--- a/target_chains/solana/Dockerfile
+++ b/target_chains/solana/Dockerfile
@@ -8,7 +8,7 @@ FROM backpackapp/build:v0.29.0@sha256:9aee169b2d8b89b4a4243419ae35c176773136e78d
 
 WORKDIR /workspace
 
-COPY pythnet/pythnet_sdk pythnet/pythnet_sdk
+COPY sdks/pythnet_sdk/rust sdks/pythnet_sdk/rust
 COPY target_chains/solana target_chains/solana
 
 WORKDIR /workspace/target_chains/solana
diff --git a/target_chains/solana/cli/Cargo.toml b/target_chains/solana/cli/Cargo.toml
index f1adf73b56..c0f36c3c58 100644
--- a/target_chains/solana/cli/Cargo.toml
+++ b/target_chains/solana/cli/Cargo.toml
@@ -13,7 +13,7 @@ anchor-client = { workspace = true }
 clap = { version = "3.2.22", features = ["derive"] }
 pyth-solana-receiver = { path = "../programs/pyth-solana-receiver" }
 wormhole-solana = { git = "https://github.com/guibescos/wormhole", branch = "reisen/sdk-solana" } # Used for initializing the wormhole receiver
-pythnet-sdk = { path = "../../../pythnet/pythnet_sdk", version = "2.0.0" }
+pythnet-sdk = { path = "../../../sdks/pythnet_sdk/rust", version = "2.0.0" }
 wormhole-vaas-serde = { workspace = true }
 serde_wormhole = { workspace = true }
 hex = "0.4.3"
diff --git a/target_chains/solana/common_test_utils/Cargo.toml b/target_chains/solana/common_test_utils/Cargo.toml
index ccfebc09b9..f2d2f3defe 100644
--- a/target_chains/solana/common_test_utils/Cargo.toml
+++ b/target_chains/solana/common_test_utils/Cargo.toml
@@ -20,7 +20,7 @@ lazy_static = "1.4.0"
 program-simulator = { path = "../program_simulator" }
 wormhole-vaas-serde = { workspace = true }
 serde_wormhole = { workspace = true }
-pythnet-sdk = { path = "../../../pythnet/pythnet_sdk", features = ["test-utils"] }
+pythnet-sdk = { path = "../../../sdks/pythnet_sdk/rust", features = ["test-utils"] }
 anchor-lang = { workspace = true }
 solana-program = { workspace = true }
 pyth-solana-receiver = { path = "../programs/pyth-solana-receiver" }
diff --git a/target_chains/solana/programs/pyth-push-oracle/Cargo.toml b/target_chains/solana/programs/pyth-push-oracle/Cargo.toml
index e0b71d246f..1c42ef531d 100644
--- a/target_chains/solana/programs/pyth-push-oracle/Cargo.toml
+++ b/target_chains/solana/programs/pyth-push-oracle/Cargo.toml
@@ -17,7 +17,7 @@ test-bpf = []
 
 [dependencies]
 anchor-lang = { workspace = true }
-pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk" }
+pythnet-sdk = { path = "../../../../sdks/pythnet_sdk/rust" }
 solana-program = { workspace = true }
 byteorder = "1.4.3"
 pyth-solana-receiver-sdk = { path = "../../pyth_solana_receiver_sdk"}
diff --git a/target_chains/solana/programs/pyth-solana-receiver/Cargo.toml b/target_chains/solana/programs/pyth-solana-receiver/Cargo.toml
index e79b2ec763..e830afcae9 100644
--- a/target_chains/solana/programs/pyth-solana-receiver/Cargo.toml
+++ b/target_chains/solana/programs/pyth-solana-receiver/Cargo.toml
@@ -17,7 +17,7 @@ test-bpf = []
 
 [dependencies]
 anchor-lang = { workspace = true }
-pythnet-sdk = { path = "../../../../pythnet/pythnet_sdk", features = [
+pythnet-sdk = { path = "../../../../sdks/pythnet_sdk/rust", features = [
     "solana-program",
 ] }
 solana-program = { workspace = true }
diff --git a/target_chains/solana/pyth_solana_receiver_sdk/Cargo.toml b/target_chains/solana/pyth_solana_receiver_sdk/Cargo.toml
index 2d907f0598..7640019759 100644
--- a/target_chains/solana/pyth_solana_receiver_sdk/Cargo.toml
+++ b/target_chains/solana/pyth_solana_receiver_sdk/Cargo.toml
@@ -15,7 +15,7 @@ name = "pyth_solana_receiver_sdk"
 [dependencies]
 anchor-lang = ">=0.28.0"
 hex = ">=0.4.3"
-pythnet-sdk = { path = "../../../pythnet/pythnet_sdk", version = "2.1.0", features = [
+pythnet-sdk = { path = "../../../sdks/pythnet_sdk/rust", version = "2.1.0", features = [
     "solana-program",
 ] }
 solana-program = ">=1.16.0, <2.0.0"