diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c7d4335
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "solana-program-library"]
+	path = solana-program-library
+	url = https://github.com/solana-labs/solana-program-library.git
+	branch = master
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..50cc5ed
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,9 @@
+[workspace]
+members = [
+    "addin-fixed-weights/program",
+    "addin-vesting/program",
+#    "addin-vesting/program/fuzz",
+]
+exclude = [
+    "solana-program-library",
+]
diff --git a/addin-fixed-weights/program/Cargo.toml b/addin-fixed-weights/program/Cargo.toml
index a2f4430..58717cf 100644
--- a/addin-fixed-weights/program/Cargo.toml
+++ b/addin-fixed-weights/program/Cargo.toml
@@ -20,9 +20,9 @@ num-traits = "0.2"
 serde = "1.0.127"
 serde_derive = "1.0.103"
 solana-program = "1.9.9"
-spl-token = { version = "3.3", features = [ "no-entrypoint" ] }
-spl-governance-addin-api= { version = "0.1.1" }
-spl-governance-tools= { version = "0.1.2" }
+spl-token = { path = "../../solana-program-library/token/program", version = "3.3", features = [ "no-entrypoint" ] }
+spl-governance-addin-api= { path = "../../solana-program-library/governance/addin-api", version = "0.1.1" }
+spl-governance-tools= { path = "../../solana-program-library/governance/tools", version = "0.1.2" }
 thiserror = "1.0"
 cfg-if = { version = "1.0" }
 
diff --git a/addin-vesting/program/Cargo.toml b/addin-vesting/program/Cargo.toml
index d09ab64..61c872a 100644
--- a/addin-vesting/program/Cargo.toml
+++ b/addin-vesting/program/Cargo.toml
@@ -1,15 +1,14 @@
 [package]
-name = "token-vesting"
+name = "spl-governance-addin-vesting"
 version = "0.1.0"
 authors = ["Elliott Benisty <elliott@bonfida.com>", "Lucas Chaumeny <lucas@bonfida.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[workspace]
-members = [
-    "fuzz"
-]
+#[workspace]
+#members = [
+#    "fuzz"
+#]
 
 [features]
 no-entrypoint = []
@@ -22,20 +21,18 @@ num-traits = "0.2"
 num-derive = "0.3"
 arrayref = "0.3.6"
 borsh = "0.9.1"
-solana-program = "1.5.6"
-spl-token = { version = "3.0.1", features = ["no-entrypoint"] }
+solana-program = "1.9.9"
+spl-token = { version = "3.2", features = ["no-entrypoint"] }
 spl-associated-token-account = { version = "1.0.2", features = ["no-entrypoint"] }
-#spl-governance = { version = "2.2.2", features = ["no-entrypoint"] }
-#spl-governance-tools = { version = "0.1.2" }
-spl-governance = { path="/mnt/working/solana/solana-program-library.git/governance/program", features = ["no-entrypoint"] }
-spl-governance-tools = { path="/mnt/working/solana/solana-program-library.git/governance/tools", version = "0.1.2" }
-spl-governance-addin-api = { path="/mnt/working/solana/solana-program-library.git/governance/addin-api", version = "0.1.1" }
+spl-governance = { path="../../solana-program-library/governance/program", features = ["no-entrypoint"] }
+spl-governance-tools = { path="../../solana-program-library/governance/tools", version = "0.1.2" }
+spl-governance-addin-api = { path="../../solana-program-library/governance/addin-api", version = "0.1.1" }
 arbitrary = { version = "0.4", features = ["derive"], optional = true }
 honggfuzz = { version = "0.5", optional = true }
 
 [dev-dependencies]
-solana-sdk = "1.5.6"
-solana-program-test = "1.5.6"
+solana-sdk = "1.9.9"
+solana-program-test = "1.9.9"
 tokio = { version = "1.0", features = ["macros"]}
 hex = "0.4"
 
diff --git a/solana-program-library b/solana-program-library
new file mode 160000
index 0000000..762c584
--- /dev/null
+++ b/solana-program-library
@@ -0,0 +1 @@
+Subproject commit 762c584dfe88d857575d0e079a9022523670969b