Split contracts into L1/L2 and messaging/rollup/verification folders

packages/contracts/contracts/bridge/messaging/OVM_L1CrossDomainMessenger.sol → packages/contracts/contracts/L1/messaging/OVM_L1CrossDomainMessenger.sol

@@ -12,8 +12,8 @@ import { Lib_CrossDomainUtils } from "../../libraries/bridge/Lib_CrossDomainUtil
 
 /* Interface Imports */
 import { iOVM_L1CrossDomainMessenger } from "./iOVM_L1CrossDomainMessenger.sol";
-import { iOVM_CanonicalTransactionChain } from "../../chain/iOVM_CanonicalTransactionChain.sol";
-import { iOVM_StateCommitmentChain } from "../../chain/iOVM_StateCommitmentChain.sol";
+import { iOVM_CanonicalTransactionChain } from "../rollup/iOVM_CanonicalTransactionChain.sol";
+import { iOVM_StateCommitmentChain } from "../rollup/iOVM_StateCommitmentChain.sol";
 
 /* External Imports */
 import { OwnableUpgradeable } from

packages/contracts/contracts/bridge/tokens/OVM_L1StandardBridge.sol → packages/contracts/contracts/L1/messaging/OVM_L1StandardBridge.sol

@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2;
 /* Interface Imports */
 import { iOVM_L1StandardBridge } from "./iOVM_L1StandardBridge.sol";
 import { iOVM_L1ERC20Bridge } from "./iOVM_L1ERC20Bridge.sol";
-import { iOVM_L2ERC20Bridge } from "./iOVM_L2ERC20Bridge.sol";
+import { iOVM_L2ERC20Bridge } from "../../L2/messaging/iOVM_L2ERC20Bridge.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 /* Library Imports */

packages/contracts/contracts/bridge/messaging/iOVM_L1CrossDomainMessenger.sol → packages/contracts/contracts/L1/messaging/iOVM_L1CrossDomainMessenger.sol

@@ -6,7 +6,7 @@ pragma experimental ABIEncoderV2;
 import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 
 /* Interface Imports */
-import { iOVM_CrossDomainMessenger } from "./iOVM_CrossDomainMessenger.sol";
+import { iOVM_CrossDomainMessenger } from "../../libraries/bridge/iOVM_CrossDomainMessenger.sol";
 
 /**
  * @title iOVM_L1CrossDomainMessenger

packages/contracts/contracts/chain/OVM_CanonicalTransactionChain.sol → packages/contracts/contracts/L1/rollup/OVM_CanonicalTransactionChain.sol

@@ -4,9 +4,9 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_OVMCodec } from "../libraries/codec/Lib_OVMCodec.sol";
-import { Lib_AddressResolver } from "../libraries/resolver/Lib_AddressResolver.sol";
-import { Lib_MerkleTree } from "../libraries/utils/Lib_MerkleTree.sol";
+import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
+import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
+import { Lib_MerkleTree } from "../../libraries/utils/Lib_MerkleTree.sol";
 
 /* Interface Imports */
 import { iOVM_CanonicalTransactionChain } from "./iOVM_CanonicalTransactionChain.sol";

packages/contracts/contracts/chain/OVM_ChainStorageContainer.sol → packages/contracts/contracts/L1/rollup/OVM_ChainStorageContainer.sol

@@ -2,8 +2,8 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
-import { Lib_Buffer } from "../libraries/utils/Lib_Buffer.sol";
-import { Lib_AddressResolver } from "../libraries/resolver/Lib_AddressResolver.sol";
+import { Lib_Buffer } from "../../libraries/utils/Lib_Buffer.sol";
+import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
 
 /* Interface Imports */
 import { iOVM_ChainStorageContainer } from "./iOVM_ChainStorageContainer.sol";

packages/contracts/contracts/chain/OVM_StateCommitmentChain.sol → packages/contracts/contracts/L1/rollup/OVM_StateCommitmentChain.sol

@@ -3,9 +3,9 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_OVMCodec } from "../libraries/codec/Lib_OVMCodec.sol";
-import { Lib_AddressResolver } from "../libraries/resolver/Lib_AddressResolver.sol";
-import { Lib_MerkleTree } from "../libraries/utils/Lib_MerkleTree.sol";
+import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
+import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
+import { Lib_MerkleTree } from "../../libraries/utils/Lib_MerkleTree.sol";
 
 /* Interface Imports */
 import { iOVM_StateCommitmentChain } from "./iOVM_StateCommitmentChain.sol";

packages/contracts/contracts/chain/iOVM_CanonicalTransactionChain.sol → packages/contracts/contracts/L1/rollup/iOVM_CanonicalTransactionChain.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_OVMCodec } from "../libraries/codec/Lib_OVMCodec.sol";
+import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 
 /* Interface Imports */
 import { iOVM_ChainStorageContainer } from "./iOVM_ChainStorageContainer.sol";

