contracts-bedrock: foundry-ify

Move the `contracts` directory to `src` and then move
the tests into a top level `test` dir so that its
standard foundry style for a repo.

This is going to break any in flight PRs so worth trying
to get in relatively quickly, will be no fun to rebase a
bunch of PRs.

Will need to follow up with another commit that bumps the
patch versions.

packages/contracts-bedrock/foundry.toml

 [profile.default]
-src = 'contracts'
+src = 'src'
 out = 'forge-artifacts'
 optimizer = true
 optimizer_runs = 999999
+script = 'scripts'
 
 remappings = [
   '@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts',

packages/contracts-bedrock/scripts/Deploy.s.sol

@@ -9,27 +9,27 @@ import { stdJson } from "forge-std/StdJson.sol";
 import { Deployer } from "./Deployer.sol";
 import { DeployConfig } from "./DeployConfig.s.sol";
 
-import { ProxyAdmin } from "../contracts/universal/ProxyAdmin.sol";
-import { AddressManager } from "../contracts/legacy/AddressManager.sol";
-import { Proxy } from "../contracts/universal/Proxy.sol";
-import { L1StandardBridge } from "../contracts/L1/L1StandardBridge.sol";
-import { OptimismPortal } from "../contracts/L1/OptimismPortal.sol";
-import { L1ChugSplashProxy } from "../contracts/legacy/L1ChugSplashProxy.sol";
-import { ResolvedDelegateProxy } from "../contracts/legacy/ResolvedDelegateProxy.sol";
-import { L1CrossDomainMessenger } from "../contracts/L1/L1CrossDomainMessenger.sol";
-import { L2OutputOracle } from "../contracts/L1/L2OutputOracle.sol";
-import { OptimismMintableERC20Factory } from "../contracts/universal/OptimismMintableERC20Factory.sol";
-import { SystemConfig } from "../contracts/L1/SystemConfig.sol";
-import { ResourceMetering } from "../contracts/L1/ResourceMetering.sol";
-import { Constants } from "../contracts/libraries/Constants.sol";
-import { DisputeGameFactory } from "../contracts/dispute/DisputeGameFactory.sol";
-import { FaultDisputeGame } from "../contracts/dispute/FaultDisputeGame.sol";
-import { L1ERC721Bridge } from "../contracts/L1/L1ERC721Bridge.sol";
-import { Predeploys } from "../contracts/libraries/Predeploys.sol";
-
-import { IBigStepper } from "../contracts/dispute/interfaces/IBigStepper.sol";
-import { AlphabetVM } from "../contracts/test/FaultDisputeGame.t.sol";
-import "../contracts/libraries/DisputeTypes.sol";
+import { ProxyAdmin } from "../src/universal/ProxyAdmin.sol";
+import { AddressManager } from "../src/legacy/AddressManager.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
+import { L1StandardBridge } from "../src/L1/L1StandardBridge.sol";
+import { OptimismPortal } from "../src/L1/OptimismPortal.sol";
+import { L1ChugSplashProxy } from "../src/legacy/L1ChugSplashProxy.sol";
+import { ResolvedDelegateProxy } from "../src/legacy/ResolvedDelegateProxy.sol";
+import { L1CrossDomainMessenger } from "../src/L1/L1CrossDomainMessenger.sol";
+import { L2OutputOracle } from "../src/L1/L2OutputOracle.sol";
+import { OptimismMintableERC20Factory } from "../src/universal/OptimismMintableERC20Factory.sol";
+import { SystemConfig } from "../src/L1/SystemConfig.sol";
+import { ResourceMetering } from "../src/L1/ResourceMetering.sol";
+import { Constants } from "../src/libraries/Constants.sol";
+import { DisputeGameFactory } from "../src/dispute/DisputeGameFactory.sol";
+import { FaultDisputeGame } from "../src/dispute/FaultDisputeGame.sol";
+import { L1ERC721Bridge } from "../src/L1/L1ERC721Bridge.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
+
+import { IBigStepper } from "../src/dispute/interfaces/IBigStepper.sol";
+import { AlphabetVM } from "../test/FaultDisputeGame.t.sol";
+import "../src/libraries/DisputeTypes.sol";
 
 /// @title Deploy
 /// @notice Script used to deploy a bedrock system. The entire system is deployed within the `run` function.

packages/contracts-bedrock/scripts/DeployL2.s.sol

@@ -5,10 +5,10 @@ import { Deployer } from "./Deployer.sol";
 import { DeployConfig } from "./DeployConfig.s.sol";
 import { console2 as console } from "forge-std/console2.sol";
 
-import { EAS } from "../contracts/EAS/EAS.sol";
-import { SchemaRegistry } from "../contracts/EAS/SchemaRegistry.sol";
-import { ISchemaRegistry } from "../contracts/EAS/ISchemaRegistry.sol";
-import { Predeploys } from "../contracts/libraries/Predeploys.sol";
+import { EAS } from "../src/EAS/EAS.sol";
+import { SchemaRegistry } from "../src/EAS/SchemaRegistry.sol";
+import { ISchemaRegistry } from "../src/EAS/ISchemaRegistry.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 /// @title DeployL2
 /// @notice Script used to deploy predeploy implementations to L2.

packages/contracts-bedrock/scripts/FaultDisputeGameViz.s.sol

@@ -3,15 +3,15 @@ pragma solidity ^0.8.15;
 import { Script } from "forge-std/Script.sol";
 import { console2 as console } from "forge-std/console2.sol";
 
-import { FaultDisputeGame_Init } from "../contracts/test/FaultDisputeGame.t.sol";
-import { DisputeGameFactory } from "../contracts/dispute/DisputeGameFactory.sol";
-import { FaultDisputeGame } from "../contracts/dispute/FaultDisputeGame.sol";
-import { IFaultDisputeGame } from "../contracts/dispute/interfaces/IFaultDisputeGame.sol";
+import { FaultDisputeGame_Init } from "../test/FaultDisputeGame.t.sol";
+import { DisputeGameFactory } from "../src/dispute/DisputeGameFactory.sol";
+import { FaultDisputeGame } from "../src/dispute/FaultDisputeGame.sol";
+import { IFaultDisputeGame } from "../src/dispute/interfaces/IFaultDisputeGame.sol";
 
-import "../contracts/libraries/DisputeTypes.sol";
-import "../contracts/libraries/DisputeErrors.sol";
-import { LibClock } from "../contracts/dispute/lib/LibClock.sol";
-import { LibPosition } from "../contracts/dispute/lib/LibPosition.sol";
+import "../src/libraries/DisputeTypes.sol";
+import "../src/libraries/DisputeErrors.sol";
+import { LibClock } from "../src/dispute/lib/LibClock.sol";
+import { LibPosition } from "../src/dispute/lib/LibPosition.sol";
 
 /**
  * @title FaultDisputeGameViz

packages/contracts-bedrock/scripts/FeeVaultWithdrawal.s.sol

@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { console } from "forge-std/console.sol";
 import { Script } from "forge-std/Script.sol";
-import { Predeploys } from "../contracts/libraries/Predeploys.sol";
-import { FeeVault } from "../contracts/universal/FeeVault.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
+import { FeeVault } from "../src/universal/FeeVault.sol";
 import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
 
 /// @title FeeVaultWithdrawal

packages/contracts-bedrock/scripts/invariant-doc-gen.ts

@@ -9,7 +9,7 @@ const BASE_INVARIANTS_DIR = path.join(
   'invariants'
 )
 const BASE_DOCS_DIR = path.join(__dirname, '..', 'invariant-docs')
-const BASE_INVARIANT_GH_URL = '../contracts/test/invariants/'
+const BASE_INVARIANT_GH_URL = '../test/invariants/'
 const NATSPEC_INV = '@custom:invariant'
 
 // Represents an invariant test contract
@@ -111,8 +111,7 @@ const docGen = (dir: string): void => {
   }
 
   console.log(
-    `Generated invariant test documentation for:\n - ${
-      docs.length
+    `Generated invariant test documentation for:\n - ${docs.length
     } contracts\n - ${docs.reduce(
       (acc: number, contract: Contract) => acc + contract.docs.length,
       0

packages/contracts-bedrock/scripts/outputs/DeleteOutput.s.sol

@@ -8,10 +8,10 @@ import { LibSort } from "../libraries/LibSort.sol";
 import { IGnosisSafe, Enum } from "../interfaces/IGnosisSafe.sol";
 import { SafeBuilder } from "../universal/SafeBuilder.sol";
 
-import { Types } from "../../contracts/libraries/Types.sol";
-import { FeeVault } from "../../contracts/universal/FeeVault.sol";
-import { L2OutputOracle } from "../../contracts/L1/L2OutputOracle.sol";
-import { Predeploys } from "../../contracts/libraries/Predeploys.sol";
+import { Types } from "../../src/libraries/Types.sol";
+import { FeeVault } from "../../src/universal/FeeVault.sol";
+import { L2OutputOracle } from "../../src/L1/L2OutputOracle.sol";
+import { Predeploys } from "../../src/libraries/Predeploys.sol";
 
 /// @title DeleteOutput
 /// @notice Deletes an output root from the L2OutputOracle.

packages/contracts-bedrock/scripts/storage-snapshot.sh

@@ -10,28 +10,28 @@ then
 fi
 
 contracts=(
-  contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger
-  contracts/L1/L1StandardBridge.sol:L1StandardBridge
-  contracts/L1/L2OutputOracle.sol:L2OutputOracle
-  contracts/L1/OptimismPortal.sol:OptimismPortal
-  contracts/L1/SystemConfig.sol:SystemConfig
-  contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist
-  contracts/L2/L1Block.sol:L1Block
-  contracts/legacy/L1BlockNumber.sol:L1BlockNumber
-  contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger
-  contracts/L2/L2StandardBridge.sol:L2StandardBridge
-  contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser
-  contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH
-  contracts/L2/SequencerFeeVault.sol:SequencerFeeVault
-  contracts/L2/BaseFeeVault.sol:BaseFeeVault
-  contracts/L2/L1FeeVault.sol:L1FeeVault
-  contracts/vendor/WETH9.sol:WETH9
-  contracts/universal/ProxyAdmin.sol:ProxyAdmin
-  contracts/universal/Proxy.sol:Proxy
-  contracts/legacy/L1ChugSplashProxy.sol:L1ChugSplashProxy
-  contracts/universal/OptimismMintableERC20.sol:OptimismMintableERC20
-  contracts/universal/OptimismMintableERC20Factory.sol:OptimismMintableERC20Factory
-  contracts/dispute/DisputeGameFactory.sol:DisputeGameFactory
+  src/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger
+  src/L1/L1StandardBridge.sol:L1StandardBridge
+  src/L1/L2OutputOracle.sol:L2OutputOracle
+  src/L1/OptimismPortal.sol:OptimismPortal
+  src/L1/SystemConfig.sol:SystemConfig
+  src/legacy/DeployerWhitelist.sol:DeployerWhitelist
+  src/L2/L1Block.sol:L1Block
+  src/legacy/L1BlockNumber.sol:L1BlockNumber
+  src/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger
+  src/L2/L2StandardBridge.sol:L2StandardBridge
+  src/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser
+  src/legacy/LegacyERC20ETH.sol:LegacyERC20ETH
+  src/L2/SequencerFeeVault.sol:SequencerFeeVault
+  src/L2/BaseFeeVault.sol:BaseFeeVault
+  src/L2/L1FeeVault.sol:L1FeeVault
+  src/vendor/WETH9.sol:WETH9
+  src/universal/ProxyAdmin.sol:ProxyAdmin
+  src/universal/Proxy.sol:Proxy
+  src/legacy/L1ChugSplashProxy.sol:L1ChugSplashProxy
+  src/universal/OptimismMintableERC20.sol:OptimismMintableERC20
+  src/universal/OptimismMintableERC20Factory.sol:OptimismMintableERC20Factory
+  src/dispute/DisputeGameFactory.sol:DisputeGameFactory
 )
 
 dir=$(dirname "$0")

packages/contracts-bedrock/scripts/universal/EnhancedScript.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { console } from "forge-std/console.sol";
 import { Script } from "forge-std/Script.sol";
-import { Semver } from "../../contracts/universal/Semver.sol";
+import { Semver } from "../../src/universal/Semver.sol";
 
 /// @title EnhancedScript
 /// @notice Enhances forge-std' Script.sol with some additional application-specific functionality.

packages/contracts-bedrock/scripts/universal/SafeBuilder.sol

@@ -8,7 +8,7 @@ import { LibSort } from "../libraries/LibSort.sol";
 import { IGnosisSafe, Enum } from "../interfaces/IGnosisSafe.sol";
 import { EnhancedScript } from "../universal/EnhancedScript.sol";
 import { GlobalConstants } from "../universal/GlobalConstants.sol";
-import { ProxyAdmin } from "../../contracts/universal/ProxyAdmin.sol";
+import { ProxyAdmin } from "../../src/universal/ProxyAdmin.sol";
 
 /// @title SafeBuilder
 /// @notice Builds SafeTransactions

packages/contracts-bedrock/scripts/upgrades/EASUpgrade.s.sol

@@ -5,8 +5,8 @@ import { console2 as console } from "forge-std/console2.sol";
 import { SafeBuilder } from "../universal/SafeBuilder.sol";
 import { IGnosisSafe, Enum } from "../interfaces/IGnosisSafe.sol";
 import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
-import { Predeploys } from "../../contracts/libraries/Predeploys.sol";
-import { ProxyAdmin } from "../../contracts/universal/ProxyAdmin.sol";
+import { Predeploys } from "../../src/libraries/Predeploys.sol";
+import { ProxyAdmin } from "../../src/universal/ProxyAdmin.sol";
 import { Deployer } from "../Deployer.sol";
 
 /// @title EASUpgrader

packages/contracts-bedrock/scripts/upgrades/PostSherlock.s.sol

@@ -6,11 +6,11 @@ import { SafeBuilder } from "../universal/SafeBuilder.sol";
 import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
 import { IGnosisSafe, Enum } from "../interfaces/IGnosisSafe.sol";
 import { LibSort } from "../libraries/LibSort.sol";
-import { ProxyAdmin } from "../../contracts/universal/ProxyAdmin.sol";
-import { Constants } from "../../contracts/libraries/Constants.sol";
-import { SystemConfig } from "../../contracts/L1/SystemConfig.sol";
-import { ResourceMetering } from "../../contracts/L1/ResourceMetering.sol";
-import { Semver } from "../../contracts/universal/Semver.sol";
+import { ProxyAdmin } from "../../src/universal/ProxyAdmin.sol";
+import { Constants } from "../../src/libraries/Constants.sol";
+import { SystemConfig } from "../../src/L1/SystemConfig.sol";
+import { ResourceMetering } from "../../src/L1/ResourceMetering.sol";
+import { Semver } from "../../src/universal/Semver.sol";
 
 /// @title PostSherlockL1
 /// @notice Upgrade script for upgrading the L1 contracts after the sherlock audit.

packages/contracts-bedrock/scripts/upgrades/PostSherlockL2.s.sol

@@ -5,8 +5,8 @@ import { console } from "forge-std/console.sol";
 import { SafeBuilder } from "../universal/SafeBuilder.sol";
 import { IGnosisSafe, Enum } from "../interfaces/IGnosisSafe.sol";
 import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
-import { Predeploys } from "../../contracts/libraries/Predeploys.sol";
-import { ProxyAdmin } from "../../contracts/universal/ProxyAdmin.sol";
+import { Predeploys } from "../../src/libraries/Predeploys.sol";
+import { ProxyAdmin } from "../../src/universal/ProxyAdmin.sol";
 
 /// @title PostSherlockL2
 /// @notice Upgrades the L2 contracts.

packages/contracts-bedrock/contracts/test/AddressAliasHelper.t.sol → packages/contracts-bedrock/test/AddressAliasHelper.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
 
 contract AddressAliasHelper_applyAndUndo_Test is Test {
     /// @notice Tests that applying and then undoing an alias results in the original address.

packages/contracts-bedrock/contracts/test/AdminFaucetAuthModule.t.sol → packages/contracts-bedrock/test/AdminFaucetAuthModule.t.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { AdminFaucetAuthModule } from "../periphery/faucet/authmodules/AdminFaucetAuthModule.sol";
-import { Faucet } from "../periphery/faucet/Faucet.sol";
+import { AdminFaucetAuthModule } from "../src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol";
+import { Faucet } from "../src/periphery/faucet/Faucet.sol";
 import { FaucetHelper } from "./Helpers.sol";
 
 /// @title  AdminFaucetAuthModuleTest

packages/contracts-bedrock/contracts/test/AssetReceiver.t.sol → packages/contracts-bedrock/test/AssetReceiver.t.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { TestERC20 } from "./Helpers.sol";
 import { TestERC721 } from "./Helpers.sol";
-import { AssetReceiver } from "../periphery/AssetReceiver.sol";
+import { AssetReceiver } from "../src/periphery/AssetReceiver.sol";
 
 contract AssetReceiver_Initializer is Test {
     address alice = address(128);

packages/contracts-bedrock/contracts/test/AttestationStation.t.sol → packages/contracts-bedrock/test/AttestationStation.t.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 /* Testing utilities */
 import { Test } from "forge-std/Test.sol";
-import { AttestationStation } from "../periphery/op-nft/AttestationStation.sol";
+import { AttestationStation } from "../src/periphery/op-nft/AttestationStation.sol";
 
 contract AttestationStation_Initializer is Test {
     address alice_attestor = address(128);

packages/contracts-bedrock/contracts/test/BenchmarkTest.t.sol → packages/contracts-bedrock/test/BenchmarkTest.t.sol

@@ -5,8 +5,8 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 import "./CommonTest.t.sol";
-import { CrossDomainMessenger } from "../universal/CrossDomainMessenger.sol";
-import { ResourceMetering } from "../L1/ResourceMetering.sol";
+import { CrossDomainMessenger } from "../src/universal/CrossDomainMessenger.sol";
+import { ResourceMetering } from "../src/L1/ResourceMetering.sol";
 
 // Free function for setting the prevBaseFee param in the OptimismPortal.
 function setPrevBaseFee(

packages/contracts-bedrock/contracts/test/Bytes.t.sol → packages/contracts-bedrock/test/Bytes.t.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Target contract
-import { Bytes } from "../libraries/Bytes.sol";
+import { Bytes } from "../src/libraries/Bytes.sol";
 
 contract Bytes_slice_Test is Test {
     /// @notice Tests that the `slice` function works as expected when starting from index 0.

packages/contracts-bedrock/contracts/test/CheckBalanceHigh.t.sol → packages/contracts-bedrock/test/CheckBalanceHigh.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { CheckBalanceHigh } from "../periphery/drippie/dripchecks/CheckBalanceHigh.sol";
+import { CheckBalanceHigh } from "../src/periphery/drippie/dripchecks/CheckBalanceHigh.sol";
 
 /// @title  CheckBalanceHighTest
 /// @notice Tests the CheckBalanceHigh contract via fuzzing both the success case

packages/contracts-bedrock/contracts/test/CheckBalanceLow.t.sol → packages/contracts-bedrock/test/CheckBalanceLow.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { CheckBalanceLow } from "../periphery/drippie/dripchecks/CheckBalanceLow.sol";
+import { CheckBalanceLow } from "../src/periphery/drippie/dripchecks/CheckBalanceLow.sol";
 
 /// @title  CheckBalanceLowTest
 /// @notice Tests the CheckBalanceLow contract via fuzzing both the success case

packages/contracts-bedrock/contracts/test/CheckGelatoLow.t.sol → packages/contracts-bedrock/test/CheckGelatoLow.t.sol

@@ -5,7 +5,7 @@ import { Test } from "forge-std/Test.sol";
 import {
     CheckGelatoLow,
     IGelatoTreasury
-} from "../periphery/drippie/dripchecks/CheckGelatoLow.sol";
+} from "../src/periphery/drippie/dripchecks/CheckGelatoLow.sol";
 
 /// @title  MockGelatoTreasury
 /// @notice Mocks the Gelato treasury for testing purposes. Allows arbitrary

packages/contracts-bedrock/contracts/test/CheckTrue.t.sol → packages/contracts-bedrock/test/CheckTrue.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { CheckTrue } from "../periphery/drippie/dripchecks/CheckTrue.sol";
+import { CheckTrue } from "../src/periphery/drippie/dripchecks/CheckTrue.sol";
 
 /// @title  CheckTrueTest
 /// @notice Ensures that the CheckTrue DripCheck contract always returns true.

packages/contracts-bedrock/contracts/test/Clones.t.sol → packages/contracts-bedrock/test/Clones.t.sol

@@ -5,7 +5,7 @@ import "forge-std/Test.sol";
 
 import { ClonesWithImmutableArgs } from "@cwia/ClonesWithImmutableArgs.sol";
 
-import { Clone } from "../libraries/Clone.sol";
+import { Clone } from "../src/libraries/Clone.sol";
 
 contract ExampleClone is Clone {
     uint256 argOffset;

packages/contracts-bedrock/contracts/test/CommonTest.t.sol → packages/contracts-bedrock/test/CommonTest.t.sol

@@ -3,36 +3,36 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Test, StdUtils } from "forge-std/Test.sol";
-import { L2OutputOracle } from "../L1/L2OutputOracle.sol";
-import { L2ToL1MessagePasser } from "../L2/L2ToL1MessagePasser.sol";
-import { L1StandardBridge } from "../L1/L1StandardBridge.sol";
-import { L2StandardBridge } from "../L2/L2StandardBridge.sol";
-import { L1ERC721Bridge } from "../L1/L1ERC721Bridge.sol";
-import { L2ERC721Bridge } from "../L2/L2ERC721Bridge.sol";
-import { OptimismMintableERC20Factory } from "../universal/OptimismMintableERC20Factory.sol";
-import { OptimismMintableERC721Factory } from "../universal/OptimismMintableERC721Factory.sol";
-import { OptimismMintableERC20 } from "../universal/OptimismMintableERC20.sol";
-import { OptimismPortal } from "../L1/OptimismPortal.sol";
-import { L1CrossDomainMessenger } from "../L1/L1CrossDomainMessenger.sol";
-import { L2CrossDomainMessenger } from "../L2/L2CrossDomainMessenger.sol";
-import { SequencerFeeVault } from "../L2/SequencerFeeVault.sol";
-import { FeeVault } from "../universal/FeeVault.sol";
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
-import { LegacyERC20ETH } from "../legacy/LegacyERC20ETH.sol";
-import { Predeploys } from "../libraries/Predeploys.sol";
-import { Types } from "../libraries/Types.sol";
+import { L2OutputOracle } from "../src/L1/L2OutputOracle.sol";
+import { L2ToL1MessagePasser } from "../src/L2/L2ToL1MessagePasser.sol";
+import { L1StandardBridge } from "../src/L1/L1StandardBridge.sol";
+import { L2StandardBridge } from "../src/L2/L2StandardBridge.sol";
+import { L1ERC721Bridge } from "../src/L1/L1ERC721Bridge.sol";
+import { L2ERC721Bridge } from "../src/L2/L2ERC721Bridge.sol";
+import { OptimismMintableERC20Factory } from "../src/universal/OptimismMintableERC20Factory.sol";
+import { OptimismMintableERC721Factory } from "../src/universal/OptimismMintableERC721Factory.sol";
+import { OptimismMintableERC20 } from "../src/universal/OptimismMintableERC20.sol";
+import { OptimismPortal } from "../src/L1/OptimismPortal.sol";
+import { L1CrossDomainMessenger } from "../src/L1/L1CrossDomainMessenger.sol";
+import { L2CrossDomainMessenger } from "../src/L2/L2CrossDomainMessenger.sol";
+import { SequencerFeeVault } from "../src/L2/SequencerFeeVault.sol";
+import { FeeVault } from "../src/universal/FeeVault.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
+import { LegacyERC20ETH } from "../src/legacy/LegacyERC20ETH.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
+import { Types } from "../src/libraries/Types.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import { Proxy } from "../universal/Proxy.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
 import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import { ResolvedDelegateProxy } from "../legacy/ResolvedDelegateProxy.sol";
-import { AddressManager } from "../legacy/AddressManager.sol";
-import { L1ChugSplashProxy } from "../legacy/L1ChugSplashProxy.sol";
-import { IL1ChugSplashDeployer } from "../legacy/L1ChugSplashProxy.sol";
+import { ResolvedDelegateProxy } from "../src/legacy/ResolvedDelegateProxy.sol";
+import { AddressManager } from "../src/legacy/AddressManager.sol";
+import { L1ChugSplashProxy } from "../src/legacy/L1ChugSplashProxy.sol";
+import { IL1ChugSplashDeployer } from "../src/legacy/L1ChugSplashProxy.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
-import { LegacyMintableERC20 } from "../legacy/LegacyMintableERC20.sol";
-import { SystemConfig } from "../L1/SystemConfig.sol";
-import { ResourceMetering } from "../L1/ResourceMetering.sol";
-import { Constants } from "../libraries/Constants.sol";
+import { LegacyMintableERC20 } from "../src/legacy/LegacyMintableERC20.sol";
+import { SystemConfig } from "../src/L1/SystemConfig.sol";
+import { ResourceMetering } from "../src/L1/ResourceMetering.sol";
+import { Constants } from "../src/libraries/Constants.sol";
 
 contract CommonTest is Test {
     address alice = address(128);

packages/contracts-bedrock/contracts/test/CrossDomainMessenger.t.sol → packages/contracts-bedrock/test/CrossDomainMessenger.t.sol

@@ -3,12 +3,12 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Messenger_Initializer, Reverter, CallerCaller, CommonTest } from "./CommonTest.t.sol";
-import { L1CrossDomainMessenger } from "../L1/L1CrossDomainMessenger.sol";
+import { L1CrossDomainMessenger } from "../src/L1/L1CrossDomainMessenger.sol";
 
 // Libraries
-import { Predeploys } from "../libraries/Predeploys.sol";
-import { Hashing } from "../libraries/Hashing.sol";
-import { Encoding } from "../libraries/Encoding.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
+import { Encoding } from "../src/libraries/Encoding.sol";
 
 // CrossDomainMessenger_Test is for testing functionality which is common to both the L1 and L2
 // CrossDomainMessenger contracts. For simplicity, we use the L1 Messenger as the test contract.

packages/contracts-bedrock/contracts/test/CrossDomainOwnable.t.sol → packages/contracts-bedrock/test/CrossDomainOwnable.t.sol

@@ -9,10 +9,10 @@ import { CommonTest, Portal_Initializer } from "./CommonTest.t.sol";
 import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
 
 // Target contract dependencies
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
 
 // Target contract
-import { CrossDomainOwnable } from "../L2/CrossDomainOwnable.sol";
+import { CrossDomainOwnable } from "../src/L2/CrossDomainOwnable.sol";
 
 contract XDomainSetter is CrossDomainOwnable {
     uint256 public value;

packages/contracts-bedrock/contracts/test/CrossDomainOwnable2.t.sol → packages/contracts-bedrock/test/CrossDomainOwnable2.t.sol

@@ -5,15 +5,15 @@ pragma solidity 0.8.15;
 import { CommonTest, Messenger_Initializer } from "./CommonTest.t.sol";
 
 // Libraries
-import { Hashing } from "../libraries/Hashing.sol";
-import { Encoding } from "../libraries/Encoding.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
+import { Encoding } from "../src/libraries/Encoding.sol";
 import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
 
 // Target contract dependencies
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
 
 // Target contract
-import { CrossDomainOwnable2 } from "../L2/CrossDomainOwnable2.sol";
+import { CrossDomainOwnable2 } from "../src/L2/CrossDomainOwnable2.sol";
 
 contract XDomainSetter2 is CrossDomainOwnable2 {
     uint256 public value;

packages/contracts-bedrock/contracts/test/CrossDomainOwnable3.t.sol → packages/contracts-bedrock/test/CrossDomainOwnable3.t.sol

@@ -5,15 +5,15 @@ pragma solidity 0.8.15;
 import { CommonTest, Messenger_Initializer } from "./CommonTest.t.sol";
 
 // Libraries
-import { Hashing } from "../libraries/Hashing.sol";
-import { Encoding } from "../libraries/Encoding.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
+import { Encoding } from "../src/libraries/Encoding.sol";
 import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
 
 // Target contract dependencies
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
 
 // Target contract
-import { CrossDomainOwnable3 } from "../L2/CrossDomainOwnable3.sol";
+import { CrossDomainOwnable3 } from "../src/L2/CrossDomainOwnable3.sol";
 
 contract XDomainSetter3 is CrossDomainOwnable3 {
     uint256 public value;

packages/contracts-bedrock/contracts/test/DeployerWhitelist.t.sol → packages/contracts-bedrock/test/DeployerWhitelist.t.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Target contract
-import { DeployerWhitelist } from "../legacy/DeployerWhitelist.sol";
+import { DeployerWhitelist } from "../src/legacy/DeployerWhitelist.sol";
 
 contract DeployerWhitelist_Test is CommonTest {
     DeployerWhitelist list;

packages/contracts-bedrock/contracts/test/DisputeGameFactory.t.sol → packages/contracts-bedrock/test/DisputeGameFactory.t.sol

 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "../libraries/DisputeTypes.sol";
-import "../libraries/DisputeErrors.sol";
+import "../src/libraries/DisputeTypes.sol";
+import "../src/libraries/DisputeErrors.sol";
 
 import { Test } from "forge-std/Test.sol";
-import { DisputeGameFactory } from "../dispute/DisputeGameFactory.sol";
-import { IDisputeGame } from "../dispute/interfaces/IDisputeGame.sol";
-import { Proxy } from "../universal/Proxy.sol";
+import { DisputeGameFactory } from "../src/dispute/DisputeGameFactory.sol";
+import { IDisputeGame } from "../src/dispute/interfaces/IDisputeGame.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
 
 contract DisputeGameFactory_Init is Test {
     DisputeGameFactory factory;

packages/contracts-bedrock/contracts/test/Drippie.t.sol → packages/contracts-bedrock/test/Drippie.t.sol

@@ -2,9 +2,9 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { Drippie } from "../periphery/drippie/Drippie.sol";
-import { IDripCheck } from "../periphery/drippie/IDripCheck.sol";
-import { CheckTrue } from "../periphery/drippie/dripchecks/CheckTrue.sol";
+import { Drippie } from "../src/periphery/drippie/Drippie.sol";
+import { IDripCheck } from "../src/periphery/drippie/IDripCheck.sol";
+import { CheckTrue } from "../src/periphery/drippie/dripchecks/CheckTrue.sol";
 import { SimpleStorage } from "./Helpers.sol";
 
 /// @title  TestDrippie

packages/contracts-bedrock/contracts/test/Encoding.t.sol → packages/contracts-bedrock/test/Encoding.t.sol

@@ -5,11 +5,11 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Libraries
-import { Types } from "../libraries/Types.sol";
-import { LegacyCrossDomainUtils } from "../libraries/LegacyCrossDomainUtils.sol";
+import { Types } from "../src/libraries/Types.sol";
+import { LegacyCrossDomainUtils } from "../src/libraries/LegacyCrossDomainUtils.sol";
 
 // Target contract
-import { Encoding } from "../libraries/Encoding.sol";
+import { Encoding } from "../src/libraries/Encoding.sol";
 
 contract Encoding_Test is CommonTest {
     /// @dev Tests encoding and decoding a nonce and version.

packages/contracts-bedrock/contracts/test/Faucet.t.sol → packages/contracts-bedrock/test/Faucet.t.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { Faucet } from "../periphery/faucet/Faucet.sol";
-import { AdminFaucetAuthModule } from "../periphery/faucet/authmodules/AdminFaucetAuthModule.sol";
+import { Faucet } from "../src/periphery/faucet/Faucet.sol";
+import { AdminFaucetAuthModule } from "../src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol";
 import { FaucetHelper } from "./Helpers.sol";
 
 contract Faucet_Initializer is Test {

packages/contracts-bedrock/contracts/test/FaultDisputeGame.t.sol → packages/contracts-bedrock/test/FaultDisputeGame.t.sol

@@ -4,14 +4,14 @@ pragma solidity ^0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 import { DisputeGameFactory_Init } from "./DisputeGameFactory.t.sol";
-import { DisputeGameFactory } from "../dispute/DisputeGameFactory.sol";
-import { FaultDisputeGame } from "../dispute/FaultDisputeGame.sol";
-
-import "../libraries/DisputeTypes.sol";
-import "../libraries/DisputeErrors.sol";
-import { LibClock } from "../dispute/lib/LibClock.sol";
-import { LibPosition } from "../dispute/lib/LibPosition.sol";
-import { IBigStepper } from "../dispute/interfaces/IBigStepper.sol";
+import { DisputeGameFactory } from "../src/dispute/DisputeGameFactory.sol";
+import { FaultDisputeGame } from "../src/dispute/FaultDisputeGame.sol";
+
+import "../src/libraries/DisputeTypes.sol";
+import "../src/libraries/DisputeErrors.sol";
+import { LibClock } from "../src/dispute/lib/LibClock.sol";
+import { LibPosition } from "../src/dispute/lib/LibPosition.sol";
+import { IBigStepper } from "../src/dispute/interfaces/IBigStepper.sol";
 
 contract FaultDisputeGame_Init is DisputeGameFactory_Init {
     /// @dev The extra data passed to the game for initialization.

packages/contracts-bedrock/contracts/test/FeeVault.t.sol → packages/contracts-bedrock/test/FeeVault.t.sol

@@ -3,17 +3,17 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Bridge_Initializer } from "./CommonTest.t.sol";
-import { BaseFeeVault } from "../L2/BaseFeeVault.sol";
-import { StandardBridge } from "../universal/StandardBridge.sol";
+import { BaseFeeVault } from "../src/L2/BaseFeeVault.sol";
+import { StandardBridge } from "../src/universal/StandardBridge.sol";
 
 // Libraries
-import { Predeploys } from "../libraries/Predeploys.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 // Target contract dependencies
-import { FeeVault } from "../universal/FeeVault.sol";
+import { FeeVault } from "../src/universal/FeeVault.sol";
 
 // Target contract
-import { L1FeeVault } from "../L2/L1FeeVault.sol";
+import { L1FeeVault } from "../src/L2/L1FeeVault.sol";
 
 // Test the implementations of the FeeVault
 contract FeeVault_Test is Bridge_Initializer {

packages/contracts-bedrock/contracts/test/GasPriceOracle.t.sol → packages/contracts-bedrock/test/GasPriceOracle.t.sol

@@ -5,11 +5,11 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Target contract dependencies
-import { L1Block } from "../L2/L1Block.sol";
-import { Predeploys } from "../libraries/Predeploys.sol";
+import { L1Block } from "../src/L2/L1Block.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 // Target contract
-import { GasPriceOracle } from "../L2/GasPriceOracle.sol";
+import { GasPriceOracle } from "../src/L2/GasPriceOracle.sol";
 
 contract GasPriceOracle_Test is CommonTest {
     event OverheadUpdated(uint256);

packages/contracts-bedrock/contracts/test/GovernanceToken.t.sol → packages/contracts-bedrock/test/GovernanceToken.t.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Target contract
-import { GovernanceToken } from "../governance/GovernanceToken.sol";
+import { GovernanceToken } from "../src/governance/GovernanceToken.sol";
 
 contract GovernanceToken_Test is CommonTest {
     address constant owner = address(0x1234);

packages/contracts-bedrock/contracts/test/Hashing.t.sol → packages/contracts-bedrock/test/Hashing.t.sol

@@ -5,12 +5,12 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Libraries
-import { Types } from "../libraries/Types.sol";
-import { Encoding } from "../libraries/Encoding.sol";
-import { LegacyCrossDomainUtils } from "../libraries/LegacyCrossDomainUtils.sol";
+import { Types } from "../src/libraries/Types.sol";
+import { Encoding } from "../src/libraries/Encoding.sol";
+import { LegacyCrossDomainUtils } from "../src/libraries/LegacyCrossDomainUtils.sol";
 
 // Target contract
-import { Hashing } from "../libraries/Hashing.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
 
 contract Hashing_hashDepositSource_Test is CommonTest {
     /// @notice Tests that hashDepositSource returns the correct hash in a simple case.

packages/contracts-bedrock/contracts/test/Helpers.sol → packages/contracts-bedrock/test/Helpers.sol

@@ -4,13 +4,13 @@ pragma solidity ^0.8.0;
 import { ERC20 } from "@rari-capital/solmate/src/tokens/ERC20.sol";
 import { ERC721 } from "@rari-capital/solmate/src/tokens/ERC721.sol";
 import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
-import { OptimistInviter } from "../periphery/op-nft/OptimistInviter.sol";
+import { OptimistInviter } from "../src/periphery/op-nft/OptimistInviter.sol";
 import { IERC1271 } from "@openzeppelin/contracts/interfaces/IERC1271.sol";
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 import {
     ECDSAUpgradeable
 } from "@openzeppelin/contracts-upgradeable/utils/cryptography/ECDSAUpgradeable.sol";
-import { AdminFaucetAuthModule } from "../periphery/faucet/authmodules/AdminFaucetAuthModule.sol";
+import { AdminFaucetAuthModule } from "../src/periphery/faucet/authmodules/AdminFaucetAuthModule.sol";
 
 contract TestERC20 is ERC20 {
     constructor() ERC20("TEST", "TST", 18) {}

packages/contracts-bedrock/contracts/test/L1Block.t.sol → packages/contracts-bedrock/test/L1Block.t.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Target contract
-import { L1Block } from "../L2/L1Block.sol";
+import { L1Block } from "../src/L2/L1Block.sol";
 
 contract L1BlockTest is CommonTest {
     L1Block lb;

packages/contracts-bedrock/contracts/test/L1BlockNumber.t.sol → packages/contracts-bedrock/test/L1BlockNumber.t.sol

@@ -5,11 +5,11 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Target contract dependencies
-import { L1Block } from "../L2/L1Block.sol";
-import { Predeploys } from "../libraries/Predeploys.sol";
+import { L1Block } from "../src/L2/L1Block.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 // Target contract
-import { L1BlockNumber } from "../legacy/L1BlockNumber.sol";
+import { L1BlockNumber } from "../src/legacy/L1BlockNumber.sol";
 
 contract L1BlockNumberTest is Test {
     L1Block lb;

packages/contracts-bedrock/contracts/test/L1CrossDomainMessenger.t.sol → packages/contracts-bedrock/test/L1CrossDomainMessenger.t.sol

@@ -6,17 +6,17 @@ import { Messenger_Initializer, Reverter, ConfigurableCaller } from "./CommonTes
 import { L2OutputOracle_Initializer } from "./L2OutputOracle.t.sol";
 
 // Libraries
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
-import { Predeploys } from "../libraries/Predeploys.sol";
-import { Hashing } from "../libraries/Hashing.sol";
-import { Encoding } from "../libraries/Encoding.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
+import { Encoding } from "../src/libraries/Encoding.sol";
 
 // Target contract dependencies
-import { L2OutputOracle } from "../L1/L2OutputOracle.sol";
-import { OptimismPortal } from "../L1/OptimismPortal.sol";
+import { L2OutputOracle } from "../src/L1/L2OutputOracle.sol";
+import { OptimismPortal } from "../src/L1/OptimismPortal.sol";
 
 // Target contract
-import { L1CrossDomainMessenger } from "../L1/L1CrossDomainMessenger.sol";
+import { L1CrossDomainMessenger } from "../src/L1/L1CrossDomainMessenger.sol";
 
 contract L1CrossDomainMessenger_Test is Messenger_Initializer {
     /// @dev The receiver address

packages/contracts-bedrock/contracts/test/L1ERC721Bridge.t.sol → packages/contracts-bedrock/test/L1ERC721Bridge.t.sol

@@ -6,10 +6,10 @@ import { Messenger_Initializer } from "./CommonTest.t.sol";
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 
 // Target contract dependencies
-import { L2ERC721Bridge } from "../L2/L2ERC721Bridge.sol";
+import { L2ERC721Bridge } from "../src/L2/L2ERC721Bridge.sol";
 
 // Target contract
-import { L1ERC721Bridge } from "../L1/L1ERC721Bridge.sol";
+import { L1ERC721Bridge } from "../src/L1/L1ERC721Bridge.sol";
 
 /// @dev Test ERC721 contract.
 contract TestERC721 is ERC721 {

packages/contracts-bedrock/contracts/test/L1StandardBridge.t.sol → packages/contracts-bedrock/test/L1StandardBridge.t.sol

@@ -7,16 +7,16 @@ import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { Bridge_Initializer } from "./CommonTest.t.sol";
 
 // Libraries
-import { Predeploys } from "../libraries/Predeploys.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 // Target contract dependencies
-import { StandardBridge } from "../universal/StandardBridge.sol";
-import { L2StandardBridge } from "../L2/L2StandardBridge.sol";
-import { CrossDomainMessenger } from "../universal/CrossDomainMessenger.sol";
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
+import { StandardBridge } from "../src/universal/StandardBridge.sol";
+import { L2StandardBridge } from "../src/L2/L2StandardBridge.sol";
+import { CrossDomainMessenger } from "../src/universal/CrossDomainMessenger.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
 
 // Target contract
-import { OptimismPortal } from "../L1/OptimismPortal.sol";
+import { OptimismPortal } from "../src/L1/OptimismPortal.sol";
 
 contract L1StandardBridge_Getter_Test is Bridge_Initializer {
     /// @dev Test that the accessors return the correct initialized values.

packages/contracts-bedrock/contracts/test/L2CrossDomainMessenger.t.sol → packages/contracts-bedrock/test/L2CrossDomainMessenger.t.sol

@@ -5,17 +5,17 @@ pragma solidity 0.8.15;
 import { Messenger_Initializer, Reverter, ConfigurableCaller } from "./CommonTest.t.sol";
 
 // Libraries
-import { Hashing } from "../libraries/Hashing.sol";
-import { Encoding } from "../libraries/Encoding.sol";
-import { Types } from "../libraries/Types.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
+import { Encoding } from "../src/libraries/Encoding.sol";
+import { Types } from "../src/libraries/Types.sol";
 
 // Target contract dependencies
-import { L2ToL1MessagePasser } from "../L2/L2ToL1MessagePasser.sol";
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
-import { L1CrossDomainMessenger } from "../L1/L1CrossDomainMessenger.sol";
+import { L2ToL1MessagePasser } from "../src/L2/L2ToL1MessagePasser.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
+import { L1CrossDomainMessenger } from "../src/L1/L1CrossDomainMessenger.sol";
 
 // Target contract
-import { L2CrossDomainMessenger } from "../L2/L2CrossDomainMessenger.sol";
+import { L2CrossDomainMessenger } from "../src/L2/L2CrossDomainMessenger.sol";
 
 contract L2CrossDomainMessenger_Test is Messenger_Initializer {
     /// @dev Receiver address for testing

packages/contracts-bedrock/contracts/test/L2ERC721Bridge.t.sol → packages/contracts-bedrock/test/L2ERC721Bridge.t.sol

@@ -6,11 +6,11 @@ import { Messenger_Initializer } from "./CommonTest.t.sol";
 
 // Target contract dependencies
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-import { L1ERC721Bridge } from "../L1/L1ERC721Bridge.sol";
-import { OptimismMintableERC721 } from "../universal/OptimismMintableERC721.sol";
+import { L1ERC721Bridge } from "../src/L1/L1ERC721Bridge.sol";
+import { OptimismMintableERC721 } from "../src/universal/OptimismMintableERC721.sol";
 
 // Target contract
-import { L2ERC721Bridge } from "../L2/L2ERC721Bridge.sol";
+import { L2ERC721Bridge } from "../src/L2/L2ERC721Bridge.sol";
 
 contract TestERC721 is ERC721 {
     constructor() ERC721("Test", "TST") {}

packages/contracts-bedrock/contracts/test/L2OutputOracle.t.sol → packages/contracts-bedrock/test/L2OutputOracle.t.sol

@@ -6,13 +6,13 @@ import { stdError } from "forge-std/Test.sol";
 import { L2OutputOracle_Initializer, NextImpl } from "./CommonTest.t.sol";
 
 // Libraries
-import { Types } from "../libraries/Types.sol";
+import { Types } from "../src/libraries/Types.sol";
 
 // Target contract dependencies
-import { Proxy } from "../universal/Proxy.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
 
 // Target contract
-import { L2OutputOracle } from "../L1/L2OutputOracle.sol";
+import { L2OutputOracle } from "../src/L1/L2OutputOracle.sol";
 
 contract L2OutputOracle_constructor_Test is L2OutputOracle_Initializer {
     /// @dev Tests that constructor sets the initial values correctly.

packages/contracts-bedrock/contracts/test/L2StandardBridge.t.sol → packages/contracts-bedrock/test/L2StandardBridge.t.sol

@@ -5,18 +5,18 @@ pragma solidity 0.8.15;
 // Target contract is imported by the `Bridge_Initializer`
 import { Bridge_Initializer } from "./CommonTest.t.sol";
 import { stdStorage, StdStorage } from "forge-std/Test.sol";
-import { CrossDomainMessenger } from "../universal/CrossDomainMessenger.sol";
-import { L2ToL1MessagePasser } from "../L2/L2ToL1MessagePasser.sol";
+import { CrossDomainMessenger } from "../src/universal/CrossDomainMessenger.sol";
+import { L2ToL1MessagePasser } from "../src/L2/L2ToL1MessagePasser.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // Libraries
-import { Hashing } from "../libraries/Hashing.sol";
-import { Types } from "../libraries/Types.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
+import { Types } from "../src/libraries/Types.sol";
 
 // Target contract dependencies
-import { Predeploys } from "../libraries/Predeploys.sol";
-import { StandardBridge } from "../universal/StandardBridge.sol";
-import { OptimismMintableERC20 } from "../universal/OptimismMintableERC20.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
+import { StandardBridge } from "../src/universal/StandardBridge.sol";
+import { OptimismMintableERC20 } from "../src/universal/OptimismMintableERC20.sol";
 
 contract L2StandardBridge_Test is Bridge_Initializer {
     using stdStorage for StdStorage;

packages/contracts-bedrock/contracts/test/L2ToL1MessagePasser.t.sol → packages/contracts-bedrock/test/L2ToL1MessagePasser.t.sol

@@ -5,11 +5,11 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Libraries
-import { Types } from "../libraries/Types.sol";
-import { Hashing } from "../libraries/Hashing.sol";
+import { Types } from "../src/libraries/Types.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
 
 // Target contract
-import { L2ToL1MessagePasser } from "../L2/L2ToL1MessagePasser.sol";
+import { L2ToL1MessagePasser } from "../src/L2/L2ToL1MessagePasser.sol";
 
 contract L2ToL1MessagePasserTest is CommonTest {
     L2ToL1MessagePasser messagePasser;

packages/contracts-bedrock/contracts/test/LegacyERC20ETH.t.sol → packages/contracts-bedrock/test/LegacyERC20ETH.t.sol

@@ -5,10 +5,10 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Target contract dependencies
-import { Predeploys } from "../libraries/Predeploys.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 // Target contract
-import { LegacyERC20ETH } from "../legacy/LegacyERC20ETH.sol";
+import { LegacyERC20ETH } from "../src/legacy/LegacyERC20ETH.sol";
 
 contract LegacyERC20ETH_Test is CommonTest {
     LegacyERC20ETH eth;

packages/contracts-bedrock/contracts/test/LegacyMessagePasser.t.sol → packages/contracts-bedrock/test/LegacyMessagePasser.t.sol

@@ -5,10 +5,10 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Testing contract dependencies
-import { Predeploys } from "../libraries/Predeploys.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 // Target contract
-import { LegacyMessagePasser } from "../legacy/LegacyMessagePasser.sol";
+import { LegacyMessagePasser } from "../src/legacy/LegacyMessagePasser.sol";
 
 contract LegacyMessagePasser_Test is CommonTest {
     LegacyMessagePasser messagePasser;

packages/contracts-bedrock/contracts/test/LibClock.t.sol → packages/contracts-bedrock/test/LibClock.t.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { LibClock } from "../dispute/lib/LibClock.sol";
-import "../libraries/DisputeTypes.sol";
+import { LibClock } from "../src/dispute/lib/LibClock.sol";
+import "../src/libraries/DisputeTypes.sol";
 
 /// @notice Tests for `LibClock`
 contract LibClock_Test is Test {

packages/contracts-bedrock/contracts/test/LibPosition.t.sol → packages/contracts-bedrock/test/LibPosition.t.sol

@@ -2,8 +2,8 @@
 pragma solidity ^0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { LibPosition } from "../dispute/lib/LibPosition.sol";
-import "../libraries/DisputeTypes.sol";
+import { LibPosition } from "../src/dispute/lib/LibPosition.sol";
+import "../src/libraries/DisputeTypes.sol";
 
 /// @notice Tests for `LibPosition`
 contract LibPosition_Test is Test {

packages/contracts-bedrock/contracts/test/MerkleTrie.t.sol → packages/contracts-bedrock/test/MerkleTrie.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { CommonTest } from "./CommonTest.t.sol";
-import { MerkleTrie } from "../libraries/trie/MerkleTrie.sol";
+import { MerkleTrie } from "../src/libraries/trie/MerkleTrie.sol";
 
 contract MerkleTrie_get_Test is CommonTest {
     function test_get_validProof1_succeeds() external {

packages/contracts-bedrock/contracts/test/MintManager.t.sol → packages/contracts-bedrock/test/MintManager.t.sol

@@ -5,10 +5,10 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Target contract dependencies
-import { GovernanceToken } from "../governance/GovernanceToken.sol";
+import { GovernanceToken } from "../src/governance/GovernanceToken.sol";
 
 // Target contract
-import { MintManager } from "../governance/MintManager.sol";
+import { MintManager } from "../src/governance/MintManager.sol";
 
 contract MintManager_Initializer is CommonTest {
     address constant owner = address(0x1234);

packages/contracts-bedrock/contracts/test/OptimismMintableERC20.t.sol → packages/contracts-bedrock/test/OptimismMintableERC20.t.sol

@@ -5,7 +5,7 @@ import { Bridge_Initializer } from "./CommonTest.t.sol";
 import {
     ILegacyMintableERC20,
     IOptimismMintableERC20
-} from "../universal/IOptimismMintableERC20.sol";
+} from "../src/universal/IOptimismMintableERC20.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 contract OptimismMintableERC20_Test is Bridge_Initializer {

packages/contracts-bedrock/contracts/test/OptimismMintableERC721.t.sol → packages/contracts-bedrock/test/OptimismMintableERC721.t.sol

@@ -11,7 +11,7 @@ import { ERC721Bridge_Initializer } from "./CommonTest.t.sol";
 import {
     OptimismMintableERC721,
     IOptimismMintableERC721
-} from "../universal/OptimismMintableERC721.sol";
+} from "../src/universal/OptimismMintableERC721.sol";
 
 contract OptimismMintableERC721_Test is ERC721Bridge_Initializer {
     ERC721 internal L1Token;

packages/contracts-bedrock/contracts/test/OptimismMintableERC721Factory.t.sol → packages/contracts-bedrock/test/OptimismMintableERC721Factory.t.sol

@@ -4,8 +4,8 @@ pragma solidity 0.8.15;
 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import { ERC721Bridge_Initializer } from "./CommonTest.t.sol";
 import { LibRLP } from "./RLP.t.sol";
-import { OptimismMintableERC721 } from "../universal/OptimismMintableERC721.sol";
-import { OptimismMintableERC721Factory } from "../universal/OptimismMintableERC721Factory.sol";
+import { OptimismMintableERC721 } from "../src/universal/OptimismMintableERC721.sol";
+import { OptimismMintableERC721Factory } from "../src/universal/OptimismMintableERC721Factory.sol";
 
 contract OptimismMintableERC721Factory_Test is ERC721Bridge_Initializer {
     OptimismMintableERC721Factory internal factory;

packages/contracts-bedrock/contracts/test/OptimismPortal.t.sol → packages/contracts-bedrock/test/OptimismPortal.t.sol

@@ -6,17 +6,17 @@ import { stdError } from "forge-std/Test.sol";
 import { Portal_Initializer, CommonTest, NextImpl } from "./CommonTest.t.sol";
 
 // Libraries
-import { Types } from "../libraries/Types.sol";
-import { Hashing } from "../libraries/Hashing.sol";
+import { Types } from "../src/libraries/Types.sol";
+import { Hashing } from "../src/libraries/Hashing.sol";
 
 // Target contract dependencies
-import { Proxy } from "../universal/Proxy.sol";
-import { ResourceMetering } from "../L1/ResourceMetering.sol";
-import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
-import { L2OutputOracle } from "../L1/L2OutputOracle.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
+import { ResourceMetering } from "../src/L1/ResourceMetering.sol";
+import { AddressAliasHelper } from "../src/vendor/AddressAliasHelper.sol";
+import { L2OutputOracle } from "../src/L1/L2OutputOracle.sol";
 
 // Target contract
-import { OptimismPortal } from "../L1/OptimismPortal.sol";
+import { OptimismPortal } from "../src/L1/OptimismPortal.sol";
 
 contract OptimismPortal_Test is Portal_Initializer {
     event Paused(address);

packages/contracts-bedrock/contracts/test/Optimist.t.sol → packages/contracts-bedrock/test/Optimist.t.sol

@@ -3,10 +3,10 @@ pragma solidity >=0.6.2 <0.9.0;
 
 // Testing utilities
 import { Test } from "forge-std/Test.sol";
-import { AttestationStation } from "../periphery/op-nft/AttestationStation.sol";
-import { Optimist } from "../periphery/op-nft/Optimist.sol";
-import { OptimistAllowlist } from "../periphery/op-nft/OptimistAllowlist.sol";
-import { OptimistInviter } from "../periphery/op-nft/OptimistInviter.sol";
+import { AttestationStation } from "../src/periphery/op-nft/AttestationStation.sol";
+import { Optimist } from "../src/periphery/op-nft/Optimist.sol";
+import { OptimistAllowlist } from "../src/periphery/op-nft/OptimistAllowlist.sol";
+import { OptimistInviter } from "../src/periphery/op-nft/OptimistInviter.sol";
 import { OptimistInviterHelper } from "./Helpers.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";

packages/contracts-bedrock/contracts/test/OptimistAllowlist.t.sol → packages/contracts-bedrock/test/OptimistAllowlist.t.sol

@@ -3,11 +3,11 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Test } from "forge-std/Test.sol";
-import { AttestationStation } from "../periphery/op-nft/AttestationStation.sol";
-import { OptimistAllowlist } from "../periphery/op-nft/OptimistAllowlist.sol";
-import { OptimistInviter } from "../periphery/op-nft/OptimistInviter.sol";
+import { AttestationStation } from "../src/periphery/op-nft/AttestationStation.sol";
+import { OptimistAllowlist } from "../src/periphery/op-nft/OptimistAllowlist.sol";
+import { OptimistInviter } from "../src/periphery/op-nft/OptimistInviter.sol";
 import { OptimistInviterHelper } from "./Helpers.sol";
-import { OptimistConstants } from "../periphery/op-nft/libraries/OptimistConstants.sol";
+import { OptimistConstants } from "../src/periphery/op-nft/libraries/OptimistConstants.sol";
 
 contract OptimistAllowlist_Initializer is Test {
     event AttestationCreated(

packages/contracts-bedrock/contracts/test/OptimistInviter.t.sol → packages/contracts-bedrock/test/OptimistInviter.t.sol

@@ -3,13 +3,13 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { Test } from "forge-std/Test.sol";
-import { AttestationStation } from "../periphery/op-nft/AttestationStation.sol";
-import { OptimistInviter } from "../periphery/op-nft/OptimistInviter.sol";
-import { Optimist } from "../periphery/op-nft/Optimist.sol";
+import { AttestationStation } from "../src/periphery/op-nft/AttestationStation.sol";
+import { OptimistInviter } from "../src/periphery/op-nft/OptimistInviter.sol";
+import { Optimist } from "../src/periphery/op-nft/Optimist.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { TestERC1271Wallet } from "./Helpers.sol";
 import { OptimistInviterHelper } from "./Helpers.sol";
-import { OptimistConstants } from "../periphery/op-nft/libraries/OptimistConstants.sol";
+import { OptimistConstants } from "../src/periphery/op-nft/libraries/OptimistConstants.sol";
 
 contract OptimistInviter_Initializer is Test {
     event InviteClaimed(address indexed issuer, address indexed claimer);

packages/contracts-bedrock/contracts/test/PreimageOracle.t.sol → packages/contracts-bedrock/test/PreimageOracle.t.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 
-import { PreimageOracle } from "../cannon/PreimageOracle.sol";
+import { PreimageOracle } from "../src/cannon/PreimageOracle.sol";
 
 contract PreimageOracle_Test is Test {
     PreimageOracle oracle;

packages/contracts-bedrock/contracts/test/Proxy.t.sol → packages/contracts-bedrock/test/Proxy.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { Proxy } from "../universal/Proxy.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
 import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
 
 contract SimpleStorage {

packages/contracts-bedrock/contracts/test/ProxyAdmin.t.sol → packages/contracts-bedrock/test/ProxyAdmin.t.sol

@@ -2,12 +2,12 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { Proxy } from "../universal/Proxy.sol";
-import { ProxyAdmin } from "../universal/ProxyAdmin.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
+import { ProxyAdmin } from "../src/universal/ProxyAdmin.sol";
 import { SimpleStorage } from "./Proxy.t.sol";
-import { L1ChugSplashProxy } from "../legacy/L1ChugSplashProxy.sol";
-import { ResolvedDelegateProxy } from "../legacy/ResolvedDelegateProxy.sol";
-import { AddressManager } from "../legacy/AddressManager.sol";
+import { L1ChugSplashProxy } from "../src/legacy/L1ChugSplashProxy.sol";
+import { ResolvedDelegateProxy } from "../src/legacy/ResolvedDelegateProxy.sol";
+import { AddressManager } from "../src/legacy/AddressManager.sol";
 
 contract ProxyAdmin_Test is Test {
     address alice = address(64);

packages/contracts-bedrock/contracts/test/RLPReader.t.sol → packages/contracts-bedrock/test/RLPReader.t.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { stdError } from "forge-std/Test.sol";
 import { CommonTest } from "./CommonTest.t.sol";
-import { RLPReader } from "../libraries/rlp/RLPReader.sol";
+import { RLPReader } from "../src/libraries/rlp/RLPReader.sol";
 
 contract RLPReader_readBytes_Test is CommonTest {
     function test_readBytes_bytestring00_succeeds() external {

packages/contracts-bedrock/contracts/test/RLPWriter.t.sol → packages/contracts-bedrock/test/RLPWriter.t.sol

 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { RLPWriter } from "../libraries/rlp/RLPWriter.sol";
+import { RLPWriter } from "../src/libraries/rlp/RLPWriter.sol";
 import { CommonTest } from "./CommonTest.t.sol";
 
 contract RLPWriter_writeString_Test is CommonTest {

packages/contracts-bedrock/contracts/test/ResolvedDelegateProxy.t.sol → packages/contracts-bedrock/test/ResolvedDelegateProxy.t.sol

@@ -5,10 +5,10 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Target contract dependencies
-import { AddressManager } from "../legacy/AddressManager.sol";
+import { AddressManager } from "../src/legacy/AddressManager.sol";
 
 // Target contract
-import { ResolvedDelegateProxy } from "../legacy/ResolvedDelegateProxy.sol";
+import { ResolvedDelegateProxy } from "../src/legacy/ResolvedDelegateProxy.sol";
 
 contract ResolvedDelegateProxy_Test is Test {
     AddressManager internal addressManager;

packages/contracts-bedrock/contracts/test/ResourceMetering.t.sol → packages/contracts-bedrock/test/ResourceMetering.t.sol

@@ -5,13 +5,13 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 
 // Libraries
-import { Constants } from "../libraries/Constants.sol";
+import { Constants } from "../src/libraries/Constants.sol";
 
 // Target contract dependencies
-import { Proxy } from "../universal/Proxy.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
 
 // Target contract
-import { ResourceMetering } from "../L1/ResourceMetering.sol";
+import { ResourceMetering } from "../src/L1/ResourceMetering.sol";
 
 contract MeterUser is ResourceMetering {
     ResourceMetering.ResourceConfig public innerConfig;

packages/contracts-bedrock/contracts/test/SafeCall.t.sol → packages/contracts-bedrock/test/SafeCall.t.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Target contract
-import { SafeCall } from "../libraries/SafeCall.sol";
+import { SafeCall } from "../src/libraries/SafeCall.sol";
 
 contract SafeCall_Test is CommonTest {
     /// @dev Tests that the `send` function succeeds.

packages/contracts-bedrock/contracts/test/Semver.t.sol → packages/contracts-bedrock/test/Semver.t.sol

@@ -2,8 +2,8 @@
 pragma solidity 0.8.15;
 
 import { CommonTest } from "./CommonTest.t.sol";
-import { Semver } from "../universal/Semver.sol";
-import { Proxy } from "../universal/Proxy.sol";
+import { Semver } from "../src/universal/Semver.sol";
+import { Proxy } from "../src/universal/Proxy.sol";
 
 /// @notice Test the Semver contract that is used for semantic versioning
 ///         of various contracts.

packages/contracts-bedrock/contracts/test/SequencerFeeVault.t.sol → packages/contracts-bedrock/test/SequencerFeeVault.t.sol

@@ -3,16 +3,16 @@ pragma solidity 0.8.15;
 
 // Testing utilities
 import { FeeVault_Initializer } from "./CommonTest.t.sol";
-import { StandardBridge } from "../universal/StandardBridge.sol";
+import { StandardBridge } from "../src/universal/StandardBridge.sol";
 
 // Libraries
-import { Predeploys } from "../libraries/Predeploys.sol";
+import { Predeploys } from "../src/libraries/Predeploys.sol";
 
 // Target contract dependencies
-import { FeeVault } from "../universal/FeeVault.sol";
+import { FeeVault } from "../src/universal/FeeVault.sol";
 
 // Target contract
-import { SequencerFeeVault } from "../L2/SequencerFeeVault.sol";
+import { SequencerFeeVault } from "../src/L2/SequencerFeeVault.sol";
 
 contract SequencerFeeVault_Test is FeeVault_Initializer {
     /// @dev Sets up the test suite.

packages/contracts-bedrock/contracts/test/StandardBridge.t.sol → packages/contracts-bedrock/test/StandardBridge.t.sol

 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.15;
 
-import { StandardBridge } from "../universal/StandardBridge.sol";
+import { StandardBridge } from "../src/universal/StandardBridge.sol";
 import { CommonTest } from "./CommonTest.t.sol";
 import {
     OptimismMintableERC20,
     ILegacyMintableERC20
-} from "../universal/OptimismMintableERC20.sol";
+} from "../src/universal/OptimismMintableERC20.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 /// @title StandardBridgeTester

packages/contracts-bedrock/contracts/test/SystemConfig.t.sol → packages/contracts-bedrock/test/SystemConfig.t.sol

@@ -5,13 +5,13 @@ pragma solidity 0.8.15;
 import { CommonTest } from "./CommonTest.t.sol";
 
 // Libraries
-import { Constants } from "../libraries/Constants.sol";
+import { Constants } from "../src/libraries/Constants.sol";
 
 // Target contract dependencies
-import { ResourceMetering } from "../L1/ResourceMetering.sol";
+import { ResourceMetering } from "../src/L1/ResourceMetering.sol";
 
 // Target contract
-import { SystemConfig } from "../L1/SystemConfig.sol";
+import { SystemConfig } from "../src/L1/SystemConfig.sol";
 
 contract SystemConfig_Init is CommonTest {
     SystemConfig sysConf;

packages/contracts-bedrock/contracts/test/Transactor.t.sol → packages/contracts-bedrock/test/Transactor.t.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { CallRecorder } from "./Helpers.sol";
 import { Reverter } from "./Helpers.sol";
-import { Transactor } from "../periphery/Transactor.sol";
+import { Transactor } from "../src/periphery/Transactor.sol";
 
 contract Transactor_Initializer is Test {
     address alice = address(128);

packages/contracts-bedrock/contracts/test/TransferOnion.t.sol → packages/contracts-bedrock/test/TransferOnion.t.sol

@@ -6,7 +6,7 @@ import { Test } from "forge-std/Test.sol";
 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 // Target contract
-import { TransferOnion } from "../periphery/TransferOnion.sol";
+import { TransferOnion } from "../src/periphery/TransferOnion.sol";
 
 /// @title  TransferOnionTest
 /// @notice Test coverage of TransferOnion

packages/contracts-bedrock/contracts/test/invariants/AddressAliasHelper.t.sol → packages/contracts-bedrock/test/invariants/AddressAliasHelper.t.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 import { StdInvariant } from "forge-std/StdInvariant.sol";
-import { AddressAliasHelper } from "../../vendor/AddressAliasHelper.sol";
+import { AddressAliasHelper } from "../../src/vendor/AddressAliasHelper.sol";
 
 contract AddressAliasHelper_Converter {
     bool public failedRoundtrip;

packages/contracts-bedrock/contracts/test/invariants/Burn.Eth.t.sol → packages/contracts-bedrock/test/invariants/Burn.Eth.t.sol

@@ -6,7 +6,7 @@ import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 
 import { StdInvariant } from "forge-std/StdInvariant.sol";
-import { Burn } from "../../libraries/Burn.sol";
+import { Burn } from "../../src/libraries/Burn.sol";
 
 contract Burn_EthBurner is StdUtils {
     Vm internal vm;

packages/contracts-bedrock/contracts/test/invariants/Burn.Gas.t.sol → packages/contracts-bedrock/test/invariants/Burn.Gas.t.sol

@@ -6,7 +6,7 @@ import { Test } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 
 import { StdInvariant } from "forge-std/StdInvariant.sol";
-import { Burn } from "../../libraries/Burn.sol";
+import { Burn } from "../../src/libraries/Burn.sol";
 
 contract Burn_GasBurner is StdUtils {
     Vm internal vm;

packages/contracts-bedrock/contracts/test/invariants/CrossDomainMessenger.t.sol → packages/contracts-bedrock/test/invariants/CrossDomainMessenger.t.sol

@@ -3,14 +3,14 @@ pragma solidity 0.8.15;
 
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { Vm } from "forge-std/Vm.sol";
-import { OptimismPortal } from "../../L1/OptimismPortal.sol";
-import { L1CrossDomainMessenger } from "../../L1/L1CrossDomainMessenger.sol";
+import { OptimismPortal } from "../../src/L1/OptimismPortal.sol";
+import { L1CrossDomainMessenger } from "../../src/L1/L1CrossDomainMessenger.sol";
 import { Messenger_Initializer } from "../CommonTest.t.sol";
-import { Types } from "../../libraries/Types.sol";
-import { Predeploys } from "../../libraries/Predeploys.sol";
-import { Constants } from "../../libraries/Constants.sol";
-import { Encoding } from "../../libraries/Encoding.sol";
-import { Hashing } from "../../libraries/Hashing.sol";
+import { Types } from "../../src/libraries/Types.sol";
+import { Predeploys } from "../../src/libraries/Predeploys.sol";
+import { Constants } from "../../src/libraries/Constants.sol";
+import { Encoding } from "../../src/libraries/Encoding.sol";
+import { Hashing } from "../../src/libraries/Hashing.sol";
 
 contract RelayActor is StdUtils {
     // Storage slot of the l2Sender

packages/contracts-bedrock/contracts/test/invariants/Encoding.t.sol → packages/contracts-bedrock/test/invariants/Encoding.t.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 import { StdInvariant } from "forge-std/StdInvariant.sol";
-import { Encoding } from "../../libraries/Encoding.sol";
+import { Encoding } from "../../src/libraries/Encoding.sol";
 
 contract Encoding_Converter {
     bool public failedRoundtripAToB;

packages/contracts-bedrock/contracts/test/invariants/Hashing.t.sol → packages/contracts-bedrock/test/invariants/Hashing.t.sol

@@ -3,8 +3,8 @@ pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
 import { StdInvariant } from "forge-std/StdInvariant.sol";
-import { Encoding } from "../../libraries/Encoding.sol";
-import { Hashing } from "../../libraries/Hashing.sol";
+import { Encoding } from "../../src/libraries/Encoding.sol";
+import { Hashing } from "../../src/libraries/Hashing.sol";
 
 contract Hash_CrossDomainHasher {
     bool public failedCrossDomainHashHighVersion;

packages/contracts-bedrock/contracts/test/invariants/L2OutputOracle.t.sol → packages/contracts-bedrock/test/invariants/L2OutputOracle.t.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 import { L2OutputOracle_Initializer } from "../CommonTest.t.sol";
-import { L2OutputOracle } from "../../L1/L2OutputOracle.sol";
+import { L2OutputOracle } from "../../src/L1/L2OutputOracle.sol";
 import { Vm } from "forge-std/Vm.sol";
 
 contract L2OutputOracle_Proposer {

packages/contracts-bedrock/contracts/test/invariants/OptimismPortal.t.sol → packages/contracts-bedrock/test/invariants/OptimismPortal.t.sol

@@ -4,15 +4,15 @@ pragma solidity 0.8.15;
 import { StdUtils } from "forge-std/Test.sol";
 import { Vm } from "forge-std/Vm.sol";
 
-import { OptimismPortal } from "../../L1/OptimismPortal.sol";
-import { L2OutputOracle } from "../../L1/L2OutputOracle.sol";
-import { AddressAliasHelper } from "../../vendor/AddressAliasHelper.sol";
-import { SystemConfig } from "../../L1/SystemConfig.sol";
-import { ResourceMetering } from "../../L1/ResourceMetering.sol";
-import { Constants } from "../../libraries/Constants.sol";
+import { OptimismPortal } from "../../src/L1/OptimismPortal.sol";
+import { L2OutputOracle } from "../../src/L1/L2OutputOracle.sol";
+import { AddressAliasHelper } from "../../src/vendor/AddressAliasHelper.sol";
+import { SystemConfig } from "../../src/L1/SystemConfig.sol";
+import { ResourceMetering } from "../../src/L1/ResourceMetering.sol";
+import { Constants } from "../../src/libraries/Constants.sol";
 
 import { Portal_Initializer } from "../CommonTest.t.sol";
-import { Types } from "../../libraries/Types.sol";
+import { Types } from "../../src/libraries/Types.sol";
 
 contract OptimismPortal_Depositor is StdUtils, ResourceMetering {
     Vm internal vm;

packages/contracts-bedrock/contracts/test/invariants/ResourceMetering.t.sol → packages/contracts-bedrock/test/invariants/ResourceMetering.t.sol

@@ -6,10 +6,10 @@ import { Test } from "forge-std/Test.sol";
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { StdInvariant } from "forge-std/StdInvariant.sol";
 
-import { Arithmetic } from "../../libraries/Arithmetic.sol";
-import { ResourceMetering } from "../../L1/ResourceMetering.sol";
-import { Proxy } from "../../universal/Proxy.sol";
-import { Constants } from "../../libraries/Constants.sol";
+import { Arithmetic } from "../../src/libraries/Arithmetic.sol";
+import { ResourceMetering } from "../../src/L1/ResourceMetering.sol";
+import { Proxy } from "../../src/universal/Proxy.sol";
+import { Constants } from "../../src/libraries/Constants.sol";
 
 contract ResourceMetering_User is StdUtils, ResourceMetering {
     bool public failedMaxGasPerBlock;

packages/contracts-bedrock/contracts/test/invariants/SafeCall.t.sol → packages/contracts-bedrock/test/invariants/SafeCall.t.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
 import { Test } from "forge-std/Test.sol";
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { Vm } from "forge-std/Vm.sol";
-import { SafeCall } from "../../libraries/SafeCall.sol";
+import { SafeCall } from "../../src/libraries/SafeCall.sol";
 
 contract SafeCall_Succeeds_Invariants is Test {
     SafeCaller_Actor actor;

packages/contracts-bedrock/contracts/test/invariants/SystemConfig.t.sol → packages/contracts-bedrock/test/invariants/SystemConfig.t.sol

@@ -2,9 +2,9 @@
 pragma solidity 0.8.15;
 
 import { Test } from "forge-std/Test.sol";
-import { SystemConfig } from "../../L1/SystemConfig.sol";
-import { ResourceMetering } from "../../L1/ResourceMetering.sol";
-import { Constants } from "../../libraries/Constants.sol";
+import { SystemConfig } from "../../src/L1/SystemConfig.sol";
+import { ResourceMetering } from "../../src/L1/ResourceMetering.sol";
+import { Constants } from "../../src/libraries/Constants.sol";
 
 contract SystemConfig_GasLimitLowerBound_Invariant is Test {
     SystemConfig public config;