From 34344982a985046eb337100afa101cb28709b004 Mon Sep 17 00:00:00 2001
From: Amr Ali <amralicc@gmail.com>
Date: Tue, 16 Apr 2019 22:39:00 +0200
Subject: [PATCH] Rename programs to instruction_processors (#3789)

* Rename programs to instruction_processors

* Updates around the code base to support instruction_processors rename

* Kabab instruction_processors

* Update Cargo.toml files and scripts to use instruction-processors

* Update Cargo.toml to use instruction-processors

* Update CI scripts to use instruction-processors
---
 Cargo.toml                                    | 38 +++++++++----------
 ci/publish-crate.sh                           |  4 +-
 ci/test-bench.sh                              |  2 +-
 ci/test-stable.sh                             |  8 ++--
 core/Cargo.toml                               | 10 ++---
 fullnode/Cargo.toml                           |  2 +-
 genesis/Cargo.toml                            | 12 +++---
 install/Cargo.toml                            |  2 +-
 .../bpf/Cargo.toml                            |  0
 .../bpf/benches/bpf_loader.rs                 |  0
 .../bpf/build.rs                              |  0
 .../bpf/c/.gitignore                          |  0
 .../bpf/c/makefile                            |  0
 .../bpf/c/src/bench_alu/bench_alu.c           |  0
 .../bpf/c/src/bench_alu/test_bench_alu.c      |  0
 .../bpf/c/src/bpf_to_bpf/entrypoint.c         |  0
 .../bpf/c/src/bpf_to_bpf/helper.c             |  0
 .../bpf/c/src/bpf_to_bpf/helper.h             |  0
 .../bpf/c/src/move_funds/move_funds.c         |  0
 .../c/src/multiple_static/multiple_static.c   |  0
 .../bpf/c/src/noop++/noop++.cc                |  0
 .../bpf/c/src/noop/noop.c                     |  0
 .../bpf/c/src/relative_call/relative_call.c   |  0
 .../bpf/c/src/struct_pass/struct_pass.c       |  0
 .../bpf/c/src/struct_ret/struct_ret.c         |  0
 .../bpf/rust/noop/.gitignore                  |  0
 .../bpf/rust/noop/Cargo.toml                  |  0
 .../bpf/rust/noop/Xargo.toml                  |  0
 .../bpf/rust/noop/bpf.ld                      |  0
 .../bpf/rust/noop/build.sh                    |  0
 .../bpf/rust/noop/clean.sh                    |  0
 .../bpf/rust/noop/dump.sh                     |  0
 .../bpf/rust/noop/src/lib.rs                  |  0
 .../bpf/rust/noop/src/solana_sdk.rs           |  0
 .../bpf/tests/programs.rs                     |  0
 .../bpf_loader/Cargo.toml                     |  0
 .../bpf_loader/src/bpf_verifier.rs            |  0
 .../bpf_loader/src/lib.rs                     |  0
 .../budget_api/Cargo.toml                     |  0
 .../budget_api/src/budget_expr.rs             |  0
 .../budget_api/src/budget_instruction.rs      |  0
 .../budget_api/src/budget_processor.rs        |  0
 .../budget_api/src/budget_state.rs            |  0
 .../budget_api/src/lib.rs                     |  0
 .../budget_program/Cargo.toml                 |  0
 .../budget_program/src/lib.rs                 |  0
 .../config_api/Cargo.toml                     |  0
 .../config_api/src/config_instruction.rs      |  0
 .../config_api/src/config_processor.rs        |  0
 .../config_api/src/lib.rs                     |  0
 .../config_program/Cargo.toml                 |  0
 .../config_program/src/lib.rs                 |  0
 .../exchange_api/Cargo.toml                   |  0
 .../exchange_api/src/exchange_instruction.rs  |  0
 .../exchange_api/src/exchange_processor.rs    |  0
 .../exchange_api/src/exchange_state.rs        |  0
 .../exchange_api/src/lib.rs                   |  0
 .../exchange_program/Cargo.toml               |  0
 .../exchange_program/src/lib.rs               |  0
 .../failure_program/Cargo.toml                |  0
 .../failure_program/src/lib.rs                |  0
 .../failure_program/tests/failure.rs          |  0
 .../noop_program/Cargo.toml                   |  0
 .../noop_program/src/lib.rs                   |  0
 .../noop_program/tests/noop.rs                |  0
 .../stake_api/Cargo.toml                      |  0
 .../stake_api/src/lib.rs                      |  0
 .../stake_api/src/stake_instruction.rs        |  0
 .../stake_api/src/stake_state.rs              |  0
 .../stake_program/Cargo.toml                  |  0
 .../stake_program/src/lib.rs                  |  0
 .../storage_api/Cargo.toml                    |  0
 .../storage_api/src/lib.rs                    |  0
 .../storage_api/src/storage_contract.rs       |  0
 .../storage_api/src/storage_instruction.rs    |  0
 .../storage_api/src/storage_processor.rs      |  0
 .../storage_program/Cargo.toml                |  0
 .../storage_program/src/lib.rs                |  0
 .../token_api/Cargo.toml                      |  0
 .../token_api/src/lib.rs                      |  0
 .../token_api/src/token_processor.rs          |  0
 .../token_api/src/token_state.rs              |  0
 .../token_program/Cargo.toml                  |  0
 .../token_program/src/lib.rs                  |  0
 .../vote_api/Cargo.toml                       |  0
 .../vote_api/src/lib.rs                       |  0
 .../vote_api/src/vote_instruction.rs          |  0
 .../vote_api/src/vote_state.rs                |  0
 .../vote_program/Cargo.toml                   |  0
 .../vote_program/src/lib.rs                   |  0
 runtime/Cargo.toml                            |  2 +-
 scripts/cargo-install-all.sh                  |  2 +-
 wallet/Cargo.toml                             |  6 +--
 93 files changed, 44 insertions(+), 44 deletions(-)
 rename {programs => instruction-processors}/bpf/Cargo.toml (100%)
 rename {programs => instruction-processors}/bpf/benches/bpf_loader.rs (100%)
 rename {programs => instruction-processors}/bpf/build.rs (100%)
 rename {programs => instruction-processors}/bpf/c/.gitignore (100%)
 rename {programs => instruction-processors}/bpf/c/makefile (100%)
 rename {programs => instruction-processors}/bpf/c/src/bench_alu/bench_alu.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/bench_alu/test_bench_alu.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/bpf_to_bpf/entrypoint.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/bpf_to_bpf/helper.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/bpf_to_bpf/helper.h (100%)
 rename {programs => instruction-processors}/bpf/c/src/move_funds/move_funds.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/multiple_static/multiple_static.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/noop++/noop++.cc (100%)
 rename {programs => instruction-processors}/bpf/c/src/noop/noop.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/relative_call/relative_call.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/struct_pass/struct_pass.c (100%)
 rename {programs => instruction-processors}/bpf/c/src/struct_ret/struct_ret.c (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/.gitignore (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/Cargo.toml (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/Xargo.toml (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/bpf.ld (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/build.sh (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/clean.sh (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/dump.sh (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/src/lib.rs (100%)
 rename {programs => instruction-processors}/bpf/rust/noop/src/solana_sdk.rs (100%)
 rename {programs => instruction-processors}/bpf/tests/programs.rs (100%)
 rename {programs => instruction-processors}/bpf_loader/Cargo.toml (100%)
 rename {programs => instruction-processors}/bpf_loader/src/bpf_verifier.rs (100%)
 rename {programs => instruction-processors}/bpf_loader/src/lib.rs (100%)
 rename {programs => instruction-processors}/budget_api/Cargo.toml (100%)
 rename {programs => instruction-processors}/budget_api/src/budget_expr.rs (100%)
 rename {programs => instruction-processors}/budget_api/src/budget_instruction.rs (100%)
 rename {programs => instruction-processors}/budget_api/src/budget_processor.rs (100%)
 rename {programs => instruction-processors}/budget_api/src/budget_state.rs (100%)
 rename {programs => instruction-processors}/budget_api/src/lib.rs (100%)
 rename {programs => instruction-processors}/budget_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/budget_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/config_api/Cargo.toml (100%)
 rename {programs => instruction-processors}/config_api/src/config_instruction.rs (100%)
 rename {programs => instruction-processors}/config_api/src/config_processor.rs (100%)
 rename {programs => instruction-processors}/config_api/src/lib.rs (100%)
 rename {programs => instruction-processors}/config_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/config_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/exchange_api/Cargo.toml (100%)
 rename {programs => instruction-processors}/exchange_api/src/exchange_instruction.rs (100%)
 rename {programs => instruction-processors}/exchange_api/src/exchange_processor.rs (100%)
 rename {programs => instruction-processors}/exchange_api/src/exchange_state.rs (100%)
 rename {programs => instruction-processors}/exchange_api/src/lib.rs (100%)
 rename {programs => instruction-processors}/exchange_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/exchange_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/failure_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/failure_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/failure_program/tests/failure.rs (100%)
 rename {programs => instruction-processors}/noop_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/noop_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/noop_program/tests/noop.rs (100%)
 rename {programs => instruction-processors}/stake_api/Cargo.toml (100%)
 rename {programs => instruction-processors}/stake_api/src/lib.rs (100%)
 rename {programs => instruction-processors}/stake_api/src/stake_instruction.rs (100%)
 rename {programs => instruction-processors}/stake_api/src/stake_state.rs (100%)
 rename {programs => instruction-processors}/stake_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/stake_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/storage_api/Cargo.toml (100%)
 rename {programs => instruction-processors}/storage_api/src/lib.rs (100%)
 rename {programs => instruction-processors}/storage_api/src/storage_contract.rs (100%)
 rename {programs => instruction-processors}/storage_api/src/storage_instruction.rs (100%)
 rename {programs => instruction-processors}/storage_api/src/storage_processor.rs (100%)
 rename {programs => instruction-processors}/storage_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/storage_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/token_api/Cargo.toml (100%)
 rename {programs => instruction-processors}/token_api/src/lib.rs (100%)
 rename {programs => instruction-processors}/token_api/src/token_processor.rs (100%)
 rename {programs => instruction-processors}/token_api/src/token_state.rs (100%)
 rename {programs => instruction-processors}/token_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/token_program/src/lib.rs (100%)
 rename {programs => instruction-processors}/vote_api/Cargo.toml (100%)
 rename {programs => instruction-processors}/vote_api/src/lib.rs (100%)
 rename {programs => instruction-processors}/vote_api/src/vote_instruction.rs (100%)
 rename {programs => instruction-processors}/vote_api/src/vote_state.rs (100%)
 rename {programs => instruction-processors}/vote_program/Cargo.toml (100%)
 rename {programs => instruction-processors}/vote_program/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index fde5106873..9abf44a540 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,28 +13,28 @@ members = [
     "ledger-tool",
     "logger",
     "metrics",
-    "programs/bpf",
-    "programs/bpf_loader",
-    "programs/budget_api",
-    "programs/budget_program",
-    "programs/config_api",
-    "programs/config_program",
-    "programs/exchange_api",
-    "programs/exchange_program",
-    "programs/token_api",
-    "programs/token_program",
-    "programs/failure_program",
-    "programs/noop_program",
-    "programs/stake_api",
-    "programs/stake_program",
-    "programs/storage_api",
-    "programs/storage_program",
-    "programs/vote_api",
-    "programs/vote_program",
+    "instruction-processors/bpf",
+    "instruction-processors/bpf_loader",
+    "instruction-processors/budget_api",
+    "instruction-processors/budget_program",
+    "instruction-processors/config_api",
+    "instruction-processors/config_program",
+    "instruction-processors/exchange_api",
+    "instruction-processors/exchange_program",
+    "instruction-processors/token_api",
+    "instruction-processors/token_program",
+    "instruction-processors/failure_program",
+    "instruction-processors/noop_program",
+    "instruction-processors/stake_api",
+    "instruction-processors/stake_program",
+    "instruction-processors/storage_api",
+    "instruction-processors/storage_program",
+    "instruction-processors/vote_api",
+    "instruction-processors/vote_program",
     "replicator",
     "sdk",
     "upload-perf",
     "vote-signer",
     "wallet",
 ]
-exclude = ["programs/bpf/rust/noop"]
+exclude = ["instruction-processors/bpf/rust/noop"]
diff --git a/ci/publish-crate.sh b/ci/publish-crate.sh
index 3e077049d6..76435dccf6 100755
--- a/ci/publish-crate.sh
+++ b/ci/publish-crate.sh
@@ -19,9 +19,9 @@ CRATES=(
   metrics
   client
   drone
-  programs/{budget_api,config_api,storage_api,token_api,vote_api}
+  instruction-processors/{budget_api,config_api,storage_api,token_api,vote_api}
   runtime
-  programs/{budget,bpf_loader,config,vote,storage,token,vote}
+  instruction-processors/{budget,bpf_loader,config,vote,storage,token,vote}
   vote-signer
   core
   fullnode
diff --git a/ci/test-bench.sh b/ci/test-bench.sh
index 589fcbd736..00006c31b7 100755
--- a/ci/test-bench.sh
+++ b/ci/test-bench.sh
@@ -56,7 +56,7 @@ _ cargo +$rust_nightly bench --manifest-path core/Cargo.toml ${V:+--verbose} \
   -- -Z unstable-options --format=json | tee -a "$BENCH_FILE"
 
 # Run bpf benches
-_ cargo +$rust_nightly bench --manifest-path programs/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
+_ cargo +$rust_nightly bench --manifest-path instruction-processors/bpf/Cargo.toml ${V:+--verbose} --features=bpf_c \
   -- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE"
 
 
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index c4d51acb44..b7e0c600c6 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -37,7 +37,7 @@ test-stable-perf)
     Cargo.toml$ \
     ci/test-stable-perf.sh \
     ci/test-stable.sh \
-    ^programs/ \
+    ^instruction-processors/ \
     ^sdk/ \
   || {
     annotate --style info \
@@ -46,10 +46,10 @@ test-stable-perf)
   }
 
   # BPF program tests
-  _ make -C programs/bpf/c tests
-  _ programs/bpf/rust/noop/build.sh # Must be built out of band
+  _ make -C instruction-processors/bpf/c tests
+  _ instruction-processors/bpf/rust/noop/build.sh # Must be built out of band
   _ cargo +"$rust_stable" test \
-    --manifest-path programs/bpf/Cargo.toml \
+    --manifest-path instruction-processors/bpf/Cargo.toml \
     --no-default-features --features=bpf_c,bpf_rust
 
   # Run root package tests with these features
diff --git a/core/Cargo.toml b/core/Cargo.toml
index ec49f960f0..e6156f853b 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -46,7 +46,7 @@ rocksdb = "0.11.0"
 serde = "1.0.89"
 serde_derive = "1.0.88"
 serde_json = "1.0.39"
-solana-budget-api = { path = "../programs/budget_api", version = "0.14.0" }
+solana-budget-api = { path = "../instruction-processors/budget_api", version = "0.14.0" }
 solana-client = { path = "../client", version = "0.14.0" }
 solana-drone = { path = "../drone", version = "0.14.0" }
 solana-kvstore = { path = "../kvstore", version = "0.14.0" , optional = true }
@@ -55,8 +55,8 @@ solana-metrics = { path = "../metrics", version = "0.14.0" }
 solana-netutil = { path = "../netutil", version = "0.14.0" }
 solana-runtime = { path = "../runtime", version = "0.14.0" }
 solana-sdk = { path = "../sdk", version = "0.14.0" }
-solana-storage-api = { path = "../programs/storage_api", version = "0.14.0" }
-solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
+solana-storage-api = { path = "../instruction-processors/storage_api", version = "0.14.0" }
+solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
 solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
 sys-info = "0.5.6"
 tokio = "0.1"
@@ -66,8 +66,8 @@ untrusted = "0.6.2"
 [dev-dependencies]
 hex-literal = "0.1.4"
 matches = "0.1.6"
-solana-vote-program = { path = "../programs/vote_program", version = "0.14.0" }
-solana-budget-program = { path = "../programs/budget_program", version = "0.14.0" }
+solana-vote-program = { path = "../instruction-processors/vote_program", version = "0.14.0" }
+solana-budget-program = { path = "../instruction-processors/budget_program", version = "0.14.0" }
 
 [[bench]]
 name = "banking_stage"
diff --git a/fullnode/Cargo.toml b/fullnode/Cargo.toml
index 71d24cfca9..3d0f97032e 100644
--- a/fullnode/Cargo.toml
+++ b/fullnode/Cargo.toml
@@ -19,7 +19,7 @@ solana-netutil = { path = "../netutil", version = "0.14.0" }
 solana-metrics = { path = "../metrics", version = "0.14.0" }
 solana-runtime = { path = "../runtime", version = "0.14.0" }
 solana-sdk = { path = "../sdk", version = "0.14.0" }
-solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
+solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
 solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
 
 [features]
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 5340f795cc..1423b77c86 100644
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -13,16 +13,16 @@ clap = "2.33.0"
 serde_json = "1.0.39"
 solana = { path = "../core", version = "0.14.0" }
 solana-sdk = { path = "../sdk", version = "0.14.0" }
-solana-budget-api = { path = "../programs/budget_api", version = "0.14.0" }
-solana-storage-api = { path = "../programs/storage_api", version = "0.14.0" }
-solana-token-api = { path = "../programs/token_api", version = "0.14.0" }
-solana-config-api = { path = "../programs/config_api", version = "0.14.0" }
-solana-exchange-api = { path = "../programs/exchange_api", version = "0.14.0" }
+solana-budget-api = { path = "../instruction-processors/budget_api", version = "0.14.0" }
+solana-storage-api = { path = "../instruction-processors/storage_api", version = "0.14.0" }
+solana-token-api = { path = "../instruction-processors/token_api", version = "0.14.0" }
+solana-config-api = { path = "../instruction-processors/config_api", version = "0.14.0" }
+solana-exchange-api = { path = "../instruction-processors/exchange_api", version = "0.14.0" }
 
 
 [dev-dependencies]
 hashbrown = "0.2.2"
-solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
+solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
 
 [features]
 cuda = ["solana/cuda"]
diff --git a/install/Cargo.toml b/install/Cargo.toml
index 6319d493b4..f9e9f2abe5 100644
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -29,7 +29,7 @@ serde = "1.0.90"
 serde_derive = "1.0.90"
 serde_yaml = "0.8.8"
 solana-client = { path = "../client", version = "0.14.0" }
-solana-config-api = { path = "../programs/config_api", version = "0.14.0" }
+solana-config-api = { path = "../instruction-processors/config_api", version = "0.14.0" }
 solana-logger = { path = "../logger", version = "0.14.0" }
 solana-sdk = { path = "../sdk", version = "0.14.0" }
 tar = "0.4.22"
diff --git a/programs/bpf/Cargo.toml b/instruction-processors/bpf/Cargo.toml
similarity index 100%
rename from programs/bpf/Cargo.toml
rename to instruction-processors/bpf/Cargo.toml
diff --git a/programs/bpf/benches/bpf_loader.rs b/instruction-processors/bpf/benches/bpf_loader.rs
similarity index 100%
rename from programs/bpf/benches/bpf_loader.rs
rename to instruction-processors/bpf/benches/bpf_loader.rs
diff --git a/programs/bpf/build.rs b/instruction-processors/bpf/build.rs
similarity index 100%
rename from programs/bpf/build.rs
rename to instruction-processors/bpf/build.rs
diff --git a/programs/bpf/c/.gitignore b/instruction-processors/bpf/c/.gitignore
similarity index 100%
rename from programs/bpf/c/.gitignore
rename to instruction-processors/bpf/c/.gitignore
diff --git a/programs/bpf/c/makefile b/instruction-processors/bpf/c/makefile
similarity index 100%
rename from programs/bpf/c/makefile
rename to instruction-processors/bpf/c/makefile
diff --git a/programs/bpf/c/src/bench_alu/bench_alu.c b/instruction-processors/bpf/c/src/bench_alu/bench_alu.c
similarity index 100%
rename from programs/bpf/c/src/bench_alu/bench_alu.c
rename to instruction-processors/bpf/c/src/bench_alu/bench_alu.c
diff --git a/programs/bpf/c/src/bench_alu/test_bench_alu.c b/instruction-processors/bpf/c/src/bench_alu/test_bench_alu.c
similarity index 100%
rename from programs/bpf/c/src/bench_alu/test_bench_alu.c
rename to instruction-processors/bpf/c/src/bench_alu/test_bench_alu.c
diff --git a/programs/bpf/c/src/bpf_to_bpf/entrypoint.c b/instruction-processors/bpf/c/src/bpf_to_bpf/entrypoint.c
similarity index 100%
rename from programs/bpf/c/src/bpf_to_bpf/entrypoint.c
rename to instruction-processors/bpf/c/src/bpf_to_bpf/entrypoint.c
diff --git a/programs/bpf/c/src/bpf_to_bpf/helper.c b/instruction-processors/bpf/c/src/bpf_to_bpf/helper.c
similarity index 100%
rename from programs/bpf/c/src/bpf_to_bpf/helper.c
rename to instruction-processors/bpf/c/src/bpf_to_bpf/helper.c
diff --git a/programs/bpf/c/src/bpf_to_bpf/helper.h b/instruction-processors/bpf/c/src/bpf_to_bpf/helper.h
similarity index 100%
rename from programs/bpf/c/src/bpf_to_bpf/helper.h
rename to instruction-processors/bpf/c/src/bpf_to_bpf/helper.h
diff --git a/programs/bpf/c/src/move_funds/move_funds.c b/instruction-processors/bpf/c/src/move_funds/move_funds.c
similarity index 100%
rename from programs/bpf/c/src/move_funds/move_funds.c
rename to instruction-processors/bpf/c/src/move_funds/move_funds.c
diff --git a/programs/bpf/c/src/multiple_static/multiple_static.c b/instruction-processors/bpf/c/src/multiple_static/multiple_static.c
similarity index 100%
rename from programs/bpf/c/src/multiple_static/multiple_static.c
rename to instruction-processors/bpf/c/src/multiple_static/multiple_static.c
diff --git a/programs/bpf/c/src/noop++/noop++.cc b/instruction-processors/bpf/c/src/noop++/noop++.cc
similarity index 100%
rename from programs/bpf/c/src/noop++/noop++.cc
rename to instruction-processors/bpf/c/src/noop++/noop++.cc
diff --git a/programs/bpf/c/src/noop/noop.c b/instruction-processors/bpf/c/src/noop/noop.c
similarity index 100%
rename from programs/bpf/c/src/noop/noop.c
rename to instruction-processors/bpf/c/src/noop/noop.c
diff --git a/programs/bpf/c/src/relative_call/relative_call.c b/instruction-processors/bpf/c/src/relative_call/relative_call.c
similarity index 100%
rename from programs/bpf/c/src/relative_call/relative_call.c
rename to instruction-processors/bpf/c/src/relative_call/relative_call.c
diff --git a/programs/bpf/c/src/struct_pass/struct_pass.c b/instruction-processors/bpf/c/src/struct_pass/struct_pass.c
similarity index 100%
rename from programs/bpf/c/src/struct_pass/struct_pass.c
rename to instruction-processors/bpf/c/src/struct_pass/struct_pass.c
diff --git a/programs/bpf/c/src/struct_ret/struct_ret.c b/instruction-processors/bpf/c/src/struct_ret/struct_ret.c
similarity index 100%
rename from programs/bpf/c/src/struct_ret/struct_ret.c
rename to instruction-processors/bpf/c/src/struct_ret/struct_ret.c
diff --git a/programs/bpf/rust/noop/.gitignore b/instruction-processors/bpf/rust/noop/.gitignore
similarity index 100%
rename from programs/bpf/rust/noop/.gitignore
rename to instruction-processors/bpf/rust/noop/.gitignore
diff --git a/programs/bpf/rust/noop/Cargo.toml b/instruction-processors/bpf/rust/noop/Cargo.toml
similarity index 100%
rename from programs/bpf/rust/noop/Cargo.toml
rename to instruction-processors/bpf/rust/noop/Cargo.toml
diff --git a/programs/bpf/rust/noop/Xargo.toml b/instruction-processors/bpf/rust/noop/Xargo.toml
similarity index 100%
rename from programs/bpf/rust/noop/Xargo.toml
rename to instruction-processors/bpf/rust/noop/Xargo.toml
diff --git a/programs/bpf/rust/noop/bpf.ld b/instruction-processors/bpf/rust/noop/bpf.ld
similarity index 100%
rename from programs/bpf/rust/noop/bpf.ld
rename to instruction-processors/bpf/rust/noop/bpf.ld
diff --git a/programs/bpf/rust/noop/build.sh b/instruction-processors/bpf/rust/noop/build.sh
similarity index 100%
rename from programs/bpf/rust/noop/build.sh
rename to instruction-processors/bpf/rust/noop/build.sh
diff --git a/programs/bpf/rust/noop/clean.sh b/instruction-processors/bpf/rust/noop/clean.sh
similarity index 100%
rename from programs/bpf/rust/noop/clean.sh
rename to instruction-processors/bpf/rust/noop/clean.sh
diff --git a/programs/bpf/rust/noop/dump.sh b/instruction-processors/bpf/rust/noop/dump.sh
similarity index 100%
rename from programs/bpf/rust/noop/dump.sh
rename to instruction-processors/bpf/rust/noop/dump.sh
diff --git a/programs/bpf/rust/noop/src/lib.rs b/instruction-processors/bpf/rust/noop/src/lib.rs
similarity index 100%
rename from programs/bpf/rust/noop/src/lib.rs
rename to instruction-processors/bpf/rust/noop/src/lib.rs
diff --git a/programs/bpf/rust/noop/src/solana_sdk.rs b/instruction-processors/bpf/rust/noop/src/solana_sdk.rs
similarity index 100%
rename from programs/bpf/rust/noop/src/solana_sdk.rs
rename to instruction-processors/bpf/rust/noop/src/solana_sdk.rs
diff --git a/programs/bpf/tests/programs.rs b/instruction-processors/bpf/tests/programs.rs
similarity index 100%
rename from programs/bpf/tests/programs.rs
rename to instruction-processors/bpf/tests/programs.rs
diff --git a/programs/bpf_loader/Cargo.toml b/instruction-processors/bpf_loader/Cargo.toml
similarity index 100%
rename from programs/bpf_loader/Cargo.toml
rename to instruction-processors/bpf_loader/Cargo.toml
diff --git a/programs/bpf_loader/src/bpf_verifier.rs b/instruction-processors/bpf_loader/src/bpf_verifier.rs
similarity index 100%
rename from programs/bpf_loader/src/bpf_verifier.rs
rename to instruction-processors/bpf_loader/src/bpf_verifier.rs
diff --git a/programs/bpf_loader/src/lib.rs b/instruction-processors/bpf_loader/src/lib.rs
similarity index 100%
rename from programs/bpf_loader/src/lib.rs
rename to instruction-processors/bpf_loader/src/lib.rs
diff --git a/programs/budget_api/Cargo.toml b/instruction-processors/budget_api/Cargo.toml
similarity index 100%
rename from programs/budget_api/Cargo.toml
rename to instruction-processors/budget_api/Cargo.toml
diff --git a/programs/budget_api/src/budget_expr.rs b/instruction-processors/budget_api/src/budget_expr.rs
similarity index 100%
rename from programs/budget_api/src/budget_expr.rs
rename to instruction-processors/budget_api/src/budget_expr.rs
diff --git a/programs/budget_api/src/budget_instruction.rs b/instruction-processors/budget_api/src/budget_instruction.rs
similarity index 100%
rename from programs/budget_api/src/budget_instruction.rs
rename to instruction-processors/budget_api/src/budget_instruction.rs
diff --git a/programs/budget_api/src/budget_processor.rs b/instruction-processors/budget_api/src/budget_processor.rs
similarity index 100%
rename from programs/budget_api/src/budget_processor.rs
rename to instruction-processors/budget_api/src/budget_processor.rs
diff --git a/programs/budget_api/src/budget_state.rs b/instruction-processors/budget_api/src/budget_state.rs
similarity index 100%
rename from programs/budget_api/src/budget_state.rs
rename to instruction-processors/budget_api/src/budget_state.rs
diff --git a/programs/budget_api/src/lib.rs b/instruction-processors/budget_api/src/lib.rs
similarity index 100%
rename from programs/budget_api/src/lib.rs
rename to instruction-processors/budget_api/src/lib.rs
diff --git a/programs/budget_program/Cargo.toml b/instruction-processors/budget_program/Cargo.toml
similarity index 100%
rename from programs/budget_program/Cargo.toml
rename to instruction-processors/budget_program/Cargo.toml
diff --git a/programs/budget_program/src/lib.rs b/instruction-processors/budget_program/src/lib.rs
similarity index 100%
rename from programs/budget_program/src/lib.rs
rename to instruction-processors/budget_program/src/lib.rs
diff --git a/programs/config_api/Cargo.toml b/instruction-processors/config_api/Cargo.toml
similarity index 100%
rename from programs/config_api/Cargo.toml
rename to instruction-processors/config_api/Cargo.toml
diff --git a/programs/config_api/src/config_instruction.rs b/instruction-processors/config_api/src/config_instruction.rs
similarity index 100%
rename from programs/config_api/src/config_instruction.rs
rename to instruction-processors/config_api/src/config_instruction.rs
diff --git a/programs/config_api/src/config_processor.rs b/instruction-processors/config_api/src/config_processor.rs
similarity index 100%
rename from programs/config_api/src/config_processor.rs
rename to instruction-processors/config_api/src/config_processor.rs
diff --git a/programs/config_api/src/lib.rs b/instruction-processors/config_api/src/lib.rs
similarity index 100%
rename from programs/config_api/src/lib.rs
rename to instruction-processors/config_api/src/lib.rs
diff --git a/programs/config_program/Cargo.toml b/instruction-processors/config_program/Cargo.toml
similarity index 100%
rename from programs/config_program/Cargo.toml
rename to instruction-processors/config_program/Cargo.toml
diff --git a/programs/config_program/src/lib.rs b/instruction-processors/config_program/src/lib.rs
similarity index 100%
rename from programs/config_program/src/lib.rs
rename to instruction-processors/config_program/src/lib.rs
diff --git a/programs/exchange_api/Cargo.toml b/instruction-processors/exchange_api/Cargo.toml
similarity index 100%
rename from programs/exchange_api/Cargo.toml
rename to instruction-processors/exchange_api/Cargo.toml
diff --git a/programs/exchange_api/src/exchange_instruction.rs b/instruction-processors/exchange_api/src/exchange_instruction.rs
similarity index 100%
rename from programs/exchange_api/src/exchange_instruction.rs
rename to instruction-processors/exchange_api/src/exchange_instruction.rs
diff --git a/programs/exchange_api/src/exchange_processor.rs b/instruction-processors/exchange_api/src/exchange_processor.rs
similarity index 100%
rename from programs/exchange_api/src/exchange_processor.rs
rename to instruction-processors/exchange_api/src/exchange_processor.rs
diff --git a/programs/exchange_api/src/exchange_state.rs b/instruction-processors/exchange_api/src/exchange_state.rs
similarity index 100%
rename from programs/exchange_api/src/exchange_state.rs
rename to instruction-processors/exchange_api/src/exchange_state.rs
diff --git a/programs/exchange_api/src/lib.rs b/instruction-processors/exchange_api/src/lib.rs
similarity index 100%
rename from programs/exchange_api/src/lib.rs
rename to instruction-processors/exchange_api/src/lib.rs
diff --git a/programs/exchange_program/Cargo.toml b/instruction-processors/exchange_program/Cargo.toml
similarity index 100%
rename from programs/exchange_program/Cargo.toml
rename to instruction-processors/exchange_program/Cargo.toml
diff --git a/programs/exchange_program/src/lib.rs b/instruction-processors/exchange_program/src/lib.rs
similarity index 100%
rename from programs/exchange_program/src/lib.rs
rename to instruction-processors/exchange_program/src/lib.rs
diff --git a/programs/failure_program/Cargo.toml b/instruction-processors/failure_program/Cargo.toml
similarity index 100%
rename from programs/failure_program/Cargo.toml
rename to instruction-processors/failure_program/Cargo.toml
diff --git a/programs/failure_program/src/lib.rs b/instruction-processors/failure_program/src/lib.rs
similarity index 100%
rename from programs/failure_program/src/lib.rs
rename to instruction-processors/failure_program/src/lib.rs
diff --git a/programs/failure_program/tests/failure.rs b/instruction-processors/failure_program/tests/failure.rs
similarity index 100%
rename from programs/failure_program/tests/failure.rs
rename to instruction-processors/failure_program/tests/failure.rs
diff --git a/programs/noop_program/Cargo.toml b/instruction-processors/noop_program/Cargo.toml
similarity index 100%
rename from programs/noop_program/Cargo.toml
rename to instruction-processors/noop_program/Cargo.toml
diff --git a/programs/noop_program/src/lib.rs b/instruction-processors/noop_program/src/lib.rs
similarity index 100%
rename from programs/noop_program/src/lib.rs
rename to instruction-processors/noop_program/src/lib.rs
diff --git a/programs/noop_program/tests/noop.rs b/instruction-processors/noop_program/tests/noop.rs
similarity index 100%
rename from programs/noop_program/tests/noop.rs
rename to instruction-processors/noop_program/tests/noop.rs
diff --git a/programs/stake_api/Cargo.toml b/instruction-processors/stake_api/Cargo.toml
similarity index 100%
rename from programs/stake_api/Cargo.toml
rename to instruction-processors/stake_api/Cargo.toml
diff --git a/programs/stake_api/src/lib.rs b/instruction-processors/stake_api/src/lib.rs
similarity index 100%
rename from programs/stake_api/src/lib.rs
rename to instruction-processors/stake_api/src/lib.rs
diff --git a/programs/stake_api/src/stake_instruction.rs b/instruction-processors/stake_api/src/stake_instruction.rs
similarity index 100%
rename from programs/stake_api/src/stake_instruction.rs
rename to instruction-processors/stake_api/src/stake_instruction.rs
diff --git a/programs/stake_api/src/stake_state.rs b/instruction-processors/stake_api/src/stake_state.rs
similarity index 100%
rename from programs/stake_api/src/stake_state.rs
rename to instruction-processors/stake_api/src/stake_state.rs
diff --git a/programs/stake_program/Cargo.toml b/instruction-processors/stake_program/Cargo.toml
similarity index 100%
rename from programs/stake_program/Cargo.toml
rename to instruction-processors/stake_program/Cargo.toml
diff --git a/programs/stake_program/src/lib.rs b/instruction-processors/stake_program/src/lib.rs
similarity index 100%
rename from programs/stake_program/src/lib.rs
rename to instruction-processors/stake_program/src/lib.rs
diff --git a/programs/storage_api/Cargo.toml b/instruction-processors/storage_api/Cargo.toml
similarity index 100%
rename from programs/storage_api/Cargo.toml
rename to instruction-processors/storage_api/Cargo.toml
diff --git a/programs/storage_api/src/lib.rs b/instruction-processors/storage_api/src/lib.rs
similarity index 100%
rename from programs/storage_api/src/lib.rs
rename to instruction-processors/storage_api/src/lib.rs
diff --git a/programs/storage_api/src/storage_contract.rs b/instruction-processors/storage_api/src/storage_contract.rs
similarity index 100%
rename from programs/storage_api/src/storage_contract.rs
rename to instruction-processors/storage_api/src/storage_contract.rs
diff --git a/programs/storage_api/src/storage_instruction.rs b/instruction-processors/storage_api/src/storage_instruction.rs
similarity index 100%
rename from programs/storage_api/src/storage_instruction.rs
rename to instruction-processors/storage_api/src/storage_instruction.rs
diff --git a/programs/storage_api/src/storage_processor.rs b/instruction-processors/storage_api/src/storage_processor.rs
similarity index 100%
rename from programs/storage_api/src/storage_processor.rs
rename to instruction-processors/storage_api/src/storage_processor.rs
diff --git a/programs/storage_program/Cargo.toml b/instruction-processors/storage_program/Cargo.toml
similarity index 100%
rename from programs/storage_program/Cargo.toml
rename to instruction-processors/storage_program/Cargo.toml
diff --git a/programs/storage_program/src/lib.rs b/instruction-processors/storage_program/src/lib.rs
similarity index 100%
rename from programs/storage_program/src/lib.rs
rename to instruction-processors/storage_program/src/lib.rs
diff --git a/programs/token_api/Cargo.toml b/instruction-processors/token_api/Cargo.toml
similarity index 100%
rename from programs/token_api/Cargo.toml
rename to instruction-processors/token_api/Cargo.toml
diff --git a/programs/token_api/src/lib.rs b/instruction-processors/token_api/src/lib.rs
similarity index 100%
rename from programs/token_api/src/lib.rs
rename to instruction-processors/token_api/src/lib.rs
diff --git a/programs/token_api/src/token_processor.rs b/instruction-processors/token_api/src/token_processor.rs
similarity index 100%
rename from programs/token_api/src/token_processor.rs
rename to instruction-processors/token_api/src/token_processor.rs
diff --git a/programs/token_api/src/token_state.rs b/instruction-processors/token_api/src/token_state.rs
similarity index 100%
rename from programs/token_api/src/token_state.rs
rename to instruction-processors/token_api/src/token_state.rs
diff --git a/programs/token_program/Cargo.toml b/instruction-processors/token_program/Cargo.toml
similarity index 100%
rename from programs/token_program/Cargo.toml
rename to instruction-processors/token_program/Cargo.toml
diff --git a/programs/token_program/src/lib.rs b/instruction-processors/token_program/src/lib.rs
similarity index 100%
rename from programs/token_program/src/lib.rs
rename to instruction-processors/token_program/src/lib.rs
diff --git a/programs/vote_api/Cargo.toml b/instruction-processors/vote_api/Cargo.toml
similarity index 100%
rename from programs/vote_api/Cargo.toml
rename to instruction-processors/vote_api/Cargo.toml
diff --git a/programs/vote_api/src/lib.rs b/instruction-processors/vote_api/src/lib.rs
similarity index 100%
rename from programs/vote_api/src/lib.rs
rename to instruction-processors/vote_api/src/lib.rs
diff --git a/programs/vote_api/src/vote_instruction.rs b/instruction-processors/vote_api/src/vote_instruction.rs
similarity index 100%
rename from programs/vote_api/src/vote_instruction.rs
rename to instruction-processors/vote_api/src/vote_instruction.rs
diff --git a/programs/vote_api/src/vote_state.rs b/instruction-processors/vote_api/src/vote_state.rs
similarity index 100%
rename from programs/vote_api/src/vote_state.rs
rename to instruction-processors/vote_api/src/vote_state.rs
diff --git a/programs/vote_program/Cargo.toml b/instruction-processors/vote_program/Cargo.toml
similarity index 100%
rename from programs/vote_program/Cargo.toml
rename to instruction-processors/vote_program/Cargo.toml
diff --git a/programs/vote_program/src/lib.rs b/instruction-processors/vote_program/src/lib.rs
similarity index 100%
rename from programs/vote_program/src/lib.rs
rename to instruction-processors/vote_program/src/lib.rs
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index ca550da5aa..b314676e11 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -26,7 +26,7 @@ serde_json = "1.0.38"
 solana-logger = { path = "../logger", version = "0.14.0" }
 solana-metrics = { path = "../metrics", version = "0.14.0" }
 solana-sdk = { path = "../sdk", version = "0.14.0" }
-solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
+solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
 
 [lib]
 name = "solana_runtime"
diff --git a/scripts/cargo-install-all.sh b/scripts/cargo-install-all.sh
index 8a1a0b65cf..b48d75018d 100755
--- a/scripts/cargo-install-all.sh
+++ b/scripts/cargo-install-all.sh
@@ -49,7 +49,7 @@ for crate in "${BIN_CRATES[@]}"; do
   )
 done
 
-for dir in programs/*; do
+for dir in instruction-processors/*; do
   for program in echo target/release/deps/libsolana_"$(basename "$dir")".{so,dylib,dll}; do
     if [[ -f $program ]]; then
       mkdir -p "$installDir/bin/deps"
diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml
index a7c116703e..35361031d4 100644
--- a/wallet/Cargo.toml
+++ b/wallet/Cargo.toml
@@ -16,17 +16,17 @@ chrono = { version = "0.4.0", features = ["serde"] }
 dirs = "1.0.5"
 log = "0.4.2"
 serde_json = "1.0.39"
-solana-budget-api = { path = "../programs/budget_api", version = "0.14.0" }
+solana-budget-api = { path = "../instruction-processors/budget_api", version = "0.14.0" }
 solana-client = { path = "../client", version = "0.14.0" }
 solana-drone = { path = "../drone", version = "0.14.0" }
 solana-logger = { path = "../logger", version = "0.14.0" }
 solana-netutil = { path = "../netutil", version = "0.14.0" }
 solana-sdk = { path = "../sdk", version = "0.14.0" }
-solana-vote-api = { path = "../programs/vote_api", version = "0.14.0" }
+solana-vote-api = { path = "../instruction-processors/vote_api", version = "0.14.0" }
 solana-vote-signer = { path = "../vote-signer", version = "0.14.0" }
 
 [dev-dependencies]
-solana-budget-program = { path = "../programs/budget_program", version = "0.14.0" }
+solana-budget-program = { path = "../instruction-processors/budget_program", version = "0.14.0" }
 solana = { path = "../core", version = "0.14.0" }
 
 [features]