diff --git a/Cargo.toml b/Cargo.toml
index 4fcaf9f6..1bce967f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ members = [
   "examples/program_deployment/methods",
   "examples/program_deployment/methods/guest",
   "testnet_initial_state",
-  "indexer_ffi",
+  "indexer/ffi",
 ]
 
 [workspace.dependencies]
@@ -57,7 +57,7 @@ indexer_service_protocol = { path = "indexer/service/protocol" }
 indexer_service_rpc = { path = "indexer/service/rpc" }
 wallet = { path = "wallet" }
 wallet-ffi = { path = "wallet-ffi", default-features = false }
-indexer_ffi = { path = "indexer_ffi" }
+indexer_ffi = { path = "indexer/ffi" }
 clock_core = { path = "programs/clock/core" }
 token_core = { path = "programs/token/core" }
 token_program = { path = "programs/token" }
diff --git a/indexer_ffi/Cargo.toml b/indexer/ffi/Cargo.toml
similarity index 100%
rename from indexer_ffi/Cargo.toml
rename to indexer/ffi/Cargo.toml
diff --git a/indexer_ffi/build.rs b/indexer/ffi/build.rs
similarity index 100%
rename from indexer_ffi/build.rs
rename to indexer/ffi/build.rs
diff --git a/indexer_ffi/cbindgen.toml b/indexer/ffi/cbindgen.toml
similarity index 100%
rename from indexer_ffi/cbindgen.toml
rename to indexer/ffi/cbindgen.toml
diff --git a/indexer_ffi/indexer_ffi.h b/indexer/ffi/indexer_ffi.h
similarity index 100%
rename from indexer_ffi/indexer_ffi.h
rename to indexer/ffi/indexer_ffi.h
diff --git a/indexer_ffi/src/api/client.rs b/indexer/ffi/src/api/client.rs
similarity index 100%
rename from indexer_ffi/src/api/client.rs
rename to indexer/ffi/src/api/client.rs
diff --git a/indexer_ffi/src/api/lifecycle.rs b/indexer/ffi/src/api/lifecycle.rs
similarity index 100%
rename from indexer_ffi/src/api/lifecycle.rs
rename to indexer/ffi/src/api/lifecycle.rs
diff --git a/indexer_ffi/src/api/memory.rs b/indexer/ffi/src/api/memory.rs
similarity index 100%
rename from indexer_ffi/src/api/memory.rs
rename to indexer/ffi/src/api/memory.rs
diff --git a/indexer_ffi/src/api/mod.rs b/indexer/ffi/src/api/mod.rs
similarity index 100%
rename from indexer_ffi/src/api/mod.rs
rename to indexer/ffi/src/api/mod.rs
diff --git a/indexer_ffi/src/api/query.rs b/indexer/ffi/src/api/query.rs
similarity index 100%
rename from indexer_ffi/src/api/query.rs
rename to indexer/ffi/src/api/query.rs
diff --git a/indexer_ffi/src/api/result.rs b/indexer/ffi/src/api/result.rs
similarity index 100%
rename from indexer_ffi/src/api/result.rs
rename to indexer/ffi/src/api/result.rs
diff --git a/indexer_ffi/src/api/types/account.rs b/indexer/ffi/src/api/types/account.rs
similarity index 100%
rename from indexer_ffi/src/api/types/account.rs
rename to indexer/ffi/src/api/types/account.rs
diff --git a/indexer_ffi/src/api/types/block.rs b/indexer/ffi/src/api/types/block.rs
similarity index 100%
rename from indexer_ffi/src/api/types/block.rs
rename to indexer/ffi/src/api/types/block.rs
diff --git a/indexer_ffi/src/api/types/mod.rs b/indexer/ffi/src/api/types/mod.rs
similarity index 100%
rename from indexer_ffi/src/api/types/mod.rs
rename to indexer/ffi/src/api/types/mod.rs
diff --git a/indexer_ffi/src/api/types/transaction.rs b/indexer/ffi/src/api/types/transaction.rs
similarity index 100%
rename from indexer_ffi/src/api/types/transaction.rs
rename to indexer/ffi/src/api/types/transaction.rs
diff --git a/indexer_ffi/src/api/types/vectors.rs b/indexer/ffi/src/api/types/vectors.rs
similarity index 100%
rename from indexer_ffi/src/api/types/vectors.rs
rename to indexer/ffi/src/api/types/vectors.rs
diff --git a/indexer_ffi/src/client.rs b/indexer/ffi/src/client.rs
similarity index 100%
rename from indexer_ffi/src/client.rs
rename to indexer/ffi/src/client.rs
diff --git a/indexer_ffi/src/errors.rs b/indexer/ffi/src/errors.rs
similarity index 100%
rename from indexer_ffi/src/errors.rs
rename to indexer/ffi/src/errors.rs
diff --git a/indexer_ffi/src/indexer.rs b/indexer/ffi/src/indexer.rs
similarity index 100%
rename from indexer_ffi/src/indexer.rs
rename to indexer/ffi/src/indexer.rs
diff --git a/indexer_ffi/src/lib.rs b/indexer/ffi/src/lib.rs
similarity index 100%
rename from indexer_ffi/src/lib.rs
rename to indexer/ffi/src/lib.rs