diff --git a/.github/workflows/publish-rust.yml b/.github/workflows/publish-rust.yml
index 9533e90f..290e6d93 100644
--- a/.github/workflows/publish-rust.yml
+++ b/.github/workflows/publish-rust.yml
@@ -11,9 +11,9 @@ on:
         options:
           - clients/rust
           - interface
-          - p-interface
+          - pinocchio/interface
+          - pinocchio/program
           - program
-          - p-token
       level:
         description: Level
         required: true
diff --git a/Cargo.toml b/Cargo.toml
index d8145b0e..5b84ae73 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["interface", "p-interface", "p-token", "program"]
+members = ["interface", "pinocchio/interface", "pinocchio/program", "program"]
 
 [workspace.package]
 authors = ["Anza Maintainers <maintainers@anza.xyz>"]
diff --git a/package.json b/package.json
index 709bda0b..2efb5a5c 100644
--- a/package.json
+++ b/package.json
@@ -24,15 +24,15 @@
     "rust:audit": "zx ./scripts/rust/audit.mjs",
     "rust:publish": "zx ./scripts/rust/publish.mjs",
     "rust:semver": "cargo semver-checks",
-    "p-token:build": "zx ./scripts/rust/build-sbf.mjs p-token",
-    "p-token:format": "zx ./scripts/rust/format.mjs p-token",
-    "p-token:lint": "zx ./scripts/rust/lint.mjs p-token",
-    "p-token:test": "zx ./scripts/rust/test.mjs p-token",
+    "p-token:build": "zx ./scripts/rust/build-sbf.mjs pinocchio/program",
+    "p-token:format": "zx ./scripts/rust/format.mjs pinocchio/program",
+    "p-token:lint": "zx ./scripts/rust/lint.mjs pinocchio/program",
+    "p-token:test": "zx ./scripts/rust/test.mjs pinocchio/program",
     "fixtures:clean": "zx ./scripts/rust/fixtures.mjs clean",
     "fixtures:generate": "zx ./scripts/rust/fixtures.mjs generate",
     "fixtures:run": "zx ./scripts/rust/fixtures.mjs run",
-    "p-interface:format": "zx ./scripts/rust/format.mjs p-interface",
-    "p-interface:lint": "zx ./scripts/rust/lint.mjs p-interface",
+    "p-interface:format": "zx ./scripts/rust/format.mjs pinocchio/interface",
+    "p-interface:lint": "zx ./scripts/rust/lint.mjs pinocchio/interface",
     "interface:format": "zx ./scripts/rust/format.mjs interface",
     "interface:lint": "zx ./scripts/rust/lint.mjs interface",
     "interface:test": "zx ./scripts/rust/test.mjs interface"
