diff --git a/packages/contracts-bedrock/.testdata/.gitkeep b/packages/contracts-bedrock/.testdata/.gitkeep
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/packages/contracts-bedrock/semver-lock.json b/packages/contracts-bedrock/semver-lock.json
index 45a4363af0e73..3458fc7c88ece 100644
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
@@ -125,7 +125,7 @@
   },
   "src/L2/OptimismSuperchainERC20Factory.sol": {
     "initCodeHash": "0x98011045722178751e4a1112892f7d9a11bc1f5e42ac18205b6d30a1f1476d24",
-    "sourceCodeHash": "0xa0dfc1ad7a02755f971df251b9bfd04c2e7b5d721c871bcd11a5f62c953163f2"
+    "sourceCodeHash": "0x9e72b2a77d82fcf3963734232ba9faff9d63962594a032041c2561f0a9f1b0b5"
   },
   "src/L2/SequencerFeeVault.sol": {
     "initCodeHash": "0x2e6551705e493bacba8cffe22e564d5c401ae5bb02577a5424e0d32784e13e74",
diff --git a/packages/contracts-bedrock/src/L2/IOptimismERC20Factory.sol b/packages/contracts-bedrock/src/L2/IOptimismERC20Factory.sol
deleted file mode 100644
index 5e0040aa83cfd..0000000000000
--- a/packages/contracts-bedrock/src/L2/IOptimismERC20Factory.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
-
-/// @title IOptimismERC20Factory
-/// @notice Generic interface for IOptimismMintableERC20Factory and ISuperchainERC20Factory. Used to
-///         determine if a ERC20 contract is deployed by a factory.
-interface IOptimismERC20Factory {
-    /// @notice Checks if a ERC20 token is deployed by the factory.
-    /// @param _localToken The address of the ERC20 token to check the deployment.
-    /// @return _remoteToken The address of the remote token if it is deployed or `address(0)` if not.
-    function deployments(address _localToken) external view returns (address _remoteToken);
-}
diff --git a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
index 92bb780ac0d71..4265101597208 100644
--- a/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
+++ b/packages/contracts-bedrock/src/L2/OptimismSuperchainERC20Factory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import { IOptimismERC20Factory } from "src/L2/IOptimismERC20Factory.sol";
+import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
 import { ISemver } from "src/universal/interfaces/ISemver.sol";
 import { OptimismSuperchainERC20 } from "src/L2/OptimismSuperchainERC20.sol";
 import { Predeploys } from "src/libraries/Predeploys.sol";
diff --git a/packages/contracts-bedrock/test/setup/Setup.sol b/packages/contracts-bedrock/test/setup/Setup.sol
index f3cc49d5075d2..f45d80033deb2 100644
--- a/packages/contracts-bedrock/test/setup/Setup.sol
+++ b/packages/contracts-bedrock/test/setup/Setup.sol
@@ -43,7 +43,7 @@ import { DataAvailabilityChallenge } from "src/L1/DataAvailabilityChallenge.sol"
 import { WETH } from "src/L2/WETH.sol";
 import { SuperchainWETH } from "src/L2/SuperchainWETH.sol";
 import { ETHLiquidity } from "src/L2/ETHLiquidity.sol";
-import { IOptimismERC20Factory } from "src/L2/IOptimismERC20Factory.sol";
+import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
 
 /// @title Setup
 /// @dev This contact is responsible for setting up the contracts in state. It currently