diff --git a/Cargo.lock b/Cargo.lock
index b37c137a7..c1f28262e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7911,6 +7911,8 @@ dependencies = [
  "reth-tasks",
  "reth-transaction-pool",
  "revm",
+ "serde",
+ "serde_json",
  "thiserror",
  "tokio",
 ]
@@ -8211,7 +8213,6 @@ dependencies = [
  "reth-primitives",
  "reth-rpc-eth-api",
  "reth-rpc-types",
- "serde",
  "serde_json",
 ]
 
diff --git a/crates/optimism/rpc/Cargo.toml b/crates/optimism/rpc/Cargo.toml
index 733947e11..26d1ab577 100644
--- a/crates/optimism/rpc/Cargo.toml
+++ b/crates/optimism/rpc/Cargo.toml
@@ -41,8 +41,18 @@ jsonrpsee.workspace = true
 
 # misc
 thiserror.workspace = true
+serde = { workspace = true, features = ["derive"] }
+
+[dev-dependencies]
+serde_json.workspace = true
 
 [features]
+client = [
+    "jsonrpsee/client",
+    "jsonrpsee/async-client",
+    "reth-rpc-eth-api/client"
+]
+
 optimism = [
     "reth-chainspec/optimism",
     "reth-evm-optimism/optimism",
diff --git a/crates/rpc/rpc-api/src/optimism.rs b/crates/optimism/rpc/src/api.rs
similarity index 100%
rename from crates/rpc/rpc-api/src/optimism.rs
rename to crates/optimism/rpc/src/api.rs
diff --git a/crates/optimism/rpc/src/lib.rs b/crates/optimism/rpc/src/lib.rs
index e70194a89..a6ee9e33d 100644
--- a/crates/optimism/rpc/src/lib.rs
+++ b/crates/optimism/rpc/src/lib.rs
@@ -10,8 +10,10 @@
 // The `optimism` feature must be enabled to use this crate.
 #![cfg(feature = "optimism")]
 
+pub mod api;
 pub mod error;
 pub mod eth;
 
+pub use api::OpEthApiServer;
 pub use error::OpEthApiError;
 pub use eth::{receipt::op_receipt_fields, transaction::OptimismTxMeta, OpEthApi};
diff --git a/crates/rpc/rpc-api/Cargo.toml b/crates/rpc/rpc-api/Cargo.toml
index 59ae5d4cf..8108e7585 100644
--- a/crates/rpc/rpc-api/Cargo.toml
+++ b/crates/rpc/rpc-api/Cargo.toml
@@ -21,7 +21,6 @@ reth-network-peers.workspace = true
 
 # misc
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
-serde = { workspace = true, features = ["derive"] }
 
 [dev-dependencies]
 serde_json.workspace = true
@@ -32,4 +31,3 @@ client = [
     "jsonrpsee/async-client",
     "reth-rpc-eth-api/client"
 ]
-optimism = ["reth-rpc-eth-api/optimism"]
\ No newline at end of file
diff --git a/crates/rpc/rpc-api/src/lib.rs b/crates/rpc/rpc-api/src/lib.rs
index cb84f8388..200b77835 100644
--- a/crates/rpc/rpc-api/src/lib.rs
+++ b/crates/rpc/rpc-api/src/lib.rs
@@ -22,7 +22,6 @@ mod ganache;
 mod hardhat;
 mod mev;
 mod net;
-mod optimism;
 mod otterscan;
 mod reth;
 mod rpc;
diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml
index b6a0020dc..733f218a1 100644
--- a/crates/rpc/rpc/Cargo.toml
+++ b/crates/rpc/rpc/Cargo.toml
@@ -89,7 +89,6 @@ optimism = [
     "reth-primitives/optimism",
     "reth-rpc-types-compat/optimism",
     "reth-provider/optimism",
-    "reth-rpc-api/optimism",
     "reth-rpc-eth-api/optimism",
     "reth-revm/optimism",
     "jsonrpsee-types",