diff --git a/packages/ovm/.soliumrc.json b/packages/ovm/.soliumrc.json
deleted file mode 100644
index 1b39f759abae2..0000000000000
--- a/packages/ovm/.soliumrc.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "extends": "solium:recommended",
-  "plugins": [
-    "security"
-  ],
-  "rules": {
-    "security/no-inline-assembly": "off",
-    "quotes": [
-      "error",
-      "double"
-    ],
-    "indentation": [
-      "error",
-      4
-    ],
-    "linebreak-style": [
-      "error",
-      "unix"
-    ]
-  }
-}
diff --git a/packages/ovm/README.md b/packages/ovm/README.md
deleted file mode 100644
index 4763956daf4b1..0000000000000
--- a/packages/ovm/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Optimistic Virtual Machine
-`ovm` is an implementation of the standard `StateMachine` interface defined in `core`. It provides the ability to apply transactions & exposes endpoints required for common Optimistic Rollup implementations and other L2s.
-
-### Requirements, Setup, & Testing
-[View instructions here]('../../README.md').
-
-### Deploying
-TODO: You can deploy by running:
-
-```sh
-yarn run deploy:<contract-specific-task-here> <environment>
-```
-
-The `environment` parameter tells the deployment script which config file to use (expected filename `.<environment>.env`).
-
diff --git a/packages/ovm/config/.env.example b/packages/ovm/config/.env.example
deleted file mode 100644
index 7d63cc9ce5f75..0000000000000
--- a/packages/ovm/config/.env.example
+++ /dev/null
@@ -1,33 +0,0 @@
-################
-# Instructions #
-################
-# Create environment file(s) named ".<environment>.env" in this same location using this file as a template
-# For instance `yarn run deploy:some-contract local` will use .local.env for configuration.
-
-
-############
-# Template #
-############
-
-# REQUIRED
-# Mnemonic for the wallet used to deploy the contracts
-DEPLOY_MNEMONIC='response fresh afford leader twice silent table exist aisle pelican focus bird'
-
-DEPLOY_SAFETY_CHECKER_CONTRACT_ADDRESS='0x some address here'
-
-# Note: can use any network name. 'local' or leaving it blank will deploy to DEPLOY_LOCAL_URL
-DEPLOY_NETWORK='local'
-
-# Only if deploying locally
-DEPLOY_LOCAL_URL='http://127.0.0.1:8545'
-
-### OPTIONAL ###
-
-# Will be defaulted to this value if not overridden -- you should not set this unless you know what you're doing.
-OPCODE_WHITELIST_MASK='0x600a0000000000000000001fffffffffffffffff0fcf004063f000013fff0fff'
-# Default whitelist config whitelists all opcodes EXCEPT:
-#    ADDRESS, BALANCE, BLOCKHASH, CALLCODE, CALLER, COINBASE,
-#    CREATE, CREATE2, DELEGATECALL, DIFFICULTY, EXTCODECOPY, EXTCODESIZE,
-#    GASLIMIT, GASPRICE, NUMBER, ORIGIN, SELFDESTRUCT, SLOAD, SSTORE,
-#    STATICCALL, TIMESTAMP
-# See test/safety-checker/whitelist-mask-generator.spec.ts for more info
diff --git a/packages/ovm/deploy/execution-manager.ts b/packages/ovm/deploy/execution-manager.ts
deleted file mode 100644
index 77cce424b738e..0000000000000
--- a/packages/ovm/deploy/execution-manager.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/* External Imports */
-import { deploy, deployContract } from '@eth-optimism/core-utils'
-import { ExecutionManagerContractDefinition } from '@eth-optimism/rollup-contracts'
-import {
-  DEFAULT_OPCODE_WHITELIST_MASK,
-  GAS_LIMIT,
-} from '@eth-optimism/rollup-core'
-
-import { Wallet } from 'ethers'
-
-/* Internal Imports */
-import { deploySafetyChecker } from './safety-checker'
-import { resolve } from 'path'
-
-const executionManagerDeploymentFunction = async (
-  wallet: Wallet
-): Promise<string> => {
-  console.log(`\nDeploying ExecutionManager!\n`)
-
-  const safetyCheckerContractAddress = await deploySafetyChecker()
-
-  const executionManager = await deployContract(
-    ExecutionManagerContractDefinition,
-    wallet,
-    DEFAULT_OPCODE_WHITELIST_MASK,
-    safetyCheckerContractAddress,
-    GAS_LIMIT,
-    true
-  )
-
-  console.log(`Execution Manager deployed to ${executionManager.address}!\n\n`)
-
-  return executionManager.address
-}
-
-/**
- * Deploys the ExecutionManager contract.
- *
- * @param rootContract Whether or not this is the main contract being deployed (as compared to a dependency).
- * @returns The deployed contract's address.
- */
-export const deployExecutionManager = async (
-  rootContract: boolean = false
-): Promise<string> => {
-  // Note: Path is from 'build/deploy/<script>.js'
-  const configDirPath = resolve(__dirname, `../../config/`)
-
-  return deploy(executionManagerDeploymentFunction, configDirPath, rootContract)
-}
-
-deployExecutionManager(true)
diff --git a/packages/ovm/deploy/safety-checker.ts b/packages/ovm/deploy/safety-checker.ts
deleted file mode 100644
index f8162f9e1b428..0000000000000
--- a/packages/ovm/deploy/safety-checker.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/* External Imports */
-import { deploy, deployContract, add0x } from '@eth-optimism/core-utils'
-import { Address } from '@eth-optimism/rollup-core'
-import { SafetyCheckerContractDefinition } from '@eth-optimism/rollup-contracts'
-
-import { Wallet } from 'ethers'
-
-/* Internal Imports */
-import { resolve } from 'path'
-
-const safetyCheckerDeploymentFunction = async (
-  wallet: Wallet
-): Promise<Address> => {
-  let safetyCheckerContractAddress =
-    process.env.DEPLOY_SAFETY_CHECKER_CONTRACT_ADDRESS
-  if (!safetyCheckerContractAddress) {
-    console.log(`\nDeploying Safety Checker!\n`)
-
-    // See test/contracts/whitelist-mask-generator.spec.ts for more info
-    const whitelistMask = process.env.OPCODE_WHITELIST_MASK
-
-    const executionManagerAddress =
-      process.env.EXECUTION_MANAGER_ADDRESS || add0x('12'.repeat(20))
-
-    console.log(
-      `Deploying Safety Checker using mask '${whitelistMask}' and execution manager '${executionManagerAddress}'...`
-    )
-    whitelistMask
-    const safetyChecker = await deployContract(
-      SafetyCheckerContractDefinition,
-      wallet,
-      whitelistMask,
-      executionManagerAddress
-    )
-    safetyCheckerContractAddress = safetyChecker.address
-
-    console.log(
-      `Safety Checker deployed to ${safetyCheckerContractAddress}!\n\n`
-    )
-  } else {
-    console.log(
-      `Using Safety Checker contract at ${safetyCheckerContractAddress}\n`
-    )
-  }
-  return safetyCheckerContractAddress
-}
-
-/**
- * Deploys the Safety Checker contract.
- *
- * @param rootContract Whether or not this is the main contract being deployed (as compared to a dependency).
- * @returns The deployed contract's address.
- */
-export const deploySafetyChecker = async (
-  rootContract: boolean = false
-): Promise<string> => {
-  // Note: Path is from 'build/deploy/<script>.js'
-  const configDirPath = resolve(__dirname, `../../config/`)
-
-  return deploy(safetyCheckerDeploymentFunction, configDirPath, rootContract)
-}
-
-deploySafetyChecker(true)
diff --git a/packages/ovm/index.ts b/packages/ovm/index.ts
deleted file mode 100644
index 15afc9aa6dc7a..0000000000000
--- a/packages/ovm/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const rootPath = __dirname
-
-export { rootPath }
-export * from './src/app'
-export * from './src/types'
diff --git a/packages/ovm/package.json b/packages/ovm/package.json
deleted file mode 100644
index 797f5ff25ff30..0000000000000
--- a/packages/ovm/package.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "name": "@eth-optimism/ovm",
-  "version": "0.0.1-alpha.25",
-  "description": "An optimistic execution-compatible EVM",
-  "main": "build/index.js",
-  "files": [
-    "build/**/*.js",
-    "build/**/*.json"
-  ],
-  "scripts": {
-    "all": "yarn clean && yarn build && yarn test && yarn fix && yarn lint",
-    "test:govm": "mocha --require source-map-support/register --require ts-node/register 'test/govm/*.spec.ts' --timeout 60000 --exit",
-    "test": "mocha --require source-map-support/register --require ts-node/register 'test/{contracts,app}/*.spec.ts' --timeout 8000 --exit",
-    "lint": "tslint --format stylish --project .",
-    "fix": "prettier --config ../../prettier-config.json --write 'index.ts' '{deploy,src,test}/**/*.ts'",
-    "build": "mkdir -p ./build && tsc -p .",
-    "clean": "rimraf build/",
-    "deploy:execution-manager": "yarn build && node ./build/deploy/execution-manager.js",
-    "deploy:safety-checker": "yarn build && node ./build/deploy/safety-checker.js"
-  },
-  "keywords": [
-    "optimistic",
-    "rollup",
-    "group",
-    "ethereum",
-    "evm",
-    "state"
-  ],
-  "author": "Optimism",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ethereum-optimism/optimism-monorepo.git"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "devDependencies": {
-    "@openzeppelin/contracts": "^2.4.0",
-    "@types/chai": "^4.1.7",
-    "@types/mocha": "^5.2.6",
-    "@types/node": "^11.11.3",
-    "chai": "^4.2.0",
-    "chai-bignumber": "^3.0.0",
-    "ethereumjs-abi": "^0.6.8",
-    "lodash": "^4.17.15",
-    "memdown": "^5.0.0",
-    "mocha": "^6.0.2",
-    "rimraf": "^2.6.3",
-    "typescript": "^3.3.3333"
-  },
-  "dependencies": {
-    "@eth-optimism/core-db": "^0.0.1-alpha.25",
-    "@eth-optimism/core-utils": "^0.0.1-alpha.25",
-    "@eth-optimism/rollup-core": "^0.0.1-alpha.25",
-    "@eth-optimism/rollup-contracts": "^0.0.1-alpha.25",
-    "@types/sinon-chai": "^3.2.2",
-    "chai": "^4.2.0",
-    "ethereum-waffle": "2.1.0",
-    "ethers": "^4.0.37",
-    "ethlint": "^1.2.5",
-    "mathjs": "^6.6.0",
-    "merkletreejs": "^0.1.7",
-    "openzeppelin-solidity": "^2.2.0"
-  },
-  "gitHead": "ccce366645fca6bad46c5cf7f7ff2f407c6ba5fd"
-}
diff --git a/packages/ovm/test/app/utils.spec.ts b/packages/ovm/test/app/utils.spec.ts
deleted file mode 100644
index 7b098d842a02a..0000000000000
--- a/packages/ovm/test/app/utils.spec.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { add0x, ZERO_ADDRESS } from '@eth-optimism/core-utils'
-/* Contract Imports */
-import { TransactionReceipt } from 'ethers/providers'
-import {
-  convertInternalLogsToOvmLogs,
-  getSuccessfulOvmTransactionMetadata,
-  OvmTransactionMetadata,
-  revertMessagePrefix,
-} from '../../src/app'
-import { buildLog } from '../helpers'
-
-const ALICE = '0x0000000000000000000000000000000000000001'
-const BOB = '0x0000000000000000000000000000000000000002'
-const CONTRACT = '0x000000000000000000000000000000000000000C'
-const CODE_CONTRACT = '0x00000000000000000000000000000000000000CC'
-const CODE_CONTRACT_HASH = add0x('00'.repeat(32))
-// We're not actually making any calls to the
-// Execution manager so this can be the zero address
-const EXECUTION_MANAGER_ADDRESS = ZERO_ADDRESS
-
-describe('convertInternalLogsToOvmLogs', () => {
-  it('should replace the address of the event with the address of the last active contract event', async () => {
-    convertInternalLogsToOvmLogs(
-      [
-        [EXECUTION_MANAGER_ADDRESS, 'ActiveContract(address)', [ALICE], 0],
-        [CODE_CONTRACT, 'EventFromAlice()', [], 1],
-        [EXECUTION_MANAGER_ADDRESS, 'ActiveContract(address)', [BOB], 2],
-        [CODE_CONTRACT, 'EventFromBob()', [], 3],
-      ].map((args) => buildLog.apply(null, args)),
-      EXECUTION_MANAGER_ADDRESS
-    ).should.deep.eq(
-      [
-        [ALICE, 'EventFromAlice()', [], 0],
-        [BOB, 'EventFromBob()', [], 1],
-      ].map((args) => buildLog.apply(null, args))
-    )
-  })
-})
-
-describe('getSuccessfulOvmTransactionMetadata', () => {
-  it('should return transaction metadata from calls from externally owned accounts', async () => {
-    const transactionReceipt: TransactionReceipt = {
-      byzantium: true,
-      logs: [
-        [EXECUTION_MANAGER_ADDRESS, 'ActiveContract(address)', [ALICE]],
-        [
-          EXECUTION_MANAGER_ADDRESS,
-          'CallingWithEOA(address,address)',
-          [ALICE, CONTRACT],
-        ],
-        [EXECUTION_MANAGER_ADDRESS, 'ActiveContract(address)', [ALICE]],
-        [EXECUTION_MANAGER_ADDRESS, 'EOACreatedContract(address)', [CONTRACT]],
-        [EXECUTION_MANAGER_ADDRESS, 'ActiveContract(address)', [CONTRACT]],
-        [
-          EXECUTION_MANAGER_ADDRESS,
-          'CreatedContract(address,address,bytes32)',
-          [CONTRACT, CODE_CONTRACT, CODE_CONTRACT_HASH],
-        ],
-      ].map((args) => buildLog.apply(null, args)),
-    }
-
-    getSuccessfulOvmTransactionMetadata(transactionReceipt).should.deep.eq({
-      ovmCreatedContractAddress: CONTRACT,
-      ovmFrom: ALICE,
-      ovmTo: CONTRACT,
-      ovmTxSucceeded: true,
-    })
-  })
-})
diff --git a/packages/ovm/test/bridge/L1ToL2TransactionPasser.spec.ts b/packages/ovm/test/bridge/L1ToL2TransactionPasser.spec.ts
deleted file mode 100644
index 81d9af734f413..0000000000000
--- a/packages/ovm/test/bridge/L1ToL2TransactionPasser.spec.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import '../setup'
-
-/* External Imports */
-import { L1ToL2TransactionPasserContractDefinition } from '@eth-optimism/rollup-contracts'
-
-import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
-
-/* Contract Imports */
-describe('L1 -> L2 Transaction Passer', () => {
-  let provider
-  let wallet
-  let l1ToL2TransactionPasser
-  beforeEach(async () => {
-    provider = createMockProvider()
-    wallet = getWallets(provider)[0]
-    l1ToL2TransactionPasser = await deployContract(
-      wallet,
-      L1ToL2TransactionPasserContractDefinition
-    )
-  })
-  const entryPoint = '0x0000000000000000000000000000000000001234'
-  const callData = '0xdeadbeefee5555'
-  it('should emit the correct L1ToL2Transaction L1 event when an L1->L2 tx is sent', async () => {
-    await l1ToL2TransactionPasser
-      .passTransactionToL2(entryPoint, callData)
-      .should.emit(l1ToL2TransactionPasser, 'L1ToL2Transaction')
-      .withArgs(0, wallet.address, entryPoint, callData)
-  })
-})
diff --git a/packages/ovm/test/bridge/L2ToL1MessageReciever.spec.ts b/packages/ovm/test/bridge/L2ToL1MessageReciever.spec.ts
deleted file mode 100644
index 8360be1c49740..0000000000000
--- a/packages/ovm/test/bridge/L2ToL1MessageReciever.spec.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import '../setup'
-
-/* External Imports */
-import { L2ToL1MessageReceiverContractDefinition } from '@eth-optimism/rollup-contracts'
-
-import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
-
-describe('L2 -> L1 Message Receiver', () => {
-  let provider
-  let wallet
-  let l2ToL1MessageReciever
-  const finalizationTime = 55
-
-  const nonce = 0
-  const callData = '0xdeadbeefee5555'
-  const randomSender = '0x1234123412341234123412341234123412341234'
-  const randomMessage = {
-    nonce,
-    ovmSender: randomSender,
-    callData,
-  }
-
-  beforeEach(async () => {
-    provider = createMockProvider()
-    wallet = getWallets(provider)[0]
-    l2ToL1MessageReciever = await deployContract(
-      wallet,
-      L2ToL1MessageReceiverContractDefinition,
-      [wallet.address, finalizationTime]
-    )
-  })
-
-  it('should allow the trusted sequencer to enqueue a message', async () => {
-    await l2ToL1MessageReciever
-      .enqueueL2ToL1Message(randomMessage)
-      .should.emit(l2ToL1MessageReciever, 'L2ToL1MessageEnqueued')
-  })
-  it('should not verify message if time has not elapsed', async () => {
-    await l2ToL1MessageReciever.enqueueL2ToL1Message(randomMessage)
-    const verify = await l2ToL1MessageReciever.verifyL2ToL1Message(
-      randomMessage,
-      0
-    )
-    verify.should.equal(false)
-  })
-  it('shuld verify message once time has elapsed', async () => {
-    await l2ToL1MessageReciever.enqueueL2ToL1Message(randomMessage)
-    for (let i = 0; i < finalizationTime; i++) {
-      await provider.send('evm_mine', [])
-    }
-    const verify = await l2ToL1MessageReciever.verifyL2ToL1Message(
-      randomMessage,
-      0
-    )
-    verify.should.equal(true)
-  })
-  it('should not verify message if time has elapsed but wrong message', async () => {
-    await l2ToL1MessageReciever.enqueueL2ToL1Message(randomMessage)
-    for (let i = 0; i < finalizationTime; i++) {
-      await provider.send('evm_mine', [])
-    }
-    const wrongMessage = {
-      nonce,
-      ovmSender: randomSender,
-      callData: '0x0101011010',
-    }
-    const verify = await l2ToL1MessageReciever.verifyL2ToL1Message(
-      wrongMessage,
-      0
-    )
-    verify.should.equal(false)
-  })
-})
diff --git a/packages/ovm/test/contracts/revert-test.spec.ts b/packages/ovm/test/contracts/revert-test.spec.ts
deleted file mode 100644
index dc3bf873d3a94..0000000000000
--- a/packages/ovm/test/contracts/revert-test.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import '../setup'
-
-/* External Imports */
-import { TestRevertTestContractDefinition as RevertTest } from '@eth-optimism/rollup-contracts'
-import { DEFAULT_ETHNODE_GAS_LIMIT } from '@eth-optimism/rollup-core'
-
-import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
-
-/*********
- * TESTS *
- *********/
-
-describe('Revert Test', () => {
-  const [wallet] = getWallets(
-    createMockProvider({ gasLimit: DEFAULT_ETHNODE_GAS_LIMIT })
-  )
-  let revertTestContract
-
-  /* Deploy contracts before each test */
-  beforeEach(async () => {
-    // First deploy the contract address
-    revertTestContract = await deployContract(wallet, RevertTest, [], {
-      gasLimit: DEFAULT_ETHNODE_GAS_LIMIT,
-    })
-  })
-
-  describe('Test that revert will blow away modified state from successful sub-calls', async () => {
-    it('reverts sub-call state', async () => {
-      await revertTestContract.entryPoint()
-
-      const a = await revertTestContract.getA()
-      a.should.equal(
-        0,
-        'Revert should revert the state update of a = 0 -> a = 5'
-      )
-    })
-  })
-})
diff --git a/packages/ovm/test/contracts/simple-storage.spec.ts b/packages/ovm/test/contracts/simple-storage.spec.ts
deleted file mode 100644
index 0d6adc51b3a3e..0000000000000
--- a/packages/ovm/test/contracts/simple-storage.spec.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import '../setup'
-
-/* External Imports */
-import { getLogger, add0x, getCurrentTime } from '@eth-optimism/core-utils'
-import {
-  ExecutionManagerContractDefinition as ExecutionManager,
-  FullStateManagerContractDefinition as StateManager,
-  TestSimpleStorageArgsFromCalldataDefinition as SimpleStorage,
-} from '@eth-optimism/rollup-contracts'
-import {
-  Address,
-  CHAIN_ID,
-  GAS_LIMIT,
-  DEFAULT_OPCODE_WHITELIST_MASK,
-  DEFAULT_ETHNODE_GAS_LIMIT,
-  getUnsignedTransactionCalldata,
-} from '@eth-optimism/rollup-core'
-
-import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
-import { Contract, ContractFactory, ethers } from 'ethers'
-import { TransactionReceipt } from 'ethers/providers'
-import * as ethereumjsAbi from 'ethereumjs-abi'
-
-/* Internal Imports */
-import {
-  manuallyDeployOvmContract,
-  executeTransaction,
-  gasLimit,
-} from '../helpers'
-
-const log = getLogger('simple-storage', true)
-
-/*********
- * TESTS *
- *********/
-
-describe('SimpleStorage', () => {
-  const provider = createMockProvider({ gasLimit: DEFAULT_ETHNODE_GAS_LIMIT })
-  const [wallet] = getWallets(provider)
-  // Create pointers to our execution manager & simple storage contract
-  let executionManager: Contract
-  let stateManager: Contract
-  let simpleStorage: ContractFactory
-  let simpleStorageOvmAddress: Address
-
-  /* Deploy contracts before each test */
-  beforeEach(async () => {
-    // Before each test let's deploy a fresh ExecutionManager and SimpleStorage
-    // Deploy ExecutionManager the normal way
-    executionManager = await deployContract(
-      wallet,
-      ExecutionManager,
-      [DEFAULT_OPCODE_WHITELIST_MASK, '0x' + '00'.repeat(20), GAS_LIMIT, true],
-      { gasLimit: DEFAULT_ETHNODE_GAS_LIMIT }
-    )
-    // Set the state manager as well
-    stateManager = new Contract(
-      await executionManager.getStateManagerAddress(),
-      StateManager.abi,
-      wallet
-    )
-
-    // Deploy SimpleStorage with the ExecutionManager
-    simpleStorageOvmAddress = await manuallyDeployOvmContract(
-      wallet,
-      provider,
-      executionManager,
-      SimpleStorage,
-      [executionManager.address]
-    )
-    // Also set our simple storage ethers contract so we can generate unsigned transactions
-    simpleStorage = new ContractFactory(
-      SimpleStorage.abi as any, // For some reason the ABI type definition is not accepted
-      SimpleStorage.bytecode
-    )
-  })
-
-  const setStorage = async (slot, value): Promise<TransactionReceipt> => {
-    const setStorageMethodId: string = ethereumjsAbi
-      .methodID('setStorage', [])
-      .toString('hex')
-
-    const innerCallData: string = add0x(`${setStorageMethodId}${slot}${value}`)
-    return executeTransaction(
-      executionManager,
-      wallet,
-      simpleStorageOvmAddress,
-      innerCallData,
-      true
-    )
-  }
-
-  describe('setStorage', async () => {
-    it('properly sets storage for the contract we expect', async () => {
-      // create calldata vars
-      const slot: string = '99'.repeat(32)
-      const value: string = '01'.repeat(32)
-
-      const reciept = await setStorage(slot, value)
-    })
-  })
-
-  describe('getStorage', async () => {
-    it('correctly loads a value after we store it', async () => {
-      // Create the variables we will use for set & get storage
-      const slot = '99'.repeat(32)
-      const value = '01'.repeat(32)
-      const reciept = await setStorage(slot, value)
-
-      const getStorageMethodId: string = ethereumjsAbi
-        .methodID('getStorage', [])
-        .toString('hex')
-
-      const innerCallData: string = add0x(`${getStorageMethodId}${slot}`)
-      const nonce = await stateManager.getOvmContractNonce(wallet.address)
-      const transaction = {
-        nonce,
-        gasLimit: GAS_LIMIT,
-        gasPrice: 0,
-        to: simpleStorageOvmAddress,
-        value: 0,
-        data: innerCallData,
-        chainId: CHAIN_ID,
-      }
-      const signedMessage = await wallet.sign(transaction)
-      const [v, r, s] = ethers.utils.RLP.decode(signedMessage).slice(-3)
-      const callData = getUnsignedTransactionCalldata(
-        executionManager,
-        'executeEOACall',
-        [
-          getCurrentTime(),
-          0,
-          transaction.nonce,
-          transaction.to,
-          transaction.data,
-          v,
-          r,
-          s,
-        ]
-      )
-
-      const result = await executionManager.provider.call({
-        to: executionManager.address,
-        data: add0x(callData),
-        gasLimit,
-      })
-      result.should.equal(add0x(value))
-    })
-  })
-})
diff --git a/packages/ovm/test/contracts/tx-origin.spec.ts b/packages/ovm/test/contracts/tx-origin.spec.ts
deleted file mode 100644
index 747ac75b05ed4..0000000000000
--- a/packages/ovm/test/contracts/tx-origin.spec.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import '../setup'
-
-/* External Imports */
-import { getLogger, add0x, getCurrentTime } from '@eth-optimism/core-utils'
-import {
-  Address,
-  CHAIN_ID,
-  GAS_LIMIT,
-  DEFAULT_OPCODE_WHITELIST_MASK,
-  DEFAULT_ETHNODE_GAS_LIMIT,
-  getUnsignedTransactionCalldata,
-} from '@eth-optimism/rollup-core'
-import {
-  ExecutionManagerContractDefinition as ExecutionManager,
-  FullStateManagerContractDefinition as StateManager,
-  TestSimpleTxOriginContractDefinition as SimpleTxOrigin,
-} from '@eth-optimism/rollup-contracts'
-
-import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
-import { Contract, ContractFactory } from 'ethers'
-import * as ethereumjsAbi from 'ethereumjs-abi'
-
-/* Internal Imports */
-import {
-  addressToBytes32Address,
-  manuallyDeployOvmContract,
-  signTransation,
-} from '../helpers'
-
-const log = getLogger('simple-storage', true)
-
-/*********
- * TESTS *
- *********/
-
-describe('SimpleTxOrigin', () => {
-  const provider = createMockProvider({ gasLimit: DEFAULT_ETHNODE_GAS_LIMIT })
-  const [wallet] = getWallets(provider)
-  let executionManager: Contract
-  let stateManager: Contract
-  let simpleTxOrigin: ContractFactory
-  let simpleTxOriginOvmAddress: Address
-
-  /* Deploy contracts before each test */
-  beforeEach(async () => {
-    // Before each test let's deploy a fresh ExecutionManager and SimpleTxOrigin
-    // Deploy ExecutionManager the normal way
-    executionManager = await deployContract(
-      wallet,
-      ExecutionManager,
-      [DEFAULT_OPCODE_WHITELIST_MASK, '0x' + '00'.repeat(20), GAS_LIMIT, true],
-      { gasLimit: DEFAULT_ETHNODE_GAS_LIMIT }
-    )
-    stateManager = new Contract(
-      await executionManager.getStateManagerAddress(),
-      StateManager.abi,
-      wallet
-    )
-
-    // Deploy SimpleTxOrigin with the ExecutionManager
-    simpleTxOriginOvmAddress = await manuallyDeployOvmContract(
-      wallet,
-      provider,
-      executionManager,
-      SimpleTxOrigin,
-      [executionManager.address]
-    )
-    // Also set our simple storage ethers contract so we can generate unsigned transactions
-    simpleTxOrigin = new ContractFactory(
-      SimpleTxOrigin.abi as any, // For some reason the ABI type definition is not accepted
-      SimpleTxOrigin.bytecode
-    )
-  })
-
-  describe('getOrigin', async () => {
-    it('correctly gets the origin address', async () => {
-      const getStorageMethodId: string = ethereumjsAbi
-        .methodID('getOrigin', [])
-        .toString('hex')
-
-      const innerCallData: string = add0x(`${getStorageMethodId}`)
-      const nonce = await stateManager.getOvmContractNonce(wallet.address)
-      const transaction = {
-        nonce,
-        gasLimit: GAS_LIMIT,
-        gasPrice: 0,
-        to: simpleTxOriginOvmAddress,
-        value: 0,
-        data: innerCallData,
-        chainId: CHAIN_ID,
-      }
-      const [v, r, s] = await signTransation(wallet, transaction)
-      const callData = getUnsignedTransactionCalldata(
-        executionManager,
-        'executeEOACall',
-        [
-          getCurrentTime(),
-          0,
-          transaction.nonce,
-          transaction.to,
-          transaction.data,
-          v,
-          r,
-          s,
-        ]
-      )
-
-      const result = await executionManager.provider.call({
-        to: executionManager.address,
-        data: add0x(callData),
-        gasLimit: 6_700_000,
-      })
-
-      result.should.equal(addressToBytes32Address(wallet.address))
-    })
-  })
-})
diff --git a/packages/ovm/test/contracts/whitelist-mask-generator.spec.ts b/packages/ovm/test/contracts/whitelist-mask-generator.spec.ts
deleted file mode 100644
index 5e0d8eea9a9b5..0000000000000
--- a/packages/ovm/test/contracts/whitelist-mask-generator.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/* External Imports */
-import { BigNumber, ZERO } from '@eth-optimism/core-utils'
-
-/* Internal Imports */
-import {
-  EVMOpcode,
-  Opcode,
-  DEFAULT_UNSAFE_OPCODES,
-} from '@eth-optimism/rollup-core'
-
-const whitelistedOpcodes: EVMOpcode[] = Opcode.ALL_OP_CODES.filter(
-  (x) => DEFAULT_UNSAFE_OPCODES.indexOf(x) < 0
-)
-
-// TODO: Uncomment this to generate a new whitelist mask
-describe('generates whitelist masks -- this is a util, not a test', () => {
-  it('does the thing', () => {
-    // Produces a hex number of 256 bits where each bit represents an
-    // opcode, 0 - 255, which is set if whitelisted and unset otherwise.
-    // Useful for the SafetyChecker  contract.
-    console.log(
-      `WHITELISTED OPCODES: ${whitelistedOpcodes.map((x) => x.name).join(',')}`
-    )
-    let whitelistMaskHex: string = whitelistedOpcodes
-      .map((x) => new BigNumber(2).pow(new BigNumber(x.code)))
-      .reduce((prev: BigNumber, cur: BigNumber) => prev.add(cur), ZERO)
-      .toString('hex')
-    if (whitelistMaskHex.length !== 64) {
-      whitelistMaskHex =
-        '0'.repeat(64 - whitelistMaskHex.length) + whitelistMaskHex
-    }
-
-    console.log(`mask: 0x${whitelistMaskHex}`)
-  })
-})
diff --git a/packages/ovm/test/govm/simple-storage.spec.ts b/packages/ovm/test/govm/simple-storage.spec.ts
deleted file mode 100644
index cd9ed3c3eb103..0000000000000
--- a/packages/ovm/test/govm/simple-storage.spec.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import '../setup'
-
-/* External Imports */
-import { getLogger, add0x } from '@eth-optimism/core-utils'
-import {
-  Address,
-  CHAIN_ID,
-  GAS_LIMIT,
-  getUnsignedTransactionCalldata,
-} from '@eth-optimism/rollup-core'
-import {
-  ExecutionManagerContractDefinition as ExecutionManager,
-  TestSimpleStorageArgsFromCalldataDefinition as SimpleStorage,
-} from '@eth-optimism/rollup-contracts'
-
-import { getWallets } from 'ethereum-waffle'
-import { Contract, ContractFactory, ethers } from 'ethers'
-import { TransactionReceipt, JsonRpcProvider } from 'ethers/providers'
-import * as ethereumjsAbi from 'ethereumjs-abi'
-
-/* Internal Imports */
-import {
-  ensureGovmIsConnected,
-  manuallyDeployOvmContract,
-  executeTransaction,
-} from '../helpers'
-
-const log = getLogger('simple-storage', true)
-
-/*********
- * TESTS *
- *********/
-
-describe('SimpleStorage', () => {
-  const provider = new JsonRpcProvider()
-  const [wallet] = getWallets(provider)
-  // Create pointers to our execution manager & simple storage contract
-  let executionManager: Contract
-  let simpleStorage: ContractFactory
-  let simpleStorageOvmAddress: Address
-  const setStorageMethodId: string = ethereumjsAbi
-    .methodID('setStorage', [])
-    .toString('hex')
-  const getStorageMethodId: string = ethereumjsAbi
-    .methodID('getStorage', [])
-    .toString('hex')
-
-  /* Deploy contracts before each test */
-  beforeEach(async () => {
-    await ensureGovmIsConnected(provider)
-    // Before each test let's deploy a fresh ExecutionManager and SimpleStorage
-    // Deploy ExecutionManager the normal way
-    executionManager = new ethers.Contract(
-      process.env.EXECUTION_MANAGER_ADDRESS,
-      ExecutionManager.abi,
-      wallet
-    )
-
-    // Deploy SimpleStorage with the ExecutionManager
-    simpleStorageOvmAddress = await manuallyDeployOvmContract(
-      wallet,
-      provider,
-      executionManager,
-      SimpleStorage,
-      [executionManager.address]
-    )
-    // Also set our simple storage ethers contract so we can generate unsigned transactions
-    simpleStorage = new ContractFactory(
-      SimpleStorage.abi as any, // For some reason the ABI type definition is not accepted
-      SimpleStorage.bytecode
-    )
-  })
-
-  const setStorage = async (slot, value): Promise<TransactionReceipt> => {
-    const innerCallData: string = add0x(`${setStorageMethodId}${slot}${value}`)
-    return executeTransaction(
-      executionManager,
-      wallet,
-      simpleStorageOvmAddress,
-      innerCallData,
-      true
-    )
-  }
-
-  describe('setStorage', async () => {
-    it('properly sets storage for the contract we expect', async () => {
-      // create calldata vars
-      const slot: string = '99'.repeat(32)
-      const value: string = '01'.repeat(32)
-
-      const reciept = await setStorage(slot, value)
-    })
-  })
-
-  describe('getStorage', async () => {
-    it('correctly loads a value after we store it', async () => {
-      const slot = '99'.repeat(32)
-      const value = '01'.repeat(32)
-      const reciept = await setStorage(slot, value)
-      const innerCallData: string = add0x(`${getStorageMethodId}${slot}`)
-      const nonce = await executionManager.getOvmContractNonce(wallet.address)
-      const transaction = {
-        nonce,
-        gasLimit: GAS_LIMIT,
-        gasPrice: 0,
-        to: simpleStorageOvmAddress,
-        value: 0,
-        data: innerCallData,
-        chainId: CHAIN_ID,
-      }
-      const signedMessage = await wallet.sign(transaction)
-      const [v, r, s] = ethers.utils.RLP.decode(signedMessage).slice(-3)
-      const callData = getUnsignedTransactionCalldata(
-        executionManager,
-        'executeEOACall',
-        [0, 0, transaction.nonce, transaction.to, transaction.data, v, r, s]
-      )
-
-      const result = await executionManager.provider.call({
-        to: executionManager.address,
-        data: add0x(callData),
-        gasLimit: 6_700_000,
-      })
-      result.should.equal(add0x(value))
-    })
-  })
-})
diff --git a/packages/ovm/test/setup.ts b/packages/ovm/test/setup.ts
deleted file mode 100644
index d92daff797721..0000000000000
--- a/packages/ovm/test/setup.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* External Imports */
-import chai = require('chai')
-import bignum = require('chai-bignumber')
-import { solidity } from 'ethereum-waffle'
-
-chai.use(bignum())
-chai.use(solidity)
-const should = chai.should()
-
-export { should }
diff --git a/packages/ovm/tsconfig.json b/packages/ovm/tsconfig.json
deleted file mode 100644
index 17fff08e56226..0000000000000
--- a/packages/ovm/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "extends": "./../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./build",
-    "baseUrl": "./",
-    "resolveJsonModule": true
-  },
-  "include": ["*.ts", "**/*.ts"]
-}
diff --git a/packages/ovm/tslint.json b/packages/ovm/tslint.json
deleted file mode 100644
index 3f4b3e6147c6c..0000000000000
--- a/packages/ovm/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": ["./../../tslint.json"],
-  "rules": {
-    "prettier": [true, "../../prettier-config.json"],
-    "no-console": false
-  }
-}
diff --git a/packages/rollup-contracts/contracts/L1ToL2TransactionPasser.sol b/packages/rollup-contracts/contracts/rollup/bridge/L1ToL2TransactionPasser.sol
similarity index 91%
rename from packages/rollup-contracts/contracts/L1ToL2TransactionPasser.sol
rename to packages/rollup-contracts/contracts/rollup/bridge/L1ToL2TransactionPasser.sol
index 20dc0f0f94dd5..104bf34f2f0d3 100644
--- a/packages/rollup-contracts/contracts/L1ToL2TransactionPasser.sol
+++ b/packages/rollup-contracts/contracts/rollup/bridge/L1ToL2TransactionPasser.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
-import {DataTypes as dt} from "./DataTypes.sol";
+import {DataTypes as dt} from "../utils/DataTypes.sol";
 
 contract L1ToL2TransactionPasser {
     uint nonce = 0;
diff --git a/packages/rollup-contracts/contracts/L2ToL1MessageReceiver.sol b/packages/rollup-contracts/contracts/rollup/bridge/L2ToL1MessageReceiver.sol
similarity index 97%
rename from packages/rollup-contracts/contracts/L2ToL1MessageReceiver.sol
rename to packages/rollup-contracts/contracts/rollup/bridge/L2ToL1MessageReceiver.sol
index c864e504b5927..d0d3cb205b395 100644
--- a/packages/rollup-contracts/contracts/L2ToL1MessageReceiver.sol
+++ b/packages/rollup-contracts/contracts/rollup/bridge/L2ToL1MessageReceiver.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
-import {DataTypes as dt} from "./DataTypes.sol";
+import {DataTypes as dt} from "../utils/DataTypes.sol";
 
 contract L2ToL1MessageReceiver {
     event L2ToL1MessageEnqueued(
diff --git a/packages/rollup-contracts/contracts/CanonicalTransactionChain.sol b/packages/rollup-contracts/contracts/rollup/chain/CanonicalTransactionChain.sol
similarity index 95%
rename from packages/rollup-contracts/contracts/CanonicalTransactionChain.sol
rename to packages/rollup-contracts/contracts/rollup/chain/CanonicalTransactionChain.sol
index 23648f53b098f..cf5eeb9b3c09c 100644
--- a/packages/rollup-contracts/contracts/CanonicalTransactionChain.sol
+++ b/packages/rollup-contracts/contracts/rollup/chain/CanonicalTransactionChain.sol
@@ -2,10 +2,10 @@ pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
-import {DataTypes as dt} from "./DataTypes.sol";
-import {RollupMerkleUtils} from "./RollupMerkleUtils.sol";
-import {L1ToL2TransactionQueue} from "./L1ToL2TransactionQueue.sol";
-import {SafetyTransactionQueue} from "./SafetyTransactionQueue.sol";
+import {DataTypes as dt} from "../utils/DataTypes.sol";
+import {RollupMerkleUtils} from "../utils/RollupMerkleUtils.sol";
+import {L1ToL2TransactionQueue} from "../queue/L1ToL2TransactionQueue.sol";
+import {SafetyTransactionQueue} from "../queue/SafetyTransactionQueue.sol";
 
 contract CanonicalTransactionChain {
   address public sequencer;
diff --git a/packages/rollup-contracts/contracts/SequencerBatchSubmitter.sol b/packages/rollup-contracts/contracts/rollup/chain/SequencerBatchSubmitter.sol
similarity index 94%
rename from packages/rollup-contracts/contracts/SequencerBatchSubmitter.sol
rename to packages/rollup-contracts/contracts/rollup/chain/SequencerBatchSubmitter.sol
index 68882bae5da20..fce10f9f2ff04 100644
--- a/packages/rollup-contracts/contracts/SequencerBatchSubmitter.sol
+++ b/packages/rollup-contracts/contracts/rollup/chain/SequencerBatchSubmitter.sol
@@ -2,8 +2,8 @@ pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
-import {DataTypes as dt} from "./DataTypes.sol";
-import {RollupMerkleUtils} from "./RollupMerkleUtils.sol";
+import {DataTypes as dt} from "../utils/DataTypes.sol";
+import {RollupMerkleUtils} from "../utils/RollupMerkleUtils.sol";
 import {CanonicalTransactionChain} from "./CanonicalTransactionChain.sol";
 import {StateCommitmentChain} from "./StateCommitmentChain.sol";
 
diff --git a/packages/rollup-contracts/contracts/StateCommitmentChain.sol b/packages/rollup-contracts/contracts/rollup/chain/StateCommitmentChain.sol
similarity index 96%
rename from packages/rollup-contracts/contracts/StateCommitmentChain.sol
rename to packages/rollup-contracts/contracts/rollup/chain/StateCommitmentChain.sol
index d05e4172e910f..ea3abb74ee135 100644
--- a/packages/rollup-contracts/contracts/StateCommitmentChain.sol
+++ b/packages/rollup-contracts/contracts/rollup/chain/StateCommitmentChain.sol
@@ -2,8 +2,8 @@ pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
-import {DataTypes as dt} from "./DataTypes.sol";
-import {RollupMerkleUtils} from "./RollupMerkleUtils.sol";
+import {DataTypes as dt} from "../utils/DataTypes.sol";
+import {RollupMerkleUtils} from "../utils/RollupMerkleUtils.sol";
 import {CanonicalTransactionChain} from "./CanonicalTransactionChain.sol";
 
 contract StateCommitmentChain {
diff --git a/packages/rollup-contracts/contracts/ExecutionManager.sol b/packages/rollup-contracts/contracts/rollup/execution/ExecutionManager.sol
similarity index 99%
rename from packages/rollup-contracts/contracts/ExecutionManager.sol
rename to packages/rollup-contracts/contracts/rollup/execution/ExecutionManager.sol
index f2037296eb2ca..653eebd3ce759 100644
--- a/packages/rollup-contracts/contracts/ExecutionManager.sol
+++ b/packages/rollup-contracts/contracts/rollup/execution/ExecutionManager.sol
@@ -2,12 +2,12 @@ pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
-import {DataTypes as dt} from "./DataTypes.sol";
+import {DataTypes as dt} from "../utils/DataTypes.sol";
 import {FullStateManager} from "./FullStateManager.sol";
-import {ContractAddressGenerator} from "./ContractAddressGenerator.sol";
-import {RLPEncode} from "./RLPEncode.sol";
-import {L2ToL1MessagePasser} from "./precompiles/L2ToL1MessagePasser.sol";
-import {L1MessageSender} from "./precompiles/L1MessageSender.sol";
+import {ContractAddressGenerator} from "../utils/ContractAddressGenerator.sol";
+import {RLPEncode} from "../utils/RLPEncode.sol";
+import {L2ToL1MessagePasser} from "../precompiles/L2ToL1MessagePasser.sol";
+import {L1MessageSender} from "../precompiles/L1MessageSender.sol";
 
 /**
  * @title ExecutionManager
diff --git a/packages/rollup-contracts/contracts/FullStateManager.sol b/packages/rollup-contracts/contracts/rollup/execution/FullStateManager.sol
similarity index 99%
rename from packages/rollup-contracts/contracts/FullStateManager.sol
rename to packages/rollup-contracts/contracts/rollup/execution/FullStateManager.sol
index d6618e500f9b8..187ef35d52615 100644
--- a/packages/rollup-contracts/contracts/FullStateManager.sol
+++ b/packages/rollup-contracts/contracts/rollup/execution/FullStateManager.sol
@@ -3,7 +3,7 @@ pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
 import {StateManager} from "./StateManager.sol";
-import {SafetyChecker} from "./SafetyChecker.sol";
+import {SafetyChecker} from "../utils/SafetyChecker.sol";
 
 /**
  * @title FullStateManager
diff --git a/packages/rollup-contracts/contracts/L2ExecutionManager.sol b/packages/rollup-contracts/contracts/rollup/execution/L2ExecutionManager.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/L2ExecutionManager.sol
rename to packages/rollup-contracts/contracts/rollup/execution/L2ExecutionManager.sol
diff --git a/packages/rollup-contracts/contracts/PartialStateManager.sol b/packages/rollup-contracts/contracts/rollup/execution/PartialStateManager.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/PartialStateManager.sol
rename to packages/rollup-contracts/contracts/rollup/execution/PartialStateManager.sol
diff --git a/packages/rollup-contracts/contracts/StateManager.sol b/packages/rollup-contracts/contracts/rollup/execution/StateManager.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/StateManager.sol
rename to packages/rollup-contracts/contracts/rollup/execution/StateManager.sol
diff --git a/packages/rollup-contracts/contracts/precompiles/L1MessageSender.sol b/packages/rollup-contracts/contracts/rollup/precompiles/L1MessageSender.sol
similarity index 83%
rename from packages/rollup-contracts/contracts/precompiles/L1MessageSender.sol
rename to packages/rollup-contracts/contracts/rollup/precompiles/L1MessageSender.sol
index b1b2932ea0f84..f09a92bb8f11e 100644
--- a/packages/rollup-contracts/contracts/precompiles/L1MessageSender.sol
+++ b/packages/rollup-contracts/contracts/rollup/precompiles/L1MessageSender.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import {ExecutionManager} from "../ExecutionManager.sol";
+import {ExecutionManager} from "../execution/ExecutionManager.sol";
 
 
 contract L1MessageSender {
diff --git a/packages/rollup-contracts/contracts/precompiles/L2ToL1MessagePasser.sol b/packages/rollup-contracts/contracts/rollup/precompiles/L2ToL1MessagePasser.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/precompiles/L2ToL1MessagePasser.sol
rename to packages/rollup-contracts/contracts/rollup/precompiles/L2ToL1MessagePasser.sol
diff --git a/packages/rollup-contracts/contracts/L1ToL2TransactionQueue.sol b/packages/rollup-contracts/contracts/rollup/queue/L1ToL2TransactionQueue.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/L1ToL2TransactionQueue.sol
rename to packages/rollup-contracts/contracts/rollup/queue/L1ToL2TransactionQueue.sol
diff --git a/packages/rollup-contracts/contracts/RollupQueue.sol b/packages/rollup-contracts/contracts/rollup/queue/RollupQueue.sol
similarity index 93%
rename from packages/rollup-contracts/contracts/RollupQueue.sol
rename to packages/rollup-contracts/contracts/rollup/queue/RollupQueue.sol
index efea20a442aa5..d3994a91d32b4 100644
--- a/packages/rollup-contracts/contracts/RollupQueue.sol
+++ b/packages/rollup-contracts/contracts/rollup/queue/RollupQueue.sol
@@ -2,8 +2,8 @@ pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
 /* Internal Imports */
-import {DataTypes as dt} from "./DataTypes.sol";
-import {RollupMerkleUtils} from "./RollupMerkleUtils.sol";
+import {DataTypes as dt} from "../utils/DataTypes.sol";
+import {RollupMerkleUtils} from "../utils/RollupMerkleUtils.sol";
 
 contract RollupQueue {
   // List of batch header hashes
diff --git a/packages/rollup-contracts/contracts/SafetyTransactionQueue.sol b/packages/rollup-contracts/contracts/rollup/queue/SafetyTransactionQueue.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/SafetyTransactionQueue.sol
rename to packages/rollup-contracts/contracts/rollup/queue/SafetyTransactionQueue.sol
diff --git a/packages/rollup-contracts/contracts/ContractAddressGenerator.sol b/packages/rollup-contracts/contracts/rollup/utils/ContractAddressGenerator.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/ContractAddressGenerator.sol
rename to packages/rollup-contracts/contracts/rollup/utils/ContractAddressGenerator.sol
diff --git a/packages/rollup-contracts/contracts/DataTypes.sol b/packages/rollup-contracts/contracts/rollup/utils/DataTypes.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/DataTypes.sol
rename to packages/rollup-contracts/contracts/rollup/utils/DataTypes.sol
diff --git a/packages/rollup-contracts/contracts/RLPEncode.sol b/packages/rollup-contracts/contracts/rollup/utils/RLPEncode.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/RLPEncode.sol
rename to packages/rollup-contracts/contracts/rollup/utils/RLPEncode.sol
diff --git a/packages/rollup-contracts/contracts/RollupMerkleUtils.sol b/packages/rollup-contracts/contracts/rollup/utils/RollupMerkleUtils.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/RollupMerkleUtils.sol
rename to packages/rollup-contracts/contracts/rollup/utils/RollupMerkleUtils.sol
diff --git a/packages/rollup-contracts/contracts/SafetyChecker.sol b/packages/rollup-contracts/contracts/rollup/utils/SafetyChecker.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/SafetyChecker.sol
rename to packages/rollup-contracts/contracts/rollup/utils/SafetyChecker.sol
diff --git a/packages/rollup-contracts/contracts/testing-contracts/AddThree.sol b/packages/rollup-contracts/contracts/test-helpers/AddThree.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/testing-contracts/AddThree.sol
rename to packages/rollup-contracts/contracts/test-helpers/AddThree.sol
diff --git a/packages/rollup-contracts/contracts/testing-contracts/ContextContract.sol b/packages/rollup-contracts/contracts/test-helpers/ContextContract.sol
similarity index 98%
rename from packages/rollup-contracts/contracts/testing-contracts/ContextContract.sol
rename to packages/rollup-contracts/contracts/test-helpers/ContextContract.sol
index 9b2b87e31f4a9..788a3f2a46e2b 100644
--- a/packages/rollup-contracts/contracts/testing-contracts/ContextContract.sol
+++ b/packages/rollup-contracts/contracts/test-helpers/ContextContract.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import {ExecutionManager} from "../ExecutionManager.sol";
+import {ExecutionManager} from "../rollup/execution/ExecutionManager.sol";
 
 /**
  * @title ContextContract
diff --git a/packages/rollup-contracts/contracts/testing-contracts/DummyContract.sol b/packages/rollup-contracts/contracts/test-helpers/DummyContract.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/testing-contracts/DummyContract.sol
rename to packages/rollup-contracts/contracts/test-helpers/DummyContract.sol
diff --git a/packages/rollup-contracts/contracts/testing-contracts/InvalidOpcodes.sol b/packages/rollup-contracts/contracts/test-helpers/InvalidOpcodes.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/testing-contracts/InvalidOpcodes.sol
rename to packages/rollup-contracts/contracts/test-helpers/InvalidOpcodes.sol
diff --git a/packages/rollup-contracts/contracts/testing-contracts/RevertTest.sol b/packages/rollup-contracts/contracts/test-helpers/RevertTest.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/testing-contracts/RevertTest.sol
rename to packages/rollup-contracts/contracts/test-helpers/RevertTest.sol
diff --git a/packages/rollup-contracts/contracts/testing-contracts/RollupTransactionEvents.sol b/packages/rollup-contracts/contracts/test-helpers/RollupTransactionEvents.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/testing-contracts/RollupTransactionEvents.sol
rename to packages/rollup-contracts/contracts/test-helpers/RollupTransactionEvents.sol
diff --git a/packages/rollup-contracts/contracts/testing-contracts/SimpleCall.sol b/packages/rollup-contracts/contracts/test-helpers/SimpleCall.sol
similarity index 99%
rename from packages/rollup-contracts/contracts/testing-contracts/SimpleCall.sol
rename to packages/rollup-contracts/contracts/test-helpers/SimpleCall.sol
index 04e553e7bbd81..9dedbc8757dfd 100644
--- a/packages/rollup-contracts/contracts/testing-contracts/SimpleCall.sol
+++ b/packages/rollup-contracts/contracts/test-helpers/SimpleCall.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.5.0;
 pragma experimental ABIEncoderV2;
 
-import {ExecutionManager} from "../ExecutionManager.sol";
+import {ExecutionManager} from "../rollup/execution/ExecutionManager.sol";
 
 /**
  * @title SimpleCall
diff --git a/packages/rollup-contracts/contracts/testing-contracts/SimpleStorage.sol b/packages/rollup-contracts/contracts/test-helpers/SimpleStorage.sol
similarity index 100%
rename from packages/rollup-contracts/contracts/testing-contracts/SimpleStorage.sol
rename to packages/rollup-contracts/contracts/test-helpers/SimpleStorage.sol
diff --git a/packages/rollup-contracts/contracts/testing-contracts/SimpleStorageArgsFromCalldata.sol b/packages/rollup-contracts/contracts/test-helpers/SimpleStorageArgsFromCalldata.sol
similarity index 97%
rename from packages/rollup-contracts/contracts/testing-contracts/SimpleStorageArgsFromCalldata.sol
rename to packages/rollup-contracts/contracts/test-helpers/SimpleStorageArgsFromCalldata.sol
index 6f182d0f8fbf8..677b3ea867045 100644
--- a/packages/rollup-contracts/contracts/testing-contracts/SimpleStorageArgsFromCalldata.sol
+++ b/packages/rollup-contracts/contracts/test-helpers/SimpleStorageArgsFromCalldata.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import {ExecutionManager} from "../ExecutionManager.sol";
+import {ExecutionManager} from "../rollup/execution/ExecutionManager.sol";
 
 /**
  * @title SimpleStorageArgsFromCalldata
diff --git a/packages/rollup-contracts/contracts/testing-contracts/SimpleTxOrigin.sol b/packages/rollup-contracts/contracts/test-helpers/SimpleTxOrigin.sol
similarity index 95%
rename from packages/rollup-contracts/contracts/testing-contracts/SimpleTxOrigin.sol
rename to packages/rollup-contracts/contracts/test-helpers/SimpleTxOrigin.sol
index 4c880ed8e1c55..95970befdf050 100644
--- a/packages/rollup-contracts/contracts/testing-contracts/SimpleTxOrigin.sol
+++ b/packages/rollup-contracts/contracts/test-helpers/SimpleTxOrigin.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import {ExecutionManager} from "../ExecutionManager.sol";
+import {ExecutionManager} from "../rollup/execution/ExecutionManager.sol";
 
 /**
  * @title SimpleTxOrigin
diff --git a/packages/rollup-contracts/package.json b/packages/rollup-contracts/package.json
index c2fd7ee707388..4dd357d121efc 100644
--- a/packages/rollup-contracts/package.json
+++ b/packages/rollup-contracts/package.json
@@ -8,9 +8,9 @@
   ],
   "scripts": {
     "all": "yarn clean && yarn build && yarn test && yarn fix && yarn lint",
-    "test": "waffle waffle-config.json && mocha --require ts-node/register 'test/*/*.spec.ts' --timeout 20000",
+    "test": "waffle waffle-config.json && mocha --require ts-node/register \"test/**/*.spec.ts\" --timeout 20000",
     "lint": "tslint --format stylish --project .",
-    "fix": "prettier --config ../../prettier-config.json --write 'index.ts' '{deploy,test}/**/*.ts'",
+    "fix": "prettier --config ../../prettier-config.json --write \"index.ts\" \"{deploy,test}/**/*.ts\"",
     "build": "waffle waffle-config.json && tsc -p .",
     "clean": "rimraf build/",
     "deploy:rollup-chain": "yarn build && node ./build/deploy/rollup-chain.js"
diff --git a/packages/ovm/src/app/index.ts b/packages/rollup-contracts/src/app/index.ts
similarity index 100%
rename from packages/ovm/src/app/index.ts
rename to packages/rollup-contracts/src/app/index.ts
diff --git a/packages/ovm/src/app/ovm.ts b/packages/rollup-contracts/src/app/ovm.ts
similarity index 100%
rename from packages/ovm/src/app/ovm.ts
rename to packages/rollup-contracts/src/app/ovm.ts
diff --git a/packages/ovm/src/app/serialization/abi-encoders.ts b/packages/rollup-contracts/src/app/serialization/abi-encoders.ts
similarity index 100%
rename from packages/ovm/src/app/serialization/abi-encoders.ts
rename to packages/rollup-contracts/src/app/serialization/abi-encoders.ts
diff --git a/packages/ovm/src/app/serialization/abi-parsers.ts b/packages/rollup-contracts/src/app/serialization/abi-parsers.ts
similarity index 100%
rename from packages/ovm/src/app/serialization/abi-parsers.ts
rename to packages/rollup-contracts/src/app/serialization/abi-parsers.ts
diff --git a/packages/ovm/src/app/serialization/common.ts b/packages/rollup-contracts/src/app/serialization/common.ts
similarity index 100%
rename from packages/ovm/src/app/serialization/common.ts
rename to packages/rollup-contracts/src/app/serialization/common.ts
diff --git a/packages/ovm/src/app/serialization/index.ts b/packages/rollup-contracts/src/app/serialization/index.ts
similarity index 100%
rename from packages/ovm/src/app/serialization/index.ts
rename to packages/rollup-contracts/src/app/serialization/index.ts
diff --git a/packages/ovm/src/app/utils.ts b/packages/rollup-contracts/src/app/utils.ts
similarity index 100%
rename from packages/ovm/src/app/utils.ts
rename to packages/rollup-contracts/src/app/utils.ts
diff --git a/packages/ovm/src/types/errors.ts b/packages/rollup-contracts/src/types/errors.ts
similarity index 100%
rename from packages/ovm/src/types/errors.ts
rename to packages/rollup-contracts/src/types/errors.ts
diff --git a/packages/ovm/src/types/index.ts b/packages/rollup-contracts/src/types/index.ts
similarity index 100%
rename from packages/ovm/src/types/index.ts
rename to packages/rollup-contracts/src/types/index.ts
diff --git a/packages/ovm/src/types/ovm.ts b/packages/rollup-contracts/src/types/ovm.ts
similarity index 100%
rename from packages/ovm/src/types/ovm.ts
rename to packages/rollup-contracts/src/types/ovm.ts
diff --git a/packages/ovm/src/types/transactionReceipt.ts b/packages/rollup-contracts/src/types/transactionReceipt.ts
similarity index 100%
rename from packages/ovm/src/types/transactionReceipt.ts
rename to packages/rollup-contracts/src/types/transactionReceipt.ts
diff --git a/packages/rollup-contracts/test/rollup-list/CanonicalTransactionChain.spec.ts b/packages/rollup-contracts/test/contract-tests/chain/CanonicalTransactionChain.spec.ts
similarity index 98%
rename from packages/rollup-contracts/test/rollup-list/CanonicalTransactionChain.spec.ts
rename to packages/rollup-contracts/test/contract-tests/chain/CanonicalTransactionChain.spec.ts
index aa0d5d155040b..19efbd68dd182 100644
--- a/packages/rollup-contracts/test/rollup-list/CanonicalTransactionChain.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/chain/CanonicalTransactionChain.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger, TestUtils } from '@eth-optimism/core-utils'
@@ -6,17 +6,17 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 import { Contract } from 'ethers'
 
 /* Internal Imports */
-import { TxChainBatch, TxQueueBatch } from './RLhelper'
-import { makeRandomBatchOfSize } from '../helpers'
+import { TxChainBatch, TxQueueBatch } from '../../test-helpers/RLhelper'
+import { makeRandomBatchOfSize } from '../../test-helpers'
 
 /* Logging */
 const log = getLogger('canonical-tx-chain', true)
 
 /* Contract Imports */
-import * as CanonicalTransactionChain from '../../build/CanonicalTransactionChain.json'
-import * as L1ToL2TransactionQueue from '../../build/L1ToL2TransactionQueue.json'
-import * as SafetyTransactionQueue from '../../build/SafetyTransactionQueue.json'
-import * as RollupMerkleUtils from '../../build/RollupMerkleUtils.json'
+import * as CanonicalTransactionChain from '../../../build/CanonicalTransactionChain.json'
+import * as L1ToL2TransactionQueue from '../../../build/L1ToL2TransactionQueue.json'
+import * as SafetyTransactionQueue from '../../../build/SafetyTransactionQueue.json'
+import * as RollupMerkleUtils from '../../../build/RollupMerkleUtils.json'
 
 /* Begin tests */
 describe('CanonicalTransactionChain', () => {
diff --git a/packages/rollup-contracts/test/rollup-list/SequencerBatchSubmitter.spec.ts b/packages/rollup-contracts/test/contract-tests/chain/SequencerBatchSubmitter.spec.ts
similarity index 91%
rename from packages/rollup-contracts/test/rollup-list/SequencerBatchSubmitter.spec.ts
rename to packages/rollup-contracts/test/contract-tests/chain/SequencerBatchSubmitter.spec.ts
index 55d04d6a6b4e9..ca570963b02dd 100644
--- a/packages/rollup-contracts/test/rollup-list/SequencerBatchSubmitter.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/chain/SequencerBatchSubmitter.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger, TestUtils } from '@eth-optimism/core-utils'
@@ -6,16 +6,16 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 import { Contract } from 'ethers'
 
 /* Internal Imports */
-import { StateChainBatch, TxChainBatch } from './RLhelper'
+import { StateChainBatch, TxChainBatch } from '../../test-helpers/RLhelper'
 
 /* Logging */
 const log = getLogger('batch-submitter', true)
 
 /* Contract Imports */
-import * as StateCommitmentChain from '../../build/StateCommitmentChain.json'
-import * as CanonicalTransactionChain from '../../build/CanonicalTransactionChain.json'
-import * as RollupMerkleUtils from '../../build/RollupMerkleUtils.json'
-import * as SequencerBatchSubmitter from '../../build/SequencerBatchSubmitter.json'
+import * as StateCommitmentChain from '../../../build/StateCommitmentChain.json'
+import * as CanonicalTransactionChain from '../../../build/CanonicalTransactionChain.json'
+import * as RollupMerkleUtils from '../../../build/RollupMerkleUtils.json'
+import * as SequencerBatchSubmitter from '../../../build/SequencerBatchSubmitter.json'
 
 /* Begin tests */
 describe('SequencerBatchSubmitter', () => {
diff --git a/packages/rollup-contracts/test/rollup-list/StateCommitmentChain.spec.ts b/packages/rollup-contracts/test/contract-tests/chain/StateCommitmentChain.spec.ts
similarity index 97%
rename from packages/rollup-contracts/test/rollup-list/StateCommitmentChain.spec.ts
rename to packages/rollup-contracts/test/contract-tests/chain/StateCommitmentChain.spec.ts
index 8996ec45edc19..029ea9bf14ead 100644
--- a/packages/rollup-contracts/test/rollup-list/StateCommitmentChain.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/chain/StateCommitmentChain.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger, TestUtils } from '@eth-optimism/core-utils'
@@ -6,16 +6,16 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 import { Contract } from 'ethers'
 
 /* Internal Imports */
-import { StateChainBatch } from './RLhelper'
-import { makeRandomBatchOfSize } from '../helpers'
+import { StateChainBatch } from '../../test-helpers/RLhelper'
+import { makeRandomBatchOfSize } from '../../test-helpers'
 
 /* Logging */
 const log = getLogger('state-commitment-chain', true)
 
 /* Contract Imports */
-import * as StateCommitmentChain from '../../build/StateCommitmentChain.json'
-import * as CanonicalTransactionChain from '../../build/CanonicalTransactionChain.json'
-import * as RollupMerkleUtils from '../../build/RollupMerkleUtils.json'
+import * as StateCommitmentChain from '../../../build/StateCommitmentChain.json'
+import * as CanonicalTransactionChain from '../../../build/CanonicalTransactionChain.json'
+import * as RollupMerkleUtils from '../../../build/RollupMerkleUtils.json'
 
 /* Begin tests */
 describe('StateCommitmentChain', () => {
diff --git a/packages/ovm/test/contracts/execution-manager.call-opcodes.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.call-opcodes.spec.ts
similarity index 99%
rename from packages/ovm/test/contracts/execution-manager.call-opcodes.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.call-opcodes.spec.ts
index d54fd01de1673..0b5463c8f0aee 100644
--- a/packages/ovm/test/contracts/execution-manager.call-opcodes.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.call-opcodes.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import {
@@ -33,7 +33,7 @@ import {
   gasLimit,
   encodeMethodId,
   encodeRawArguments,
-} from '../helpers'
+} from '../../../test-helpers'
 import { fromPairs } from 'lodash'
 
 export const abi = new ethers.utils.AbiCoder()
diff --git a/packages/ovm/test/contracts/execution-manager.code-opcodes.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.code-opcodes.spec.ts
similarity index 98%
rename from packages/ovm/test/contracts/execution-manager.code-opcodes.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.code-opcodes.spec.ts
index 1f62cd2ea074f..bf6f9d101774b 100644
--- a/packages/ovm/test/contracts/execution-manager.code-opcodes.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.code-opcodes.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import {
@@ -28,7 +28,7 @@ import {
   manuallyDeployOvmContract,
   executeOVMCall,
   addressToBytes32Address,
-} from '../helpers'
+} from '../../../test-helpers'
 
 export const abi = new ethers.utils.AbiCoder()
 
diff --git a/packages/ovm/test/contracts/execution-manager.context-opcodes.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.context-opcodes.spec.ts
similarity index 98%
rename from packages/ovm/test/contracts/execution-manager.context-opcodes.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.context-opcodes.spec.ts
index c352ff24d2bca..04c74393bf855 100644
--- a/packages/ovm/test/contracts/execution-manager.context-opcodes.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.context-opcodes.spec.ts
@@ -1,4 +1,4 @@
-import { should } from '../setup'
+import { should } from '../../../setup'
 
 /* External Imports */
 import {
@@ -32,7 +32,7 @@ import {
   encodeRawArguments,
   encodeMethodId,
   gasLimit,
-} from '../helpers'
+} from '../../../test-helpers'
 import { fromPairs } from 'lodash'
 
 export const abi = new ethers.utils.AbiCoder()
diff --git a/packages/ovm/test/contracts/execution-manager.create-opcodes.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.create-opcodes.spec.ts
similarity index 98%
rename from packages/ovm/test/contracts/execution-manager.create-opcodes.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.create-opcodes.spec.ts
index 3915bbca9a600..64fe0321f3e2e 100644
--- a/packages/ovm/test/contracts/execution-manager.create-opcodes.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.create-opcodes.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import { getLogger, remove0x, add0x } from '@eth-optimism/core-utils'
@@ -24,7 +24,7 @@ import {
   executeOVMCall,
   encodeMethodId,
   encodeRawArguments,
-} from '../helpers'
+} from '../../../test-helpers'
 import { fromPairs } from 'lodash'
 
 const methodIds = fromPairs(
diff --git a/packages/ovm/test/contracts/execution-manager.executeCall.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.executeCall.spec.ts
similarity index 99%
rename from packages/ovm/test/contracts/execution-manager.executeCall.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.executeCall.spec.ts
index c8b4429a31352..71c618ae56c7a 100644
--- a/packages/ovm/test/contracts/execution-manager.executeCall.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.executeCall.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import {
@@ -28,7 +28,7 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 import * as ethereumjsAbi from 'ethereumjs-abi'
 
 /* Internal Imports */
-import { manuallyDeployOvmContract, ZERO_UINT } from '../helpers'
+import { manuallyDeployOvmContract, ZERO_UINT } from '../../../test-helpers'
 
 export const abi = new ethers.utils.AbiCoder()
 
diff --git a/packages/ovm/test/contracts/execution-manager.l1-l2-opcodes.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.l1-l2-opcodes.spec.ts
similarity index 99%
rename from packages/ovm/test/contracts/execution-manager.l1-l2-opcodes.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.l1-l2-opcodes.spec.ts
index ddb518186a861..11e23c216188e 100644
--- a/packages/ovm/test/contracts/execution-manager.l1-l2-opcodes.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.l1-l2-opcodes.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import {
@@ -32,7 +32,7 @@ import {
   gasLimit,
   encodeMethodId,
   encodeRawArguments,
-} from '../helpers'
+} from '../../../test-helpers'
 import { cloneDeep, fromPairs } from 'lodash'
 
 export const abi = new ethers.utils.AbiCoder()
diff --git a/packages/ovm/test/contracts/execution-manager.purity-checking.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.purity-checking.spec.ts
similarity index 97%
rename from packages/ovm/test/contracts/execution-manager.purity-checking.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.purity-checking.spec.ts
index f462c71a8b3d1..a814e11d380d4 100644
--- a/packages/ovm/test/contracts/execution-manager.purity-checking.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.purity-checking.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import { getLogger } from '@eth-optimism/core-utils'
@@ -21,7 +21,7 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 import {
   manuallyDeployOvmContractReturnReceipt,
   didCreateSucceed,
-} from '../helpers'
+} from '../../../test-helpers'
 import { TransactionReceipt } from 'ethers/providers'
 
 const log = getLogger('execution-manager-safety-checking', true)
diff --git a/packages/ovm/test/contracts/execution-manager.recover-eoa-address.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.recover-eoa-address.spec.ts
similarity index 99%
rename from packages/ovm/test/contracts/execution-manager.recover-eoa-address.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.recover-eoa-address.spec.ts
index dedce1adfc983..446189181e40e 100644
--- a/packages/ovm/test/contracts/execution-manager.recover-eoa-address.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.recover-eoa-address.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import { getLogger } from '@eth-optimism/core-utils'
diff --git a/packages/ovm/test/contracts/execution-manager.storage-opcodes.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.storage-opcodes.spec.ts
similarity index 96%
rename from packages/ovm/test/contracts/execution-manager.storage-opcodes.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.storage-opcodes.spec.ts
index 54d3655af7d8d..b60757a69b564 100644
--- a/packages/ovm/test/contracts/execution-manager.storage-opcodes.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/execution-manager/execution-manager.storage-opcodes.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../../setup'
 
 /* External Imports */
 import { abi, getLogger, add0x } from '@eth-optimism/core-utils'
@@ -13,7 +13,11 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 import { Contract } from 'ethers'
 
 /* Internal Imports */
-import { gasLimit, encodeMethodId, encodeRawArguments } from '../helpers'
+import {
+  gasLimit,
+  encodeMethodId,
+  encodeRawArguments,
+} from '../../../test-helpers'
 import { fromPairs } from 'lodash'
 
 const log = getLogger('execution-manager-storage', true)
diff --git a/packages/ovm/test/contracts/l2-execution-manager.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/l2-execution-manager.spec.ts
similarity index 99%
rename from packages/ovm/test/contracts/l2-execution-manager.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/l2-execution-manager.spec.ts
index 2a386ef0ccbc0..74658b8edded2 100644
--- a/packages/ovm/test/contracts/l2-execution-manager.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/l2-execution-manager.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { add0x, getLogger } from '@eth-optimism/core-utils'
diff --git a/packages/ovm/test/contracts/state-manager.spec.ts b/packages/rollup-contracts/test/contract-tests/execution/state-manager.spec.ts
similarity index 98%
rename from packages/ovm/test/contracts/state-manager.spec.ts
rename to packages/rollup-contracts/test/contract-tests/execution/state-manager.spec.ts
index 9eebe448f46df..d755f81d17d1d 100644
--- a/packages/ovm/test/contracts/state-manager.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/execution/state-manager.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger } from '@eth-optimism/core-utils'
diff --git a/packages/rollup-contracts/test/rollup-list/L1ToL2TransactionQueue.spec.ts b/packages/rollup-contracts/test/contract-tests/queue/L1ToL2TransactionQueue.spec.ts
similarity index 93%
rename from packages/rollup-contracts/test/rollup-list/L1ToL2TransactionQueue.spec.ts
rename to packages/rollup-contracts/test/contract-tests/queue/L1ToL2TransactionQueue.spec.ts
index afeff5c3c2a3b..b3aaa73fdf82f 100644
--- a/packages/rollup-contracts/test/rollup-list/L1ToL2TransactionQueue.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/queue/L1ToL2TransactionQueue.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger, TestUtils } from '@eth-optimism/core-utils'
@@ -8,8 +8,8 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 const log = getLogger('l1-to-l2-tx-queue', true)
 
 /* Contract Imports */
-import * as L1ToL2TransactionQueue from '../../build/L1ToL2TransactionQueue.json'
-import * as RollupMerkleUtils from '../../build/RollupMerkleUtils.json'
+import * as L1ToL2TransactionQueue from '../../../build/L1ToL2TransactionQueue.json'
+import * as RollupMerkleUtils from '../../../build/RollupMerkleUtils.json'
 
 /* Begin tests */
 describe('L1ToL2TransactionQueue', () => {
diff --git a/packages/rollup-contracts/test/rollup-list/RollupQueue.spec.ts b/packages/rollup-contracts/test/contract-tests/queue/RollupQueue.spec.ts
similarity index 96%
rename from packages/rollup-contracts/test/rollup-list/RollupQueue.spec.ts
rename to packages/rollup-contracts/test/contract-tests/queue/RollupQueue.spec.ts
index 13f33aedad7ef..815904c659160 100644
--- a/packages/rollup-contracts/test/rollup-list/RollupQueue.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/queue/RollupQueue.spec.ts
@@ -1,18 +1,18 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger, TestUtils } from '@eth-optimism/core-utils'
 import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 
 /* Internal Imports */
-import { TxQueueBatch } from './RLhelper'
+import { TxQueueBatch } from '../../test-helpers/RLhelper'
 
 /* Logging */
 const log = getLogger('rollup-queue', true)
 
 /* Contract Imports */
-import * as RollupQueue from '../../build/RollupQueue.json'
-import * as RollupMerkleUtils from '../../build/RollupMerkleUtils.json'
+import * as RollupQueue from '../../../build/RollupQueue.json'
+import * as RollupMerkleUtils from '../../../build/RollupMerkleUtils.json'
 
 const DEFAULT_TX = '0x1234'
 
diff --git a/packages/rollup-contracts/test/rollup-list/SafetyTransactionQueue.spec.ts b/packages/rollup-contracts/test/contract-tests/queue/SafetyTransactionQueue.spec.ts
similarity index 92%
rename from packages/rollup-contracts/test/rollup-list/SafetyTransactionQueue.spec.ts
rename to packages/rollup-contracts/test/contract-tests/queue/SafetyTransactionQueue.spec.ts
index 62a4d38a0a895..5c5b3962123d3 100644
--- a/packages/rollup-contracts/test/rollup-list/SafetyTransactionQueue.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/queue/SafetyTransactionQueue.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger, TestUtils } from '@eth-optimism/core-utils'
@@ -8,8 +8,8 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 const log = getLogger('safety-tx-queue', true)
 
 /* Contract Imports */
-import * as SafetyTransactionQueue from '../../build/SafetyTransactionQueue.json'
-import * as RollupMerkleUtils from '../../build/RollupMerkleUtils.json'
+import * as SafetyTransactionQueue from '../../../build/SafetyTransactionQueue.json'
+import * as RollupMerkleUtils from '../../../build/RollupMerkleUtils.json'
 
 describe('SafetyTransactionQueue', () => {
   const provider = createMockProvider()
diff --git a/packages/rollup-contracts/test/merklization/RollupMerkleUtils.spec.ts b/packages/rollup-contracts/test/contract-tests/utils/RollupMerkleUtils.spec.ts
similarity index 98%
rename from packages/rollup-contracts/test/merklization/RollupMerkleUtils.spec.ts
rename to packages/rollup-contracts/test/contract-tests/utils/RollupMerkleUtils.spec.ts
index 6eb952f7b16ac..44a7ba269bad9 100644
--- a/packages/rollup-contracts/test/merklization/RollupMerkleUtils.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/utils/RollupMerkleUtils.spec.ts
@@ -1,7 +1,7 @@
-import '../setup'
+import '../../setup'
 
 /* Internal Imports */
-import { makeRepeatedBytes, makeRandomBlockOfSize } from '../helpers'
+import { makeRepeatedBytes, makeRandomBlockOfSize } from '../../test-helpers'
 
 /* External Imports */
 import { newInMemoryDB, SparseMerkleTreeImpl } from '@eth-optimism/core-db'
@@ -15,7 +15,7 @@ import {
 import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 
 /* Contract Imports */
-import * as RollupMerkleUtils from '../../build/RollupMerkleUtils.json'
+import * as RollupMerkleUtils from '../../../build/RollupMerkleUtils.json'
 
 /* Logging */
 const log = getLogger('merkle-utils', true)
diff --git a/packages/ovm/test/contracts/contract-address-generator.spec.ts b/packages/rollup-contracts/test/contract-tests/utils/contract-address-generator.spec.ts
similarity index 96%
rename from packages/ovm/test/contracts/contract-address-generator.spec.ts
rename to packages/rollup-contracts/test/contract-tests/utils/contract-address-generator.spec.ts
index 108d8670f14df..8775ddaf7a14f 100644
--- a/packages/ovm/test/contracts/contract-address-generator.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/utils/contract-address-generator.spec.ts
@@ -1,4 +1,4 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger } from '@eth-optimism/core-utils'
@@ -9,8 +9,8 @@ import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
 import { utils } from 'ethers'
 
 /* Internal Imports */
-import { create2Tests } from './test-files/create2test.json'
-import { buildCreate2Address } from '../helpers'
+import { create2Tests } from '../../test-helpers/data/create2test.json'
+import { buildCreate2Address } from '../../test-helpers'
 
 const log = getLogger('contract-address-generator', true)
 
diff --git a/packages/ovm/test/contracts/rlp-encode.spec.ts b/packages/rollup-contracts/test/contract-tests/utils/rlp-encode.spec.ts
similarity index 95%
rename from packages/ovm/test/contracts/rlp-encode.spec.ts
rename to packages/rollup-contracts/test/contract-tests/utils/rlp-encode.spec.ts
index 3deab330a4801..2cbd646326af8 100644
--- a/packages/ovm/test/contracts/rlp-encode.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/utils/rlp-encode.spec.ts
@@ -1,11 +1,11 @@
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger } from '@eth-optimism/core-utils'
 import { RLPEncodeContractDefinition as RLPEncode } from '@eth-optimism/rollup-contracts'
 
 import { createMockProvider, deployContract, getWallets } from 'ethereum-waffle'
-import { rlpTests } from './test-files/rlptest.json'
+import { rlpTests } from '../../test-helpers/data/rlptest.json'
 
 const log = getLogger('rlp-encode', true)
 
diff --git a/packages/ovm/test/contracts/safety-checker.spec.ts b/packages/rollup-contracts/test/contract-tests/utils/safety-checker.spec.ts
similarity index 99%
rename from packages/ovm/test/contracts/safety-checker.spec.ts
rename to packages/rollup-contracts/test/contract-tests/utils/safety-checker.spec.ts
index b33e3c159a22d..ba0c667043430 100644
--- a/packages/ovm/test/contracts/safety-checker.spec.ts
+++ b/packages/rollup-contracts/test/contract-tests/utils/safety-checker.spec.ts
@@ -1,5 +1,5 @@
 /* Internal Imports */
-import '../setup'
+import '../../setup'
 
 /* External Imports */
 import { getLogger, add0x, remove0x } from '@eth-optimism/core-utils'
diff --git a/packages/rollup-contracts/test/helpers/index.ts b/packages/rollup-contracts/test/helpers/index.ts
deleted file mode 100644
index 81614d8539ae8..0000000000000
--- a/packages/rollup-contracts/test/helpers/index.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**********************************
- * Byte String Generation Helpers *
- *********************************/
-
-// Create a byte string of some length in bytes. It repeats the value provided until the
-// string hits that length
-export function makeRepeatedBytes(value: string, length: number): string {
-  const repeated = value.repeat((length * 2) / value.length + 1)
-  const sliced = repeated.slice(0, length * 2)
-  return '0x' + sliced
-}
-
-export function makeRandomBlockOfSize(blockSize: number): string[] {
-  const block = []
-  for (let i = 0; i < blockSize; i++) {
-    block.push(makeRepeatedBytes('' + Math.floor(Math.random() * 500 + 1), 32))
-  }
-  return block
-}
-
-export function makeRandomBatchOfSize(batchSize: number): string[] {
-  return makeRandomBlockOfSize(batchSize)
-}
diff --git a/packages/rollup-contracts/test/rollup-list/RLhelper.ts b/packages/rollup-contracts/test/test-helpers/RLhelper.ts
similarity index 100%
rename from packages/rollup-contracts/test/rollup-list/RLhelper.ts
rename to packages/rollup-contracts/test/test-helpers/RLhelper.ts
diff --git a/packages/ovm/test/contracts/test-files/create2test.json b/packages/rollup-contracts/test/test-helpers/data/create2test.json
similarity index 100%
rename from packages/ovm/test/contracts/test-files/create2test.json
rename to packages/rollup-contracts/test/test-helpers/data/create2test.json
diff --git a/packages/ovm/test/contracts/test-files/rlptest.json b/packages/rollup-contracts/test/test-helpers/data/rlptest.json
similarity index 100%
rename from packages/ovm/test/contracts/test-files/rlptest.json
rename to packages/rollup-contracts/test/test-helpers/data/rlptest.json
diff --git a/packages/ovm/test/helpers.ts b/packages/rollup-contracts/test/test-helpers/index.ts
similarity index 91%
rename from packages/ovm/test/helpers.ts
rename to packages/rollup-contracts/test/test-helpers/index.ts
index 0fd9241a0a2b1..4907daa4e7f40 100644
--- a/packages/ovm/test/helpers.ts
+++ b/packages/rollup-contracts/test/test-helpers/index.ts
@@ -1,3 +1,35 @@
+import { Transaction } from 'ethers/utils'
+import * as ethereumjsAbi from 'ethereumjs-abi'
+
+/* Contract Imports */
+import { internalTxReceiptToOvmTxReceipt } from '../../src/app'
+
+import { OvmTransactionReceipt } from '../../src/types'
+
+/**********************************
+ * Byte String Generation Helpers *
+ *********************************/
+
+// Create a byte string of some length in bytes. It repeats the value provided until the
+// string hits that length
+export function makeRepeatedBytes(value: string, length: number): string {
+  const repeated = value.repeat((length * 2) / value.length + 1)
+  const sliced = repeated.slice(0, length * 2)
+  return '0x' + sliced
+}
+
+export function makeRandomBlockOfSize(blockSize: number): string[] {
+  const block = []
+  for (let i = 0; i < blockSize; i++) {
+    block.push(makeRepeatedBytes('' + Math.floor(Math.random() * 500 + 1), 32))
+  }
+  return block
+}
+
+export function makeRandomBatchOfSize(batchSize: number): string[] {
+  return makeRandomBlockOfSize(batchSize)
+}
+
 /* External Imports */
 import { Address, CHAIN_ID, GAS_LIMIT } from '@eth-optimism/rollup-core'
 import {
@@ -20,13 +52,6 @@ import {
   JsonRpcProvider,
   Log,
 } from 'ethers/providers'
-import { Transaction } from 'ethers/utils'
-import * as ethereumjsAbi from 'ethereumjs-abi'
-
-/* Contract Imports */
-import { internalTxReceiptToOvmTxReceipt } from '../src/app'
-
-import { OvmTransactionReceipt } from '../src/types'
 
 type Signature = [string, string, string]