diff --git a/p-interface/Cargo.toml b/pinocchio/interface/Cargo.toml
similarity index 100%
rename from p-interface/Cargo.toml
rename to pinocchio/interface/Cargo.toml
diff --git a/p-interface/README.md b/pinocchio/interface/README.md
similarity index 100%
rename from p-interface/README.md
rename to pinocchio/interface/README.md
diff --git a/p-interface/src/error.rs b/pinocchio/interface/src/error.rs
similarity index 100%
rename from p-interface/src/error.rs
rename to pinocchio/interface/src/error.rs
diff --git a/p-interface/src/instruction.rs b/pinocchio/interface/src/instruction.rs
similarity index 100%
rename from p-interface/src/instruction.rs
rename to pinocchio/interface/src/instruction.rs
diff --git a/p-interface/src/lib.rs b/pinocchio/interface/src/lib.rs
similarity index 100%
rename from p-interface/src/lib.rs
rename to pinocchio/interface/src/lib.rs
diff --git a/p-interface/src/native_mint.rs b/pinocchio/interface/src/native_mint.rs
similarity index 100%
rename from p-interface/src/native_mint.rs
rename to pinocchio/interface/src/native_mint.rs
diff --git a/p-interface/src/state/account.rs b/pinocchio/interface/src/state/account.rs
similarity index 100%
rename from p-interface/src/state/account.rs
rename to pinocchio/interface/src/state/account.rs
diff --git a/p-interface/src/state/account_state.rs b/pinocchio/interface/src/state/account_state.rs
similarity index 100%
rename from p-interface/src/state/account_state.rs
rename to pinocchio/interface/src/state/account_state.rs
diff --git a/p-interface/src/state/mint.rs b/pinocchio/interface/src/state/mint.rs
similarity index 100%
rename from p-interface/src/state/mint.rs
rename to pinocchio/interface/src/state/mint.rs
diff --git a/p-interface/src/state/mod.rs b/pinocchio/interface/src/state/mod.rs
similarity index 100%
rename from p-interface/src/state/mod.rs
rename to pinocchio/interface/src/state/mod.rs
diff --git a/p-interface/src/state/multisig.rs b/pinocchio/interface/src/state/multisig.rs
similarity index 100%
rename from p-interface/src/state/multisig.rs
rename to pinocchio/interface/src/state/multisig.rs
diff --git a/p-token/Cargo.toml b/pinocchio/program/Cargo.toml
similarity index 94%
rename from p-token/Cargo.toml
rename to pinocchio/program/Cargo.toml
index 0c702cff..43a99a8d 100644
--- a/p-token/Cargo.toml
+++ b/pinocchio/program/Cargo.toml
@@ -17,7 +17,7 @@ logging = []
 [dependencies]
 pinocchio = { workspace = true }
 pinocchio-log = { version = "0.5.1", default-features = false }
-pinocchio-token-interface = { version = "^0", path = "../p-interface" }
+pinocchio-token-interface = { version = "^0", path = "../interface" }
 
 [dev-dependencies]
 agave-feature-set = "2.2.20"
