diff --git a/Cargo.toml b/Cargo.toml
index dcceb699..2e5602f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,9 +13,10 @@ members = [
   "sequencer_core",
   "sequencer_rpc",
   "sequencer_runner",
-  "indexer_service",
-  "indexer_service/protocol",
-  "indexer_service/rpc",
+  "indexer/core",
+  "indexer/service",
+  "indexer/service/protocol",
+  "indexer/service/rpc",
   "explorer_service",
   "program_methods",
   "program_methods/guest",
@@ -25,7 +26,6 @@ members = [
   "examples/program_deployment/methods",
   "examples/program_deployment/methods/guest",
   "bedrock_client",
-  "indexer_core",
 ]
 
 [workspace.dependencies]
@@ -38,14 +38,14 @@ key_protocol = { path = "key_protocol" }
 sequencer_core = { path = "sequencer_core" }
 sequencer_rpc = { path = "sequencer_rpc" }
 sequencer_runner = { path = "sequencer_runner" }
-indexer_service = { path = "indexer_service" }
-indexer_service_protocol = { path = "indexer_service/protocol" }
-indexer_service_rpc = { path = "indexer_service/rpc" }
+indexer_core = { path = "indexer/core" }
+indexer_service = { path = "indexer/service" }
+indexer_service_protocol = { path = "indexer/service/protocol" }
+indexer_service_rpc = { path = "indexer/service/rpc" }
 wallet = { path = "wallet" }
 wallet-ffi = { path = "wallet-ffi" }
 test_program_methods = { path = "test_program_methods" }
 bedrock_client = { path = "bedrock_client" }
-indexer_core = { path = "indexer_core" }
 
 tokio = { version = "1.28.2", features = [
   "net",
diff --git a/indexer_core/Cargo.toml b/indexer/core/Cargo.toml
similarity index 100%
rename from indexer_core/Cargo.toml
rename to indexer/core/Cargo.toml
diff --git a/indexer_core/src/config.rs b/indexer/core/src/config.rs
similarity index 100%
rename from indexer_core/src/config.rs
rename to indexer/core/src/config.rs
diff --git a/indexer_core/src/lib.rs b/indexer/core/src/lib.rs
similarity index 99%
rename from indexer_core/src/lib.rs
rename to indexer/core/src/lib.rs
index 332d4d98..23909e29 100644
--- a/indexer_core/src/lib.rs
+++ b/indexer/core/src/lib.rs
@@ -111,4 +111,4 @@ fn parse_blocks(
             _ => None,
         })
     })
-}
\ No newline at end of file
+}
diff --git a/indexer_core/src/state.rs b/indexer/core/src/state.rs
similarity index 100%
rename from indexer_core/src/state.rs
rename to indexer/core/src/state.rs
diff --git a/indexer_service/Cargo.toml b/indexer/service/Cargo.toml
similarity index 100%
rename from indexer_service/Cargo.toml
rename to indexer/service/Cargo.toml
diff --git a/indexer_service/Dockerfile b/indexer/service/Dockerfile
similarity index 100%
rename from indexer_service/Dockerfile
rename to indexer/service/Dockerfile
diff --git a/indexer_service/docker-compose.yml b/indexer/service/docker-compose.yml
similarity index 100%
rename from indexer_service/docker-compose.yml
rename to indexer/service/docker-compose.yml
diff --git a/indexer_service/protocol/Cargo.toml b/indexer/service/protocol/Cargo.toml
similarity index 100%
rename from indexer_service/protocol/Cargo.toml
rename to indexer/service/protocol/Cargo.toml
diff --git a/indexer_service/protocol/src/convert.rs b/indexer/service/protocol/src/convert.rs
similarity index 100%
rename from indexer_service/protocol/src/convert.rs
rename to indexer/service/protocol/src/convert.rs
diff --git a/indexer_service/protocol/src/lib.rs b/indexer/service/protocol/src/lib.rs
similarity index 100%
rename from indexer_service/protocol/src/lib.rs
rename to indexer/service/protocol/src/lib.rs
diff --git a/indexer_service/rpc/Cargo.toml b/indexer/service/rpc/Cargo.toml
similarity index 100%
rename from indexer_service/rpc/Cargo.toml
rename to indexer/service/rpc/Cargo.toml
diff --git a/indexer_service/rpc/src/lib.rs b/indexer/service/rpc/src/lib.rs
similarity index 100%
rename from indexer_service/rpc/src/lib.rs
rename to indexer/service/rpc/src/lib.rs
diff --git a/indexer_service/src/lib.rs b/indexer/service/src/lib.rs
similarity index 100%
rename from indexer_service/src/lib.rs
rename to indexer/service/src/lib.rs
diff --git a/indexer_service/src/main.rs b/indexer/service/src/main.rs
similarity index 100%
rename from indexer_service/src/main.rs
rename to indexer/service/src/main.rs
diff --git a/indexer_service/src/mock_service.rs b/indexer/service/src/mock_service.rs
similarity index 100%
rename from indexer_service/src/mock_service.rs
rename to indexer/service/src/mock_service.rs
diff --git a/indexer_service/src/service.rs b/indexer/service/src/service.rs
similarity index 100%
rename from indexer_service/src/service.rs
rename to indexer/service/src/service.rs