diff --git a/Cargo.lock b/Cargo.lock
index 78065b71..1105cd30 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -302,6 +302,25 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
+[[package]]
+name = "amm_core"
+version = "0.1.0"
+dependencies = [
+ "borsh",
+ "nssa_core",
+ "risc0-zkvm",
+ "serde",
+]
+
+[[package]]
+name = "amm_program"
+version = "0.1.0"
+dependencies = [
+ "amm_core",
+ "nssa_core",
+ "token_core",
+]
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -2655,6 +2674,7 @@ dependencies = [
 name = "nssa"
 version = "0.1.0"
 dependencies = [
+ "amm_core",
  "borsh",
  "bytemuck",
  "env_logger",
@@ -3051,6 +3071,8 @@ dependencies = [
 name = "programs"
 version = "0.1.0"
 dependencies = [
+ "amm_core",
+ "amm_program",
  "nssa_core",
  "risc0-zkvm",
  "serde",
@@ -4799,6 +4821,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 name = "wallet"
 version = "0.1.0"
 dependencies = [
+ "amm_core",
  "anyhow",
  "async-stream",
  "base58",
diff --git a/Cargo.toml b/Cargo.toml
index 61a12d2b..6be5e402 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,8 @@ members = [
   "common",
   "nssa",
   "nssa/core",
+  "programs/amm/core",
+  "programs/amm",
   "programs/token/core",
   "programs/token",
   "program_methods",
@@ -36,6 +38,8 @@ sequencer_runner = { path = "sequencer_runner" }
 wallet = { path = "wallet" }
 token_core = { path = "programs/token/core" }
 token_program = { path = "programs/token" }
+amm_core = { path = "programs/amm/core" }
+amm_program = { path = "programs/amm" }
 test_program_methods = { path = "test_program_methods" }
 
 tokio = { version = "1.28.2", features = [
diff --git a/programs/amm/core/Cargo..toml b/programs/amm/core/Cargo..toml
deleted file mode 100644
index e69de29b..00000000