packages/contracts/contracts/chain/iOVM_StateCommitmentChain.sol → packages/contracts/contracts/L1/rollup/iOVM_StateCommitmentChain.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_OVMCodec } from "../libraries/codec/Lib_OVMCodec.sol";
+import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
 
 /**
  * @title iOVM_StateCommitmentChain

packages/contracts/contracts/verification/OVM_BondManager.sol → packages/contracts/contracts/L1/verification/OVM_BondManager.sol

@@ -5,7 +5,7 @@ pragma solidity >0.5.0 <0.8.0;
 import { iOVM_BondManager } from "./iOVM_BondManager.sol";
 
 /* Contract Imports */
-import { Lib_AddressResolver } from "../libraries/resolver/Lib_AddressResolver.sol";
+import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
 
 /**
  * @title OVM_BondManager

packages/contracts/contracts/bridge/messaging/OVM_L2CrossDomainMessenger.sol → packages/contracts/contracts/L2/messaging/OVM_L2CrossDomainMessenger.sol

@@ -8,8 +8,8 @@ import { Lib_CrossDomainUtils } from "../../libraries/bridge/Lib_CrossDomainUtil
 
 /* Interface Imports */
 import { iOVM_L2CrossDomainMessenger } from "./iOVM_L2CrossDomainMessenger.sol";
-import { iOVM_L1MessageSender } from "../../predeploys/iOVM_L1MessageSender.sol";
-import { iOVM_L2ToL1MessagePasser } from "../../predeploys/iOVM_L2ToL1MessagePasser.sol";
+import { iOVM_L1MessageSender } from "../predeploys/iOVM_L1MessageSender.sol";
+import { iOVM_L2ToL1MessagePasser } from "../predeploys/iOVM_L2ToL1MessagePasser.sol";
 
 /* External Imports */
 import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";

packages/contracts/contracts/bridge/tokens/OVM_L2StandardBridge.sol → packages/contracts/contracts/L2/messaging/OVM_L2StandardBridge.sol

@@ -3,8 +3,8 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Interface Imports */
-import { iOVM_L1StandardBridge } from "./iOVM_L1StandardBridge.sol";
-import { iOVM_L1ERC20Bridge } from "./iOVM_L1ERC20Bridge.sol";
+import { iOVM_L1StandardBridge } from "../../L1/messaging/iOVM_L1StandardBridge.sol";
+import { iOVM_L1ERC20Bridge } from "../../L1/messaging/iOVM_L1ERC20Bridge.sol";
 import { iOVM_L2ERC20Bridge } from "./iOVM_L2ERC20Bridge.sol";
 
 /* Library Imports */

packages/contracts/contracts/bridge/messaging/iOVM_L2CrossDomainMessenger.sol → packages/contracts/contracts/L2/messaging/iOVM_L2CrossDomainMessenger.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Interface Imports */
-import { iOVM_CrossDomainMessenger } from "./iOVM_CrossDomainMessenger.sol";
+import { iOVM_CrossDomainMessenger } from "../../libraries/bridge/iOVM_CrossDomainMessenger.sol";
 
 /**
  * @title iOVM_L2CrossDomainMessenger

packages/contracts/contracts/predeploys/OVM_ETH.sol → packages/contracts/contracts/L2/predeploys/OVM_ETH.sol

@@ -2,11 +2,11 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
-import { Lib_PredeployAddresses } from "../libraries/constants/Lib_PredeployAddresses.sol";
+import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 
 /* Contract Imports */
-import { L2StandardERC20 } from "../libraries/standards/L2StandardERC20.sol";
-import { IWETH9 } from "../libraries/standards/IWETH9.sol";
+import { L2StandardERC20 } from "../../libraries/standards/L2StandardERC20.sol";
+import { IWETH9 } from "../../libraries/standards/IWETH9.sol";
 
 /**
  * @title OVM_ETH

packages/contracts/contracts/predeploys/OVM_SequencerFeeVault.sol → packages/contracts/contracts/L2/predeploys/OVM_SequencerFeeVault.sol

@@ -2,11 +2,11 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
-import { Lib_PredeployAddresses } from "../libraries/constants/Lib_PredeployAddresses.sol";
+import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 
 /* Contract Imports */
 import { OVM_ETH } from "./OVM_ETH.sol";
-import { OVM_L2StandardBridge } from "../bridge/tokens/OVM_L2StandardBridge.sol";
+import { OVM_L2StandardBridge } from "../messaging/OVM_L2StandardBridge.sol";
 
 /**
  * @title OVM_SequencerFeeVault

packages/contracts/contracts/libraries/bridge/OVM_CrossDomainEnabled.sol

@@ -2,8 +2,7 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
-import { iOVM_CrossDomainMessenger } from
-    "../../bridge/messaging/iOVM_CrossDomainMessenger.sol";
+import { iOVM_CrossDomainMessenger } from "./iOVM_CrossDomainMessenger.sol";
 
 /**
  * @title OVM_CrossDomainEnabled