Remove optimistic-ethereum level in contracts hierarchy

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/messaging/OVM_L1CrossDomainMessenger.sol → packages/contracts/contracts/bridge/messaging/OVM_L1CrossDomainMessenger.sol

@@ -3,12 +3,12 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_AddressResolver } from "../../../libraries/resolver/Lib_AddressResolver.sol";
-import { Lib_OVMCodec } from "../../../libraries/codec/Lib_OVMCodec.sol";
-import { Lib_AddressManager } from "../../../libraries/resolver/Lib_AddressManager.sol";
-import { Lib_SecureMerkleTrie } from "../../../libraries/trie/Lib_SecureMerkleTrie.sol";
-import { Lib_PredeployAddresses } from "../../../libraries/constants/Lib_PredeployAddresses.sol";
-import { Lib_CrossDomainUtils } from "../../../libraries/bridge/Lib_CrossDomainUtils.sol";
+import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
+import { Lib_OVMCodec } from "../../libraries/codec/Lib_OVMCodec.sol";
+import { Lib_AddressManager } from "../../libraries/resolver/Lib_AddressManager.sol";
+import { Lib_SecureMerkleTrie } from "../../libraries/trie/Lib_SecureMerkleTrie.sol";
+import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
+import { Lib_CrossDomainUtils } from "../../libraries/bridge/Lib_CrossDomainUtils.sol";
 
 /* Interface Imports */
 import { iOVM_L1CrossDomainMessenger } from "./iOVM_L1CrossDomainMessenger.sol";

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/messaging/OVM_L2CrossDomainMessenger.sol → packages/contracts/contracts/bridge/messaging/OVM_L2CrossDomainMessenger.sol

@@ -3,8 +3,8 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_AddressResolver } from "../../../libraries/resolver/Lib_AddressResolver.sol";
-import { Lib_CrossDomainUtils } from "../../../libraries/bridge/Lib_CrossDomainUtils.sol";
+import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
+import { Lib_CrossDomainUtils } from "../../libraries/bridge/Lib_CrossDomainUtils.sol";
 
 /* Interface Imports */
 import { iOVM_L2CrossDomainMessenger } from "./iOVM_L2CrossDomainMessenger.sol";

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/messaging/iOVM_L1CrossDomainMessenger.sol → packages/contracts/contracts/bridge/messaging/iOVM_L1CrossDomainMessenger.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_CrossDomainMessenger } from "./iOVM_CrossDomainMessenger.sol";

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/tokens/OVM_L1StandardBridge.sol → packages/contracts/contracts/bridge/tokens/OVM_L1StandardBridge.sol

@@ -10,8 +10,8 @@ import { iOVM_L2ERC20Bridge } from "./iOVM_L2ERC20Bridge.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 /* Library Imports */
-import { OVM_CrossDomainEnabled } from "../../../libraries/bridge/OVM_CrossDomainEnabled.sol";
-import { Lib_PredeployAddresses } from "../../../libraries/constants/Lib_PredeployAddresses.sol";
+import { OVM_CrossDomainEnabled } from "../../libraries/bridge/OVM_CrossDomainEnabled.sol";
+import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/tokens/OVM_L2StandardBridge.sol → packages/contracts/contracts/bridge/tokens/OVM_L2StandardBridge.sol

@@ -9,11 +9,11 @@ import { iOVM_L2ERC20Bridge } from "./iOVM_L2ERC20Bridge.sol";
 
 /* Library Imports */
 import { ERC165Checker } from "@openzeppelin/contracts/introspection/ERC165Checker.sol";
-import { OVM_CrossDomainEnabled } from "../../../libraries/bridge/OVM_CrossDomainEnabled.sol";
-import { Lib_PredeployAddresses } from "../../../libraries/constants/Lib_PredeployAddresses.sol";
+import { OVM_CrossDomainEnabled } from "../../libraries/bridge/OVM_CrossDomainEnabled.sol";
+import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 
 /* Contract Imports */