diff --git a/p-token/README.md b/pinocchio/program/README.md
similarity index 100%
rename from p-token/README.md
rename to pinocchio/program/README.md
diff --git a/p-token/src/entrypoint.rs b/pinocchio/program/src/entrypoint.rs
similarity index 100%
rename from p-token/src/entrypoint.rs
rename to pinocchio/program/src/entrypoint.rs
diff --git a/p-token/src/lib.rs b/pinocchio/program/src/lib.rs
similarity index 100%
rename from p-token/src/lib.rs
rename to pinocchio/program/src/lib.rs
diff --git a/p-token/src/processor/amount_to_ui_amount.rs b/pinocchio/program/src/processor/amount_to_ui_amount.rs
similarity index 100%
rename from p-token/src/processor/amount_to_ui_amount.rs
rename to pinocchio/program/src/processor/amount_to_ui_amount.rs
diff --git a/p-token/src/processor/approve.rs b/pinocchio/program/src/processor/approve.rs
similarity index 100%
rename from p-token/src/processor/approve.rs
rename to pinocchio/program/src/processor/approve.rs
diff --git a/p-token/src/processor/approve_checked.rs b/pinocchio/program/src/processor/approve_checked.rs
similarity index 100%
rename from p-token/src/processor/approve_checked.rs
rename to pinocchio/program/src/processor/approve_checked.rs
diff --git a/p-token/src/processor/batch.rs b/pinocchio/program/src/processor/batch.rs
similarity index 100%
rename from p-token/src/processor/batch.rs
rename to pinocchio/program/src/processor/batch.rs
diff --git a/p-token/src/processor/burn.rs b/pinocchio/program/src/processor/burn.rs
similarity index 100%
rename from p-token/src/processor/burn.rs
rename to pinocchio/program/src/processor/burn.rs
diff --git a/p-token/src/processor/burn_checked.rs b/pinocchio/program/src/processor/burn_checked.rs
similarity index 100%
rename from p-token/src/processor/burn_checked.rs
rename to pinocchio/program/src/processor/burn_checked.rs
diff --git a/p-token/src/processor/close_account.rs b/pinocchio/program/src/processor/close_account.rs
similarity index 100%
rename from p-token/src/processor/close_account.rs
rename to pinocchio/program/src/processor/close_account.rs
diff --git a/p-token/src/processor/freeze_account.rs b/pinocchio/program/src/processor/freeze_account.rs
similarity index 100%
rename from p-token/src/processor/freeze_account.rs
rename to pinocchio/program/src/processor/freeze_account.rs
diff --git a/p-token/src/processor/get_account_data_size.rs b/pinocchio/program/src/processor/get_account_data_size.rs
similarity index 100%
rename from p-token/src/processor/get_account_data_size.rs
rename to pinocchio/program/src/processor/get_account_data_size.rs
diff --git a/p-token/src/processor/initialize_account.rs b/pinocchio/program/src/processor/initialize_account.rs
similarity index 100%
rename from p-token/src/processor/initialize_account.rs
rename to pinocchio/program/src/processor/initialize_account.rs
diff --git a/p-token/src/processor/initialize_account2.rs b/pinocchio/program/src/processor/initialize_account2.rs
similarity index 100%
rename from p-token/src/processor/initialize_account2.rs
rename to pinocchio/program/src/processor/initialize_account2.rs
diff --git a/p-token/src/processor/initialize_account3.rs b/pinocchio/program/src/processor/initialize_account3.rs
similarity index 100%
rename from p-token/src/processor/initialize_account3.rs
rename to pinocchio/program/src/processor/initialize_account3.rs
diff --git a/p-token/src/processor/initialize_immutable_owner.rs b/pinocchio/program/src/processor/initialize_immutable_owner.rs
similarity index 100%
rename from p-token/src/processor/initialize_immutable_owner.rs
rename to pinocchio/program/src/processor/initialize_immutable_owner.rs
diff --git a/p-token/src/processor/initialize_mint.rs b/pinocchio/program/src/processor/initialize_mint.rs
similarity index 100%
rename from p-token/src/processor/initialize_mint.rs
rename to pinocchio/program/src/processor/initialize_mint.rs
diff --git a/p-token/src/processor/initialize_mint2.rs b/pinocchio/program/src/processor/initialize_mint2.rs
similarity index 100%
rename from p-token/src/processor/initialize_mint2.rs
rename to pinocchio/program/src/processor/initialize_mint2.rs
diff --git a/p-token/src/processor/initialize_multisig.rs b/pinocchio/program/src/processor/initialize_multisig.rs
similarity index 100%
rename from p-token/src/processor/initialize_multisig.rs
rename to pinocchio/program/src/processor/initialize_multisig.rs
diff --git a/p-token/src/processor/initialize_multisig2.rs b/pinocchio/program/src/processor/initialize_multisig2.rs
similarity index 100%
rename from p-token/src/processor/initialize_multisig2.rs
rename to pinocchio/program/src/processor/initialize_multisig2.rs
diff --git a/p-token/src/processor/mint_to.rs b/pinocchio/program/src/processor/mint_to.rs
similarity index 100%
rename from p-token/src/processor/mint_to.rs
rename to pinocchio/program/src/processor/mint_to.rs
diff --git a/p-token/src/processor/mint_to_checked.rs b/pinocchio/program/src/processor/mint_to_checked.rs
similarity index 100%
rename from p-token/src/processor/mint_to_checked.rs
rename to pinocchio/program/src/processor/mint_to_checked.rs
diff --git a/p-token/src/processor/mod.rs b/pinocchio/program/src/processor/mod.rs
similarity index 100%
rename from p-token/src/processor/mod.rs
rename to pinocchio/program/src/processor/mod.rs
diff --git a/p-token/src/processor/revoke.rs b/pinocchio/program/src/processor/revoke.rs
similarity index 100%
rename from p-token/src/processor/revoke.rs
rename to pinocchio/program/src/processor/revoke.rs
diff --git a/p-token/src/processor/set_authority.rs b/pinocchio/program/src/processor/set_authority.rs
similarity index 100%
rename from p-token/src/processor/set_authority.rs
rename to pinocchio/program/src/processor/set_authority.rs
diff --git a/p-token/src/processor/shared/approve.rs b/pinocchio/program/src/processor/shared/approve.rs
similarity index 100%
rename from p-token/src/processor/shared/approve.rs
rename to pinocchio/program/src/processor/shared/approve.rs
diff --git a/p-token/src/processor/shared/burn.rs b/pinocchio/program/src/processor/shared/burn.rs
similarity index 100%
rename from p-token/src/processor/shared/burn.rs
rename to pinocchio/program/src/processor/shared/burn.rs
diff --git a/p-token/src/processor/shared/initialize_account.rs b/pinocchio/program/src/processor/shared/initialize_account.rs
similarity index 100%
rename from p-token/src/processor/shared/initialize_account.rs
rename to pinocchio/program/src/processor/shared/initialize_account.rs
diff --git a/p-token/src/processor/shared/initialize_mint.rs b/pinocchio/program/src/processor/shared/initialize_mint.rs
similarity index 100%
rename from p-token/src/processor/shared/initialize_mint.rs
rename to pinocchio/program/src/processor/shared/initialize_mint.rs
diff --git a/p-token/src/processor/shared/initialize_multisig.rs b/pinocchio/program/src/processor/shared/initialize_multisig.rs
similarity index 100%
rename from p-token/src/processor/shared/initialize_multisig.rs
rename to pinocchio/program/src/processor/shared/initialize_multisig.rs
diff --git a/p-token/src/processor/shared/mint_to.rs b/pinocchio/program/src/processor/shared/mint_to.rs
similarity index 100%
rename from p-token/src/processor/shared/mint_to.rs
rename to pinocchio/program/src/processor/shared/mint_to.rs
diff --git a/p-token/src/processor/shared/mod.rs b/pinocchio/program/src/processor/shared/mod.rs
similarity index 100%
rename from p-token/src/processor/shared/mod.rs
rename to pinocchio/program/src/processor/shared/mod.rs
diff --git a/p-token/src/processor/shared/toggle_account_state.rs b/pinocchio/program/src/processor/shared/toggle_account_state.rs
similarity index 100%
rename from p-token/src/processor/shared/toggle_account_state.rs
rename to pinocchio/program/src/processor/shared/toggle_account_state.rs
diff --git a/p-token/src/processor/shared/transfer.rs b/pinocchio/program/src/processor/shared/transfer.rs
similarity index 100%
rename from p-token/src/processor/shared/transfer.rs
rename to pinocchio/program/src/processor/shared/transfer.rs
diff --git a/p-token/src/processor/sync_native.rs b/pinocchio/program/src/processor/sync_native.rs
similarity index 100%
rename from p-token/src/processor/sync_native.rs
rename to pinocchio/program/src/processor/sync_native.rs
diff --git a/p-token/src/processor/thaw_account.rs b/pinocchio/program/src/processor/thaw_account.rs
similarity index 100%
rename from p-token/src/processor/thaw_account.rs
rename to pinocchio/program/src/processor/thaw_account.rs
diff --git a/p-token/src/processor/transfer.rs b/pinocchio/program/src/processor/transfer.rs
similarity index 100%
rename from p-token/src/processor/transfer.rs
rename to pinocchio/program/src/processor/transfer.rs
diff --git a/p-token/src/processor/transfer_checked.rs b/pinocchio/program/src/processor/transfer_checked.rs
similarity index 100%
rename from p-token/src/processor/transfer_checked.rs
rename to pinocchio/program/src/processor/transfer_checked.rs
diff --git a/p-token/src/processor/ui_amount_to_amount.rs b/pinocchio/program/src/processor/ui_amount_to_amount.rs
similarity index 100%
rename from p-token/src/processor/ui_amount_to_amount.rs
rename to pinocchio/program/src/processor/ui_amount_to_amount.rs
diff --git a/p-token/src/processor/unwrap_lamports.rs b/pinocchio/program/src/processor/unwrap_lamports.rs
similarity index 100%
rename from p-token/src/processor/unwrap_lamports.rs
rename to pinocchio/program/src/processor/unwrap_lamports.rs
diff --git a/p-token/src/processor/withdraw_excess_lamports.rs b/pinocchio/program/src/processor/withdraw_excess_lamports.rs
similarity index 100%
rename from p-token/src/processor/withdraw_excess_lamports.rs
rename to pinocchio/program/src/processor/withdraw_excess_lamports.rs
diff --git a/p-token/tests/amount_to_ui_amount.rs b/pinocchio/program/tests/amount_to_ui_amount.rs
similarity index 100%
rename from p-token/tests/amount_to_ui_amount.rs
rename to pinocchio/program/tests/amount_to_ui_amount.rs
diff --git a/p-token/tests/approve.rs b/pinocchio/program/tests/approve.rs
similarity index 100%
rename from p-token/tests/approve.rs
rename to pinocchio/program/tests/approve.rs
diff --git a/p-token/tests/approve_checked.rs b/pinocchio/program/tests/approve_checked.rs
similarity index 100%
rename from p-token/tests/approve_checked.rs
rename to pinocchio/program/tests/approve_checked.rs
diff --git a/p-token/tests/batch.rs b/pinocchio/program/tests/batch.rs
similarity index 100%
rename from p-token/tests/batch.rs
rename to pinocchio/program/tests/batch.rs
diff --git a/p-token/tests/burn.rs b/pinocchio/program/tests/burn.rs
similarity index 100%
rename from p-token/tests/burn.rs
rename to pinocchio/program/tests/burn.rs
diff --git a/p-token/tests/burn_checked.rs b/pinocchio/program/tests/burn_checked.rs
similarity index 100%
rename from p-token/tests/burn_checked.rs
rename to pinocchio/program/tests/burn_checked.rs
diff --git a/p-token/tests/close_account.rs b/pinocchio/program/tests/close_account.rs
similarity index 100%
rename from p-token/tests/close_account.rs
rename to pinocchio/program/tests/close_account.rs
diff --git a/p-token/tests/freeze_account.rs b/pinocchio/program/tests/freeze_account.rs
similarity index 100%
rename from p-token/tests/freeze_account.rs
rename to pinocchio/program/tests/freeze_account.rs
diff --git a/p-token/tests/initialize_account.rs b/pinocchio/program/tests/initialize_account.rs
similarity index 100%
rename from p-token/tests/initialize_account.rs
rename to pinocchio/program/tests/initialize_account.rs
diff --git a/p-token/tests/initialize_account2.rs b/pinocchio/program/tests/initialize_account2.rs
similarity index 100%
rename from p-token/tests/initialize_account2.rs
rename to pinocchio/program/tests/initialize_account2.rs
diff --git a/p-token/tests/initialize_account3.rs b/pinocchio/program/tests/initialize_account3.rs
similarity index 100%
rename from p-token/tests/initialize_account3.rs
rename to pinocchio/program/tests/initialize_account3.rs
diff --git a/p-token/tests/initialize_immutable_owner.rs b/pinocchio/program/tests/initialize_immutable_owner.rs
similarity index 100%
rename from p-token/tests/initialize_immutable_owner.rs
rename to pinocchio/program/tests/initialize_immutable_owner.rs
diff --git a/p-token/tests/initialize_mint.rs b/pinocchio/program/tests/initialize_mint.rs
similarity index 100%
rename from p-token/tests/initialize_mint.rs
rename to pinocchio/program/tests/initialize_mint.rs
diff --git a/p-token/tests/initialize_mint2.rs b/pinocchio/program/tests/initialize_mint2.rs
similarity index 100%
rename from p-token/tests/initialize_mint2.rs
rename to pinocchio/program/tests/initialize_mint2.rs
diff --git a/p-token/tests/initialize_multisig.rs b/pinocchio/program/tests/initialize_multisig.rs
similarity index 100%
rename from p-token/tests/initialize_multisig.rs
rename to pinocchio/program/tests/initialize_multisig.rs
diff --git a/p-token/tests/initialize_multisig2.rs b/pinocchio/program/tests/initialize_multisig2.rs
similarity index 100%
rename from p-token/tests/initialize_multisig2.rs
rename to pinocchio/program/tests/initialize_multisig2.rs
diff --git a/p-token/tests/mint_to.rs b/pinocchio/program/tests/mint_to.rs
similarity index 100%
rename from p-token/tests/mint_to.rs
rename to pinocchio/program/tests/mint_to.rs
diff --git a/p-token/tests/mint_to_checked.rs b/pinocchio/program/tests/mint_to_checked.rs
similarity index 100%
rename from p-token/tests/mint_to_checked.rs
rename to pinocchio/program/tests/mint_to_checked.rs
diff --git a/p-token/tests/revoke.rs b/pinocchio/program/tests/revoke.rs
similarity index 100%
rename from p-token/tests/revoke.rs
rename to pinocchio/program/tests/revoke.rs
diff --git a/p-token/tests/set_authority.rs b/pinocchio/program/tests/set_authority.rs
similarity index 100%
rename from p-token/tests/set_authority.rs
rename to pinocchio/program/tests/set_authority.rs
diff --git a/p-token/tests/setup/account.rs b/pinocchio/program/tests/setup/account.rs
similarity index 100%
rename from p-token/tests/setup/account.rs
rename to pinocchio/program/tests/setup/account.rs
diff --git a/p-token/tests/setup/mint.rs b/pinocchio/program/tests/setup/mint.rs
similarity index 100%
rename from p-token/tests/setup/mint.rs
rename to pinocchio/program/tests/setup/mint.rs
diff --git a/p-token/tests/setup/mod.rs b/pinocchio/program/tests/setup/mod.rs
similarity index 100%
rename from p-token/tests/setup/mod.rs
rename to pinocchio/program/tests/setup/mod.rs
diff --git a/p-token/tests/setup/mollusk.rs b/pinocchio/program/tests/setup/mollusk.rs
similarity index 100%
rename from p-token/tests/setup/mollusk.rs
rename to pinocchio/program/tests/setup/mollusk.rs
diff --git a/p-token/tests/sync_native.rs b/pinocchio/program/tests/sync_native.rs
similarity index 100%
rename from p-token/tests/sync_native.rs
rename to pinocchio/program/tests/sync_native.rs
diff --git a/p-token/tests/thaw_account.rs b/pinocchio/program/tests/thaw_account.rs
similarity index 100%
rename from p-token/tests/thaw_account.rs
rename to pinocchio/program/tests/thaw_account.rs
diff --git a/p-token/tests/transfer.rs b/pinocchio/program/tests/transfer.rs
similarity index 100%
rename from p-token/tests/transfer.rs
rename to pinocchio/program/tests/transfer.rs
diff --git a/p-token/tests/transfer_checked.rs b/pinocchio/program/tests/transfer_checked.rs
similarity index 100%
rename from p-token/tests/transfer_checked.rs
rename to pinocchio/program/tests/transfer_checked.rs
diff --git a/p-token/tests/ui_amount_to_amount.rs b/pinocchio/program/tests/ui_amount_to_amount.rs
similarity index 100%
rename from p-token/tests/ui_amount_to_amount.rs
rename to pinocchio/program/tests/ui_amount_to_amount.rs
diff --git a/p-token/tests/unwrap_lamports.rs b/pinocchio/program/tests/unwrap_lamports.rs
similarity index 100%
rename from p-token/tests/unwrap_lamports.rs
rename to pinocchio/program/tests/unwrap_lamports.rs
diff --git a/p-token/tests/withdraw_excess_lamports.rs b/pinocchio/program/tests/withdraw_excess_lamports.rs
similarity index 100%
rename from p-token/tests/withdraw_excess_lamports.rs
rename to pinocchio/program/tests/withdraw_excess_lamports.rs