-import { IL2StandardERC20 } from "../../../libraries/standards/IL2StandardERC20.sol";
+import { IL2StandardERC20 } from "../../libraries/standards/IL2StandardERC20.sol";
 
 /**
  * @title OVM_L2StandardBridge

packages/contracts/contracts/optimistic-ethereum/OVM/bridge/tokens/OVM_L2StandardTokenFactory.sol → packages/contracts/contracts/bridge/tokens/OVM_L2StandardTokenFactory.sol

@@ -3,8 +3,8 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Contract Imports */
-import { L2StandardERC20 } from "../../../libraries/standards/L2StandardERC20.sol";
-import { Lib_PredeployAddresses } from "../../../libraries/constants/Lib_PredeployAddresses.sol";
+import { L2StandardERC20 } from "../../libraries/standards/L2StandardERC20.sol";
+import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployAddresses.sol";
 
 /**
  * @title OVM_L2StandardTokenFactory

packages/contracts/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol → packages/contracts/contracts/chain/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/optimistic-ethereum/OVM/chain/OVM_ChainStorageContainer.sol → packages/contracts/contracts/chain/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/optimistic-ethereum/OVM/chain/OVM_StateCommitmentChain.sol → packages/contracts/contracts/chain/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/optimistic-ethereum/OVM/chain/iOVM_CanonicalTransactionChain.sol → packages/contracts/contracts/chain/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/optimistic-ethereum/OVM/chain/iOVM_StateCommitmentChain.sol → packages/contracts/contracts/chain/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/optimistic-ethereum/libraries/bridge/OVM_CrossDomainEnabled.sol → packages/contracts/contracts/libraries/bridge/OVM_CrossDomainEnabled.sol

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

packages/contracts/contracts/optimistic-ethereum/OVM/predeploys/OVM_ETH.sol → packages/contracts/contracts/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/optimistic-ethereum/OVM/predeploys/OVM_SequencerFeeVault.sol → packages/contracts/contracts/predeploys/OVM_SequencerFeeVault.sol

@@ -2,10 +2,10 @@
 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 "../predeploys/OVM_ETH.sol";
+import { OVM_ETH } from "./OVM_ETH.sol";
 import { OVM_L2StandardBridge } from "../bridge/tokens/OVM_L2StandardBridge.sol";
 
 /**

packages/contracts/contracts/test-libraries/codec/TestLib_OVMCodec.sol

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

packages/contracts/contracts/test-libraries/rlp/TestLib_RLPReader.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_RLPReader } from "../../optimistic-ethereum/libraries/rlp/Lib_RLPReader.sol";
+import { Lib_RLPReader } from "../../libraries/rlp/Lib_RLPReader.sol";
 
 /**
  * @title TestLib_RLPReader

packages/contracts/contracts/test-libraries/rlp/TestLib_RLPWriter.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_RLPWriter } from "../../optimistic-ethereum/libraries/rlp/Lib_RLPWriter.sol";
+import { Lib_RLPWriter } from "../../libraries/rlp/Lib_RLPWriter.sol";
 import { TestERC20 } from "../../test-helpers/TestERC20.sol";
 
 /**

packages/contracts/contracts/test-libraries/trie/TestLib_MerkleTrie.sol

@@ -2,7 +2,7 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
-import { Lib_MerkleTrie } from "../../optimistic-ethereum/libraries/trie/Lib_MerkleTrie.sol";
+import { Lib_MerkleTrie } from "../../libraries/trie/Lib_MerkleTrie.sol";
 
 /**
  * @title TestLib_MerkleTrie

packages/contracts/contracts/test-libraries/trie/TestLib_SecureMerkleTrie.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_SecureMerkleTrie } from "../../optimistic-ethereum/libraries/trie/Lib_SecureMerkleTrie.sol";
+import { Lib_SecureMerkleTrie } from "../../libraries/trie/Lib_SecureMerkleTrie.sol";
 
 /**
  * @title TestLib_SecureMerkleTrie

packages/contracts/contracts/test-libraries/utils/TestLib_Buffer.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_Buffer } from "../../optimistic-ethereum/libraries/utils/Lib_Buffer.sol";
+import { Lib_Buffer } from "../../libraries/utils/Lib_Buffer.sol";
 
 /**
  * @title TestLib_Buffer

packages/contracts/contracts/test-libraries/utils/TestLib_Bytes32Utils.sol

@@ -2,7 +2,7 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
-import { Lib_Bytes32Utils } from "../../optimistic-ethereum/libraries/utils/Lib_Bytes32Utils.sol";
+import { Lib_Bytes32Utils } from "../../libraries/utils/Lib_Bytes32Utils.sol";
 
 /**
  * @title TestLib_Byte32Utils

packages/contracts/contracts/test-libraries/utils/TestLib_BytesUtils.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_BytesUtils } from "../../optimistic-ethereum/libraries/utils/Lib_BytesUtils.sol";
+import { Lib_BytesUtils } from "../../libraries/utils/Lib_BytesUtils.sol";
 import { TestERC20 } from "../../test-helpers/TestERC20.sol";
 
 /**

packages/contracts/contracts/test-libraries/utils/TestLib_MerkleTree.sol

@@ -3,7 +3,7 @@ pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
-import { Lib_MerkleTree } from "../../optimistic-ethereum/libraries/utils/Lib_MerkleTree.sol";
+import { Lib_MerkleTree } from "../../libraries/utils/Lib_MerkleTree.sol";
 
 /**
  * @title TestLib_MerkleTree

packages/contracts/contracts/optimistic-ethereum/OVM/verification/OVM_BondManager.sol → packages/contracts/contracts/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