Merge branch 'dev-section-redesign' into reSkinReferenceDocs

* dev-section-redesign: (87 commits)
  Added note about restriction on `testDirectory`
  fix(dev-utils): Make chai a dev dependency since exported interface depends on it
  Add changelog entries
  fix(subproviders): make web3-provider-engine types a 'dependency' so it's available to users of the library
  fix(sra-spec): make @loopback/openapi-v3-types a 'dependency' so it's available to users of the library
  fix(sol-cov): make @types/solidity-parser-antlr a 'dependency' so it's available to users of the library
  fix(dev-utils): make web3-provider-engine types a 'dependency' so it's available to users of the library
  fix(0x.js): make web3-provider-engine types a 'dependency' so it's available to users of the library
  fix(monorepo-scripts): Move the creation of the `.installation-test` directory OUTSIDE of the monorepo root, so that the installed packages can't reference the hoisted node_modules folder
  Remove ContractNotFound errors in contract-wrappers
  Update prettierignore
  Update website to use the new unsubscribeAll method in contract-wrappers
  In abi-gen-wrappers, ./wrappers -> ./src/generated-wrappers
  In contract-wrappers, remove setProvider and add unsubscribeAll method.
  take out explicit children definition in props
  Update json-schemas for contract-wrappers
  Add OrThrow suffix to getContractAddressesForNetwork
  remove unused import
  Update CHANGELOG.json for all changed packages
  Remove ContractAddresses from packages/types (mistake after rebase)
  ...

106 files changed, 113 insertions, 12998 deletions

diff --git a/packages/contracts/src/1.0.0/Arbitrage/Arbitrage.sol b/packages/contracts/src/1.0.0/Arbitrage/Arbitrage.sol
deleted file mode 100644
index 5054afc2f..000000000
--- a/packages/contracts/src/1.0.0/Arbitrage/Arbitrage.sol
+++ /dev/null
@@ -1,114 +0,0 @@
-pragma solidity ^0.4.19;
-
-import { IExchange_v1 as Exchange } from "../Exchange/IExchange_v1.sol";
-import { EtherDelta } from "../EtherDelta/EtherDelta.sol";
-import { Ownable_v1 as Ownable } from "../Ownable/Ownable_v1.sol";
-import { IToken_v1 as Token } from "../Token/IToken_v1.sol";
-
-/// @title Arbitrage - Facilitates atomic arbitrage of ERC20 tokens between EtherDelta and 0x Exchange contract.
-/// @author Leonid Logvinov - <leo@0xProject.com>
-contract Arbitrage is Ownable {
-
-    Exchange exchange;
-    EtherDelta etherDelta;
-    address proxyAddress;
-
-    uint256 constant MAX_UINT = 2**256 - 1;
-
-    function Arbitrage(address _exchangeAddress, address _etherDeltaAddress, address _proxyAddress) {
-        exchange = Exchange(_exchangeAddress);
-        etherDelta = EtherDelta(_etherDeltaAddress);
-        proxyAddress = _proxyAddress;
-    }
-
-    /*
-     * Makes token tradeable by setting an allowance for etherDelta and 0x proxy contract.
-     * Also sets an allowance for the owner of the contracts therefore allowing to withdraw tokens.
-     */
-    function setAllowances(address tokenAddress) external onlyOwner {
-        Token token = Token(tokenAddress);
-        token.approve(address(etherDelta), MAX_UINT);
-        token.approve(proxyAddress, MAX_UINT);
-        token.approve(owner, MAX_UINT);
-    }
-
-    /*
-     * Because of the limits on the number of local variables in Solidity we need to compress parameters while loosing
-     * readability. Scheme of the parameter layout:
-     *
-     * addresses
-     * 0..4 orderAddresses
-     * 5 user
-     *
-     * values
-     * 0..5 orderValues
-     * 6 fillTakerTokenAmount
-     * 7 amountGet
-     * 8 amountGive
-     * 9 expires
-     * 10 nonce
-     * 11 amount
-
-     * signature
-     * exchange then etherDelta
-     */
-    function makeAtomicTrade(
-        address[6] addresses, uint[12] values,
-        uint8[2] v, bytes32[2] r, bytes32[2] s
-    ) external onlyOwner {
-        makeExchangeTrade(addresses, values, v, r, s);
-        makeEtherDeltaTrade(addresses, values, v, r, s);
-    }
-
-    function makeEtherDeltaTrade(
-        address[6] addresses, uint[12] values,
-        uint8[2] v, bytes32[2] r, bytes32[2] s
-    ) internal {
-        uint amount = values[11];
-        etherDelta.depositToken(
-            addresses[2], // tokenGet === makerToken
-            values[7] // amountGet
-        );
-        etherDelta.trade(
-            addresses[2], // tokenGet === makerToken
-            values[7], // amountGet
-            addresses[3], // tokenGive === takerToken
-            values[8], // amountGive
-            values[9], // expires
-            values[10], // nonce
-            addresses[5], // user
-            v[1],
-            r[1],
-            s[1],
-            amount
-        );
-        etherDelta.withdrawToken(
-            addresses[3], // tokenGive === tokenToken
-            values[8] // amountGive
-        );
-    }
-
-    function makeExchangeTrade(
-        address[6] addresses, uint[12] values,
-        uint8[2] v, bytes32[2] r, bytes32[2] s
-    ) internal {
-        address[5] memory orderAddresses = [
-            addresses[0], // maker
-            addresses[1], // taker
-            addresses[2], // makerToken
-            addresses[3], // takerToken
-            addresses[4] // feeRecepient
-        ];
-        uint[6] memory orderValues = [
-            values[0], // makerTokenAmount
-            values[1], // takerTokenAmount
-            values[2], // makerFee
-            values[3], // takerFee
-            values[4], // expirationTimestampInSec
-            values[5]  // salt
-        ];
-        uint fillTakerTokenAmount = values[6]; // fillTakerTokenAmount
-        // Execute Exchange trade. It either succeeds in full or fails and reverts all the changes.
-        exchange.fillOrKillOrder(orderAddresses, orderValues, fillTakerTokenAmount, v[0], r[0], s[0]);
-    }
-}
diff --git a/packages/contracts/src/1.0.0/ERC20Token/ERC20Token_v1.sol b/packages/contracts/src/1.0.0/ERC20Token/ERC20Token_v1.sol
deleted file mode 100644
index e05ee2d5e..000000000
--- a/packages/contracts/src/1.0.0/ERC20Token/ERC20Token_v1.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-pragma solidity ^0.4.11;
-
-import { Token_v1 as Token } from "../Token/Token_v1.sol";
-
-contract ERC20Token_v1 is Token {
-
-    function transfer(address _to, uint _value) returns (bool) {
-        //Default assumes totalSupply can't be over max (2^256 - 1).
-        if (balances[msg.sender] >= _value && balances[_to] + _value >= balances[_to]) {
-            balances[msg.sender] -= _value;
-            balances[_to] += _value;
-            Transfer(msg.sender, _to, _value);
-            return true;
-        } else { return false; }
-    }
-
-    function transferFrom(address _from, address _to, uint _value) returns (bool) {
-        if (balances[_from] >= _value && allowed[_from][msg.sender] >= _value && balances[_to] + _value >= balances[_to]) {
-            balances[_to] += _value;
-            balances[_from] -= _value;
-            allowed[_from][msg.sender] -= _value;
-            Transfer(_from, _to, _value);
-            return true;
-        } else { return false; }
-    }
-
-    function balanceOf(address _owner) constant returns (uint) {
-        return balances[_owner];
-    }
-
-    function approve(address _spender, uint _value) returns (bool) {
-        allowed[msg.sender][_spender] = _value;
-        Approval(msg.sender, _spender, _value);
-        return true;
-    }
-
-    function allowance(address _owner, address _spender) constant returns (uint) {
-        return allowed[_owner][_spender];
-    }
-
-    mapping (address => uint) balances;
-    mapping (address => mapping (address => uint)) allowed;
-    uint public totalSupply;
-}
diff --git a/packages/contracts/src/1.0.0/EtherDelta/AccountLevels.sol b/packages/contracts/src/1.0.0/EtherDelta/AccountLevels.sol
deleted file mode 100644
index 8d7a930d3..000000000
--- a/packages/contracts/src/1.0.0/EtherDelta/AccountLevels.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma solidity ^0.4.19;
-
-contract AccountLevels {
-    //given a user, returns an account level
-    //0 = regular user (pays take fee and make fee)
-    //1 = market maker silver (pays take fee, no make fee, gets rebate)
-    //2 = market maker gold (pays take fee, no make fee, gets entire counterparty's take fee as rebate)
-    function accountLevel(address user) constant returns(uint) {
-        return 0;
-    }
-}
diff --git a/packages/contracts/src/1.0.0/EtherDelta/EtherDelta.sol b/packages/contracts/src/1.0.0/EtherDelta/EtherDelta.sol
deleted file mode 100644
index fe599ca0a..000000000
--- a/packages/contracts/src/1.0.0/EtherDelta/EtherDelta.sol
+++ /dev/null
@@ -1,168 +0,0 @@
-pragma solidity ^0.4.19;
-
-import { SafeMath } from "../SafeMath/SafeMath_v1.sol";
-import { AccountLevels } from "./AccountLevels.sol";
-import { Token } from "../Token/Token_v1.sol";
-
-contract EtherDelta is SafeMath {
-    address public admin; //the admin address
-    address public feeAccount; //the account that will receive fees
-    address public accountLevelsAddr; //the address of the AccountLevels contract
-    uint public feeMake; //percentage times (1 ether)
-    uint public feeTake; //percentage times (1 ether)
-    uint public feeRebate; //percentage times (1 ether)
-    mapping (address => mapping (address => uint)) public tokens; //mapping of token addresses to mapping of account balances (token=0 means Ether)
-    mapping (address => mapping (bytes32 => bool)) public orders; //mapping of user accounts to mapping of order hashes to booleans (true = submitted by user, equivalent to offchain signature)
-    mapping (address => mapping (bytes32 => uint)) public orderFills; //mapping of user accounts to mapping of order hashes to uints (amount of order that has been filled)
-
-    event Order(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce, address user);
-    event Cancel(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce, address user, uint8 v, bytes32 r, bytes32 s);
-    event Trade(address tokenGet, uint amountGet, address tokenGive, uint amountGive, address get, address give);
-    event Deposit(address token, address user, uint amount, uint balance);
-    event Withdraw(address token, address user, uint amount, uint balance);
-
-    function EtherDelta(address admin_, address feeAccount_, address accountLevelsAddr_, uint feeMake_, uint feeTake_, uint feeRebate_) {
-        admin = admin_;
-        feeAccount = feeAccount_;
-        accountLevelsAddr = accountLevelsAddr_;
-        feeMake = feeMake_;
-        feeTake = feeTake_;
-        feeRebate = feeRebate_;
-    }
-
-    function() {
-        throw;
-    }
-
-    function changeAdmin(address admin_) {
-        if (msg.sender != admin) throw;
-        admin = admin_;
-    }
-
-    function changeAccountLevelsAddr(address accountLevelsAddr_) {
-        if (msg.sender != admin) throw;
-        accountLevelsAddr = accountLevelsAddr_;
-    }
-
-    function changeFeeAccount(address feeAccount_) {
-        if (msg.sender != admin) throw;
-        feeAccount = feeAccount_;
-    }
-
-    function changeFeeMake(uint feeMake_) {
-        if (msg.sender != admin) throw;
-        if (feeMake_ > feeMake) throw;
-        feeMake = feeMake_;
-    }
-
-    function changeFeeTake(uint feeTake_) {
-        if (msg.sender != admin) throw;
-        if (feeTake_ > feeTake || feeTake_ < feeRebate) throw;
-        feeTake = feeTake_;
-    }
-
-    function changeFeeRebate(uint feeRebate_) {
-        if (msg.sender != admin) throw;
-        if (feeRebate_ < feeRebate || feeRebate_ > feeTake) throw;
-        feeRebate = feeRebate_;
-    }
-
-    function deposit() payable {
-        tokens[0][msg.sender] = safeAdd(tokens[0][msg.sender], msg.value);
-        Deposit(0, msg.sender, msg.value, tokens[0][msg.sender]);
-    }
-
-    function withdraw(uint amount) {
-        if (tokens[0][msg.sender] < amount) throw;
-        tokens[0][msg.sender] = safeSub(tokens[0][msg.sender], amount);
-        if (!msg.sender.call.value(amount)()) throw;
-        Withdraw(0, msg.sender, amount, tokens[0][msg.sender]);
-    }
-
-    function depositToken(address token, uint amount) {
-        //remember to call Token(address).approve(this, amount) or this contract will not be able to do the transfer on your behalf.
-        if (token==0) throw;
-        if (!Token(token).transferFrom(msg.sender, this, amount)) throw;
-        tokens[token][msg.sender] = safeAdd(tokens[token][msg.sender], amount);
-        Deposit(token, msg.sender, amount, tokens[token][msg.sender]);
-    }
-
-    function withdrawToken(address token, uint amount) {
-        if (token==0) throw;
-        if (tokens[token][msg.sender] < amount) throw;
-        tokens[token][msg.sender] = safeSub(tokens[token][msg.sender], amount);
-        if (!Token(token).transfer(msg.sender, amount)) throw;
-        Withdraw(token, msg.sender, amount, tokens[token][msg.sender]);
-    }
-
-    function balanceOf(address token, address user) constant returns (uint) {
-        return tokens[token][user];
-    }
-
-    function order(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce) {
-        bytes32 hash = sha256(this, tokenGet, amountGet, tokenGive, amountGive, expires, nonce);
-        orders[msg.sender][hash] = true;
-        Order(tokenGet, amountGet, tokenGive, amountGive, expires, nonce, msg.sender);
-    }
-
-    function trade(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce, address user, uint8 v, bytes32 r, bytes32 s, uint amount) {
-        //amount is in amountGet terms
-        bytes32 hash = sha256(this, tokenGet, amountGet, tokenGive, amountGive, expires, nonce);
-        if (!(
-            (orders[user][hash] || ecrecover(sha3("\x19Ethereum Signed Message:\n32", hash),v,r,s) == user) &&
-            block.number <= expires &&
-            safeAdd(orderFills[user][hash], amount) <= amountGet
-        )) throw;
-        tradeBalances(tokenGet, amountGet, tokenGive, amountGive, user, amount);
-        orderFills[user][hash] = safeAdd(orderFills[user][hash], amount);
-        Trade(tokenGet, amount, tokenGive, amountGive * amount / amountGet, user, msg.sender);
-    }
-
-    function tradeBalances(address tokenGet, uint amountGet, address tokenGive, uint amountGive, address user, uint amount) private {
-        uint feeMakeXfer = safeMul(amount, feeMake) / (1 ether);
-        uint feeTakeXfer = safeMul(amount, feeTake) / (1 ether);
-        uint feeRebateXfer = 0;
-        if (accountLevelsAddr != 0x0) {
-            uint accountLevel = AccountLevels(accountLevelsAddr).accountLevel(user);
-            if (accountLevel==1) feeRebateXfer = safeMul(amount, feeRebate) / (1 ether);
-            if (accountLevel==2) feeRebateXfer = feeTakeXfer;
-        }
-        tokens[tokenGet][msg.sender] = safeSub(tokens[tokenGet][msg.sender], safeAdd(amount, feeTakeXfer));
-        tokens[tokenGet][user] = safeAdd(tokens[tokenGet][user], safeSub(safeAdd(amount, feeRebateXfer), feeMakeXfer));
-        tokens[tokenGet][feeAccount] = safeAdd(tokens[tokenGet][feeAccount], safeSub(safeAdd(feeMakeXfer, feeTakeXfer), feeRebateXfer));
-        tokens[tokenGive][user] = safeSub(tokens[tokenGive][user], safeMul(amountGive, amount) / amountGet);
-        tokens[tokenGive][msg.sender] = safeAdd(tokens[tokenGive][msg.sender], safeMul(amountGive, amount) / amountGet);
-    }
-
-    function testTrade(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce, address user, uint8 v, bytes32 r, bytes32 s, uint amount, address sender) constant returns(bool) {
-        if (!(
-            tokens[tokenGet][sender] >= amount &&
-            availableVolume(tokenGet, amountGet, tokenGive, amountGive, expires, nonce, user, v, r, s) >= amount
-        )) return false;
-        return true;
-    }
-
-    function availableVolume(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce, address user, uint8 v, bytes32 r, bytes32 s) constant returns(uint) {
-        bytes32 hash = sha256(this, tokenGet, amountGet, tokenGive, amountGive, expires, nonce);
-        if (!(
-            (orders[user][hash] || ecrecover(sha3("\x19Ethereum Signed Message:\n32", hash),v,r,s) == user) &&
-            block.number <= expires
-        )) return 0;
-        uint available1 = safeSub(amountGet, orderFills[user][hash]);
-        uint available2 = safeMul(tokens[tokenGive][user], amountGet) / amountGive;
-        if (available1<available2) return available1;
-        return available2;
-    }
-
-    function amountFilled(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce, address user, uint8 v, bytes32 r, bytes32 s) constant returns(uint) {
-        bytes32 hash = sha256(this, tokenGet, amountGet, tokenGive, amountGive, expires, nonce);
-        return orderFills[user][hash];
-    }
-
-    function cancelOrder(address tokenGet, uint amountGet, address tokenGive, uint amountGive, uint expires, uint nonce, uint8 v, bytes32 r, bytes32 s) {
-        bytes32 hash = sha256(this, tokenGet, amountGet, tokenGive, amountGive, expires, nonce);
-        if (!(orders[msg.sender][hash] || ecrecover(sha3("\x19Ethereum Signed Message:\n32", hash),v,r,s) == msg.sender)) throw;
-        orderFills[msg.sender][hash] = amountGet;
-        Cancel(tokenGet, amountGet, tokenGive, amountGive, expires, nonce, msg.sender, v, r, s);
-    }
-}
diff --git a/packages/contracts/src/1.0.0/Exchange/Exchange_v1.sol b/packages/contracts/src/1.0.0/Exchange/Exchange_v1.sol
deleted file mode 100644
index 3f8e7368d..000000000
--- a/packages/contracts/src/1.0.0/Exchange/Exchange_v1.sol
+++ /dev/null
@@ -1,602 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.4.14;
-
-import { TokenTransferProxy_v1 as TokenTransferProxy } from "../TokenTransferProxy/TokenTransferProxy_v1.sol";
-import { Token_v1 as Token } from "../Token/Token_v1.sol";
-import { SafeMath_v1 as SafeMath } from "../SafeMath/SafeMath_v1.sol";
-
-/// @title Exchange - Facilitates exchange of ERC20 tokens.
-/// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com>
-contract Exchange_v1 is SafeMath {
-
-    // Error Codes
-    enum Errors {
-        ORDER_EXPIRED,                    // Order has already expired
-        ORDER_FULLY_FILLED_OR_CANCELLED,  // Order has already been fully filled or cancelled
-        ROUNDING_ERROR_TOO_LARGE,         // Rounding error too large
-        INSUFFICIENT_BALANCE_OR_ALLOWANCE // Insufficient balance or allowance for token transfer
-    }
-
-    string constant public VERSION = "1.0.0";
-    uint16 constant public EXTERNAL_QUERY_GAS_LIMIT = 4999;    // Changes to state require at least 5000 gas
-
-    address public ZRX_TOKEN_CONTRACT;
-    address public TOKEN_TRANSFER_PROXY_CONTRACT;
-
-    // Mappings of orderHash => amounts of takerTokenAmount filled or cancelled.
-    mapping (bytes32 => uint) public filled;
-    mapping (bytes32 => uint) public cancelled;
-
-    event LogFill(
-        address indexed maker,
-        address taker,
-        address indexed feeRecipient,
-        address makerToken,
-        address takerToken,
-        uint filledMakerTokenAmount,
-        uint filledTakerTokenAmount,
-        uint paidMakerFee,
-        uint paidTakerFee,
-        bytes32 indexed tokens, // keccak256(makerToken, takerToken), allows subscribing to a token pair
-        bytes32 orderHash
-    );
-
-    event LogCancel(
-        address indexed maker,
-        address indexed feeRecipient,
-        address makerToken,
-        address takerToken,
-        uint cancelledMakerTokenAmount,
-        uint cancelledTakerTokenAmount,
-        bytes32 indexed tokens,
-        bytes32 orderHash
-    );
-
-    event LogError(uint8 indexed errorId, bytes32 indexed orderHash);
-
-    struct Order {
-        address maker;
-        address taker;
-        address makerToken;
-        address takerToken;
-        address feeRecipient;
-        uint makerTokenAmount;
-        uint takerTokenAmount;
-        uint makerFee;
-        uint takerFee;
-        uint expirationTimestampInSec;
-        bytes32 orderHash;
-    }
-
-    function Exchange_v1(address _zrxToken, address _tokenTransferProxy) {
-        ZRX_TOKEN_CONTRACT = _zrxToken;
-        TOKEN_TRANSFER_PROXY_CONTRACT = _tokenTransferProxy;
-    }
-
-    /*
-    * Core exchange functions
-    */
-
-    /// @dev Fills the input order.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @param fillTakerTokenAmount Desired amount of takerToken to fill.
-    /// @param shouldThrowOnInsufficientBalanceOrAllowance Test if transfer will fail before attempting.
-    /// @param v ECDSA signature parameter v.
-    /// @param r ECDSA signature parameters r.
-    /// @param s ECDSA signature parameters s.
-    /// @return Total amount of takerToken filled in trade.
-    function fillOrder(
-          address[5] orderAddresses,
-          uint[6] orderValues,
-          uint fillTakerTokenAmount,
-          bool shouldThrowOnInsufficientBalanceOrAllowance,
-          uint8 v,
-          bytes32 r,
-          bytes32 s)
-          public
-          returns (uint filledTakerTokenAmount)
-    {
-        Order memory order = Order({
-            maker: orderAddresses[0],
-            taker: orderAddresses[1],
-            makerToken: orderAddresses[2],
-            takerToken: orderAddresses[3],
-            feeRecipient: orderAddresses[4],
-            makerTokenAmount: orderValues[0],
-            takerTokenAmount: orderValues[1],
-            makerFee: orderValues[2],
-            takerFee: orderValues[3],
-            expirationTimestampInSec: orderValues[4],
-            orderHash: getOrderHash(orderAddresses, orderValues)
-        });
-
-        require(order.taker == address(0) || order.taker == msg.sender);
-        require(order.makerTokenAmount > 0 && order.takerTokenAmount > 0 && fillTakerTokenAmount > 0);
-        require(isValidSignature(
-            order.maker,
-            order.orderHash,
-            v,
-            r,
-            s
-        ));
-
-        if (block.timestamp >= order.expirationTimestampInSec) {
-            LogError(uint8(Errors.ORDER_EXPIRED), order.orderHash);
-            return 0;
-        }
-
-        uint remainingTakerTokenAmount = safeSub(order.takerTokenAmount, getUnavailableTakerTokenAmount(order.orderHash));
-        filledTakerTokenAmount = min256(fillTakerTokenAmount, remainingTakerTokenAmount);
-        if (filledTakerTokenAmount == 0) {
-            LogError(uint8(Errors.ORDER_FULLY_FILLED_OR_CANCELLED), order.orderHash);
-            return 0;
-        }
-
-        if (isRoundingError(filledTakerTokenAmount, order.takerTokenAmount, order.makerTokenAmount)) {
-            LogError(uint8(Errors.ROUNDING_ERROR_TOO_LARGE), order.orderHash);
-            return 0;
-        }
-
-        if (!shouldThrowOnInsufficientBalanceOrAllowance && !isTransferable(order, filledTakerTokenAmount)) {
-            LogError(uint8(Errors.INSUFFICIENT_BALANCE_OR_ALLOWANCE), order.orderHash);
-            return 0;
-        }
-
-        uint filledMakerTokenAmount = getPartialAmount(filledTakerTokenAmount, order.takerTokenAmount, order.makerTokenAmount);
-        uint paidMakerFee;
-        uint paidTakerFee;
-        filled[order.orderHash] = safeAdd(filled[order.orderHash], filledTakerTokenAmount);
-        require(transferViaTokenTransferProxy(
-            order.makerToken,
-            order.maker,
-            msg.sender,
-            filledMakerTokenAmount
-        ));
-        require(transferViaTokenTransferProxy(
-            order.takerToken,
-            msg.sender,
-            order.maker,
-            filledTakerTokenAmount
-        ));
-        if (order.feeRecipient != address(0)) {
-            if (order.makerFee > 0) {
-                paidMakerFee = getPartialAmount(filledTakerTokenAmount, order.takerTokenAmount, order.makerFee);
-                require(transferViaTokenTransferProxy(
-                    ZRX_TOKEN_CONTRACT,
-                    order.maker,
-                    order.feeRecipient,
-                    paidMakerFee
-                ));
-            }
-            if (order.takerFee > 0) {
-                paidTakerFee = getPartialAmount(filledTakerTokenAmount, order.takerTokenAmount, order.takerFee);
-                require(transferViaTokenTransferProxy(
-                    ZRX_TOKEN_CONTRACT,
-                    msg.sender,
-                    order.feeRecipient,
-                    paidTakerFee
-                ));
-            }
-        }
-
-        LogFill(
-            order.maker,
-            msg.sender,
-            order.feeRecipient,
-            order.makerToken,
-            order.takerToken,
-            filledMakerTokenAmount,
-            filledTakerTokenAmount,
-            paidMakerFee,
-            paidTakerFee,
-            keccak256(order.makerToken, order.takerToken),
-            order.orderHash
-        );
-        return filledTakerTokenAmount;
-    }
-
-    /// @dev Cancels the input order.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @param cancelTakerTokenAmount Desired amount of takerToken to cancel in order.
-    /// @return Amount of takerToken cancelled.
-    function cancelOrder(
-        address[5] orderAddresses,
-        uint[6] orderValues,
-        uint cancelTakerTokenAmount)
-        public
-        returns (uint)
-    {
-        Order memory order = Order({
-            maker: orderAddresses[0],
-            taker: orderAddresses[1],
-            makerToken: orderAddresses[2],
-            takerToken: orderAddresses[3],
-            feeRecipient: orderAddresses[4],
-            makerTokenAmount: orderValues[0],
-            takerTokenAmount: orderValues[1],
-            makerFee: orderValues[2],
-            takerFee: orderValues[3],
-            expirationTimestampInSec: orderValues[4],
-            orderHash: getOrderHash(orderAddresses, orderValues)
-        });
-
-        require(order.maker == msg.sender);
-        require(order.makerTokenAmount > 0 && order.takerTokenAmount > 0 && cancelTakerTokenAmount > 0);
-
-        if (block.timestamp >= order.expirationTimestampInSec) {
-            LogError(uint8(Errors.ORDER_EXPIRED), order.orderHash);
-            return 0;
-        }
-
-        uint remainingTakerTokenAmount = safeSub(order.takerTokenAmount, getUnavailableTakerTokenAmount(order.orderHash));
-        uint cancelledTakerTokenAmount = min256(cancelTakerTokenAmount, remainingTakerTokenAmount);
-        if (cancelledTakerTokenAmount == 0) {
-            LogError(uint8(Errors.ORDER_FULLY_FILLED_OR_CANCELLED), order.orderHash);
-            return 0;
-        }
-
-        cancelled[order.orderHash] = safeAdd(cancelled[order.orderHash], cancelledTakerTokenAmount);
-
-        LogCancel(
-            order.maker,
-            order.feeRecipient,
-            order.makerToken,
-            order.takerToken,
-            getPartialAmount(cancelledTakerTokenAmount, order.takerTokenAmount, order.makerTokenAmount),
-            cancelledTakerTokenAmount,
-            keccak256(order.makerToken, order.takerToken),
-            order.orderHash
-        );
-        return cancelledTakerTokenAmount;
-    }
-
-    /*
-    * Wrapper functions
-    */
-
-    /// @dev Fills an order with specified parameters and ECDSA signature, throws if specified amount not filled entirely.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @param fillTakerTokenAmount Desired amount of takerToken to fill.
-    /// @param v ECDSA signature parameter v.
-    /// @param r ECDSA signature parameters r.
-    /// @param s ECDSA signature parameters s.
-    function fillOrKillOrder(
-        address[5] orderAddresses,
-        uint[6] orderValues,
-        uint fillTakerTokenAmount,
-        uint8 v,
-        bytes32 r,
-        bytes32 s)
-        public
-    {
-        require(fillOrder(
-            orderAddresses,
-            orderValues,
-            fillTakerTokenAmount,
-            false,
-            v,
-            r,
-            s
-        ) == fillTakerTokenAmount);
-    }
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param fillTakerTokenAmounts Array of desired amounts of takerToken to fill in orders.
-    /// @param shouldThrowOnInsufficientBalanceOrAllowance Test if transfers will fail before attempting.
-    /// @param v Array ECDSA signature v parameters.
-    /// @param r Array of ECDSA signature r parameters.
-    /// @param s Array of ECDSA signature s parameters.
-    function batchFillOrders(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint[] fillTakerTokenAmounts,
-        bool shouldThrowOnInsufficientBalanceOrAllowance,
-        uint8[] v,
-        bytes32[] r,
-        bytes32[] s)
-        public
-    {
-        for (uint i = 0; i < orderAddresses.length; i++) {
-            fillOrder(
-                orderAddresses[i],
-                orderValues[i],
-                fillTakerTokenAmounts[i],
-                shouldThrowOnInsufficientBalanceOrAllowance,
-                v[i],
-                r[i],
-                s[i]
-            );
-        }
-    }
-
-    /// @dev Synchronously executes multiple fillOrKill orders in a single transaction.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param fillTakerTokenAmounts Array of desired amounts of takerToken to fill in orders.
-    /// @param v Array ECDSA signature v parameters.
-    /// @param r Array of ECDSA signature r parameters.
-    /// @param s Array of ECDSA signature s parameters.
-    function batchFillOrKillOrders(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint[] fillTakerTokenAmounts,
-        uint8[] v,
-        bytes32[] r,
-        bytes32[] s)
-        public
-    {
-        for (uint i = 0; i < orderAddresses.length; i++) {
-            fillOrKillOrder(
-                orderAddresses[i],
-                orderValues[i],
-                fillTakerTokenAmounts[i],
-                v[i],
-                r[i],
-                s[i]
-            );
-        }
-    }
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction until total fillTakerTokenAmount filled.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param fillTakerTokenAmount Desired total amount of takerToken to fill in orders.
-    /// @param shouldThrowOnInsufficientBalanceOrAllowance Test if transfers will fail before attempting.
-    /// @param v Array ECDSA signature v parameters.
-    /// @param r Array of ECDSA signature r parameters.
-    /// @param s Array of ECDSA signature s parameters.
-    /// @return Total amount of fillTakerTokenAmount filled in orders.
-    function fillOrdersUpTo(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint fillTakerTokenAmount,
-        bool shouldThrowOnInsufficientBalanceOrAllowance,
-        uint8[] v,
-        bytes32[] r,
-        bytes32[] s)
-        public
-        returns (uint)
-    {
-        uint filledTakerTokenAmount = 0;
-        for (uint i = 0; i < orderAddresses.length; i++) {
-            require(orderAddresses[i][3] == orderAddresses[0][3]); // takerToken must be the same for each order
-            filledTakerTokenAmount = safeAdd(filledTakerTokenAmount, fillOrder(
-                orderAddresses[i],
-                orderValues[i],
-                safeSub(fillTakerTokenAmount, filledTakerTokenAmount),
-                shouldThrowOnInsufficientBalanceOrAllowance,
-                v[i],
-                r[i],
-                s[i]
-            ));
-            if (filledTakerTokenAmount == fillTakerTokenAmount) break;
-        }
-        return filledTakerTokenAmount;
-    }
-
-    /// @dev Synchronously cancels multiple orders in a single transaction.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param cancelTakerTokenAmounts Array of desired amounts of takerToken to cancel in orders.
-    function batchCancelOrders(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint[] cancelTakerTokenAmounts)
-        public
-    {
-        for (uint i = 0; i < orderAddresses.length; i++) {
-            cancelOrder(
-                orderAddresses[i],
-                orderValues[i],
-                cancelTakerTokenAmounts[i]
-            );
-        }
-    }
-
-    /*
-    * Constant public functions
-    */
-
-    /// @dev Calculates Keccak-256 hash of order with specified parameters.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @return Keccak-256 hash of order.
-    function getOrderHash(address[5] orderAddresses, uint[6] orderValues)
-        public
-        constant
-        returns (bytes32)
-    {
-        return keccak256(
-            address(this),
-            orderAddresses[0], // maker
-            orderAddresses[1], // taker
-            orderAddresses[2], // makerToken
-            orderAddresses[3], // takerToken
-            orderAddresses[4], // feeRecipient
-            orderValues[0],    // makerTokenAmount
-            orderValues[1],    // takerTokenAmount
-            orderValues[2],    // makerFee
-            orderValues[3],    // takerFee
-            orderValues[4],    // expirationTimestampInSec
-            orderValues[5]     // salt
-        );
-    }
-
-    /// @dev Verifies that an order signature is valid.
-    /// @param signer address of signer.
-    /// @param hash Signed Keccak-256 hash.
-    /// @param v ECDSA signature parameter v.
-    /// @param r ECDSA signature parameters r.
-    /// @param s ECDSA signature parameters s.
-    /// @return Validity of order signature.
-    function isValidSignature(
-        address signer,
-        bytes32 hash,
-        uint8 v,
-        bytes32 r,
-        bytes32 s)
-        public
-        constant
-        returns (bool)
-    {
-        return signer == ecrecover(
-            keccak256("\x19Ethereum Signed Message:\n32", hash),
-            v,
-            r,
-            s
-        );
-    }
-
-    /// @dev Checks if rounding error > 0.1%.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingError(uint numerator, uint denominator, uint target)
-        public
-        constant
-        returns (bool)
-    {
-        uint remainder = mulmod(target, numerator, denominator);
-        if (remainder == 0) return false; // No rounding error.
-
-        uint errPercentageTimes1000000 = safeDiv(
-            safeMul(remainder, 1000000),
-            safeMul(numerator, target)
-        );
-        return errPercentageTimes1000000 > 1000;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function getPartialAmount(uint numerator, uint denominator, uint target)
-        public
-        constant
-        returns (uint)
-    {
-        return safeDiv(safeMul(numerator, target), denominator);
-    }
-
-    /// @dev Calculates the sum of values already filled and cancelled for a given order.
-    /// @param orderHash The Keccak-256 hash of the given order.
-    /// @return Sum of values already filled and cancelled.
-    function getUnavailableTakerTokenAmount(bytes32 orderHash)
-        public
-        constant
-        returns (uint)
-    {
-        return safeAdd(filled[orderHash], cancelled[orderHash]);
-    }
-
-
-    /*
-    * Internal functions
-    */
-
-    /// @dev Transfers a token using TokenTransferProxy transferFrom function.
-    /// @param token Address of token to transferFrom.
-    /// @param from Address transfering token.
-    /// @param to Address receiving token.
-    /// @param value Amount of token to transfer.
-    /// @return Success of token transfer.
-    function transferViaTokenTransferProxy(
-        address token,
-        address from,
-        address to,
-        uint value)
-        internal
-        returns (bool)
-    {
-        return TokenTransferProxy(TOKEN_TRANSFER_PROXY_CONTRACT).transferFrom(token, from, to, value);
-    }
-
-    /// @dev Checks if any order transfers will fail.
-    /// @param order Order struct of params that will be checked.
-    /// @param fillTakerTokenAmount Desired amount of takerToken to fill.
-    /// @return Predicted result of transfers.
-    function isTransferable(Order order, uint fillTakerTokenAmount)
-        internal
-        constant  // The called token contracts may attempt to change state, but will not be able to due to gas limits on getBalance and getAllowance.
-        returns (bool)
-    {
-        address taker = msg.sender;
-        uint fillMakerTokenAmount = getPartialAmount(fillTakerTokenAmount, order.takerTokenAmount, order.makerTokenAmount);
-
-        if (order.feeRecipient != address(0)) {
-            bool isMakerTokenZRX = order.makerToken == ZRX_TOKEN_CONTRACT;
-            bool isTakerTokenZRX = order.takerToken == ZRX_TOKEN_CONTRACT;
-            uint paidMakerFee = getPartialAmount(fillTakerTokenAmount, order.takerTokenAmount, order.makerFee);
-            uint paidTakerFee = getPartialAmount(fillTakerTokenAmount, order.takerTokenAmount, order.takerFee);
-            uint requiredMakerZRX = isMakerTokenZRX ? safeAdd(fillMakerTokenAmount, paidMakerFee) : paidMakerFee;
-            uint requiredTakerZRX = isTakerTokenZRX ? safeAdd(fillTakerTokenAmount, paidTakerFee) : paidTakerFee;
-
-            if (   getBalance(ZRX_TOKEN_CONTRACT, order.maker) < requiredMakerZRX
-                || getAllowance(ZRX_TOKEN_CONTRACT, order.maker) < requiredMakerZRX
-                || getBalance(ZRX_TOKEN_CONTRACT, taker) < requiredTakerZRX
-                || getAllowance(ZRX_TOKEN_CONTRACT, taker) < requiredTakerZRX
-            ) return false;
-
-            if (!isMakerTokenZRX && (   getBalance(order.makerToken, order.maker) < fillMakerTokenAmount // Don't double check makerToken if ZRX
-                                     || getAllowance(order.makerToken, order.maker) < fillMakerTokenAmount)
-            ) return false;
-            if (!isTakerTokenZRX && (   getBalance(order.takerToken, taker) < fillTakerTokenAmount // Don't double check takerToken if ZRX
-                                     || getAllowance(order.takerToken, taker) < fillTakerTokenAmount)
-            ) return false;
-        } else if (   getBalance(order.makerToken, order.maker) < fillMakerTokenAmount
-                   || getAllowance(order.makerToken, order.maker) < fillMakerTokenAmount
-                   || getBalance(order.takerToken, taker) < fillTakerTokenAmount
-                   || getAllowance(order.takerToken, taker) < fillTakerTokenAmount
-        ) return false;
-
-        return true;
-    }
-
-    /// @dev Get token balance of an address.
-    /// @param token Address of token.
-    /// @param owner Address of owner.
-    /// @return Token balance of owner.
-    function getBalance(address token, address owner)
-        internal
-        constant  // The called token contract may attempt to change state, but will not be able to due to an added gas limit.
-        returns (uint)
-    {
-        return Token(token).balanceOf.gas(EXTERNAL_QUERY_GAS_LIMIT)(owner); // Limit gas to prevent reentrancy
-    }
-
-    /// @dev Get allowance of token given to TokenTransferProxy by an address.
-    /// @param token Address of token.
-    /// @param owner Address of owner.
-    /// @return Allowance of token given to TokenTransferProxy by owner.
-    function getAllowance(address token, address owner)
-        internal
-        constant  // The called token contract may attempt to change state, but will not be able to due to an added gas limit.
-        returns (uint)
-    {
-        return Token(token).allowance.gas(EXTERNAL_QUERY_GAS_LIMIT)(owner, TOKEN_TRANSFER_PROXY_CONTRACT); // Limit gas to prevent reentrancy
-    }
-}
diff --git a/packages/contracts/src/1.0.0/Exchange/IExchange_v1.sol b/packages/contracts/src/1.0.0/Exchange/IExchange_v1.sol
deleted file mode 100644
index ec4bce7b0..000000000
--- a/packages/contracts/src/1.0.0/Exchange/IExchange_v1.sol
+++ /dev/null
@@ -1,226 +0,0 @@
-pragma solidity ^0.4.19;
-
-contract IExchange_v1 {
-
-    // Error Codes
-    enum Errors {
-        ORDER_EXPIRED,                    // Order has already expired
-        ORDER_FULLY_FILLED_OR_CANCELLED,  // Order has already been fully filled or cancelled
-        ROUNDING_ERROR_TOO_LARGE,         // Rounding error too large
-        INSUFFICIENT_BALANCE_OR_ALLOWANCE // Insufficient balance or allowance for token transfer
-    }
-
-    event LogError(uint8 indexed errorId, bytes32 indexed orderHash);
-
-    event LogFill(
-        address indexed maker,
-        address taker,
-        address indexed feeRecipient,
-        address makerToken,
-        address takerToken,
-        uint filledMakerTokenAmount,
-        uint filledTakerTokenAmount,
-        uint paidMakerFee,
-        uint paidTakerFee,
-        bytes32 indexed tokens, // keccak256(makerToken, takerToken), allows subscribing to a token pair
-        bytes32 orderHash
-    );
-
-    event LogCancel(
-        address indexed maker,
-        address indexed feeRecipient,
-        address makerToken,
-        address takerToken,
-        uint cancelledMakerTokenAmount,
-        uint cancelledTakerTokenAmount,
-        bytes32 indexed tokens,
-        bytes32 orderHash
-    );
-    
-    function ZRX_TOKEN_CONTRACT()
-      public view
-      returns (address);
-      
-    function TOKEN_TRANSFER_PROXY_CONTRACT()
-      public view
-      returns (address);
-      
-    function EXTERNAL_QUERY_GAS_LIMIT()
-      public view
-      returns (uint16);
-      
-    function VERSION()
-      public view
-      returns (string);
-    
-    function filled(bytes32)
-      public view
-      returns (uint256);
-      
-    function cancelled(bytes32)
-      public view
-      returns (uint256);
-    
-    /// @dev Calculates the sum of values already filled and cancelled for a given order.
-    /// @param orderHash The Keccak-256 hash of the given order.
-    /// @return Sum of values already filled and cancelled.
-    function getUnavailableTakerTokenAmount(bytes32 orderHash)
-        public constant
-        returns (uint);
-    
-    /// @dev Calculates partial value given a numerator and denominator.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function getPartialAmount(uint numerator, uint denominator, uint target)
-        public constant
-        returns (uint);
-    
-    /// @dev Checks if rounding error > 0.1%.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingError(uint numerator, uint denominator, uint target)
-        public constant
-        returns (bool);
-      
-    /// @dev Calculates Keccak-256 hash of order with specified parameters.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @return Keccak-256 hash of order.
-    function getOrderHash(address[5] orderAddresses, uint[6] orderValues)
-        public
-        constant
-        returns (bytes32);
-        
-    /// @dev Verifies that an order signature is valid.
-    /// @param signer address of signer.
-    /// @param hash Signed Keccak-256 hash.
-    /// @param v ECDSA signature parameter v.
-    /// @param r ECDSA signature parameters r.
-    /// @param s ECDSA signature parameters s.
-    /// @return Validity of order signature.
-    function isValidSignature(
-        address signer,
-        bytes32 hash,
-        uint8 v,
-        bytes32 r,
-        bytes32 s)
-        public constant
-        returns (bool);
-    
-    /// @dev Fills the input order.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @param fillTakerTokenAmount Desired amount of takerToken to fill.
-    /// @param shouldThrowOnInsufficientBalanceOrAllowance Test if transfer will fail before attempting.
-    /// @param v ECDSA signature parameter v.
-    /// @param r ECDSA signature parameters r.
-    /// @param s ECDSA signature parameters s.
-    /// @return Total amount of takerToken filled in trade.
-    function fillOrder(
-          address[5] orderAddresses,
-          uint[6] orderValues,
-          uint fillTakerTokenAmount,
-          bool shouldThrowOnInsufficientBalanceOrAllowance,
-          uint8 v,
-          bytes32 r,
-          bytes32 s)
-          public
-          returns (uint filledTakerTokenAmount);
-      
-    /// @dev Cancels the input order.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @param cancelTakerTokenAmount Desired amount of takerToken to cancel in order.
-    /// @return Amount of takerToken cancelled.
-    function cancelOrder(
-        address[5] orderAddresses,
-        uint[6] orderValues,
-        uint cancelTakerTokenAmount)
-        public
-        returns (uint);
-
-
-    /// @dev Fills an order with specified parameters and ECDSA signature, throws if specified amount not filled entirely.
-    /// @param orderAddresses Array of order's maker, taker, makerToken, takerToken, and feeRecipient.
-    /// @param orderValues Array of order's makerTokenAmount, takerTokenAmount, makerFee, takerFee, expirationTimestampInSec, and salt.
-    /// @param fillTakerTokenAmount Desired amount of takerToken to fill.
-    /// @param v ECDSA signature parameter v.
-    /// @param r ECDSA signature parameters r.
-    /// @param s ECDSA signature parameters s.
-    function fillOrKillOrder(
-        address[5] orderAddresses,
-        uint[6] orderValues,
-        uint fillTakerTokenAmount,
-        uint8 v,
-        bytes32 r,
-        bytes32 s)
-        public;
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param fillTakerTokenAmounts Array of desired amounts of takerToken to fill in orders.
-    /// @param shouldThrowOnInsufficientBalanceOrAllowance Test if transfers will fail before attempting.
-    /// @param v Array ECDSA signature v parameters.
-    /// @param r Array of ECDSA signature r parameters.
-    /// @param s Array of ECDSA signature s parameters.
-    function batchFillOrders(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint[] fillTakerTokenAmounts,
-        bool shouldThrowOnInsufficientBalanceOrAllowance,
-        uint8[] v,
-        bytes32[] r,
-        bytes32[] s)
-        public;
-
-    /// @dev Synchronously executes multiple fillOrKill orders in a single transaction.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param fillTakerTokenAmounts Array of desired amounts of takerToken to fill in orders.
-    /// @param v Array ECDSA signature v parameters.
-    /// @param r Array of ECDSA signature r parameters.
-    /// @param s Array of ECDSA signature s parameters.
-    function batchFillOrKillOrders(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint[] fillTakerTokenAmounts,
-        uint8[] v,
-        bytes32[] r,
-        bytes32[] s)
-        public;
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction until total fillTakerTokenAmount filled.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param fillTakerTokenAmount Desired total amount of takerToken to fill in orders.
-    /// @param shouldThrowOnInsufficientBalanceOrAllowance Test if transfers will fail before attempting.
-    /// @param v Array ECDSA signature v parameters.
-    /// @param r Array of ECDSA signature r parameters.
-    /// @param s Array of ECDSA signature s parameters.
-    /// @return Total amount of fillTakerTokenAmount filled in orders.
-    function fillOrdersUpTo(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint fillTakerTokenAmount,
-        bool shouldThrowOnInsufficientBalanceOrAllowance,
-        uint8[] v,
-        bytes32[] r,
-        bytes32[] s)
-        public
-        returns (uint);
-
-    /// @dev Synchronously cancels multiple orders in a single transaction.
-    /// @param orderAddresses Array of address arrays containing individual order addresses.
-    /// @param orderValues Array of uint arrays containing individual order values.
-    /// @param cancelTakerTokenAmounts Array of desired amounts of takerToken to cancel in orders.
-    function batchCancelOrders(
-        address[5][] orderAddresses,
-        uint[6][] orderValues,
-        uint[] cancelTakerTokenAmounts)
-        public;
-}
diff --git a/packages/contracts/src/1.0.0/MultiSigWalletWithTImeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol b/packages/contracts/src/1.0.0/MultiSigWalletWithTImeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
deleted file mode 100644
index aee722c53..000000000
--- a/packages/contracts/src/1.0.0/MultiSigWalletWithTImeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.4.10;
-
-import "../../2.0.0/multisig/MultiSigWalletWithTimeLock.sol";
-
-contract MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress is MultiSigWalletWithTimeLock {
-
-    address public TOKEN_TRANSFER_PROXY_CONTRACT;
-
-    modifier validRemoveAuthorizedAddressTx(uint transactionId) {
-        Transaction storage tx = transactions[transactionId];
-        require(tx.destination == TOKEN_TRANSFER_PROXY_CONTRACT);
-        require(isFunctionRemoveAuthorizedAddress(tx.data));
-        _;
-    }
-
-    /// @dev Contract constructor sets initial owners, required number of confirmations, time lock, and tokenTransferProxy address.
-    /// @param _owners List of initial owners.
-    /// @param _required Number of required confirmations.
-    /// @param _secondsTimeLocked Duration needed after a transaction is confirmed and before it becomes executable, in seconds.
-    /// @param _tokenTransferProxy Address of TokenTransferProxy contract.
-    function MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress(
-        address[] _owners,
-        uint _required,
-        uint _secondsTimeLocked,
-        address _tokenTransferProxy)
-        public
-        MultiSigWalletWithTimeLock(_owners, _required, _secondsTimeLocked)
-    {
-        TOKEN_TRANSFER_PROXY_CONTRACT = _tokenTransferProxy;
-    }
-
-    /// @dev Allows execution of removeAuthorizedAddress without time lock.
-    /// @param transactionId Transaction ID.
-    function executeRemoveAuthorizedAddress(uint transactionId)
-        public
-        notExecuted(transactionId)
-        fullyConfirmed(transactionId)
-        validRemoveAuthorizedAddressTx(transactionId)
-    {
-        Transaction storage tx = transactions[transactionId];
-        tx.executed = true;
-        if (tx.destination.call.value(tx.value)(tx.data))
-            Execution(transactionId);
-        else {
-            ExecutionFailure(transactionId);
-            tx.executed = false;
-        }
-    }
-
-    /// @dev Compares first 4 bytes of byte array to removeAuthorizedAddress function signature.
-    /// @param data Transaction data.
-    /// @return Successful if data is a call to removeAuthorizedAddress.
-    function isFunctionRemoveAuthorizedAddress(bytes data)
-        public
-        constant
-        returns (bool)
-    {
-        bytes4 removeAuthorizedAddressSignature = bytes4(sha3("removeAuthorizedAddress(address)"));
-        for (uint i = 0; i < 4; i++) {
-            require(data[i] == removeAuthorizedAddressSignature[i]);
-        }
-        return true;
-    }
-}
diff --git a/packages/contracts/src/1.0.0/Ownable/IOwnable_v1.sol b/packages/contracts/src/1.0.0/Ownable/IOwnable_v1.sol
deleted file mode 100644
index 7e22d544d..000000000
--- a/packages/contracts/src/1.0.0/Ownable/IOwnable_v1.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma solidity ^0.4.19;
-
-/*
- * Ownable
- *
- * Base contract with an owner.
- * Provides onlyOwner modifier, which prevents function from running if it is called by anyone other than the owner.
- */
-
-contract IOwnable_v1 {
-  
-    function owner()
-      public view
-      returns (address);
-  
-    function transferOwnership(address newOwner)
-      public;
-}
diff --git a/packages/contracts/src/1.0.0/Ownable/Ownable_v1.sol b/packages/contracts/src/1.0.0/Ownable/Ownable_v1.sol
deleted file mode 100644
index c87438fa4..000000000
--- a/packages/contracts/src/1.0.0/Ownable/Ownable_v1.sol
+++ /dev/null
@@ -1,27 +0,0 @@
-pragma solidity ^0.4.11;
-
-/*
- * Ownable
- *
- * Base contract with an owner.
- * Provides onlyOwner modifier, which prevents function from running if it is called by anyone other than the owner.
- */
-
-contract Ownable_v1 {
-    address public owner;
-
-    function Ownable_v1() {
-        owner = msg.sender;
-    }
-
-    modifier onlyOwner() {
-        require(msg.sender == owner);
-        _;
-    }
-
-    function transferOwnership(address newOwner) onlyOwner {
-        if (newOwner != address(0)) {
-            owner = newOwner;
-        }
-    }
-}
diff --git a/packages/contracts/src/1.0.0/SafeMath/SafeMath_v1.sol b/packages/contracts/src/1.0.0/SafeMath/SafeMath_v1.sol
deleted file mode 100644
index 341d611ec..000000000
--- a/packages/contracts/src/1.0.0/SafeMath/SafeMath_v1.sol
+++ /dev/null
@@ -1,73 +0,0 @@
-pragma solidity ^0.4.11;
-
-contract SafeMath_v1 {
-    function safeMul(uint a, uint b)
-        internal
-        constant
-        returns (uint256)
-    {
-        uint c = a * b;
-        assert(a == 0 || c / a == b);
-        return c;
-    }
-
-    function safeDiv(uint a, uint b)
-        internal
-        constant
-        returns (uint256)
-    {
-        uint c = a / b;
-        return c;
-    }
-
-    function safeSub(uint a, uint b)
-        internal
-        constant
-        returns (uint256)
-    {
-        assert(b <= a);
-        return a - b;
-    }
-
-    function safeAdd(uint a, uint b)
-        internal
-        constant
-        returns (uint256)
-    {
-        uint c = a + b;
-        assert(c >= a);
-        return c;
-    }
-
-    function max64(uint64 a, uint64 b)
-        internal
-        constant
-        returns (uint64)
-    {
-        return a >= b ? a : b;
-    }
-
-    function min64(uint64 a, uint64 b)
-        internal
-        constant
-        returns (uint64)
-    {
-        return a < b ? a : b;
-    }
-
-    function max256(uint256 a, uint256 b)
-        internal
-        constant
-        returns (uint256)
-    {
-        return a >= b ? a : b;
-    }
-
-    function min256(uint256 a, uint256 b)
-        internal
-        constant
-        returns (uint256)
-    {
-        return a < b ? a : b;
-    }
-}
diff --git a/packages/contracts/src/1.0.0/Token/Token_v1.sol b/packages/contracts/src/1.0.0/Token/Token_v1.sol
deleted file mode 100644
index de619fb7e..000000000
--- a/packages/contracts/src/1.0.0/Token/Token_v1.sol
+++ /dev/null
@@ -1,39 +0,0 @@
-pragma solidity ^0.4.11;
-
-contract Token_v1 {
-
-    /// @return total amount of tokens
-    function totalSupply() constant returns (uint supply) {}
-
-    /// @param _owner The address from which the balance will be retrieved
-    /// @return The balance
-    function balanceOf(address _owner) constant returns (uint balance) {}
-
-    /// @notice send `_value` token to `_to` from `msg.sender`
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return Whether the transfer was successful or not
-    function transfer(address _to, uint _value) returns (bool success) {}
-
-    /// @notice send `_value` token to `_to` from `_from` on the condition it is approved by `_from`
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return Whether the transfer was successful or not
-    function transferFrom(address _from, address _to, uint _value) returns (bool success) {}
-
-    /// @notice `msg.sender` approves `_addr` to spend `_value` tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @param _value The amount of wei to be approved for transfer
-    /// @return Whether the approval was successful or not
-    function approve(address _spender, uint _value) returns (bool success) {}
-
-    /// @param _owner The address of the account owning tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @return Amount of remaining tokens allowed to spent
-    function allowance(address _owner, address _spender) constant returns (uint remaining) {}
-
-    event Transfer(address indexed _from, address indexed _to, uint _value);
-    event Approval(address indexed _owner, address indexed _spender, uint _value);
-}
-
diff --git a/packages/contracts/src/1.0.0/TokenRegistry/ITokenRegistery.sol b/packages/contracts/src/1.0.0/TokenRegistry/ITokenRegistery.sol
deleted file mode 100644
index b8bdaf3b9..000000000
--- a/packages/contracts/src/1.0.0/TokenRegistry/ITokenRegistery.sol
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.4.21;
-
-import { IOwnable_v1 as IOwnable } from "../Ownable/IOwnable_v1.sol";
-
-/// @title Token Registry - Stores metadata associated with ERC20 tokens. See ERC22 https://github.com/ethereum/EIPs/issues/22
-/// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com>
-contract ITokenRegistery is IOwnable {
-
-    event LogAddToken(
-        address indexed token,
-        string name,
-        string symbol,
-        uint8 decimals,
-        bytes ipfsHash,
-        bytes swarmHash
-    );
-
-    event LogRemoveToken(
-        address indexed token,
-        string name,
-        string symbol,
-        uint8 decimals,
-        bytes ipfsHash,
-        bytes swarmHash
-    );
-
-    event LogTokenNameChange(
-        address indexed token,
-        string oldName,
-        string newName
-    );
-    
-    event LogTokenSymbolChange(
-        address indexed token,
-        string oldSymbol,
-        string newSymbol
-    );
-    
-    event LogTokenIpfsHashChange(
-        address indexed token,
-        bytes oldIpfsHash,
-        bytes newIpfsHash
-    );
-    
-    event LogTokenSwarmHashChange(
-        address indexed token,
-        bytes oldSwarmHash,
-        bytes newSwarmHash
-    );
-
-    function tokens(address tokenAddress)
-        public view
-        returns (
-            address token,
-            string name,
-            string symbol,
-            uint8 decimals,
-            bytes ipfsHash,
-            bytes swarmHash
-        );
-
-    function tokenAddresses(uint256 index)
-        public view
-        returns (address);
-
-
-    /// @dev Allows owner to add a new token to the registry.
-    /// @param _token Address of new token.
-    /// @param _name Name of new token.
-    /// @param _symbol Symbol for new token.
-    /// @param _decimals Number of decimals, divisibility of new token.
-    /// @param _ipfsHash IPFS hash of token icon.
-    /// @param _swarmHash Swarm hash of token icon.
-    function addToken(
-        address _token,
-        string _name,
-        string _symbol,
-        uint8 _decimals,
-        bytes _ipfsHash,
-        bytes _swarmHash)
-        public;
-    
-    /// @dev Allows owner to remove an existing token from the registry.
-    /// @param _token Address of existing token.
-    function removeToken(address _token, uint _index)
-        public;
-
-    /// @dev Allows owner to modify an existing token's name.
-    /// @param _token Address of existing token.
-    /// @param _name New name.
-    function setTokenName(address _token, string _name)
-        public;
-
-    /// @dev Allows owner to modify an existing token's symbol.
-    /// @param _token Address of existing token.
-    /// @param _symbol New symbol.
-    function setTokenSymbol(address _token, string _symbol)
-        public;
-
-    /// @dev Allows owner to modify an existing token's IPFS hash.
-    /// @param _token Address of existing token.
-    /// @param _ipfsHash New IPFS hash.
-    function setTokenIpfsHash(address _token, bytes _ipfsHash)
-        public;
-
-    /// @dev Allows owner to modify an existing token's Swarm hash.
-    /// @param _token Address of existing token.
-    /// @param _swarmHash New Swarm hash.
-    function setTokenSwarmHash(address _token, bytes _swarmHash)
-        public;
-
-    /*
-     * Web3 call functions
-     */
-
-    /// @dev Provides a registered token's address when given the token symbol.
-    /// @param _symbol Symbol of registered token.
-    /// @return Token's address.
-    function getTokenAddressBySymbol(string _symbol)
-        public constant
-        returns (address);
-
-    /// @dev Provides a registered token's address when given the token name.
-    /// @param _name Name of registered token.
-    /// @return Token's address.
-    function getTokenAddressByName(string _name)
-        public constant
-        returns (address);
-
-    /// @dev Provides a registered token's metadata, looked up by address.
-    /// @param _token Address of registered token.
-    /// @return Token metadata.
-    function getTokenMetaData(address _token)
-        public constant
-        returns (
-            address,  //tokenAddress
-            string,   //name
-            string,   //symbol
-            uint8,    //decimals
-            bytes,    //ipfsHash
-            bytes     //swarmHash
-        );
-
-    /// @dev Provides a registered token's metadata, looked up by name.
-    /// @param _name Name of registered token.
-    /// @return Token metadata.
-    function getTokenByName(string _name)
-        public constant
-        returns (
-            address,  //tokenAddress
-            string,   //name
-            string,   //symbol
-            uint8,    //decimals
-            bytes,    //ipfsHash
-            bytes     //swarmHash
-        );
-
-    /// @dev Provides a registered token's metadata, looked up by symbol.
-    /// @param _symbol Symbol of registered token.
-    /// @return Token metadata.
-    function getTokenBySymbol(string _symbol)
-        public constant
-        returns (
-            address,  //tokenAddress
-            string,   //name
-            string,   //symbol
-            uint8,    //decimals
-            bytes,    //ipfsHash
-            bytes     //swarmHash
-        );
-
-    /// @dev Returns an array containing all token addresses.
-    /// @return Array of token addresses.
-    function getTokenAddresses()
-        public constant
-        returns (address[]);
-}
diff --git a/packages/contracts/src/1.0.0/TokenRegistry/TokenRegistry.sol b/packages/contracts/src/1.0.0/TokenRegistry/TokenRegistry.sol
deleted file mode 100644
index 7417a10a3..000000000
--- a/packages/contracts/src/1.0.0/TokenRegistry/TokenRegistry.sol
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.4.11;
-
-import { Ownable_v1 as Ownable } from "../Ownable/Ownable_v1.sol";
-
-/// @title Token Registry - Stores metadata associated with ERC20 tokens. See ERC22 https://github.com/ethereum/EIPs/issues/22
-/// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com>
-contract TokenRegistry is Ownable {
-
-    event LogAddToken(
-        address indexed token,
-        string name,
-        string symbol,
-        uint8 decimals,
-        bytes ipfsHash,
-        bytes swarmHash
-    );
-
-    event LogRemoveToken(
-        address indexed token,
-        string name,
-        string symbol,
-        uint8 decimals,
-        bytes ipfsHash,
-        bytes swarmHash
-    );
-
-    event LogTokenNameChange(address indexed token, string oldName, string newName);
-    event LogTokenSymbolChange(address indexed token, string oldSymbol, string newSymbol);
-    event LogTokenIpfsHashChange(address indexed token, bytes oldIpfsHash, bytes newIpfsHash);
-    event LogTokenSwarmHashChange(address indexed token, bytes oldSwarmHash, bytes newSwarmHash);
-
-    mapping (address => TokenMetadata) public tokens;
-    mapping (string => address) tokenBySymbol;
-    mapping (string => address) tokenByName;
-
-    address[] public tokenAddresses;
-
-    struct TokenMetadata {
-        address token;
-        string name;
-        string symbol;
-        uint8 decimals;
-        bytes ipfsHash;
-        bytes swarmHash;
-    }
-
-    modifier tokenExists(address _token) {
-        require(tokens[_token].token != address(0));
-        _;
-    }
-
-    modifier tokenDoesNotExist(address _token) {
-        require(tokens[_token].token == address(0));
-        _;
-    }
-
-    modifier nameDoesNotExist(string _name) {
-        require(tokenByName[_name] == address(0));
-        _;
-    }
-
-    modifier symbolDoesNotExist(string _symbol) {
-        require(tokenBySymbol[_symbol] == address(0));
-        _;
-    }
-
-    modifier addressNotNull(address _address) {
-        require(_address != address(0));
-        _;
-    }
-
-
-    /// @dev Allows owner to add a new token to the registry.
-    /// @param _token Address of new token.
-    /// @param _name Name of new token.
-    /// @param _symbol Symbol for new token.
-    /// @param _decimals Number of decimals, divisibility of new token.
-    /// @param _ipfsHash IPFS hash of token icon.
-    /// @param _swarmHash Swarm hash of token icon.
-    function addToken(
-        address _token,
-        string _name,
-        string _symbol,
-        uint8 _decimals,
-        bytes _ipfsHash,
-        bytes _swarmHash)
-        public
-        onlyOwner
-        tokenDoesNotExist(_token)
-        addressNotNull(_token)
-        symbolDoesNotExist(_symbol)
-        nameDoesNotExist(_name)
-    {
-        tokens[_token] = TokenMetadata({
-            token: _token,
-            name: _name,
-            symbol: _symbol,
-            decimals: _decimals,
-            ipfsHash: _ipfsHash,
-            swarmHash: _swarmHash
-        });
-        tokenAddresses.push(_token);
-        tokenBySymbol[_symbol] = _token;
-        tokenByName[_name] = _token;
-        LogAddToken(
-            _token,
-            _name,
-            _symbol,
-            _decimals,
-            _ipfsHash,
-            _swarmHash
-        );
-    }
-
-    /// @dev Allows owner to remove an existing token from the registry.
-    /// @param _token Address of existing token.
-    function removeToken(address _token, uint _index)
-        public
-        onlyOwner
-        tokenExists(_token)
-    {
-        require(tokenAddresses[_index] == _token);
-
-        tokenAddresses[_index] = tokenAddresses[tokenAddresses.length - 1];
-        tokenAddresses.length -= 1;
-
-        TokenMetadata storage token = tokens[_token];
-        LogRemoveToken(
-            token.token,
-            token.name,
-            token.symbol,
-            token.decimals,
-            token.ipfsHash,
-            token.swarmHash
-        );
-        delete tokenBySymbol[token.symbol];
-        delete tokenByName[token.name];
-        delete tokens[_token];
-    }
-
-    /// @dev Allows owner to modify an existing token's name.
-    /// @param _token Address of existing token.
-    /// @param _name New name.
-    function setTokenName(address _token, string _name)
-        public
-        onlyOwner
-        tokenExists(_token)
-        nameDoesNotExist(_name)
-    {
-        TokenMetadata storage token = tokens[_token];
-        LogTokenNameChange(_token, token.name, _name);
-        delete tokenByName[token.name];
-        tokenByName[_name] = _token;
-        token.name = _name;
-    }
-
-    /// @dev Allows owner to modify an existing token's symbol.
-    /// @param _token Address of existing token.
-    /// @param _symbol New symbol.
-    function setTokenSymbol(address _token, string _symbol)
-        public
-        onlyOwner
-        tokenExists(_token)
-        symbolDoesNotExist(_symbol)
-    {
-        TokenMetadata storage token = tokens[_token];
-        LogTokenSymbolChange(_token, token.symbol, _symbol);
-        delete tokenBySymbol[token.symbol];
-        tokenBySymbol[_symbol] = _token;
-        token.symbol = _symbol;
-    }
-
-    /// @dev Allows owner to modify an existing token's IPFS hash.
-    /// @param _token Address of existing token.
-    /// @param _ipfsHash New IPFS hash.
-    function setTokenIpfsHash(address _token, bytes _ipfsHash)
-        public
-        onlyOwner
-        tokenExists(_token)
-    {
-        TokenMetadata storage token = tokens[_token];
-        LogTokenIpfsHashChange(_token, token.ipfsHash, _ipfsHash);
-        token.ipfsHash = _ipfsHash;
-    }
-
-    /// @dev Allows owner to modify an existing token's Swarm hash.
-    /// @param _token Address of existing token.
-    /// @param _swarmHash New Swarm hash.
-    function setTokenSwarmHash(address _token, bytes _swarmHash)
-        public
-        onlyOwner
-        tokenExists(_token)
-    {
-        TokenMetadata storage token = tokens[_token];
-        LogTokenSwarmHashChange(_token, token.swarmHash, _swarmHash);
-        token.swarmHash = _swarmHash;
-    }
-
-    /*
-     * Web3 call functions
-     */
-
-    /// @dev Provides a registered token's address when given the token symbol.
-    /// @param _symbol Symbol of registered token.
-    /// @return Token's address.
-    function getTokenAddressBySymbol(string _symbol) constant returns (address) {
-        return tokenBySymbol[_symbol];
-    }
-
-    /// @dev Provides a registered token's address when given the token name.
-    /// @param _name Name of registered token.
-    /// @return Token's address.
-    function getTokenAddressByName(string _name) constant returns (address) {
-        return tokenByName[_name];
-    }
-
-    /// @dev Provides a registered token's metadata, looked up by address.
-    /// @param _token Address of registered token.
-    /// @return Token metadata.
-    function getTokenMetaData(address _token)
-        public
-        constant
-        returns (
-            address,  //tokenAddress
-            string,   //name
-            string,   //symbol
-            uint8,    //decimals
-            bytes,    //ipfsHash
-            bytes     //swarmHash
-        )
-    {
-        TokenMetadata memory token = tokens[_token];
-        return (
-            token.token,
-            token.name,
-            token.symbol,
-            token.decimals,
-            token.ipfsHash,
-            token.swarmHash
-        );
-    }
-
-    /// @dev Provides a registered token's metadata, looked up by name.
-    /// @param _name Name of registered token.
-    /// @return Token metadata.
-    function getTokenByName(string _name)
-        public
-        constant
-        returns (
-            address,  //tokenAddress
-            string,   //name
-            string,   //symbol
-            uint8,    //decimals
-            bytes,    //ipfsHash
-            bytes     //swarmHash
-        )
-    {
-        address _token = tokenByName[_name];
-        return getTokenMetaData(_token);
-    }
-
-    /// @dev Provides a registered token's metadata, looked up by symbol.
-    /// @param _symbol Symbol of registered token.
-    /// @return Token metadata.
-    function getTokenBySymbol(string _symbol)
-        public
-        constant
-        returns (
-            address,  //tokenAddress
-            string,   //name
-            string,   //symbol
-            uint8,    //decimals
-            bytes,    //ipfsHash
-            bytes     //swarmHash
-        )
-    {
-        address _token = tokenBySymbol[_symbol];
-        return getTokenMetaData(_token);
-    }
-
-    /// @dev Returns an array containing all token addresses.
-    /// @return Array of token addresses.
-    function getTokenAddresses()
-        public
-        constant
-        returns (address[])
-    {
-        return tokenAddresses;
-    }
-}
diff --git a/packages/contracts/src/1.0.0/TokenTransferProxy/TokenTransferProxy_v1.sol b/packages/contracts/src/1.0.0/TokenTransferProxy/TokenTransferProxy_v1.sol
deleted file mode 100644
index e3659d8ba..000000000
--- a/packages/contracts/src/1.0.0/TokenTransferProxy/TokenTransferProxy_v1.sol
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.4.11;
-
-import { Token_v1 as Token } from "../Token/Token_v1.sol";
-import { Ownable_v1 as Ownable } from "../Ownable/Ownable_v1.sol";
-
-/// @title TokenTransferProxy - Transfers tokens on behalf of contracts that have been approved via decentralized governance.
-/// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com>
-contract TokenTransferProxy_v1 is Ownable {
-
-    /// @dev Only authorized addresses can invoke functions with this modifier.
-    modifier onlyAuthorized {
-        require(authorized[msg.sender]);
-        _;
-    }
-
-    modifier targetAuthorized(address target) {
-        require(authorized[target]);
-        _;
-    }
-
-    modifier targetNotAuthorized(address target) {
-        require(!authorized[target]);
-        _;
-    }
-
-    mapping (address => bool) public authorized;
-    address[] public authorities;
-
-    event LogAuthorizedAddressAdded(address indexed target, address indexed caller);
-    event LogAuthorizedAddressRemoved(address indexed target, address indexed caller);
-
-    /*
-     * Public functions
-     */
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function addAuthorizedAddress(address target)
-        public
-        onlyOwner
-        targetNotAuthorized(target)
-    {
-        authorized[target] = true;
-        authorities.push(target);
-        LogAuthorizedAddressAdded(target, msg.sender);
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    function removeAuthorizedAddress(address target)
-        public
-        onlyOwner
-        targetAuthorized(target)
-    {
-        delete authorized[target];
-        for (uint i = 0; i < authorities.length; i++) {
-            if (authorities[i] == target) {
-                authorities[i] = authorities[authorities.length - 1];
-                authorities.length -= 1;
-                break;
-            }
-        }
-        LogAuthorizedAddressRemoved(target, msg.sender);
-    }
-
-    /// @dev Calls into ERC20 Token contract, invoking transferFrom.
-    /// @param token Address of token to transfer.
-    /// @param from Address to transfer token from.
-    /// @param to Address to transfer token to.
-    /// @param value Amount of token to transfer.
-    /// @return Success of transfer.
-    function transferFrom(
-        address token,
-        address from,
-        address to,
-        uint value)
-        public
-        onlyAuthorized
-        returns (bool)
-    {
-        return Token(token).transferFrom(from, to, value);
-    }
-
-    /*
-     * Public constant functions
-     */
-
-    /// @dev Gets all authorized addresses.
-    /// @return Array of authorized addresses.
-    function getAuthorizedAddresses()
-        public
-        constant
-        returns (address[])
-    {
-        return authorities;
-    }
-}
diff --git a/packages/contracts/src/1.0.0/UnlimitedAllowanceToken/UnlimitedAllowanceToken_v1.sol b/packages/contracts/src/1.0.0/UnlimitedAllowanceToken/UnlimitedAllowanceToken_v1.sol
deleted file mode 100644
index 46379c43d..000000000
--- a/packages/contracts/src/1.0.0/UnlimitedAllowanceToken/UnlimitedAllowanceToken_v1.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity ^0.4.11;
-
-import { ERC20Token_v1 as ERC20Token } from "../ERC20Token/ERC20Token_v1.sol";
-
-contract UnlimitedAllowanceToken_v1 is ERC20Token {
-
-    uint constant MAX_UINT = 2**256 - 1;
-
-    /// @dev ERC20 transferFrom, modified such that an allowance of MAX_UINT represents an unlimited allowance.
-    /// @param _from Address to transfer from.
-    /// @param _to Address to transfer to.
-    /// @param _value Amount to transfer.
-    /// @return Success of transfer.
-    function transferFrom(address _from, address _to, uint _value)
-        public
-        returns (bool)
-    {
-        uint allowance = allowed[_from][msg.sender];
-        if (balances[_from] >= _value
-            && allowance >= _value
-            && balances[_to] + _value >= balances[_to]
-        ) {
-            balances[_to] += _value;
-            balances[_from] -= _value;
-            if (allowance < MAX_UINT) {
-                allowed[_from][msg.sender] -= _value;
-            }
-            Transfer(_from, _to, _value);
-            return true;
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/packages/contracts/src/2.0.0/examples/ExchangeWrapper/ExchangeWrapper.sol b/packages/contracts/src/2.0.0/examples/ExchangeWrapper/ExchangeWrapper.sol
deleted file mode 100644
index 2fa0e3c5e..000000000
--- a/packages/contracts/src/2.0.0/examples/ExchangeWrapper/ExchangeWrapper.sol
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../protocol/Exchange/interfaces/IExchange.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-
-
-contract ExchangeWrapper {
-
-    // Exchange contract.
-    // solhint-disable-next-line var-name-mixedcase
-    IExchange internal EXCHANGE;
-
-    constructor (address _exchange)
-        public
-    {
-        EXCHANGE = IExchange(_exchange);
-    }
-
-    /// @dev Cancels all orders created by sender with a salt less than or equal to the targetOrderEpoch
-    ///      and senderAddress equal to this contract.
-    /// @param targetOrderEpoch Orders created with a salt less or equal to this value will be cancelled.
-    /// @param salt Arbitrary value to gaurantee uniqueness of 0x transaction hash.
-    /// @param makerSignature Proof that maker wishes to call this function with given params.
-    function cancelOrdersUpTo(
-        uint256 targetOrderEpoch,
-        uint256 salt,
-        bytes makerSignature
-    )
-        external
-    {
-        address makerAddress = msg.sender;
-
-        // Encode arguments into byte array.
-        bytes memory data = abi.encodeWithSelector(
-            EXCHANGE.cancelOrdersUpTo.selector,
-            targetOrderEpoch
-        );
-
-        // Call `cancelOrdersUpTo` via `executeTransaction`.
-        EXCHANGE.executeTransaction(
-            salt,
-            makerAddress,
-            data,
-            makerSignature
-        );
-    }
-
-    /// @dev Fills an order using `msg.sender` as the taker.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param salt Arbitrary value to gaurantee uniqueness of 0x transaction hash.
-    /// @param orderSignature Proof that order has been created by maker.
-    /// @param takerSignature Proof that taker wishes to call this function with given params.
-    function fillOrder(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        uint256 salt,
-        bytes memory orderSignature,
-        bytes memory takerSignature
-    )
-        public
-    {
-        address takerAddress = msg.sender;
-
-        // Encode arguments into byte array.
-        bytes memory data = abi.encodeWithSelector(
-            EXCHANGE.fillOrder.selector,
-            order,
-            takerAssetFillAmount,
-            orderSignature
-        );
-
-        // Call `fillOrder` via `executeTransaction`.
-        EXCHANGE.executeTransaction(
-            salt,
-            takerAddress,
-            data,
-            takerSignature
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/examples/Validator/Validator.sol b/packages/contracts/src/2.0.0/examples/Validator/Validator.sol
deleted file mode 100644
index 72ed528ba..000000000
--- a/packages/contracts/src/2.0.0/examples/Validator/Validator.sol
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/Exchange/interfaces/IValidator.sol";
-
-
-contract Validator is 
-    IValidator
-{
-
-    // The single valid signer for this wallet.
-    // solhint-disable-next-line var-name-mixedcase
-    address internal VALID_SIGNER;
-
-    /// @dev constructs a new `Validator` with a single valid signer.
-    /// @param validSigner The sole, valid signer.
-    constructor (address validSigner) public {
-        VALID_SIGNER = validSigner;
-    }
-
-    /// @dev Verifies that a signature is valid. `signer` must match `VALID_SIGNER`.
-    /// @param hash Message hash that is signed.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof of signing.
-    /// @return Validity of signature.
-    // solhint-disable no-unused-vars
-    function isValidSignature(
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        external
-        view
-        returns (bool isValid)
-    {
-        return (signerAddress == VALID_SIGNER);
-    }
-    // solhint-enable no-unused-vars
-}
diff --git a/packages/contracts/src/2.0.0/examples/Wallet/Wallet.sol b/packages/contracts/src/2.0.0/examples/Wallet/Wallet.sol
deleted file mode 100644
index b75021a31..000000000
--- a/packages/contracts/src/2.0.0/examples/Wallet/Wallet.sol
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/Exchange/interfaces/IWallet.sol";
-import "../../utils/LibBytes/LibBytes.sol";
-
-
-contract Wallet is 
-    IWallet
-{
-    using LibBytes for bytes;
-
-    // The owner of this wallet.
-    // solhint-disable-next-line var-name-mixedcase
-    address internal WALLET_OWNER;
-
-    /// @dev constructs a new `Wallet` with a single owner.
-    /// @param walletOwner The owner of this wallet.
-    constructor (address walletOwner) public {
-        WALLET_OWNER = walletOwner;
-    }
-
-    /// @dev Validates an EIP712 signature.
-    ///      The signer must match the owner of this wallet.
-    /// @param hash Message hash that is signed.
-    /// @param eip712Signature Proof of signing.
-    /// @return Validity of signature.
-    function isValidSignature(
-        bytes32 hash,
-        bytes eip712Signature
-    )
-        external
-        view
-        returns (bool isValid)
-    {
-        require(
-            eip712Signature.length == 65,
-            "LENGTH_65_REQUIRED"
-        );
-
-        uint8 v = uint8(eip712Signature[0]);
-        bytes32 r = eip712Signature.readBytes32(1);
-        bytes32 s = eip712Signature.readBytes32(33);
-        address recoveredAddress = ecrecover(hash, v, r, s);
-        isValid = WALLET_OWNER == recoveredAddress;
-        return isValid;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/examples/Whitelist/Whitelist.sol b/packages/contracts/src/2.0.0/examples/Whitelist/Whitelist.sol
deleted file mode 100644
index e4e25038c..000000000
--- a/packages/contracts/src/2.0.0/examples/Whitelist/Whitelist.sol
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../protocol/Exchange/interfaces/IExchange.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-import "../../utils/Ownable/Ownable.sol";
-
-
-contract Whitelist is
-    Ownable
-{
-
-    // Mapping of address => whitelist status.
-    mapping (address => bool) public isWhitelisted;
-
-    // Exchange contract.
-    // solhint-disable var-name-mixedcase
-    IExchange internal EXCHANGE;
-    bytes internal TX_ORIGIN_SIGNATURE;
-    // solhint-enable var-name-mixedcase
-
-    byte constant internal VALIDATOR_SIGNATURE_BYTE = "\x05";
-
-    constructor (address _exchange)
-        public
-    {
-        EXCHANGE = IExchange(_exchange);
-        TX_ORIGIN_SIGNATURE = abi.encodePacked(address(this), VALIDATOR_SIGNATURE_BYTE);
-    }
-
-    /// @dev Adds or removes an address from the whitelist.
-    /// @param target Address to add or remove from whitelist.
-    /// @param isApproved Whitelist status to assign to address.
-    function updateWhitelistStatus(
-        address target,
-        bool isApproved
-    )
-        external
-        onlyOwner
-    {
-        isWhitelisted[target] = isApproved;
-    }
-
-    /// @dev Verifies signer is same as signer of current Ethereum transaction.
-    ///      NOTE: This function can currently be used to validate signatures coming from outside of this contract.
-    ///      Extra safety checks can be added for a production contract.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof of signing.
-    /// @return Validity of order signature.
-    // solhint-disable no-unused-vars
-    function isValidSignature(
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        external
-        view
-        returns (bool isValid)
-    {
-        // solhint-disable-next-line avoid-tx-origin
-        return signerAddress == tx.origin;
-    }
-    // solhint-enable no-unused-vars
-
-    /// @dev Fills an order using `msg.sender` as the taker.
-    ///      The transaction will revert if both the maker and taker are not whitelisted.
-    ///      Orders should specify this contract as the `senderAddress` in order to gaurantee
-    ///      that both maker and taker have been whitelisted.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param salt Arbitrary value to gaurantee uniqueness of 0x transaction hash.
-    /// @param orderSignature Proof that order has been created by maker.
-    function fillOrderIfWhitelisted(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        uint256 salt,
-        bytes memory orderSignature
-    )
-        public
-    {
-        address takerAddress = msg.sender;
-
-        // This contract must be the entry point for the transaction.
-        require(
-            // solhint-disable-next-line avoid-tx-origin
-            takerAddress == tx.origin,
-            "INVALID_SENDER"
-        );
-
-        // Check if maker is on the whitelist.
-        require(
-            isWhitelisted[order.makerAddress],
-            "MAKER_NOT_WHITELISTED"
-        );
-
-        // Check if taker is on the whitelist.
-        require(
-            isWhitelisted[takerAddress],
-            "TAKER_NOT_WHITELISTED"
-        );
-
-        // Encode arguments into byte array.
-        bytes memory data = abi.encodeWithSelector(
-            EXCHANGE.fillOrder.selector,
-            order,
-            takerAssetFillAmount,
-            orderSignature
-        );
-
-        // Call `fillOrder` via `executeTransaction`.
-        EXCHANGE.executeTransaction(
-            salt,
-            takerAddress,
-            data,
-            TX_ORIGIN_SIGNATURE
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/Forwarder.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/Forwarder.sol
deleted file mode 100644
index 94dec40ed..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/Forwarder.sol
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "./MixinWeth.sol";
-import "./MixinForwarderCore.sol";
-import "./libs/LibConstants.sol";
-import "./MixinAssets.sol";
-import "./MixinExchangeWrapper.sol";
-
-
-// solhint-disable no-empty-blocks
-contract Forwarder is
-    LibConstants,
-    MixinWeth,
-    MixinAssets,
-    MixinExchangeWrapper,
-    MixinForwarderCore
-{
-    constructor (
-        address _exchange,
-        bytes memory _zrxAssetData,
-        bytes memory _wethAssetData
-    )
-        public
-        LibConstants(
-            _exchange,
-            _zrxAssetData,
-            _wethAssetData
-        )
-        MixinForwarderCore()
-    {}
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinAssets.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinAssets.sol
deleted file mode 100644
index 43efb5ff3..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinAssets.sol
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/LibBytes/LibBytes.sol";
-import "../../utils/Ownable/Ownable.sol";
-import "../../tokens/ERC20Token/IERC20Token.sol";
-import "../../tokens/ERC721Token/IERC721Token.sol";
-import "./libs/LibConstants.sol";
-import "./mixins/MAssets.sol";
-
-
-contract MixinAssets is
-    Ownable,
-    LibConstants,
-    MAssets
-{
-    using LibBytes for bytes;
-
-    bytes4 constant internal ERC20_TRANSFER_SELECTOR = bytes4(keccak256("transfer(address,uint256)"));
-
-    /// @dev Withdraws assets from this contract. The contract requires a ZRX balance in order to 
-    ///      function optimally, and this function allows the ZRX to be withdrawn by owner. It may also be
-    ///      used to withdraw assets that were accidentally sent to this contract.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of ERC20 token to withdraw.
-    function withdrawAsset(
-        bytes assetData,
-        uint256 amount
-    )
-        external
-        onlyOwner
-    {
-        transferAssetToSender(assetData, amount);
-    }
-
-    /// @dev Transfers given amount of asset to sender.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of asset to transfer to sender.
-    function transferAssetToSender(
-        bytes memory assetData,
-        uint256 amount
-    )
-        internal
-    {
-        bytes4 proxyId = assetData.readBytes4(0);
-
-        if (proxyId == ERC20_DATA_ID) {
-            transferERC20Token(assetData, amount);
-        } else if (proxyId == ERC721_DATA_ID) {
-            transferERC721Token(assetData, amount);
-        } else {
-            revert("UNSUPPORTED_ASSET_PROXY");
-        }
-    }
-
-    /// @dev Decodes ERC20 assetData and transfers given amount to sender.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of asset to transfer to sender.
-    function transferERC20Token(
-        bytes memory assetData,
-        uint256 amount
-    )
-        internal
-    {
-        address token = assetData.readAddress(16);
-
-        // Transfer tokens.
-        // We do a raw call so we can check the success separate
-        // from the return data.
-        bool success = token.call(abi.encodeWithSelector(
-            ERC20_TRANSFER_SELECTOR,
-            msg.sender,
-            amount
-        ));
-        require(
-            success,
-            "TRANSFER_FAILED"
-        );
-        
-        // Check return data.
-        // If there is no return data, we assume the token incorrectly
-        // does not return a bool. In this case we expect it to revert
-        // on failure, which was handled above.
-        // If the token does return data, we require that it is a single
-        // value that evaluates to true.
-        assembly {
-            if returndatasize {
-                success := 0
-                if eq(returndatasize, 32) {
-                    // First 64 bytes of memory are reserved scratch space
-                    returndatacopy(0, 0, 32)
-                    success := mload(0)
-                }
-            }
-        }
-        require(
-            success,
-            "TRANSFER_FAILED"
-        );
-    }
-
-    /// @dev Decodes ERC721 assetData and transfers given amount to sender.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of asset to transfer to sender.
-    function transferERC721Token(
-        bytes memory assetData,
-        uint256 amount
-    )
-        internal
-    {
-        require(
-            amount == 1,
-            "INVALID_AMOUNT"
-        );
-        // Decode asset data.
-        address token = assetData.readAddress(16);
-        uint256 tokenId = assetData.readUint256(36);
-
-        // Perform transfer.
-        IERC721Token(token).transferFrom(
-            address(this),
-            msg.sender,
-            tokenId
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol
deleted file mode 100644
index fea9a53c2..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinExchangeWrapper.sol
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "./libs/LibConstants.sol";
-import "./mixins/MExchangeWrapper.sol";
-import "../../protocol/Exchange/libs/LibAbiEncoder.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-import "../../protocol/Exchange/libs/LibFillResults.sol";
-import "../../protocol/Exchange/libs/LibMath.sol";
-
-
-contract MixinExchangeWrapper is
-    LibAbiEncoder,
-    LibFillResults,
-    LibMath,
-    LibConstants,
-    MExchangeWrapper
-{
-    /// @dev Fills the input order.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrderNoThrow(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        internal
-        returns (FillResults memory fillResults)
-    {
-        // ABI encode calldata for `fillOrder`
-        bytes memory fillOrderCalldata = abiEncodeFillOrder(
-            order,
-            takerAssetFillAmount,
-            signature
-        );
-
-        address exchange = address(EXCHANGE);
-
-        // Call `fillOrder` and handle any exceptions gracefully
-        assembly {
-            let success := call(
-                gas,                                // forward all gas
-                exchange,                           // call address of Exchange contract
-                0,                                  // transfer 0 wei
-                add(fillOrderCalldata, 32),         // pointer to start of input (skip array length in first 32 bytes)
-                mload(fillOrderCalldata),           // length of input
-                fillOrderCalldata,                  // write output over input
-                128                                 // output size is 128 bytes
-            )
-            if success {
-                mstore(fillResults, mload(fillOrderCalldata))
-                mstore(add(fillResults, 32), mload(add(fillOrderCalldata, 32)))
-                mstore(add(fillResults, 64), mload(add(fillOrderCalldata, 64)))
-                mstore(add(fillResults, 96), mload(add(fillOrderCalldata, 96)))
-            }
-        }
-        // fillResults values will be 0 by default if call was unsuccessful
-        return fillResults;
-    }
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of WETH has been sold by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param wethSellAmount Desired amount of WETH to sell.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketSellWeth(
-        LibOrder.Order[] memory orders,
-        uint256 wethSellAmount,
-        bytes[] memory signatures
-    )
-        internal
-        returns (FillResults memory totalFillResults)
-    {
-        bytes memory makerAssetData = orders[0].makerAssetData;
-        bytes memory wethAssetData = WETH_ASSET_DATA;
-
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-
-            // We assume that asset being bought by taker is the same for each order.
-            // We assume that asset being sold by taker is WETH for each order.
-            orders[i].makerAssetData = makerAssetData;
-            orders[i].takerAssetData = wethAssetData;
-
-            // Calculate the remaining amount of WETH to sell
-            uint256 remainingTakerAssetFillAmount = safeSub(wethSellAmount, totalFillResults.takerAssetFilledAmount);
-
-            // Attempt to sell the remaining amount of WETH
-            FillResults memory singleFillResults = fillOrderNoThrow(
-                orders[i],
-                remainingTakerAssetFillAmount,
-                signatures[i]
-            );
-
-            // Update amounts filled and fees paid by maker and taker
-            addFillResults(totalFillResults, singleFillResults);
-
-            // Stop execution if the entire amount of takerAsset has been sold
-            if (totalFillResults.takerAssetFilledAmount >= wethSellAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction until total amount is bought by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    ///      The asset being sold by taker must always be WETH.
-    /// @param orders Array of order specifications.
-    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketBuyExactAmountWithWeth(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        internal
-        returns (FillResults memory totalFillResults)
-    {
-        bytes memory makerAssetData = orders[0].makerAssetData;
-        bytes memory wethAssetData = WETH_ASSET_DATA;
-
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-
-            // We assume that asset being bought by taker is the same for each order.
-            // We assume that asset being sold by taker is WETH for each order.
-            orders[i].makerAssetData = makerAssetData;
-            orders[i].takerAssetData = wethAssetData;
-
-            // Calculate the remaining amount of makerAsset to buy
-            uint256 remainingMakerAssetFillAmount = safeSub(makerAssetFillAmount, totalFillResults.makerAssetFilledAmount);
-
-            // Convert the remaining amount of makerAsset to buy into remaining amount
-            // of takerAsset to sell, assuming entire amount can be sold in the current order
-            uint256 remainingTakerAssetFillAmount = getPartialAmountFloor(
-                orders[i].takerAssetAmount,
-                orders[i].makerAssetAmount,
-                remainingMakerAssetFillAmount
-            );
-
-            // Attempt to sell the remaining amount of takerAsset
-            FillResults memory singleFillResults = fillOrderNoThrow(
-                orders[i],
-                remainingTakerAssetFillAmount,
-                signatures[i]
-            );
-
-            // Update amounts filled and fees paid by maker and taker
-            addFillResults(totalFillResults, singleFillResults);
-
-            // Stop execution if the entire amount of makerAsset has been bought
-            uint256 makerAssetFilledAmount = totalFillResults.makerAssetFilledAmount;
-            if (makerAssetFilledAmount >= makerAssetFillAmount) {
-                break;
-            }
-        }
-
-        require(
-            makerAssetFilledAmount >= makerAssetFillAmount,
-            "COMPLETE_FILL_FAILED"
-        );
-        return totalFillResults;
-    }
-
-    /// @dev Buys zrxBuyAmount of ZRX fee tokens, taking into account ZRX fees for each order. This will guarantee
-    ///      that at least zrxBuyAmount of ZRX is purchased (sometimes slightly over due to rounding issues).
-    ///      It is possible that a request to buy 200 ZRX will require purchasing 202 ZRX
-    ///      as 2 ZRX is required to purchase the 200 ZRX fee tokens. This guarantees at least 200 ZRX for future purchases.
-    ///      The asset being sold by taker must always be WETH. 
-    /// @param orders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset.
-    /// @param zrxBuyAmount Desired amount of ZRX to buy.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
-    function marketBuyExactZrxWithWeth(
-        LibOrder.Order[] memory orders,
-        uint256 zrxBuyAmount,
-        bytes[] memory signatures
-    )
-        internal
-        returns (FillResults memory totalFillResults)
-    {
-        // Do nothing if zrxBuyAmount == 0
-        if (zrxBuyAmount == 0) {
-            return totalFillResults;
-        }
-
-        bytes memory zrxAssetData = ZRX_ASSET_DATA;
-        bytes memory wethAssetData = WETH_ASSET_DATA;
-        uint256 zrxPurchased = 0;
-
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-
-            // All of these are ZRX/WETH, so we can drop the respective assetData from calldata.
-            orders[i].makerAssetData = zrxAssetData;
-            orders[i].takerAssetData = wethAssetData;
-
-            // Calculate the remaining amount of ZRX to buy.
-            uint256 remainingZrxBuyAmount = safeSub(zrxBuyAmount, zrxPurchased);
-
-            // Convert the remaining amount of ZRX to buy into remaining amount
-            // of WETH to sell, assuming entire amount can be sold in the current order.
-            uint256 remainingWethSellAmount = getPartialAmountFloor(
-                orders[i].takerAssetAmount,
-                safeSub(orders[i].makerAssetAmount, orders[i].takerFee),  // our exchange rate after fees 
-                remainingZrxBuyAmount
-            );
-
-            // Attempt to sell the remaining amount of WETH.
-            FillResults memory singleFillResult = fillOrderNoThrow(
-                orders[i],
-                safeAdd(remainingWethSellAmount, 1),  // we add 1 wei to the fill amount to make up for rounding errors
-                signatures[i]
-            );
-
-            // Update amounts filled and fees paid by maker and taker.
-            addFillResults(totalFillResults, singleFillResult);
-            zrxPurchased = safeSub(totalFillResults.makerAssetFilledAmount, totalFillResults.takerFeePaid);
-
-            // Stop execution if the entire amount of ZRX has been bought.
-            if (zrxPurchased >= zrxBuyAmount) {
-                break;
-            }
-        }
-
-        require(
-            zrxPurchased >= zrxBuyAmount,
-            "COMPLETE_FILL_FAILED"
-        );
-        return totalFillResults;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol
deleted file mode 100644
index 54487f726..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinForwarderCore.sol
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "./libs/LibConstants.sol";
-import "./mixins/MWeth.sol";
-import "./mixins/MAssets.sol";
-import "./mixins/MExchangeWrapper.sol";
-import "./interfaces/IForwarderCore.sol";
-import "../../utils/LibBytes/LibBytes.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-import "../../protocol/Exchange/libs/LibFillResults.sol";
-import "../../protocol/Exchange/libs/LibMath.sol";
-
-
-contract MixinForwarderCore is
-    LibFillResults,
-    LibMath,
-    LibConstants,
-    MWeth,
-    MAssets,
-    MExchangeWrapper,
-    IForwarderCore
-{
-    using LibBytes for bytes;
-
-    /// @dev Constructor approves ERC20 proxy to transfer ZRX and WETH on this contract's behalf.
-    constructor ()
-        public
-    {
-        address proxyAddress = EXCHANGE.getAssetProxy(ERC20_DATA_ID);
-        require(
-            proxyAddress != address(0),
-            "UNREGISTERED_ASSET_PROXY"
-        );
-        ETHER_TOKEN.approve(proxyAddress, MAX_UINT);
-        ZRX_TOKEN.approve(proxyAddress, MAX_UINT);
-    }
-
-    /// @dev Purchases as much of orders' makerAssets as possible by selling up to 95% of transaction's ETH value.
-    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
-    ///      5% of ETH value is reserved for paying fees to order feeRecipients (in ZRX) and forwarding contract feeRecipient (in ETH).
-    ///      Any ETH not spent will be refunded to sender.
-    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
-    /// @param feeSignatures Proofs that feeOrders have been created by makers.
-    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
-    /// @param feeRecipient Address that will receive ETH when orders are filled.
-    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
-    function marketSellOrdersWithEth(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256  feePercentage,
-        address feeRecipient
-    )
-        public
-        payable
-        returns (
-            FillResults memory orderFillResults,
-            FillResults memory feeOrderFillResults
-        )
-    {
-        // Convert ETH to WETH.
-        convertEthToWeth();
-
-        uint256 wethSellAmount;
-        uint256 zrxBuyAmount;
-        uint256 makerAssetAmountPurchased;
-        if (orders[0].makerAssetData.equals(ZRX_ASSET_DATA)) {
-            // Calculate amount of WETH that won't be spent on ETH fees.
-            wethSellAmount = getPartialAmountFloor(
-                PERCENTAGE_DENOMINATOR,
-                safeAdd(PERCENTAGE_DENOMINATOR, feePercentage),
-                msg.value
-            );
-            // Market sell available WETH.
-            // ZRX fees are paid with this contract's balance.
-            orderFillResults = marketSellWeth(
-                orders,
-                wethSellAmount,
-                signatures
-            );
-            // The fee amount must be deducted from the amount transfered back to sender.
-            makerAssetAmountPurchased = safeSub(orderFillResults.makerAssetFilledAmount, orderFillResults.takerFeePaid);
-        } else {
-            // 5% of WETH is reserved for filling feeOrders and paying feeRecipient.
-            wethSellAmount = getPartialAmountFloor(
-                MAX_WETH_FILL_PERCENTAGE,
-                PERCENTAGE_DENOMINATOR,
-                msg.value
-            );
-            // Market sell 95% of WETH.
-            // ZRX fees are payed with this contract's balance.
-            orderFillResults = marketSellWeth(
-                orders,
-                wethSellAmount,
-                signatures
-            );
-            // Buy back all ZRX spent on fees.
-            zrxBuyAmount = orderFillResults.takerFeePaid;
-            feeOrderFillResults = marketBuyExactZrxWithWeth(
-                feeOrders,
-                zrxBuyAmount,
-                feeSignatures
-            );
-            makerAssetAmountPurchased = orderFillResults.makerAssetFilledAmount;
-        }
-
-        // Transfer feePercentage of total ETH spent on primary orders to feeRecipient.
-        // Refund remaining ETH to msg.sender.
-        transferEthFeeAndRefund(
-            orderFillResults.takerAssetFilledAmount,
-            feeOrderFillResults.takerAssetFilledAmount,
-            feePercentage,
-            feeRecipient
-        );
-
-        // Transfer purchased assets to msg.sender.
-        transferAssetToSender(orders[0].makerAssetData, makerAssetAmountPurchased);
-    }
-
-    /// @dev Attempt to purchase makerAssetFillAmount of makerAsset by selling ETH provided with transaction.
-    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
-    ///      Any ETH not spent will be refunded to sender.
-    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
-    /// @param makerAssetFillAmount Desired amount of makerAsset to purchase.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
-    /// @param feeSignatures Proofs that feeOrders have been created by makers.
-    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
-    /// @param feeRecipient Address that will receive ETH when orders are filled.
-    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
-    function marketBuyOrdersWithEth(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256  feePercentage,
-        address feeRecipient
-    )
-        public
-        payable
-        returns (
-            FillResults memory orderFillResults,
-            FillResults memory feeOrderFillResults
-        )
-    {
-        // Convert ETH to WETH.
-        convertEthToWeth();
-
-        uint256 zrxBuyAmount;
-        uint256 makerAssetAmountPurchased;
-        if (orders[0].makerAssetData.equals(ZRX_ASSET_DATA)) {
-            // If the makerAsset is ZRX, it is not necessary to pay fees out of this
-            // contracts's ZRX balance because fees are factored into the price of the order.
-            orderFillResults = marketBuyExactZrxWithWeth(
-                orders,
-                makerAssetFillAmount,
-                signatures
-            );
-            // The fee amount must be deducted from the amount transfered back to sender.
-            makerAssetAmountPurchased = safeSub(orderFillResults.makerAssetFilledAmount, orderFillResults.takerFeePaid);
-        } else {
-            // Attemp to purchase desired amount of makerAsset.
-            // ZRX fees are payed with this contract's balance.
-            orderFillResults = marketBuyExactAmountWithWeth(
-                orders,
-                makerAssetFillAmount,
-                signatures
-            );
-            // Buy back all ZRX spent on fees.
-            zrxBuyAmount = orderFillResults.takerFeePaid;
-            feeOrderFillResults = marketBuyExactZrxWithWeth(
-                feeOrders,
-                zrxBuyAmount,
-                feeSignatures
-            );
-            makerAssetAmountPurchased = orderFillResults.makerAssetFilledAmount;
-        }
-
-        // Transfer feePercentage of total ETH spent on primary orders to feeRecipient.
-        // Refund remaining ETH to msg.sender.
-        transferEthFeeAndRefund(
-            orderFillResults.takerAssetFilledAmount,
-            feeOrderFillResults.takerAssetFilledAmount,
-            feePercentage,
-            feeRecipient
-        );
-
-        // Transfer purchased assets to msg.sender.
-        transferAssetToSender(orders[0].makerAssetData, makerAssetAmountPurchased);
-    }
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinWeth.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/MixinWeth.sol
deleted file mode 100644
index d2814a49b..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/MixinWeth.sol
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/Exchange/libs/LibMath.sol";
-import "./libs/LibConstants.sol";
-import "./mixins/MWeth.sol";
-
-
-contract MixinWeth is
-    LibMath,
-    LibConstants,
-    MWeth
-{
-    /// @dev Default payabale function, this allows us to withdraw WETH
-    function ()
-        public
-        payable
-    {
-        require(
-            msg.sender == address(ETHER_TOKEN),
-            "DEFAULT_FUNCTION_WETH_CONTRACT_ONLY"
-        );
-    }
-
-    /// @dev Converts message call's ETH value into WETH.
-    function convertEthToWeth()
-        internal
-    {
-        require(
-            msg.value > 0,
-            "INVALID_MSG_VALUE"
-        );
-        ETHER_TOKEN.deposit.value(msg.value)();
-    }
-
-    /// @dev Transfers feePercentage of WETH spent on primary orders to feeRecipient.
-    ///      Refunds any excess ETH to msg.sender.
-    /// @param wethSoldExcludingFeeOrders Amount of WETH sold when filling primary orders.
-    /// @param wethSoldForZrx Amount of WETH sold when purchasing ZRX required for primary order fees.
-    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
-    /// @param feeRecipient Address that will receive ETH when orders are filled.
-    function transferEthFeeAndRefund(
-        uint256 wethSoldExcludingFeeOrders,
-        uint256 wethSoldForZrx,
-        uint256 feePercentage,
-        address feeRecipient
-    )
-        internal
-    {
-        // Ensure feePercentage is less than 5%.
-        require(
-            feePercentage <= MAX_FEE_PERCENTAGE,
-            "FEE_PERCENTAGE_TOO_LARGE"
-        );
-
-        // Ensure that no extra WETH owned by this contract has been sold.
-        uint256 wethSold = safeAdd(wethSoldExcludingFeeOrders, wethSoldForZrx);
-        require(
-            wethSold <= msg.value,
-            "OVERSOLD_WETH"
-        );
-
-        // Calculate amount of WETH that hasn't been sold.
-        uint256 wethRemaining = safeSub(msg.value, wethSold);
-
-        // Calculate ETH fee to pay to feeRecipient.
-        uint256 ethFee = getPartialAmountFloor(
-            feePercentage,
-            PERCENTAGE_DENOMINATOR,
-            wethSoldExcludingFeeOrders
-        );
-
-        // Ensure fee is less than amount of WETH remaining.
-        require(
-            ethFee <= wethRemaining,
-            "INSUFFICIENT_ETH_REMAINING"
-        );
-    
-        // Do nothing if no WETH remaining
-        if (wethRemaining > 0) {
-            // Convert remaining WETH to ETH
-            ETHER_TOKEN.withdraw(wethRemaining);
-
-            // Pay ETH to feeRecipient
-            if (ethFee > 0) {
-                feeRecipient.transfer(ethFee);
-            }
-
-            // Refund remaining ETH to msg.sender.
-            uint256 ethRefund = safeSub(wethRemaining, ethFee);
-            if (ethRefund > 0) {
-                msg.sender.transfer(ethRefund);
-            }
-        }
-    }
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IAssets.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IAssets.sol
deleted file mode 100644
index 1e034c003..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IAssets.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract IAssets {
-
-    /// @dev Withdraws assets from this contract. The contract requires a ZRX balance in order to 
-    ///      function optimally, and this function allows the ZRX to be withdrawn by owner. It may also be
-    ///      used to withdraw assets that were accidentally sent to this contract.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of ERC20 token to withdraw.
-    function withdrawAsset(
-        bytes assetData,
-        uint256 amount
-    )
-        external;
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IForwarder.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IForwarder.sol
deleted file mode 100644
index f5a26e2ba..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IForwarder.sol
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "./IForwarderCore.sol";
-import "./IAssets.sol";
-
-
-// solhint-disable no-empty-blocks
-contract IForwarder is
-    IForwarderCore,
-    IAssets
-{}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IForwarderCore.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IForwarderCore.sol
deleted file mode 100644
index 74c7da01d..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/interfaces/IForwarderCore.sol
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../../protocol/Exchange/libs/LibOrder.sol";
-import "../../../protocol/Exchange/libs/LibFillResults.sol";
-
-
-contract IForwarderCore {
-
-    /// @dev Purchases as much of orders' makerAssets as possible by selling up to 95% of transaction's ETH value.
-    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
-    ///      5% of ETH value is reserved for paying fees to order feeRecipients (in ZRX) and forwarding contract feeRecipient (in ETH).
-    ///      Any ETH not spent will be refunded to sender.
-    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
-    /// @param feeSignatures Proofs that feeOrders have been created by makers.
-    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
-    /// @param feeRecipient Address that will receive ETH when orders are filled.
-    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
-    function marketSellOrdersWithEth(
-        LibOrder.Order[] memory orders,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256  feePercentage,
-        address feeRecipient
-    )
-        public
-        payable
-        returns (
-            LibFillResults.FillResults memory orderFillResults,
-            LibFillResults.FillResults memory feeOrderFillResults
-        );
-
-    /// @dev Attempt to purchase makerAssetFillAmount of makerAsset by selling ETH provided with transaction.
-    ///      Any ZRX required to pay fees for primary orders will automatically be purchased by this contract.
-    ///      Any ETH not spent will be refunded to sender.
-    /// @param orders Array of order specifications used containing desired makerAsset and WETH as takerAsset. 
-    /// @param makerAssetFillAmount Desired amount of makerAsset to purchase.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @param feeOrders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset. Used to purchase ZRX for primary order fees.
-    /// @param feeSignatures Proofs that feeOrders have been created by makers.
-    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
-    /// @param feeRecipient Address that will receive ETH when orders are filled.
-    /// @return Amounts filled and fees paid by maker and taker for both sets of orders.
-    function marketBuyOrdersWithEth(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures,
-        LibOrder.Order[] memory feeOrders,
-        bytes[] memory feeSignatures,
-        uint256  feePercentage,
-        address feeRecipient
-    )
-        public
-        payable
-        returns (
-            LibFillResults.FillResults memory orderFillResults,
-            LibFillResults.FillResults memory feeOrderFillResults
-        );
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/libs/LibConstants.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/libs/LibConstants.sol
deleted file mode 100644
index 704e42ce3..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/libs/LibConstants.sol
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../../utils/LibBytes/LibBytes.sol";
-import "../../../protocol/Exchange/interfaces/IExchange.sol";
-import "../../../tokens/EtherToken/IEtherToken.sol";
-import "../../../tokens/ERC20Token/IERC20Token.sol";
-
-
-contract LibConstants {
-
-    using LibBytes for bytes;
-
-    bytes4 constant internal ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)"));
-    bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
-    uint256 constant internal MAX_UINT = 2**256 - 1;
-    uint256 constant internal PERCENTAGE_DENOMINATOR = 10**18; 
-    uint256 constant internal MAX_FEE_PERCENTAGE = 5 * PERCENTAGE_DENOMINATOR / 100;         // 5%
-    uint256 constant internal MAX_WETH_FILL_PERCENTAGE = 95 * PERCENTAGE_DENOMINATOR / 100;  // 95%
- 
-     // solhint-disable var-name-mixedcase
-    IExchange internal EXCHANGE;
-    IEtherToken internal ETHER_TOKEN;
-    IERC20Token internal ZRX_TOKEN;
-    bytes internal ZRX_ASSET_DATA;
-    bytes internal WETH_ASSET_DATA;
-    // solhint-enable var-name-mixedcase
-
-    constructor (
-        address _exchange,
-        bytes memory _zrxAssetData,
-        bytes memory _wethAssetData
-    )
-        public
-    {
-        EXCHANGE = IExchange(_exchange);
-        ZRX_ASSET_DATA = _zrxAssetData;
-        WETH_ASSET_DATA = _wethAssetData;
-
-        address etherToken = _wethAssetData.readAddress(16);
-        address zrxToken = _zrxAssetData.readAddress(16);
-        ETHER_TOKEN = IEtherToken(etherToken);
-        ZRX_TOKEN = IERC20Token(zrxToken);
-    }
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/libs/LibForwarderErrors.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/libs/LibForwarderErrors.sol
deleted file mode 100644
index fb3ade1db..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/libs/LibForwarderErrors.sol
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-// solhint-disable
-pragma solidity 0.4.24;
-
-
-/// This contract is intended to serve as a reference, but is not actually used for efficiency reasons.
-contract LibForwarderErrors {
-    string constant FEE_PERCENTAGE_TOO_LARGE = "FEE_PROPORTION_TOO_LARGE";                        // Provided fee percentage greater than 5%.
-    string constant INSUFFICIENT_ETH_REMAINING = "INSUFFICIENT_ETH_REMAINING";                    // Not enough ETH remaining to pay feeRecipient.
-    string constant OVERSOLD_WETH = "OVERSOLD_WETH";                                              // More WETH sold than provided with current message call.
-    string constant COMPLETE_FILL_FAILED = "COMPLETE_FILL_FAILED";                                // Desired purchase amount not completely filled (required for ZRX fees only).
-    string constant TRANSFER_FAILED = "TRANSFER_FAILED";                                          // Asset transfer failed.
-    string constant UNSUPPORTED_ASSET_PROXY = "UNSUPPORTED_ASSET_PROXY";                          // Proxy in assetData not supported.
-    string constant DEFAULT_FUNCTION_WETH_CONTRACT_ONLY = "DEFAULT_FUNCTION_WETH_CONTRACT_ONLY";  // Fallback function may only be used for WETH withdrawals.
-    string constant INVALID_MSG_VALUE = "INVALID_MSG_VALUE";                                      // msg.value must be greater than 0.
-    string constant INVALID_AMOUNT = "INVALID_AMOUNT";                                            // Amount must equal 1.
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MAssets.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MAssets.sol
deleted file mode 100644
index 9e7f80d97..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MAssets.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../interfaces/IAssets.sol";
-
-
-contract MAssets is
-    IAssets
-{
-    /// @dev Transfers given amount of asset to sender.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of asset to transfer to sender.
-    function transferAssetToSender(
-        bytes memory assetData,
-        uint256 amount
-    )
-        internal;
-
-    /// @dev Decodes ERC20 assetData and transfers given amount to sender.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of asset to transfer to sender.
-    function transferERC20Token(
-        bytes memory assetData,
-        uint256 amount
-    )
-        internal;
-
-    /// @dev Decodes ERC721 assetData and transfers given amount to sender.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param amount Amount of asset to transfer to sender.
-    function transferERC721Token(
-        bytes memory assetData,
-        uint256 amount
-    )
-        internal;
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MExchangeWrapper.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MExchangeWrapper.sol
deleted file mode 100644
index 13c26b03a..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MExchangeWrapper.sol
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../../protocol/Exchange/libs/LibOrder.sol";
-import "../../../protocol/Exchange/libs/LibFillResults.sol";
-
-
-contract MExchangeWrapper {
-
-    /// @dev Fills the input order.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrderNoThrow(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        internal
-        returns (LibFillResults.FillResults memory fillResults);
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of WETH has been sold by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param wethSellAmount Desired amount of WETH to sell.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketSellWeth(
-        LibOrder.Order[] memory orders,
-        uint256 wethSellAmount,
-        bytes[] memory signatures
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction until total amount is bought by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    ///      The asset being sold by taker must always be WETH.
-    /// @param orders Array of order specifications.
-    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketBuyExactAmountWithWeth(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Buys zrxBuyAmount of ZRX fee tokens, taking into account ZRX fees for each order. This will guarantee
-    ///      that at least zrxBuyAmount of ZRX is purchased (sometimes slightly over due to rounding issues).
-    ///      It is possible that a request to buy 200 ZRX will require purchasing 202 ZRX
-    ///      as 2 ZRX is required to purchase the 200 ZRX fee tokens. This guarantees at least 200 ZRX for future purchases.
-    ///      The asset being sold by taker must always be WETH. 
-    /// @param orders Array of order specifications containing ZRX as makerAsset and WETH as takerAsset.
-    /// @param zrxBuyAmount Desired amount of ZRX to buy.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return totalFillResults Amounts filled and fees paid by maker and taker.
-    function marketBuyExactZrxWithWeth(
-        LibOrder.Order[] memory orders,
-        uint256 zrxBuyAmount,
-        bytes[] memory signatures
-    )
-        internal
-        returns (LibFillResults.FillResults memory totalFillResults);
-}
diff --git a/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MWeth.sol b/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MWeth.sol
deleted file mode 100644
index 88e77be4e..000000000
--- a/packages/contracts/src/2.0.0/extensions/Forwarder/mixins/MWeth.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract MWeth {
-
-    /// @dev Converts message call's ETH value into WETH.
-    function convertEthToWeth()
-        internal;
-
-    /// @dev Transfers feePercentage of WETH spent on primary orders to feeRecipient.
-    ///      Refunds any excess ETH to msg.sender.
-    /// @param wethSoldExcludingFeeOrders Amount of WETH sold when filling primary orders.
-    /// @param wethSoldForZrx Amount of WETH sold when purchasing ZRX required for primary order fees.
-    /// @param feePercentage Percentage of WETH sold that will payed as fee to forwarding contract feeRecipient.
-    /// @param feeRecipient Address that will receive ETH when orders are filled.
-    function transferEthFeeAndRefund(
-        uint256 wethSoldExcludingFeeOrders,
-        uint256 wethSoldForZrx,
-        uint256 feePercentage,
-        address feeRecipient
-    )
-        internal;
-}
diff --git a/packages/contracts/src/2.0.0/extensions/OrderValidator/OrderValidator.sol b/packages/contracts/src/2.0.0/extensions/OrderValidator/OrderValidator.sol
deleted file mode 100644
index 8bfde3847..000000000
--- a/packages/contracts/src/2.0.0/extensions/OrderValidator/OrderValidator.sol
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../protocol/Exchange/interfaces/IExchange.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-import "../../tokens/ERC20Token/IERC20Token.sol";
-import "../../tokens/ERC721Token/IERC721Token.sol";
-import "../../utils/LibBytes/LibBytes.sol";
-
-
-contract OrderValidator {
-
-    using LibBytes for bytes;
-
-    bytes4 constant internal ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)"));
-    bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
-
-    struct TraderInfo {
-        uint256 makerBalance;       // Maker's balance of makerAsset
-        uint256 makerAllowance;     // Maker's allowance to corresponding AssetProxy
-        uint256 takerBalance;       // Taker's balance of takerAsset
-        uint256 takerAllowance;     // Taker's allowance to corresponding AssetProxy
-        uint256 makerZrxBalance;    // Maker's balance of ZRX
-        uint256 makerZrxAllowance;  // Maker's allowance of ZRX to ERC20Proxy
-        uint256 takerZrxBalance;    // Taker's balance of ZRX
-        uint256 takerZrxAllowance;  // Taker's allowance of ZRX to ERC20Proxy
-    }
-
-    // solhint-disable var-name-mixedcase
-    IExchange internal EXCHANGE;
-    bytes internal ZRX_ASSET_DATA;
-    // solhint-enable var-name-mixedcase
-
-    constructor (address _exchange, bytes memory _zrxAssetData)
-        public
-    {
-        EXCHANGE = IExchange(_exchange);
-        ZRX_ASSET_DATA = _zrxAssetData;
-    }
-
-    /// @dev Fetches information for order and maker/taker of order.
-    /// @param order The order structure.
-    /// @param takerAddress Address that will be filling the order.
-    /// @return OrderInfo and TraderInfo instances for given order.
-    function getOrderAndTraderInfo(LibOrder.Order memory order, address takerAddress)
-        public
-        view
-        returns (LibOrder.OrderInfo memory orderInfo, TraderInfo memory traderInfo)
-    {
-        orderInfo = EXCHANGE.getOrderInfo(order);
-        traderInfo = getTraderInfo(order, takerAddress);
-        return (orderInfo, traderInfo);
-    }
-
-    /// @dev Fetches information for all passed in orders and the makers/takers of each order.
-    /// @param orders Array of order specifications.
-    /// @param takerAddresses Array of taker addresses corresponding to each order.
-    /// @return Arrays of OrderInfo and TraderInfo instances that correspond to each order.
-    function getOrdersAndTradersInfo(LibOrder.Order[] memory orders, address[] memory takerAddresses)
-        public
-        view
-        returns (LibOrder.OrderInfo[] memory ordersInfo, TraderInfo[] memory tradersInfo)
-    {
-        ordersInfo = EXCHANGE.getOrdersInfo(orders);
-        tradersInfo = getTradersInfo(orders, takerAddresses);
-        return (ordersInfo, tradersInfo);
-    }
-
-    /// @dev Fetches balance and allowances for maker and taker of order.
-    /// @param order The order structure.
-    /// @param takerAddress Address that will be filling the order.
-    /// @return Balances and allowances of maker and taker of order.
-    function getTraderInfo(LibOrder.Order memory order, address takerAddress)
-        public
-        view
-        returns (TraderInfo memory traderInfo)
-    {
-        (traderInfo.makerBalance, traderInfo.makerAllowance) = getBalanceAndAllowance(order.makerAddress, order.makerAssetData);
-        (traderInfo.takerBalance, traderInfo.takerAllowance) = getBalanceAndAllowance(takerAddress, order.takerAssetData);
-        bytes memory zrxAssetData = ZRX_ASSET_DATA;
-        (traderInfo.makerZrxBalance, traderInfo.makerZrxAllowance) = getBalanceAndAllowance(order.makerAddress, zrxAssetData);
-        (traderInfo.takerZrxBalance, traderInfo.takerZrxAllowance) = getBalanceAndAllowance(takerAddress, zrxAssetData);
-        return traderInfo;
-    }
-
-    /// @dev Fetches balances and allowances of maker and taker for each provided order.
-    /// @param orders Array of order specifications.
-    /// @param takerAddresses Array of taker addresses corresponding to each order.
-    /// @return Array of balances and allowances for maker and taker of each order.
-    function getTradersInfo(LibOrder.Order[] memory orders, address[] memory takerAddresses)
-        public
-        view
-        returns (TraderInfo[] memory)
-    {
-        uint256 ordersLength = orders.length;
-        TraderInfo[] memory tradersInfo = new TraderInfo[](ordersLength);
-        for (uint256 i = 0; i != ordersLength; i++) {
-            tradersInfo[i] = getTraderInfo(orders[i], takerAddresses[i]);
-        }
-        return tradersInfo;
-    }
-
-    /// @dev Fetches token balances and allowances of an address to given assetProxy. Supports ERC20 and ERC721.
-    /// @param target Address to fetch balances and allowances of.
-    /// @param assetData Encoded data that can be decoded by a specified proxy contract when transferring asset.
-    /// @return Balance of asset and allowance set to given proxy of asset.
-    ///         For ERC721 tokens, these values will always be 1 or 0.
-    function getBalanceAndAllowance(address target, bytes memory assetData)
-        public
-        view
-        returns (uint256 balance, uint256 allowance)
-    {
-        bytes4 assetProxyId = assetData.readBytes4(0);
-        address token = assetData.readAddress(16);
-        address assetProxy = EXCHANGE.getAssetProxy(assetProxyId);
-
-        if (assetProxyId == ERC20_DATA_ID) {
-            // Query balance
-            balance = IERC20Token(token).balanceOf(target);
-
-            // Query allowance
-            allowance = IERC20Token(token).allowance(target, assetProxy);
-        } else if (assetProxyId == ERC721_DATA_ID) {
-            uint256 tokenId = assetData.readUint256(36);
-
-            // Query owner of tokenId
-            address owner = getERC721TokenOwner(token, tokenId);
-
-            // Set balance to 1 if tokenId is owned by target
-            balance = target == owner ? 1 : 0;
-
-            // Check if ERC721Proxy is approved to spend tokenId
-            bool isApproved = IERC721Token(token).isApprovedForAll(target, assetProxy) || IERC721Token(token).getApproved(tokenId) == assetProxy;
-            
-            // Set alowance to 1 if ERC721Proxy is approved to spend tokenId
-            allowance = isApproved ? 1 : 0;
-        } else {
-            revert("UNSUPPORTED_ASSET_PROXY");
-        }
-        return (balance, allowance);
-    }
-
-    /// @dev Fetches token balances and allowances of an address for each given assetProxy. Supports ERC20 and ERC721.
-    /// @param target Address to fetch balances and allowances of.
-    /// @param assetData Array of encoded byte arrays that can be decoded by a specified proxy contract when transferring asset.
-    /// @return Balances and allowances of assets.
-    ///         For ERC721 tokens, these values will always be 1 or 0.
-    function getBalancesAndAllowances(address target, bytes[] memory assetData)
-        public
-        view
-        returns (uint256[] memory, uint256[] memory)
-    {
-        uint256 length = assetData.length;
-        uint256[] memory balances = new uint256[](length);
-        uint256[] memory allowances = new uint256[](length);
-        for (uint256 i = 0; i != length; i++) {
-            (balances[i], allowances[i]) = getBalanceAndAllowance(target, assetData[i]);
-        }
-        return (balances, allowances);
-    }
-
-    /// @dev Calls `token.ownerOf(tokenId)`, but returns a null owner instead of reverting on an unowned token.
-    /// @param token Address of ERC721 token.
-    /// @param tokenId The identifier for the specific NFT.
-    /// @return Owner of tokenId or null address if unowned.
-    function getERC721TokenOwner(address token, uint256 tokenId)
-        public
-        view
-        returns (address owner)
-    {
-        assembly {
-            // load free memory pointer
-            let cdStart := mload(64)
-
-            // bytes4(keccak256(ownerOf(uint256))) = 0x6352211e
-            mstore(cdStart, 0x6352211e00000000000000000000000000000000000000000000000000000000)
-            mstore(add(cdStart, 4), tokenId)
-
-            // staticcall `ownerOf(tokenId)`
-            // `ownerOf` will revert if tokenId is not owned
-            let success := staticcall(
-                gas,      // forward all gas
-                token,    // call token contract
-                cdStart,  // start of calldata
-                36,       // length of input is 36 bytes
-                cdStart,  // write output over input
-                32        // size of output is 32 bytes
-            )
-
-            // Success implies that tokenId is owned
-            // Copy owner from return data if successful
-            if success {
-                owner := mload(cdStart)
-            }    
-        }
-
-        // Owner initialized to address(0), no need to modify if call is unsuccessful
-        return owner;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/multisig/MultiSigWallet.sol b/packages/contracts/src/2.0.0/multisig/MultiSigWallet.sol
deleted file mode 100644
index 516e7391c..000000000
--- a/packages/contracts/src/2.0.0/multisig/MultiSigWallet.sol
+++ /dev/null
@@ -1,393 +0,0 @@
-// solhint-disable
-pragma solidity ^0.4.15;
-
-
-/// @title Multisignature wallet - Allows multiple parties to agree on transactions before execution.
-/// @author Stefan George - <stefan.george@consensys.net>
-contract MultiSigWallet {
-
-    /*
-     *  Events
-     */
-    event Confirmation(address indexed sender, uint indexed transactionId);
-    event Revocation(address indexed sender, uint indexed transactionId);
-    event Submission(uint indexed transactionId);
-    event Execution(uint indexed transactionId);
-    event ExecutionFailure(uint indexed transactionId);
-    event Deposit(address indexed sender, uint value);
-    event OwnerAddition(address indexed owner);
-    event OwnerRemoval(address indexed owner);
-    event RequirementChange(uint required);
-
-    /*
-     *  Constants
-     */
-    uint constant public MAX_OWNER_COUNT = 50;
-
-    /*
-     *  Storage
-     */
-    mapping (uint => Transaction) public transactions;
-    mapping (uint => mapping (address => bool)) public confirmations;
-    mapping (address => bool) public isOwner;
-    address[] public owners;
-    uint public required;
-    uint public transactionCount;
-
-    struct Transaction {
-        address destination;
-        uint value;
-        bytes data;
-        bool executed;
-    }
-
-    /*
-     *  Modifiers
-     */
-    modifier onlyWallet() {
-        require(msg.sender == address(this));
-        _;
-    }
-
-    modifier ownerDoesNotExist(address owner) {
-        require(!isOwner[owner]);
-        _;
-    }
-
-    modifier ownerExists(address owner) {
-        require(isOwner[owner]);
-        _;
-    }
-
-    modifier transactionExists(uint transactionId) {
-        require(transactions[transactionId].destination != 0);
-        _;
-    }
-
-    modifier confirmed(uint transactionId, address owner) {
-        require(confirmations[transactionId][owner]);
-        _;
-    }
-
-    modifier notConfirmed(uint transactionId, address owner) {
-        require(!confirmations[transactionId][owner]);
-        _;
-    }
-
-    modifier notExecuted(uint transactionId) {
-        require(!transactions[transactionId].executed);
-        _;
-    }
-
-    modifier notNull(address _address) {
-        require(_address != 0);
-        _;
-    }
-
-    modifier validRequirement(uint ownerCount, uint _required) {
-        require(ownerCount <= MAX_OWNER_COUNT
-            && _required <= ownerCount
-            && _required != 0
-            && ownerCount != 0);
-        _;
-    }
-
-    /// @dev Fallback function allows to deposit ether.
-    function()
-        payable
-    {
-        if (msg.value > 0)
-            Deposit(msg.sender, msg.value);
-    }
-
-    /*
-     * Public functions
-     */
-    /// @dev Contract constructor sets initial owners and required number of confirmations.
-    /// @param _owners List of initial owners.
-    /// @param _required Number of required confirmations.
-    function MultiSigWallet(address[] _owners, uint _required)
-        public
-        validRequirement(_owners.length, _required)
-    {
-        for (uint i=0; i<_owners.length; i++) {
-            require(!isOwner[_owners[i]] && _owners[i] != 0);
-            isOwner[_owners[i]] = true;
-        }
-        owners = _owners;
-        required = _required;
-    }
-
-    /// @dev Allows to add a new owner. Transaction has to be sent by wallet.
-    /// @param owner Address of new owner.
-    function addOwner(address owner)
-        public
-        onlyWallet
-        ownerDoesNotExist(owner)
-        notNull(owner)
-        validRequirement(owners.length + 1, required)
-    {
-        isOwner[owner] = true;
-        owners.push(owner);
-        OwnerAddition(owner);
-    }
-
-    /// @dev Allows to remove an owner. Transaction has to be sent by wallet.
-    /// @param owner Address of owner.
-    function removeOwner(address owner)
-        public
-        onlyWallet
-        ownerExists(owner)
-    {
-        isOwner[owner] = false;
-        for (uint i=0; i<owners.length - 1; i++)
-            if (owners[i] == owner) {
-                owners[i] = owners[owners.length - 1];
-                break;
-            }
-        owners.length -= 1;
-        if (required > owners.length)
-            changeRequirement(owners.length);
-        OwnerRemoval(owner);
-    }
-
-    /// @dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.
-    /// @param owner Address of owner to be replaced.
-    /// @param newOwner Address of new owner.
-    function replaceOwner(address owner, address newOwner)
-        public
-        onlyWallet
-        ownerExists(owner)
-        ownerDoesNotExist(newOwner)
-    {
-        for (uint i=0; i<owners.length; i++)
-            if (owners[i] == owner) {
-                owners[i] = newOwner;
-                break;
-            }
-        isOwner[owner] = false;
-        isOwner[newOwner] = true;
-        OwnerRemoval(owner);
-        OwnerAddition(newOwner);
-    }
-
-    /// @dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.
-    /// @param _required Number of required confirmations.
-    function changeRequirement(uint _required)
-        public
-        onlyWallet
-        validRequirement(owners.length, _required)
-    {
-        required = _required;
-        RequirementChange(_required);
-    }
-
-    /// @dev Allows an owner to submit and confirm a transaction.
-    /// @param destination Transaction target address.
-    /// @param value Transaction ether value.
-    /// @param data Transaction data payload.
-    /// @return Returns transaction ID.
-    function submitTransaction(address destination, uint value, bytes data)
-        public
-        returns (uint transactionId)
-    {
-        transactionId = addTransaction(destination, value, data);
-        confirmTransaction(transactionId);
-    }
-
-    /// @dev Allows an owner to confirm a transaction.
-    /// @param transactionId Transaction ID.
-    function confirmTransaction(uint transactionId)
-        public
-        ownerExists(msg.sender)
-        transactionExists(transactionId)
-        notConfirmed(transactionId, msg.sender)
-    {
-        confirmations[transactionId][msg.sender] = true;
-        Confirmation(msg.sender, transactionId);
-        executeTransaction(transactionId);
-    }
-
-    /// @dev Allows an owner to revoke a confirmation for a transaction.
-    /// @param transactionId Transaction ID.
-    function revokeConfirmation(uint transactionId)
-        public
-        ownerExists(msg.sender)
-        confirmed(transactionId, msg.sender)
-        notExecuted(transactionId)
-    {
-        confirmations[transactionId][msg.sender] = false;
-        Revocation(msg.sender, transactionId);
-    }
-
-    /// @dev Allows anyone to execute a confirmed transaction.
-    /// @param transactionId Transaction ID.
-    function executeTransaction(uint transactionId)
-        public
-        ownerExists(msg.sender)
-        confirmed(transactionId, msg.sender)
-        notExecuted(transactionId)
-    {
-        if (isConfirmed(transactionId)) {
-            Transaction storage txn = transactions[transactionId];
-            txn.executed = true;
-            if (external_call(txn.destination, txn.value, txn.data.length, txn.data))
-                Execution(transactionId);
-            else {
-                ExecutionFailure(transactionId);
-                txn.executed = false;
-            }
-        }
-    }
-
-    // call has been separated into its own function in order to take advantage
-    // of the Solidity's code generator to produce a loop that copies tx.data into memory.
-    function external_call(address destination, uint value, uint dataLength, bytes data) internal returns (bool) {
-        bool result;
-        assembly {
-            let x := mload(0x40)   // "Allocate" memory for output (0x40 is where "free memory" pointer is stored by convention)
-            let d := add(data, 32) // First 32 bytes are the padded length of data, so exclude that
-            result := call(
-                sub(gas, 34710),   // 34710 is the value that solidity is currently emitting
-                                   // It includes callGas (700) + callVeryLow (3, to pay for SUB) + callValueTransferGas (9000) +
-                                   // callNewAccountGas (25000, in case the destination address does not exist and needs creating)
-                destination,
-                value,
-                d,
-                dataLength,        // Size of the input (in bytes) - this is what fixes the padding problem
-                x,
-                0                  // Output is ignored, therefore the output size is zero
-            )
-        }
-        return result;
-    }
-
-    /// @dev Returns the confirmation status of a transaction.
-    /// @param transactionId Transaction ID.
-    /// @return Confirmation status.
-    function isConfirmed(uint transactionId)
-        public
-        constant
-        returns (bool)
-    {
-        uint count = 0;
-        for (uint i=0; i<owners.length; i++) {
-            if (confirmations[transactionId][owners[i]])
-                count += 1;
-            if (count == required)
-                return true;
-        }
-    }
-
-    /*
-     * Internal functions
-     */
-    /// @dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.
-    /// @param destination Transaction target address.
-    /// @param value Transaction ether value.
-    /// @param data Transaction data payload.
-    /// @return Returns transaction ID.
-    function addTransaction(address destination, uint value, bytes data)
-        internal
-        notNull(destination)
-        returns (uint transactionId)
-    {
-        transactionId = transactionCount;
-        transactions[transactionId] = Transaction({
-            destination: destination,
-            value: value,
-            data: data,
-            executed: false
-        });
-        transactionCount += 1;
-        Submission(transactionId);
-    }
-
-    /*
-     * Web3 call functions
-     */
-    /// @dev Returns number of confirmations of a transaction.
-    /// @param transactionId Transaction ID.
-    /// @return Number of confirmations.
-    function getConfirmationCount(uint transactionId)
-        public
-        constant
-        returns (uint count)
-    {
-        for (uint i=0; i<owners.length; i++)
-            if (confirmations[transactionId][owners[i]])
-                count += 1;
-    }
-
-    /// @dev Returns total number of transactions after filers are applied.
-    /// @param pending Include pending transactions.
-    /// @param executed Include executed transactions.
-    /// @return Total number of transactions after filters are applied.
-    function getTransactionCount(bool pending, bool executed)
-        public
-        constant
-        returns (uint count)
-    {
-        for (uint i=0; i<transactionCount; i++)
-            if (   pending && !transactions[i].executed
-                || executed && transactions[i].executed)
-                count += 1;
-    }
-
-    /// @dev Returns list of owners.
-    /// @return List of owner addresses.
-    function getOwners()
-        public
-        constant
-        returns (address[])
-    {
-        return owners;
-    }
-
-    /// @dev Returns array with owner addresses, which confirmed transaction.
-    /// @param transactionId Transaction ID.
-    /// @return Returns array of owner addresses.
-    function getConfirmations(uint transactionId)
-        public
-        constant
-        returns (address[] _confirmations)
-    {
-        address[] memory confirmationsTemp = new address[](owners.length);
-        uint count = 0;
-        uint i;
-        for (i=0; i<owners.length; i++)
-            if (confirmations[transactionId][owners[i]]) {
-                confirmationsTemp[count] = owners[i];
-                count += 1;
-            }
-        _confirmations = new address[](count);
-        for (i=0; i<count; i++)
-            _confirmations[i] = confirmationsTemp[i];
-    }
-
-    /// @dev Returns list of transaction IDs in defined range.
-    /// @param from Index start position of transaction array.
-    /// @param to Index end position of transaction array.
-    /// @param pending Include pending transactions.
-    /// @param executed Include executed transactions.
-    /// @return Returns array of transaction IDs.
-    function getTransactionIds(uint from, uint to, bool pending, bool executed)
-        public
-        constant
-        returns (uint[] _transactionIds)
-    {
-        uint[] memory transactionIdsTemp = new uint[](transactionCount);
-        uint count = 0;
-        uint i;
-        for (i=0; i<transactionCount; i++)
-            if (   pending && !transactions[i].executed
-                || executed && transactions[i].executed)
-            {
-                transactionIdsTemp[count] = i;
-                count += 1;
-            }
-        _transactionIds = new uint[](to - from);
-        for (i=from; i<to; i++)
-            _transactionIds[i - from] = transactionIdsTemp[i];
-    }
-}
\ No newline at end of file
diff --git a/packages/contracts/src/2.0.0/multisig/MultiSigWalletWithTimeLock.sol b/packages/contracts/src/2.0.0/multisig/MultiSigWalletWithTimeLock.sol
deleted file mode 100644
index 9513d3b30..000000000
--- a/packages/contracts/src/2.0.0/multisig/MultiSigWalletWithTimeLock.sol
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./MultiSigWallet.sol";
-
-
-/// @title Multisignature wallet with time lock- Allows multiple parties to execute a transaction after a time lock has passed.
-/// @author Amir Bandeali - <amir@0xProject.com>
-// solhint-disable not-rely-on-time
-contract MultiSigWalletWithTimeLock is
-    MultiSigWallet
-{
-    event ConfirmationTimeSet(uint256 indexed transactionId, uint256 confirmationTime);
-    event TimeLockChange(uint256 secondsTimeLocked);
-
-    uint256 public secondsTimeLocked;
-
-    mapping (uint256 => uint256) public confirmationTimes;
-
-    modifier notFullyConfirmed(uint256 transactionId) {
-        require(
-            !isConfirmed(transactionId),
-            "TX_FULLY_CONFIRMED"
-        );
-        _;
-    }
-
-    modifier fullyConfirmed(uint256 transactionId) {
-        require(
-            isConfirmed(transactionId),
-            "TX_NOT_FULLY_CONFIRMED"
-        );
-        _;
-    }
-
-    modifier pastTimeLock(uint256 transactionId) {
-        require(
-            block.timestamp >= confirmationTimes[transactionId] + secondsTimeLocked,
-            "TIME_LOCK_INCOMPLETE"
-        );
-        _;
-    }
-
-    /// @dev Contract constructor sets initial owners, required number of confirmations, and time lock.
-    /// @param _owners List of initial owners.
-    /// @param _required Number of required confirmations.
-    /// @param _secondsTimeLocked Duration needed after a transaction is confirmed and before it becomes executable, in seconds.
-    constructor (
-        address[] _owners,
-        uint256 _required,
-        uint256 _secondsTimeLocked
-    )
-        public
-        MultiSigWallet(_owners, _required)
-    {
-        secondsTimeLocked = _secondsTimeLocked;
-    }
-
-    /// @dev Changes the duration of the time lock for transactions.
-    /// @param _secondsTimeLocked Duration needed after a transaction is confirmed and before it becomes executable, in seconds.
-    function changeTimeLock(uint256 _secondsTimeLocked)
-        public
-        onlyWallet
-    {
-        secondsTimeLocked = _secondsTimeLocked;
-        emit TimeLockChange(_secondsTimeLocked);
-    }
-
-    /// @dev Allows an owner to confirm a transaction.
-    /// @param transactionId Transaction ID.
-    function confirmTransaction(uint256 transactionId)
-        public
-        ownerExists(msg.sender)
-        transactionExists(transactionId)
-        notConfirmed(transactionId, msg.sender)
-        notFullyConfirmed(transactionId)
-    {
-        confirmations[transactionId][msg.sender] = true;
-        emit Confirmation(msg.sender, transactionId);
-        if (isConfirmed(transactionId)) {
-            setConfirmationTime(transactionId, block.timestamp);
-        }
-    }
-
-    /// @dev Allows anyone to execute a confirmed transaction.
-    /// @param transactionId Transaction ID.
-    function executeTransaction(uint256 transactionId)
-        public
-        notExecuted(transactionId)
-        fullyConfirmed(transactionId)
-        pastTimeLock(transactionId)
-    {
-        Transaction storage txn = transactions[transactionId];
-        txn.executed = true;
-        if (external_call(txn.destination, txn.value, txn.data.length, txn.data)) {
-            emit Execution(transactionId);
-        } else {
-            emit ExecutionFailure(transactionId);
-            txn.executed = false;
-        }
-    }
-
-    /// @dev Sets the time of when a submission first passed.
-    function setConfirmationTime(uint256 transactionId, uint256 confirmationTime)
-        internal
-    {
-        confirmationTimes[transactionId] = confirmationTime;
-        emit ConfirmationTimeSet(transactionId, confirmationTime);
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol
deleted file mode 100644
index 258443bca..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC20Proxy.sol
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./MixinAuthorizable.sol";
-
-
-contract ERC20Proxy is
-    MixinAuthorizable
-{
-    // Id of this proxy.
-    bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC20Token(address)"));
-    
-    // solhint-disable-next-line payable-fallback
-    function () 
-        external
-    {
-        assembly {
-            // The first 4 bytes of calldata holds the function selector
-            let selector := and(calldataload(0), 0xffffffff00000000000000000000000000000000000000000000000000000000)
-
-            // `transferFrom` will be called with the following parameters:
-            // assetData Encoded byte array.
-            // from Address to transfer asset from.
-            // to Address to transfer asset to.
-            // amount Amount of asset to transfer.
-            // bytes4(keccak256("transferFrom(bytes,address,address,uint256)")) = 0xa85e59e4
-            if eq(selector, 0xa85e59e400000000000000000000000000000000000000000000000000000000) {
-
-                // To lookup a value in a mapping, we load from the storage location keccak256(k, p),
-                // where k is the key left padded to 32 bytes and p is the storage slot
-                let start := mload(64)
-                mstore(start, and(caller, 0xffffffffffffffffffffffffffffffffffffffff))
-                mstore(add(start, 32), authorized_slot)
-
-                // Revert if authorized[msg.sender] == false
-                if iszero(sload(keccak256(start, 64))) {
-                    // Revert with `Error("SENDER_NOT_AUTHORIZED")`
-                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                    mstore(64, 0x0000001553454e4445525f4e4f545f415554484f52495a454400000000000000)
-                    mstore(96, 0)
-                    revert(0, 100)
-                }
-
-                // `transferFrom`.
-                // The function is marked `external`, so no abi decodeding is done for
-                // us. Instead, we expect the `calldata` memory to contain the
-                // following:
-                //
-                // | Area     | Offset | Length  | Contents                            |
-                // |----------|--------|---------|-------------------------------------|
-                // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 4 * 32  | function parameters:                |
-                // |          | 4      |         |   1. offset to assetData (*)        |
-                // |          | 36     |         |   2. from                           |
-                // |          | 68     |         |   3. to                             |
-                // |          | 100    |         |   4. amount                         |
-                // | Data     |        |         | assetData:                          |
-                // |          | 132    | 32      | assetData Length                    |
-                // |          | 164    | **      | assetData Contents                  |
-                //
-                // (*): offset is computed from start of function parameters, so offset
-                //      by an additional 4 bytes in the calldata.
-                //
-                // (**): see table below to compute length of assetData Contents
-                //
-                // WARNING: The ABIv2 specification allows additional padding between
-                //          the Params and Data section. This will result in a larger
-                //          offset to assetData.
-
-                // Asset data itself is encoded as follows:
-                //
-                // | Area     | Offset | Length  | Contents                            |
-                // |----------|--------|---------|-------------------------------------|
-                // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 1 * 32  | function parameters:                |
-                // |          | 4      | 12 + 20 |   1. token address                  |
-
-                // We construct calldata for the `token.transferFrom` ABI.
-                // The layout of this calldata is in the table below.
-                //
-                // | Area     | Offset | Length  | Contents                            |
-                // |----------|--------|---------|-------------------------------------|
-                // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 3 * 32  | function parameters:                |
-                // |          | 4      |         |   1. from                           |
-                // |          | 36     |         |   2. to                             |
-                // |          | 68     |         |   3. amount                         |
-
-                /////// Read token address from calldata ///////
-                // * The token address is stored in `assetData`.
-                //
-                // * The "offset to assetData" is stored at offset 4 in the calldata (table 1).
-                //   [assetDataOffsetFromParams = calldataload(4)]
-                //
-                // * Notes that the "offset to assetData" is relative to the "Params" area of calldata;
-                //   add 4 bytes to account for the length of the "Header" area (table 1).
-                //   [assetDataOffsetFromHeader = assetDataOffsetFromParams + 4]
-                //
-                // * The "token address" is offset 32+4=36 bytes into "assetData" (tables 1 & 2).
-                //   [tokenOffset = assetDataOffsetFromHeader + 36 = calldataload(4) + 4 + 36]
-                let token := calldataload(add(calldataload(4), 40))
-                
-                /////// Setup Header Area ///////
-                // This area holds the 4-byte `transferFrom` selector.
-                // Any trailing data in transferFromSelector will be
-                // overwritten in the next `mstore` call.
-                mstore(0, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
-                
-                /////// Setup Params Area ///////
-                // We copy the fields `from`, `to` and `amount` in bulk
-                // from our own calldata to the new calldata.
-                calldatacopy(4, 36, 96)
-
-                /////// Call `token.transferFrom` using the calldata ///////
-                let success := call(
-                    gas,            // forward all gas
-                    token,          // call address of token contract
-                    0,              // don't send any ETH
-                    0,              // pointer to start of input
-                    100,            // length of input
-                    0,              // write output over input
-                    32              // output size should be 32 bytes
-                )
-
-                /////// Check return data. ///////
-                // If there is no return data, we assume the token incorrectly
-                // does not return a bool. In this case we expect it to revert
-                // on failure, which was handled above.
-                // If the token does return data, we require that it is a single
-                // nonzero 32 bytes value.
-                // So the transfer succeeded if the call succeeded and either
-                // returned nothing, or returned a non-zero 32 byte value. 
-                success := and(success, or(
-                    iszero(returndatasize),
-                    and(
-                        eq(returndatasize, 32),
-                        gt(mload(0), 0)
-                    )
-                ))
-                if success {
-                    return(0, 0)
-                }
-                
-                // Revert with `Error("TRANSFER_FAILED")`
-                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                mstore(64, 0x0000000f5452414e534645525f4641494c454400000000000000000000000000)
-                mstore(96, 0)
-                revert(0, 100)
-            }
-
-            // Revert if undefined function is called
-            revert(0, 0)
-        }
-    }
-
-    /// @dev Gets the proxy id associated with the proxy address.
-    /// @return Proxy id.
-    function getProxyId()
-        external
-        pure
-        returns (bytes4)
-    {
-        return PROXY_ID;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol
deleted file mode 100644
index 65b664b8b..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./MixinAuthorizable.sol";
-
-
-contract ERC721Proxy is
-    MixinAuthorizable
-{
-    // Id of this proxy.
-    bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
-
-    // solhint-disable-next-line payable-fallback
-    function () 
-        external
-    {
-        assembly {
-            // The first 4 bytes of calldata holds the function selector
-            let selector := and(calldataload(0), 0xffffffff00000000000000000000000000000000000000000000000000000000)
-
-            // `transferFrom` will be called with the following parameters:
-            // assetData Encoded byte array.
-            // from Address to transfer asset from.
-            // to Address to transfer asset to.
-            // amount Amount of asset to transfer.
-            // bytes4(keccak256("transferFrom(bytes,address,address,uint256)")) = 0xa85e59e4
-            if eq(selector, 0xa85e59e400000000000000000000000000000000000000000000000000000000) {
-
-                // To lookup a value in a mapping, we load from the storage location keccak256(k, p),
-                // where k is the key left padded to 32 bytes and p is the storage slot
-                let start := mload(64)
-                mstore(start, and(caller, 0xffffffffffffffffffffffffffffffffffffffff))
-                mstore(add(start, 32), authorized_slot)
-
-                // Revert if authorized[msg.sender] == false
-                if iszero(sload(keccak256(start, 64))) {
-                    // Revert with `Error("SENDER_NOT_AUTHORIZED")`
-                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                    mstore(64, 0x0000001553454e4445525f4e4f545f415554484f52495a454400000000000000)
-                    mstore(96, 0)
-                    revert(0, 100)
-                }
-
-                // `transferFrom`.
-                // The function is marked `external`, so no abi decodeding is done for
-                // us. Instead, we expect the `calldata` memory to contain the
-                // following:
-                //
-                // | Area     | Offset | Length  | Contents                            |
-                // |----------|--------|---------|-------------------------------------|
-                // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 4 * 32  | function parameters:                |
-                // |          | 4      |         |   1. offset to assetData (*)        |
-                // |          | 36     |         |   2. from                           |
-                // |          | 68     |         |   3. to                             |
-                // |          | 100    |         |   4. amount                         |
-                // | Data     |        |         | assetData:                          |
-                // |          | 132    | 32      | assetData Length                    |
-                // |          | 164    | **      | assetData Contents                  |
-                //
-                // (*): offset is computed from start of function parameters, so offset
-                //      by an additional 4 bytes in the calldata.
-                //
-                // (**): see table below to compute length of assetData Contents
-                //
-                // WARNING: The ABIv2 specification allows additional padding between
-                //          the Params and Data section. This will result in a larger
-                //          offset to assetData.
-
-                // Asset data itself is encoded as follows:
-                //
-                // | Area     | Offset | Length  | Contents                            |
-                // |----------|--------|---------|-------------------------------------|
-                // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 2 * 32  | function parameters:                |
-                // |          | 4      | 12 + 20 |   1. token address                  |
-                // |          | 36     |         |   2. tokenId                        |
-                
-                // We construct calldata for the `token.transferFrom` ABI.
-                // The layout of this calldata is in the table below.
-                // 
-                // | Area     | Offset | Length  | Contents                            |
-                // |----------|--------|---------|-------------------------------------|
-                // | Header   | 0      | 4       | function selector                   |
-                // | Params   |        | 3 * 32  | function parameters:                |
-                // |          | 4      |         |   1. from                           |
-                // |          | 36     |         |   2. to                             |
-                // |          | 68     |         |   3. tokenId                        |
-
-                // There exists only 1 of each token.
-                // require(amount == 1, "INVALID_AMOUNT")
-                if sub(calldataload(100), 1) {
-                    // Revert with `Error("INVALID_AMOUNT")`
-                    mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                    mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                    mstore(64, 0x0000000e494e56414c49445f414d4f554e540000000000000000000000000000)
-                    mstore(96, 0)
-                    revert(0, 100)
-                }
-
-                /////// Setup Header Area ///////
-                // This area holds the 4-byte `transferFrom` selector.
-                // Any trailing data in transferFromSelector will be
-                // overwritten in the next `mstore` call.
-                mstore(0, 0x23b872dd00000000000000000000000000000000000000000000000000000000)
-                
-                /////// Setup Params Area ///////
-                // We copy the fields `from` and `to` in bulk
-                // from our own calldata to the new calldata.
-                calldatacopy(4, 36, 64)
-
-                // Copy `tokenId` field from our own calldata to the new calldata.
-                let assetDataOffset := calldataload(4)
-                calldatacopy(68, add(assetDataOffset, 72), 32)
-
-                /////// Call `token.transferFrom` using the calldata ///////
-                let token := calldataload(add(assetDataOffset, 40))
-                let success := call(
-                    gas,            // forward all gas
-                    token,          // call address of token contract
-                    0,              // don't send any ETH
-                    0,              // pointer to start of input
-                    100,            // length of input
-                    0,              // write output to null
-                    0               // output size is 0 bytes
-                )
-                if success {
-                    return(0, 0)
-                }
-                
-                // Revert with `Error("TRANSFER_FAILED")`
-                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                mstore(64, 0x0000000f5452414e534645525f4641494c454400000000000000000000000000)
-                mstore(96, 0)
-                revert(0, 100)
-            }
-
-            // Revert if undefined function is called
-            revert(0, 0)
-        }
-    }
-
-    /// @dev Gets the proxy id associated with the proxy address.
-    /// @return Proxy id.
-    function getProxyId()
-        external
-        pure
-        returns (bytes4)
-    {
-        return PROXY_ID;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol
deleted file mode 100644
index fe9bbf848..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/MixinAuthorizable.sol
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/Ownable/Ownable.sol";
-import "./mixins/MAuthorizable.sol";
-
-
-contract MixinAuthorizable is
-    Ownable,
-    MAuthorizable
-{
-    /// @dev Only authorized addresses can invoke functions with this modifier.
-    modifier onlyAuthorized {
-        require(
-            authorized[msg.sender],
-            "SENDER_NOT_AUTHORIZED"
-        );
-        _;
-    }
-
-    mapping (address => bool) public authorized;
-    address[] public authorities;
-
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function addAuthorizedAddress(address target)
-        external
-        onlyOwner
-    {
-        require(
-            !authorized[target],
-            "TARGET_ALREADY_AUTHORIZED"
-        );
-
-        authorized[target] = true;
-        authorities.push(target);
-        emit AuthorizedAddressAdded(target, msg.sender);
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    function removeAuthorizedAddress(address target)
-        external
-        onlyOwner
-    {
-        require(
-            authorized[target],
-            "TARGET_NOT_AUTHORIZED"
-        );
-
-        delete authorized[target];
-        for (uint256 i = 0; i < authorities.length; i++) {
-            if (authorities[i] == target) {
-                authorities[i] = authorities[authorities.length - 1];
-                authorities.length -= 1;
-                break;
-            }
-        }
-        emit AuthorizedAddressRemoved(target, msg.sender);
-    }
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function removeAuthorizedAddressAtIndex(
-        address target,
-        uint256 index
-    )
-        external
-        onlyOwner
-    {
-        require(
-            authorized[target],
-            "TARGET_NOT_AUTHORIZED"
-        );
-        require(
-            index < authorities.length,
-            "INDEX_OUT_OF_BOUNDS"
-        );
-        require(
-            authorities[index] == target,
-            "AUTHORIZED_ADDRESS_MISMATCH"
-        );
-
-        delete authorized[target];
-        authorities[index] = authorities[authorities.length - 1];
-        authorities.length -= 1;
-        emit AuthorizedAddressRemoved(target, msg.sender);
-    }
-
-    /// @dev Gets all authorized addresses.
-    /// @return Array of authorized addresses.
-    function getAuthorizedAddresses()
-        external
-        view
-        returns (address[] memory)
-    {
-        return authorities;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetData.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetData.sol
deleted file mode 100644
index 3e76e38dd..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetData.sol
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-// solhint-disable
-pragma solidity 0.4.24;
-
-
-// @dev Interface of the asset proxy's assetData.
-// The asset proxies take an ABI encoded `bytes assetData` as argument.
-// This argument is ABI encoded as one of the methods of this interface.
-interface IAssetData {
-
-    function ERC20Token(address tokenContract)
-        external
-        pure;
-    
-    function ERC721Token(
-        address tokenContract,
-        uint256 tokenId,
-        bytes receiverData
-    )
-        external
-        pure;
-    
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol
deleted file mode 100644
index b25d2d75a..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAssetProxy.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./IAuthorizable.sol";
-
-
-contract IAssetProxy is
-    IAuthorizable
-{
-    /// @dev Transfers assets. Either succeeds or throws.
-    /// @param assetData Byte array encoded for the respective asset proxy.
-    /// @param from Address to transfer asset from.
-    /// @param to Address to transfer asset to.
-    /// @param amount Amount of asset to transfer.
-    function transferFrom(
-        bytes assetData,
-        address from,
-        address to,
-        uint256 amount
-    )
-        external;
-    
-    /// @dev Gets the proxy id associated with the proxy address.
-    /// @return Proxy id.
-    function getProxyId()
-        external
-        pure
-        returns (bytes4);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol
deleted file mode 100644
index ba1d4aa77..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/interfaces/IAuthorizable.sol
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../../utils/Ownable/IOwnable.sol";
-
-
-contract IAuthorizable is
-    IOwnable
-{
-    /// @dev Authorizes an address.
-    /// @param target Address to authorize.
-    function addAuthorizedAddress(address target)
-        external;
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    function removeAuthorizedAddress(address target)
-        external;
-
-    /// @dev Removes authorizion of an address.
-    /// @param target Address to remove authorization from.
-    /// @param index Index of target in authorities array.
-    function removeAuthorizedAddressAtIndex(
-        address target,
-        uint256 index
-    )
-        external;
-    
-    /// @dev Gets all authorized addresses.
-    /// @return Array of authorized addresses.
-    function getAuthorizedAddresses()
-        external
-        view
-        returns (address[] memory);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/libs/LibAssetProxyErrors.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
deleted file mode 100644
index 1d9a70cc1..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/libs/LibAssetProxyErrors.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-// solhint-disable
-pragma solidity 0.4.24;
-
-
-/// @dev This contract documents the revert reasons used in the AssetProxy contracts.
-/// This contract is intended to serve as a reference, but is not actually used for efficiency reasons.
-contract LibAssetProxyErrors {
-
-    /// Authorizable errors ///
-    string constant SENDER_NOT_AUTHORIZED = "SENDER_NOT_AUTHORIZED";                        // Sender not authorized to call this method.
-    string constant TARGET_NOT_AUTHORIZED = "TARGET_NOT_AUTHORIZED";                        // Target address not authorized to call this method.
-    string constant TARGET_ALREADY_AUTHORIZED = "TARGET_ALREADY_AUTHORIZED";                // Target address must not already be authorized.
-    string constant INDEX_OUT_OF_BOUNDS = "INDEX_OUT_OF_BOUNDS";                            // Specified array index is out of bounds.
-    string constant AUTHORIZED_ADDRESS_MISMATCH = "AUTHORIZED_ADDRESS_MISMATCH";            // Address at index does not match given target address.
-
-    /// Transfer errors ///
-    string constant INVALID_AMOUNT = "INVALID_AMOUNT";                                      // Transfer amount must equal 1.
-    string constant TRANSFER_FAILED = "TRANSFER_FAILED";                                    // Transfer failed.
-    string constant LENGTH_GREATER_THAN_131_REQUIRED = "LENGTH_GREATER_THAN_131_REQUIRED";  // Byte array must have a length greater than 0.
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol b/packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol
deleted file mode 100644
index d63fb7f6d..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxy/mixins/MAuthorizable.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../interfaces/IAuthorizable.sol";
-
-
-contract MAuthorizable is
-    IAuthorizable
-{
-    // Event logged when a new address is authorized.
-    event AuthorizedAddressAdded(
-        address indexed target,
-        address indexed caller
-    );
-
-    // Event logged when a currently authorized address is unauthorized.
-    event AuthorizedAddressRemoved(
-        address indexed target,
-        address indexed caller
-    );
-
-    /// @dev Only authorized addresses can invoke functions with this modifier.
-    modifier onlyAuthorized { revert(); _; }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol b/packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol
deleted file mode 100644
index edb788fab..000000000
--- a/packages/contracts/src/2.0.0/protocol/AssetProxyOwner/AssetProxyOwner.sol
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../multisig/MultiSigWalletWithTimeLock.sol";
-import "../../utils/LibBytes/LibBytes.sol";
-
-
-contract AssetProxyOwner is
-    MultiSigWalletWithTimeLock
-{
-    using LibBytes for bytes;
-
-    event AssetProxyRegistration(address assetProxyContract, bool isRegistered);
-
-    // Mapping of AssetProxy contract address =>
-    // if this contract is allowed to call the AssetProxy's `removeAuthorizedAddressAtIndex` method without a time lock.
-    mapping (address => bool) public isAssetProxyRegistered;
-
-    bytes4 constant internal REMOVE_AUTHORIZED_ADDRESS_AT_INDEX_SELECTOR = bytes4(keccak256("removeAuthorizedAddressAtIndex(address,uint256)"));
-
-    /// @dev Function will revert if the transaction does not call `removeAuthorizedAddressAtIndex`
-    ///      on an approved AssetProxy contract.
-    modifier validRemoveAuthorizedAddressAtIndexTx(uint256 transactionId) {
-        Transaction storage txn = transactions[transactionId];
-        require(
-            isAssetProxyRegistered[txn.destination],
-            "UNREGISTERED_ASSET_PROXY"
-        );
-        require(
-            txn.data.readBytes4(0) == REMOVE_AUTHORIZED_ADDRESS_AT_INDEX_SELECTOR,
-            "INVALID_FUNCTION_SELECTOR"
-        );
-        _;
-    }
-
-    /// @dev Contract constructor sets initial owners, required number of confirmations,
-    ///      time lock, and list of AssetProxy addresses.
-    /// @param _owners List of initial owners.
-    /// @param _assetProxyContracts Array of AssetProxy contract addresses.
-    /// @param _required Number of required confirmations.
-    /// @param _secondsTimeLocked Duration needed after a transaction is confirmed and before it becomes executable, in seconds.
-    constructor (
-        address[] memory _owners,
-        address[] memory _assetProxyContracts,
-        uint256 _required,
-        uint256 _secondsTimeLocked
-    )
-        public
-        MultiSigWalletWithTimeLock(_owners, _required, _secondsTimeLocked)
-    {
-        for (uint256 i = 0; i < _assetProxyContracts.length; i++) {
-            address assetProxy = _assetProxyContracts[i];
-            require(
-                assetProxy != address(0),
-                "INVALID_ASSET_PROXY"
-            );
-            isAssetProxyRegistered[assetProxy] = true;
-        }
-    }
-
-    /// @dev Registers or deregisters an AssetProxy to be able to execute
-    ///      `removeAuthorizedAddressAtIndex` without a timelock.
-    /// @param assetProxyContract Address of AssetProxy contract.
-    /// @param isRegistered Status of approval for AssetProxy contract.
-    function registerAssetProxy(address assetProxyContract, bool isRegistered)
-        public
-        onlyWallet
-        notNull(assetProxyContract)
-    {
-        isAssetProxyRegistered[assetProxyContract] = isRegistered;
-        emit AssetProxyRegistration(assetProxyContract, isRegistered);
-    }
-
-    /// @dev Allows execution of `removeAuthorizedAddressAtIndex` without time lock.
-    /// @param transactionId Transaction ID.
-    function executeRemoveAuthorizedAddressAtIndex(uint256 transactionId)
-        public
-        notExecuted(transactionId)
-        fullyConfirmed(transactionId)
-        validRemoveAuthorizedAddressAtIndexTx(transactionId)
-    {
-        Transaction storage txn = transactions[transactionId];
-        txn.executed = true;
-        if (external_call(txn.destination, txn.value, txn.data.length, txn.data)) {
-            emit Execution(transactionId);
-        } else {
-            emit ExecutionFailure(transactionId);
-            txn.executed = false;
-        }
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol b/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol
deleted file mode 100644
index ead36009f..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/Exchange.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "./libs/LibConstants.sol";
-import "./MixinExchangeCore.sol";
-import "./MixinSignatureValidator.sol";
-import "./MixinWrapperFunctions.sol";
-import "./MixinAssetProxyDispatcher.sol";
-import "./MixinTransactions.sol";
-import "./MixinMatchOrders.sol";
-
-
-// solhint-disable no-empty-blocks
-contract Exchange is
-    MixinExchangeCore,
-    MixinMatchOrders,
-    MixinSignatureValidator,
-    MixinTransactions,
-    MixinAssetProxyDispatcher,
-    MixinWrapperFunctions
-{
-    string constant public VERSION = "2.0.1-alpha";
-
-    // Mixins are instantiated in the order they are inherited
-    constructor (bytes memory _zrxAssetData)
-        public
-        LibConstants(_zrxAssetData) // @TODO: Remove when we deploy.
-        MixinExchangeCore()
-        MixinMatchOrders()
-        MixinSignatureValidator()
-        MixinTransactions()
-        MixinAssetProxyDispatcher()
-        MixinWrapperFunctions()
-    {}
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol
deleted file mode 100644
index 87b09b6b3..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/Ownable/Ownable.sol";
-import "./mixins/MAssetProxyDispatcher.sol";
-import "../AssetProxy/interfaces/IAssetProxy.sol";
-
-
-contract MixinAssetProxyDispatcher is
-    Ownable,
-    MAssetProxyDispatcher
-{
-    // Mapping from Asset Proxy Id's to their respective Asset Proxy
-    mapping (bytes4 => IAssetProxy) public assetProxies;
-
-    /// @dev Registers an asset proxy to its asset proxy id.
-    ///      Once an asset proxy is registered, it cannot be unregistered.
-    /// @param assetProxy Address of new asset proxy to register.
-    function registerAssetProxy(address assetProxy)
-        external
-        onlyOwner
-    {
-        IAssetProxy assetProxyContract = IAssetProxy(assetProxy);
-
-        // Ensure that no asset proxy exists with current id.
-        bytes4 assetProxyId = assetProxyContract.getProxyId();
-        address currentAssetProxy = assetProxies[assetProxyId];
-        require(
-            currentAssetProxy == address(0),
-            "ASSET_PROXY_ALREADY_EXISTS"
-        );
-
-        // Add asset proxy and log registration.
-        assetProxies[assetProxyId] = assetProxyContract;
-        emit AssetProxyRegistered(
-            assetProxyId,
-            assetProxy
-        );
-    }
-
-    /// @dev Gets an asset proxy.
-    /// @param assetProxyId Id of the asset proxy.
-    /// @return The asset proxy registered to assetProxyId. Returns 0x0 if no proxy is registered.
-    function getAssetProxy(bytes4 assetProxyId)
-        external
-        view
-        returns (address)
-    {
-        return assetProxies[assetProxyId];
-    }
-
-    /// @dev Forwards arguments to assetProxy and calls `transferFrom`. Either succeeds or throws.
-    /// @param assetData Byte array encoded for the asset.
-    /// @param from Address to transfer token from.
-    /// @param to Address to transfer token to.
-    /// @param amount Amount of token to transfer.
-    function dispatchTransferFrom(
-        bytes memory assetData,
-        address from,
-        address to,
-        uint256 amount
-    )
-        internal
-    {
-        // Do nothing if no amount should be transferred.
-        if (amount > 0 && from != to) {
-            // Ensure assetData length is valid
-            require(
-                assetData.length > 3,
-                "LENGTH_GREATER_THAN_3_REQUIRED"
-            );
-            
-            // Lookup assetProxy. We do not use `LibBytes.readBytes4` for gas efficiency reasons.
-            bytes4 assetProxyId;
-            assembly {
-                assetProxyId := and(mload(
-                    add(assetData, 32)),
-                    0xFFFFFFFF00000000000000000000000000000000000000000000000000000000
-                )
-            }
-            address assetProxy = assetProxies[assetProxyId];
-
-            // Ensure that assetProxy exists
-            require(
-                assetProxy != address(0),
-                "ASSET_PROXY_DOES_NOT_EXIST"
-            );
-            
-            // We construct calldata for the `assetProxy.transferFrom` ABI.
-            // The layout of this calldata is in the table below.
-            // 
-            // | Area     | Offset | Length  | Contents                                    |
-            // | -------- |--------|---------|-------------------------------------------- |
-            // | Header   | 0      | 4       | function selector                           |
-            // | Params   |        | 4 * 32  | function parameters:                        |
-            // |          | 4      |         |   1. offset to assetData (*)                |
-            // |          | 36     |         |   2. from                                   |
-            // |          | 68     |         |   3. to                                     |
-            // |          | 100    |         |   4. amount                                 |
-            // | Data     |        |         | assetData:                                  |
-            // |          | 132    | 32      | assetData Length                            |
-            // |          | 164    | **      | assetData Contents                          |
-
-            assembly {
-                /////// Setup State ///////
-                // `cdStart` is the start of the calldata for `assetProxy.transferFrom` (equal to free memory ptr).
-                let cdStart := mload(64)
-                // `dataAreaLength` is the total number of words needed to store `assetData`
-                //  As-per the ABI spec, this value is padded up to the nearest multiple of 32,
-                //  and includes 32-bytes for length.
-                let dataAreaLength := and(add(mload(assetData), 63), 0xFFFFFFFFFFFE0)
-                // `cdEnd` is the end of the calldata for `assetProxy.transferFrom`.
-                let cdEnd := add(cdStart, add(132, dataAreaLength))
-
-                
-                /////// Setup Header Area ///////
-                // This area holds the 4-byte `transferFromSelector`.
-                // bytes4(keccak256("transferFrom(bytes,address,address,uint256)")) = 0xa85e59e4
-                mstore(cdStart, 0xa85e59e400000000000000000000000000000000000000000000000000000000)
-                
-                /////// Setup Params Area ///////
-                // Each parameter is padded to 32-bytes. The entire Params Area is 128 bytes.
-                // Notes:
-                //   1. The offset to `assetData` is the length of the Params Area (128 bytes).
-                //   2. A 20-byte mask is applied to addresses to zero-out the unused bytes.
-                mstore(add(cdStart, 4), 128)
-                mstore(add(cdStart, 36), and(from, 0xffffffffffffffffffffffffffffffffffffffff))
-                mstore(add(cdStart, 68), and(to, 0xffffffffffffffffffffffffffffffffffffffff))
-                mstore(add(cdStart, 100), amount)
-                
-                /////// Setup Data Area ///////
-                // This area holds `assetData`.
-                let dataArea := add(cdStart, 132)
-                // solhint-disable-next-line no-empty-blocks
-                for {} lt(dataArea, cdEnd) {} {
-                    mstore(dataArea, mload(assetData))
-                    dataArea := add(dataArea, 32)
-                    assetData := add(assetData, 32)
-                }
-
-                /////// Call `assetProxy.transferFrom` using the constructed calldata ///////
-                let success := call(
-                    gas,                    // forward all gas
-                    assetProxy,             // call address of asset proxy
-                    0,                      // don't send any ETH
-                    cdStart,                // pointer to start of input
-                    sub(cdEnd, cdStart),    // length of input  
-                    cdStart,                // write output over input
-                    512                     // reserve 512 bytes for output
-                )
-                if iszero(success) {
-                    revert(cdStart, returndatasize())
-                }
-            }
-        }
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
deleted file mode 100644
index 736dcd0b1..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../utils/ReentrancyGuard/ReentrancyGuard.sol";
-import "./libs/LibConstants.sol";
-import "./libs/LibFillResults.sol";
-import "./libs/LibOrder.sol";
-import "./libs/LibMath.sol";
-import "./mixins/MExchangeCore.sol";
-import "./mixins/MSignatureValidator.sol";
-import "./mixins/MTransactions.sol";
-import "./mixins/MAssetProxyDispatcher.sol";
-
-
-contract MixinExchangeCore is
-    ReentrancyGuard,
-    LibConstants,
-    LibMath,
-    LibOrder,
-    LibFillResults,
-    MAssetProxyDispatcher,
-    MExchangeCore,
-    MSignatureValidator,
-    MTransactions
-{
-    // Mapping of orderHash => amount of takerAsset already bought by maker
-    mapping (bytes32 => uint256) public filled;
-
-    // Mapping of orderHash => cancelled
-    mapping (bytes32 => bool) public cancelled;
-
-    // Mapping of makerAddress => senderAddress => lowest salt an order can have in order to be fillable
-    // Orders with specified senderAddress and with a salt less than their epoch are considered cancelled
-    mapping (address => mapping (address => uint256)) public orderEpoch;
-
-    /// @dev Cancels all orders created by makerAddress with a salt less than or equal to the targetOrderEpoch
-    ///      and senderAddress equal to msg.sender (or null address if msg.sender == makerAddress).
-    /// @param targetOrderEpoch Orders created with a salt less or equal to this value will be cancelled.
-    function cancelOrdersUpTo(uint256 targetOrderEpoch)
-        external
-        nonReentrant
-    {
-        address makerAddress = getCurrentContextAddress();
-        // If this function is called via `executeTransaction`, we only update the orderEpoch for the makerAddress/msg.sender combination.
-        // This allows external filter contracts to add rules to how orders are cancelled via this function.
-        address senderAddress = makerAddress == msg.sender ? address(0) : msg.sender;
-
-        // orderEpoch is initialized to 0, so to cancelUpTo we need salt + 1
-        uint256 newOrderEpoch = targetOrderEpoch + 1;  
-        uint256 oldOrderEpoch = orderEpoch[makerAddress][senderAddress];
-
-        // Ensure orderEpoch is monotonically increasing
-        require(
-            newOrderEpoch > oldOrderEpoch, 
-            "INVALID_NEW_ORDER_EPOCH"
-        );
-
-        // Update orderEpoch
-        orderEpoch[makerAddress][senderAddress] = newOrderEpoch;
-        emit CancelUpTo(
-            makerAddress,
-            senderAddress,
-            newOrderEpoch
-        );
-    }
-
-    /// @dev Fills the input order.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrder(
-        Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        nonReentrant
-        returns (FillResults memory fillResults)
-    {
-        fillResults = fillOrderInternal(
-            order,
-            takerAssetFillAmount,
-            signature
-        );
-        return fillResults;
-    }
-
-    /// @dev After calling, the order can not be filled anymore.
-    ///      Throws if order is invalid or sender does not have permission to cancel.
-    /// @param order Order to cancel. Order must be OrderStatus.FILLABLE.
-    function cancelOrder(Order memory order)
-        public
-        nonReentrant
-    {
-        cancelOrderInternal(order);
-    }
-
-    /// @dev Gets information about an order: status, hash, and amount filled.
-    /// @param order Order to gather information on.
-    /// @return OrderInfo Information about the order and its state.
-    ///         See LibOrder.OrderInfo for a complete description.
-    function getOrderInfo(Order memory order)
-        public
-        view
-        returns (OrderInfo memory orderInfo)
-    {
-        // Compute the order hash
-        orderInfo.orderHash = getOrderHash(order);
-
-        // Fetch filled amount
-        orderInfo.orderTakerAssetFilledAmount = filled[orderInfo.orderHash];
-
-        // If order.makerAssetAmount is zero, we also reject the order.
-        // While the Exchange contract handles them correctly, they create
-        // edge cases in the supporting infrastructure because they have
-        // an 'infinite' price when computed by a simple division.
-        if (order.makerAssetAmount == 0) {
-            orderInfo.orderStatus = uint8(OrderStatus.INVALID_MAKER_ASSET_AMOUNT);
-            return orderInfo;
-        }
-
-        // If order.takerAssetAmount is zero, then the order will always
-        // be considered filled because 0 == takerAssetAmount == orderTakerAssetFilledAmount
-        // Instead of distinguishing between unfilled and filled zero taker
-        // amount orders, we choose not to support them.
-        if (order.takerAssetAmount == 0) {
-            orderInfo.orderStatus = uint8(OrderStatus.INVALID_TAKER_ASSET_AMOUNT);
-            return orderInfo;
-        }
-
-        // Validate order availability
-        if (orderInfo.orderTakerAssetFilledAmount >= order.takerAssetAmount) {
-            orderInfo.orderStatus = uint8(OrderStatus.FULLY_FILLED);
-            return orderInfo;
-        }
-
-        // Validate order expiration
-        // solhint-disable-next-line not-rely-on-time
-        if (block.timestamp >= order.expirationTimeSeconds) {
-            orderInfo.orderStatus = uint8(OrderStatus.EXPIRED);
-            return orderInfo;
-        }
-
-        // Check if order has been cancelled
-        if (cancelled[orderInfo.orderHash]) {
-            orderInfo.orderStatus = uint8(OrderStatus.CANCELLED);
-            return orderInfo;
-        }
-        if (orderEpoch[order.makerAddress][order.senderAddress] > order.salt) {
-            orderInfo.orderStatus = uint8(OrderStatus.CANCELLED);
-            return orderInfo;
-        }
-
-        // All other statuses are ruled out: order is Fillable
-        orderInfo.orderStatus = uint8(OrderStatus.FILLABLE);
-        return orderInfo;
-    }
-
-    /// @dev Fills the input order.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrderInternal(
-        Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        internal
-        returns (FillResults memory fillResults)
-    {
-        // Fetch order info
-        OrderInfo memory orderInfo = getOrderInfo(order);
-
-        // Fetch taker address
-        address takerAddress = getCurrentContextAddress();
-        
-        // Assert that the order is fillable by taker
-        assertFillableOrder(
-            order,
-            orderInfo,
-            takerAddress,
-            signature
-        );
-        
-        // Get amount of takerAsset to fill
-        uint256 remainingTakerAssetAmount = safeSub(order.takerAssetAmount, orderInfo.orderTakerAssetFilledAmount);
-        uint256 takerAssetFilledAmount = min256(takerAssetFillAmount, remainingTakerAssetAmount);
-
-        // Validate context
-        assertValidFill(
-            order,
-            orderInfo,
-            takerAssetFillAmount,
-            takerAssetFilledAmount,
-            fillResults.makerAssetFilledAmount
-        );
-
-        // Compute proportional fill amounts
-        fillResults = calculateFillResults(order, takerAssetFilledAmount);
-
-        // Update exchange internal state
-        updateFilledState(
-            order,
-            takerAddress,
-            orderInfo.orderHash,
-            orderInfo.orderTakerAssetFilledAmount,
-            fillResults
-        );
-    
-        // Settle order
-        settleOrder(
-            order,
-            takerAddress,
-            fillResults
-        );
-
-        return fillResults;
-    }
-
-    /// @dev After calling, the order can not be filled anymore.
-    ///      Throws if order is invalid or sender does not have permission to cancel.
-    /// @param order Order to cancel. Order must be OrderStatus.FILLABLE.
-    function cancelOrderInternal(Order memory order)
-        internal
-    {
-        // Fetch current order status
-        OrderInfo memory orderInfo = getOrderInfo(order);
-
-        // Validate context
-        assertValidCancel(order, orderInfo);
-
-        // Perform cancel
-        updateCancelledState(order, orderInfo.orderHash);
-    }
-
-    /// @dev Updates state with results of a fill order.
-    /// @param order that was filled.
-    /// @param takerAddress Address of taker who filled the order.
-    /// @param orderTakerAssetFilledAmount Amount of order already filled.
-    function updateFilledState(
-        Order memory order,
-        address takerAddress,
-        bytes32 orderHash,
-        uint256 orderTakerAssetFilledAmount,
-        FillResults memory fillResults
-    )
-        internal
-    {
-        // Update state
-        filled[orderHash] = safeAdd(orderTakerAssetFilledAmount, fillResults.takerAssetFilledAmount);
-
-        // Log order
-        emit Fill(
-            order.makerAddress,
-            order.feeRecipientAddress,
-            takerAddress,
-            msg.sender,
-            fillResults.makerAssetFilledAmount,
-            fillResults.takerAssetFilledAmount,
-            fillResults.makerFeePaid,
-            fillResults.takerFeePaid,
-            orderHash,
-            order.makerAssetData,
-            order.takerAssetData
-        );
-    }
-
-    /// @dev Updates state with results of cancelling an order.
-    ///      State is only updated if the order is currently fillable.
-    ///      Otherwise, updating state would have no effect.
-    /// @param order that was cancelled.
-    /// @param orderHash Hash of order that was cancelled.
-    function updateCancelledState(
-        Order memory order,
-        bytes32 orderHash
-    )
-        internal
-    {
-        // Perform cancel
-        cancelled[orderHash] = true;
-
-        // Log cancel
-        emit Cancel(
-            order.makerAddress,
-            order.feeRecipientAddress,
-            msg.sender,
-            orderHash,
-            order.makerAssetData,
-            order.takerAssetData
-        );
-    }
-    
-    /// @dev Validates context for fillOrder. Succeeds or throws.
-    /// @param order to be filled.
-    /// @param orderInfo OrderStatus, orderHash, and amount already filled of order.
-    /// @param takerAddress Address of order taker.
-    /// @param signature Proof that the orders was created by its maker.
-    function assertFillableOrder(
-        Order memory order,
-        OrderInfo memory orderInfo,
-        address takerAddress,
-        bytes memory signature
-    )
-        internal
-        view
-    {
-        // An order can only be filled if its status is FILLABLE.
-        require(
-            orderInfo.orderStatus == uint8(OrderStatus.FILLABLE),
-            "ORDER_UNFILLABLE"
-        );
-        
-        // Validate sender is allowed to fill this order
-        if (order.senderAddress != address(0)) {
-            require(
-                order.senderAddress == msg.sender,
-                "INVALID_SENDER"
-            );
-        }
-        
-        // Validate taker is allowed to fill this order
-        if (order.takerAddress != address(0)) {
-            require(
-                order.takerAddress == takerAddress,
-                "INVALID_TAKER"
-            );
-        }
-        
-        // Validate Maker signature (check only if first time seen)
-        if (orderInfo.orderTakerAssetFilledAmount == 0) {
-            require(
-                isValidSignature(
-                    orderInfo.orderHash,
-                    order.makerAddress,
-                    signature
-                ),
-                "INVALID_ORDER_SIGNATURE"
-            );
-        }
-    }
-    
-    /// @dev Validates context for fillOrder. Succeeds or throws.
-    /// @param order to be filled.
-    /// @param orderInfo OrderStatus, orderHash, and amount already filled of order.
-    /// @param takerAssetFillAmount Desired amount of order to fill by taker.
-    /// @param takerAssetFilledAmount Amount of takerAsset that will be filled.
-    /// @param makerAssetFilledAmount Amount of makerAsset that will be transfered.
-    function assertValidFill(
-        Order memory order,
-        OrderInfo memory orderInfo,
-        uint256 takerAssetFillAmount,  // TODO: use FillResults
-        uint256 takerAssetFilledAmount,
-        uint256 makerAssetFilledAmount
-    )
-        internal
-        view
-    {
-        // Revert if fill amount is invalid
-        // TODO: reconsider necessity for v2.1
-        require(
-            takerAssetFillAmount != 0,
-            "INVALID_TAKER_AMOUNT"
-        );
-        
-        // Make sure taker does not pay more than desired amount
-        // NOTE: This assertion should never fail, it is here
-        //       as an extra defence against potential bugs.
-        require(
-            takerAssetFilledAmount <= takerAssetFillAmount,
-            "TAKER_OVERPAY"
-        );
-        
-        // Make sure order is not overfilled
-        // NOTE: This assertion should never fail, it is here
-        //       as an extra defence against potential bugs.
-        require(
-            safeAdd(orderInfo.orderTakerAssetFilledAmount, takerAssetFilledAmount) <= order.takerAssetAmount,
-            "ORDER_OVERFILL"
-        );
-        
-        // Make sure order is filled at acceptable price.
-        // The order has an implied price from the makers perspective:
-        //    order price = order.makerAssetAmount / order.takerAssetAmount
-        // i.e. the number of makerAsset maker is paying per takerAsset. The
-        // maker is guaranteed to get this price or a better (lower) one. The
-        // actual price maker is getting in this fill is:
-        //    fill price = makerAssetFilledAmount / takerAssetFilledAmount
-        // We need `fill price <= order price` for the fill to be fair to maker.
-        // This amounts to:
-        //     makerAssetFilledAmount        order.makerAssetAmount
-        //    ------------------------  <=  -----------------------
-        //     takerAssetFilledAmount        order.takerAssetAmount
-        // or, equivalently:
-        //     makerAssetFilledAmount * order.takerAssetAmount <=
-        //     order.makerAssetAmount * takerAssetFilledAmount
-        // NOTE: This assertion should never fail, it is here
-        //       as an extra defence against potential bugs.
-        require(
-            safeMul(makerAssetFilledAmount, order.takerAssetAmount)
-            <= 
-            safeMul(order.makerAssetAmount, takerAssetFilledAmount),
-            "INVALID_FILL_PRICE"
-        );
-    }
-
-    /// @dev Validates context for cancelOrder. Succeeds or throws.
-    /// @param order to be cancelled.
-    /// @param orderInfo OrderStatus, orderHash, and amount already filled of order.
-    function assertValidCancel(
-        Order memory order,
-        OrderInfo memory orderInfo
-    )
-        internal
-        view
-    {
-        // Ensure order is valid
-        // An order can only be cancelled if its status is FILLABLE.
-        require(
-            orderInfo.orderStatus == uint8(OrderStatus.FILLABLE),
-            "ORDER_UNFILLABLE"
-        );
-
-        // Validate sender is allowed to cancel this order
-        if (order.senderAddress != address(0)) {
-            require(
-                order.senderAddress == msg.sender,
-                "INVALID_SENDER"
-            );
-        }
-
-        // Validate transaction signed by maker
-        address makerAddress = getCurrentContextAddress();
-        require(
-            order.makerAddress == makerAddress,
-            "INVALID_MAKER"
-        );
-    }
-
-    /// @dev Calculates amounts filled and fees paid by maker and taker.
-    /// @param order to be filled.
-    /// @param takerAssetFilledAmount Amount of takerAsset that will be filled.
-    /// @return fillResults Amounts filled and fees paid by maker and taker.
-    function calculateFillResults(
-        Order memory order,
-        uint256 takerAssetFilledAmount
-    )
-        internal
-        pure
-        returns (FillResults memory fillResults)
-    {
-        // Compute proportional transfer amounts
-        fillResults.takerAssetFilledAmount = takerAssetFilledAmount;
-        fillResults.makerAssetFilledAmount = safeGetPartialAmountFloor(
-            takerAssetFilledAmount,
-            order.takerAssetAmount,
-            order.makerAssetAmount
-        );
-        fillResults.makerFeePaid = safeGetPartialAmountFloor(
-            fillResults.makerAssetFilledAmount,
-            order.makerAssetAmount,
-            order.makerFee
-        );
-        fillResults.takerFeePaid = safeGetPartialAmountFloor(
-            takerAssetFilledAmount,
-            order.takerAssetAmount,
-            order.takerFee
-        );
-
-        return fillResults;
-    }
-
-    /// @dev Settles an order by transferring assets between counterparties.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAddress Address selling takerAsset and buying makerAsset.
-    /// @param fillResults Amounts to be filled and fees paid by maker and taker.
-    function settleOrder(
-        LibOrder.Order memory order,
-        address takerAddress,
-        LibFillResults.FillResults memory fillResults
-    )
-        private
-    {
-        bytes memory zrxAssetData = ZRX_ASSET_DATA;
-        dispatchTransferFrom(
-            order.makerAssetData,
-            order.makerAddress,
-            takerAddress,
-            fillResults.makerAssetFilledAmount
-        );
-        dispatchTransferFrom(
-            order.takerAssetData,
-            takerAddress,
-            order.makerAddress,
-            fillResults.takerAssetFilledAmount
-        );
-        dispatchTransferFrom(
-            zrxAssetData,
-            order.makerAddress,
-            order.feeRecipientAddress,
-            fillResults.makerFeePaid
-        );
-        dispatchTransferFrom(
-            zrxAssetData,
-            takerAddress,
-            order.feeRecipientAddress,
-            fillResults.takerFeePaid
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
deleted file mode 100644
index b4f6bdb26..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-  Copyright 2018 ZeroEx Intl.
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../utils/ReentrancyGuard/ReentrancyGuard.sol";
-import "./libs/LibConstants.sol";
-import "./libs/LibMath.sol";
-import "./libs/LibOrder.sol";
-import "./libs/LibFillResults.sol";
-import "./mixins/MExchangeCore.sol";
-import "./mixins/MMatchOrders.sol";
-import "./mixins/MTransactions.sol";
-import "./mixins/MAssetProxyDispatcher.sol";
-
-
-contract MixinMatchOrders is
-    ReentrancyGuard,
-    LibConstants,
-    LibMath,
-    MAssetProxyDispatcher,
-    MExchangeCore,
-    MMatchOrders,
-    MTransactions
-{
-    /// @dev Match two complementary orders that have a profitable spread.
-    ///      Each order is filled at their respective price point. However, the calculations are
-    ///      carried out as though the orders are both being filled at the right order's price point.
-    ///      The profit made by the left order goes to the taker (who matched the two orders).
-    /// @param leftOrder First order to match.
-    /// @param rightOrder Second order to match.
-    /// @param leftSignature Proof that order was created by the left maker.
-    /// @param rightSignature Proof that order was created by the right maker.
-    /// @return matchedFillResults Amounts filled and fees paid by maker and taker of matched orders.
-    function matchOrders(
-        LibOrder.Order memory leftOrder,
-        LibOrder.Order memory rightOrder,
-        bytes memory leftSignature,
-        bytes memory rightSignature
-    )
-        public
-        nonReentrant
-        returns (LibFillResults.MatchedFillResults memory matchedFillResults)
-    {
-        // We assume that rightOrder.takerAssetData == leftOrder.makerAssetData and rightOrder.makerAssetData == leftOrder.takerAssetData.
-        // If this assumption isn't true, the match will fail at signature validation.
-        rightOrder.makerAssetData = leftOrder.takerAssetData;
-        rightOrder.takerAssetData = leftOrder.makerAssetData;
-
-        // Get left & right order info
-        LibOrder.OrderInfo memory leftOrderInfo = getOrderInfo(leftOrder);
-        LibOrder.OrderInfo memory rightOrderInfo = getOrderInfo(rightOrder);
-
-        // Fetch taker address
-        address takerAddress = getCurrentContextAddress();
-        
-        // Either our context is valid or we revert
-        assertFillableOrder(
-            leftOrder,
-            leftOrderInfo,
-            takerAddress,
-            leftSignature
-        );
-        assertFillableOrder(
-            rightOrder,
-            rightOrderInfo,
-            takerAddress,
-            rightSignature
-        );
-        assertValidMatch(leftOrder, rightOrder);
-
-        // Compute proportional fill amounts
-        matchedFillResults = calculateMatchedFillResults(
-            leftOrder,
-            rightOrder,
-            leftOrderInfo.orderTakerAssetFilledAmount,
-            rightOrderInfo.orderTakerAssetFilledAmount
-        );
-
-        // Validate fill contexts
-        assertValidFill(
-            leftOrder,
-            leftOrderInfo,
-            matchedFillResults.left.takerAssetFilledAmount,
-            matchedFillResults.left.takerAssetFilledAmount,
-            matchedFillResults.left.makerAssetFilledAmount
-        );
-        assertValidFill(
-            rightOrder,
-            rightOrderInfo,
-            matchedFillResults.right.takerAssetFilledAmount,
-            matchedFillResults.right.takerAssetFilledAmount,
-            matchedFillResults.right.makerAssetFilledAmount
-        );
-        
-        // Update exchange state
-        updateFilledState(
-            leftOrder,
-            takerAddress,
-            leftOrderInfo.orderHash,
-            leftOrderInfo.orderTakerAssetFilledAmount,
-            matchedFillResults.left
-        );
-        updateFilledState(
-            rightOrder,
-            takerAddress,
-            rightOrderInfo.orderHash,
-            rightOrderInfo.orderTakerAssetFilledAmount,
-            matchedFillResults.right
-        );
-
-        // Settle matched orders. Succeeds or throws.
-        settleMatchedOrders(
-            leftOrder,
-            rightOrder,
-            takerAddress,
-            matchedFillResults
-        );
-
-        return matchedFillResults;
-    }
-
-    /// @dev Validates context for matchOrders. Succeeds or throws.
-    /// @param leftOrder First order to match.
-    /// @param rightOrder Second order to match.
-    function assertValidMatch(
-        LibOrder.Order memory leftOrder,
-        LibOrder.Order memory rightOrder
-    )
-        internal
-        pure
-    {
-        // Make sure there is a profitable spread.
-        // There is a profitable spread iff the cost per unit bought (OrderA.MakerAmount/OrderA.TakerAmount) for each order is greater
-        // than the profit per unit sold of the matched order (OrderB.TakerAmount/OrderB.MakerAmount).
-        // This is satisfied by the equations below:
-        // <leftOrder.makerAssetAmount> / <leftOrder.takerAssetAmount> >= <rightOrder.takerAssetAmount> / <rightOrder.makerAssetAmount>
-        // AND
-        // <rightOrder.makerAssetAmount> / <rightOrder.takerAssetAmount> >= <leftOrder.takerAssetAmount> / <leftOrder.makerAssetAmount>
-        // These equations can be combined to get the following:
-        require(
-            safeMul(leftOrder.makerAssetAmount, rightOrder.makerAssetAmount) >=
-            safeMul(leftOrder.takerAssetAmount, rightOrder.takerAssetAmount),
-            "NEGATIVE_SPREAD_REQUIRED"
-        );
-    }
-
-    /// @dev Calculates fill amounts for the matched orders.
-    ///      Each order is filled at their respective price point. However, the calculations are
-    ///      carried out as though the orders are both being filled at the right order's price point.
-    ///      The profit made by the leftOrder order goes to the taker (who matched the two orders).
-    /// @param leftOrder First order to match.
-    /// @param rightOrder Second order to match.
-    /// @param leftOrderTakerAssetFilledAmount Amount of left order already filled.
-    /// @param rightOrderTakerAssetFilledAmount Amount of right order already filled.
-    /// @param matchedFillResults Amounts to fill and fees to pay by maker and taker of matched orders.
-    function calculateMatchedFillResults(
-        LibOrder.Order memory leftOrder,
-        LibOrder.Order memory rightOrder,
-        uint256 leftOrderTakerAssetFilledAmount,
-        uint256 rightOrderTakerAssetFilledAmount
-    )
-        internal
-        pure
-        returns (LibFillResults.MatchedFillResults memory matchedFillResults)
-    {
-        // Derive maker asset amounts for left & right orders, given store taker assert amounts
-        uint256 leftTakerAssetAmountRemaining = safeSub(leftOrder.takerAssetAmount, leftOrderTakerAssetFilledAmount);
-        uint256 leftMakerAssetAmountRemaining = safeGetPartialAmountFloor(
-            leftOrder.makerAssetAmount,
-            leftOrder.takerAssetAmount,
-            leftTakerAssetAmountRemaining
-        );
-        uint256 rightTakerAssetAmountRemaining = safeSub(rightOrder.takerAssetAmount, rightOrderTakerAssetFilledAmount);
-        uint256 rightMakerAssetAmountRemaining = safeGetPartialAmountFloor(
-            rightOrder.makerAssetAmount,
-            rightOrder.takerAssetAmount,
-            rightTakerAssetAmountRemaining
-        );
-
-        // Calculate fill results for maker and taker assets: at least one order will be fully filled.
-        // The maximum amount the left maker can buy is `leftTakerAssetAmountRemaining`
-        // The maximum amount the right maker can sell is `rightMakerAssetAmountRemaining`
-        // We have two distinct cases for calculating the fill results:
-        // Case 1.
-        //   If the left maker can buy more than the right maker can sell, then only the right order is fully filled.
-        //   If the left maker can buy exactly what the right maker can sell, then both orders are fully filled.
-        // Case 2.
-        //   If the left maker cannot buy more than the right maker can sell, then only the left order is fully filled.
-        if (leftTakerAssetAmountRemaining >= rightMakerAssetAmountRemaining) {
-            // Case 1: Right order is fully filled
-            matchedFillResults.right.makerAssetFilledAmount = rightMakerAssetAmountRemaining;
-            matchedFillResults.right.takerAssetFilledAmount = rightTakerAssetAmountRemaining;
-            matchedFillResults.left.takerAssetFilledAmount = matchedFillResults.right.makerAssetFilledAmount;
-            // Round down to ensure the maker's exchange rate does not exceed the price specified by the order. 
-            // We favor the maker when the exchange rate must be rounded.
-            matchedFillResults.left.makerAssetFilledAmount = safeGetPartialAmountFloor(
-                leftOrder.makerAssetAmount,
-                leftOrder.takerAssetAmount,
-                matchedFillResults.left.takerAssetFilledAmount
-            );
-        } else {
-            // Case 2: Left order is fully filled
-            matchedFillResults.left.makerAssetFilledAmount = leftMakerAssetAmountRemaining;
-            matchedFillResults.left.takerAssetFilledAmount = leftTakerAssetAmountRemaining;
-            matchedFillResults.right.makerAssetFilledAmount = matchedFillResults.left.takerAssetFilledAmount;
-            // Round up to ensure the maker's exchange rate does not exceed the price specified by the order.
-            // We favor the maker when the exchange rate must be rounded.
-            matchedFillResults.right.takerAssetFilledAmount = safeGetPartialAmountCeil(
-                rightOrder.takerAssetAmount,
-                rightOrder.makerAssetAmount,
-                matchedFillResults.right.makerAssetFilledAmount
-            );
-        }
-
-        // Calculate amount given to taker
-        matchedFillResults.leftMakerAssetSpreadAmount = safeSub(
-            matchedFillResults.left.makerAssetFilledAmount,
-            matchedFillResults.right.takerAssetFilledAmount
-        );
-
-        // Compute fees for left order
-        matchedFillResults.left.makerFeePaid = safeGetPartialAmountFloor(
-            matchedFillResults.left.makerAssetFilledAmount,
-            leftOrder.makerAssetAmount,
-            leftOrder.makerFee
-        );
-        matchedFillResults.left.takerFeePaid = safeGetPartialAmountFloor(
-            matchedFillResults.left.takerAssetFilledAmount,
-            leftOrder.takerAssetAmount,
-            leftOrder.takerFee
-        );
-
-        // Compute fees for right order
-        matchedFillResults.right.makerFeePaid = safeGetPartialAmountFloor(
-            matchedFillResults.right.makerAssetFilledAmount,
-            rightOrder.makerAssetAmount,
-            rightOrder.makerFee
-        );
-        matchedFillResults.right.takerFeePaid = safeGetPartialAmountFloor(
-            matchedFillResults.right.takerAssetFilledAmount,
-            rightOrder.takerAssetAmount,
-            rightOrder.takerFee
-        );
-
-        // Return fill results
-        return matchedFillResults;
-    }
-
-    /// @dev Settles matched order by transferring appropriate funds between order makers, taker, and fee recipient.
-    /// @param leftOrder First matched order.
-    /// @param rightOrder Second matched order.
-    /// @param takerAddress Address that matched the orders. The taker receives the spread between orders as profit.
-    /// @param matchedFillResults Struct holding amounts to transfer between makers, taker, and fee recipients.
-    function settleMatchedOrders(
-        LibOrder.Order memory leftOrder,
-        LibOrder.Order memory rightOrder,
-        address takerAddress,
-        LibFillResults.MatchedFillResults memory matchedFillResults
-    )
-        private
-    {
-        bytes memory zrxAssetData = ZRX_ASSET_DATA;
-        // Order makers and taker
-        dispatchTransferFrom(
-            leftOrder.makerAssetData,
-            leftOrder.makerAddress,
-            rightOrder.makerAddress,
-            matchedFillResults.right.takerAssetFilledAmount
-        );
-        dispatchTransferFrom(
-            rightOrder.makerAssetData,
-            rightOrder.makerAddress,
-            leftOrder.makerAddress,
-            matchedFillResults.left.takerAssetFilledAmount
-        );
-        dispatchTransferFrom(
-            leftOrder.makerAssetData,
-            leftOrder.makerAddress,
-            takerAddress,
-            matchedFillResults.leftMakerAssetSpreadAmount
-        );
-
-        // Maker fees
-        dispatchTransferFrom(
-            zrxAssetData,
-            leftOrder.makerAddress,
-            leftOrder.feeRecipientAddress,
-            matchedFillResults.left.makerFeePaid
-        );
-        dispatchTransferFrom(
-            zrxAssetData,
-            rightOrder.makerAddress,
-            rightOrder.feeRecipientAddress,
-            matchedFillResults.right.makerFeePaid
-        );
-
-        // Taker fees
-        if (leftOrder.feeRecipientAddress == rightOrder.feeRecipientAddress) {
-            dispatchTransferFrom(
-                zrxAssetData,
-                takerAddress,
-                leftOrder.feeRecipientAddress,
-                safeAdd(
-                    matchedFillResults.left.takerFeePaid,
-                    matchedFillResults.right.takerFeePaid
-                )
-            );
-        } else {
-            dispatchTransferFrom(
-                zrxAssetData,
-                takerAddress,
-                leftOrder.feeRecipientAddress,
-                matchedFillResults.left.takerFeePaid
-            );
-            dispatchTransferFrom(
-                zrxAssetData,
-                takerAddress,
-                rightOrder.feeRecipientAddress,
-                matchedFillResults.right.takerFeePaid
-            );
-        }
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
deleted file mode 100644
index 176e28351..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinSignatureValidator.sol
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/LibBytes/LibBytes.sol";
-import "../../utils/ReentrancyGuard/ReentrancyGuard.sol";
-import "./mixins/MSignatureValidator.sol";
-import "./mixins/MTransactions.sol";
-import "./interfaces/IWallet.sol";
-import "./interfaces/IValidator.sol";
-
-
-contract MixinSignatureValidator is
-    ReentrancyGuard,
-    MSignatureValidator,
-    MTransactions
-{
-    using LibBytes for bytes;
-    
-    // Mapping of hash => signer => signed
-    mapping (bytes32 => mapping (address => bool)) public preSigned;
-
-    // Mapping of signer => validator => approved
-    mapping (address => mapping (address => bool)) public allowedValidators;
-
-    /// @dev Approves a hash on-chain using any valid signature type.
-    ///      After presigning a hash, the preSign signature type will become valid for that hash and signer.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof that the hash has been signed by signer.
-    function preSign(
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        external
-    {
-        if (signerAddress != msg.sender) {
-            require(
-                isValidSignature(
-                    hash,
-                    signerAddress,
-                    signature
-                ),
-                "INVALID_SIGNATURE"
-            );
-        }
-        preSigned[hash][signerAddress] = true;
-    }
-
-    /// @dev Approves/unnapproves a Validator contract to verify signatures on signer's behalf.
-    /// @param validatorAddress Address of Validator contract.
-    /// @param approval Approval or disapproval of  Validator contract.
-    function setSignatureValidatorApproval(
-        address validatorAddress,
-        bool approval
-    )
-        external
-        nonReentrant
-    {
-        address signerAddress = getCurrentContextAddress();
-        allowedValidators[signerAddress][validatorAddress] = approval;
-        emit SignatureValidatorApproval(
-            signerAddress,
-            validatorAddress,
-            approval
-        );
-    }
-
-    /// @dev Verifies that a hash has been signed by the given signer.
-    /// @param hash Any 32 byte hash.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof that the hash has been signed by signer.
-    /// @return True if the address recovered from the provided signature matches the input signer address.
-    function isValidSignature(
-        bytes32 hash,
-        address signerAddress,
-        bytes memory signature
-    )
-        public
-        view
-        returns (bool isValid)
-    {
-        require(
-            signature.length > 0,
-            "LENGTH_GREATER_THAN_0_REQUIRED"
-        );
-
-        // Pop last byte off of signature byte array.
-        uint8 signatureTypeRaw = uint8(signature.popLastByte());
-
-        // Ensure signature is supported
-        require(
-            signatureTypeRaw < uint8(SignatureType.NSignatureTypes),
-            "SIGNATURE_UNSUPPORTED"
-        );
-
-        SignatureType signatureType = SignatureType(signatureTypeRaw);
-
-        // Variables are not scoped in Solidity.
-        uint8 v;
-        bytes32 r;
-        bytes32 s;
-        address recovered;
-
-        // Always illegal signature.
-        // This is always an implicit option since a signer can create a
-        // signature array with invalid type or length. We may as well make
-        // it an explicit option. This aids testing and analysis. It is
-        // also the initialization value for the enum type.
-        if (signatureType == SignatureType.Illegal) {
-            revert("SIGNATURE_ILLEGAL");
-
-        // Always invalid signature.
-        // Like Illegal, this is always implicitly available and therefore
-        // offered explicitly. It can be implicitly created by providing
-        // a correctly formatted but incorrect signature.
-        } else if (signatureType == SignatureType.Invalid) {
-            require(
-                signature.length == 0,
-                "LENGTH_0_REQUIRED"
-            );
-            isValid = false;
-            return isValid;
-
-        // Signature using EIP712
-        } else if (signatureType == SignatureType.EIP712) {
-            require(
-                signature.length == 65,
-                "LENGTH_65_REQUIRED"
-            );
-            v = uint8(signature[0]);
-            r = signature.readBytes32(1);
-            s = signature.readBytes32(33);
-            recovered = ecrecover(
-                hash,
-                v,
-                r,
-                s
-            );
-            isValid = signerAddress == recovered;
-            return isValid;
-
-        // Signed using web3.eth_sign
-        } else if (signatureType == SignatureType.EthSign) {
-            require(
-                signature.length == 65,
-                "LENGTH_65_REQUIRED"
-            );
-            v = uint8(signature[0]);
-            r = signature.readBytes32(1);
-            s = signature.readBytes32(33);
-            recovered = ecrecover(
-                keccak256(abi.encodePacked(
-                    "\x19Ethereum Signed Message:\n32",
-                    hash
-                )),
-                v,
-                r,
-                s
-            );
-            isValid = signerAddress == recovered;
-            return isValid;
-
-        // Signature verified by wallet contract.
-        // If used with an order, the maker of the order is the wallet contract.
-        } else if (signatureType == SignatureType.Wallet) {
-            isValid = isValidWalletSignature(
-                hash,
-                signerAddress,
-                signature
-            );
-            return isValid;
-
-        // Signature verified by validator contract.
-        // If used with an order, the maker of the order can still be an EOA.
-        // A signature using this type should be encoded as:
-        // | Offset   | Length | Contents                        |
-        // | 0x00     | x      | Signature to validate           |
-        // | 0x00 + x | 20     | Address of validator contract   |
-        // | 0x14 + x | 1      | Signature type is always "\x06" |
-        } else if (signatureType == SignatureType.Validator) {
-            // Pop last 20 bytes off of signature byte array.
-            address validatorAddress = signature.popLast20Bytes();
-            
-            // Ensure signer has approved validator.
-            if (!allowedValidators[signerAddress][validatorAddress]) {
-                return false;
-            }
-            isValid = isValidValidatorSignature(
-                validatorAddress,
-                hash,
-                signerAddress,
-                signature
-            );
-            return isValid;
-
-        // Signer signed hash previously using the preSign function.
-        } else if (signatureType == SignatureType.PreSigned) {
-            isValid = preSigned[hash][signerAddress];
-            return isValid;
-        }
-
-        // Anything else is illegal (We do not return false because
-        // the signature may actually be valid, just not in a format
-        // that we currently support. In this case returning false
-        // may lead the caller to incorrectly believe that the
-        // signature was invalid.)
-        revert("SIGNATURE_UNSUPPORTED");
-    }
-
-    /// @dev Verifies signature using logic defined by Wallet contract.
-    /// @param hash Any 32 byte hash.
-    /// @param walletAddress Address that should have signed the given hash
-    ///                      and defines its own signature verification method.
-    /// @param signature Proof that the hash has been signed by signer.
-    /// @return True if signature is valid for given wallet..
-    function isValidWalletSignature(
-        bytes32 hash,
-        address walletAddress,
-        bytes signature
-    )
-        internal
-        view
-        returns (bool isValid)
-    {
-        bytes memory calldata = abi.encodeWithSelector(
-            IWallet(walletAddress).isValidSignature.selector,
-            hash,
-            signature
-        );
-        assembly {
-            let cdStart := add(calldata, 32)
-            let success := staticcall(
-                gas,              // forward all gas
-                walletAddress,    // address of Wallet contract
-                cdStart,          // pointer to start of input
-                mload(calldata),  // length of input
-                cdStart,          // write output over input
-                32                // output size is 32 bytes
-            )
-
-            switch success
-            case 0 {
-                // Revert with `Error("WALLET_ERROR")`
-                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                mstore(64, 0x0000000c57414c4c45545f4552524f5200000000000000000000000000000000)
-                mstore(96, 0)
-                revert(0, 100)
-            }
-            case 1 {
-                // Signature is valid if call did not revert and returned true
-                isValid := mload(cdStart)
-            }
-        }
-        return isValid;
-    }
-
-    /// @dev Verifies signature using logic defined by Validator contract.
-    /// @param validatorAddress Address of validator contract.
-    /// @param hash Any 32 byte hash.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof that the hash has been signed by signer.
-    /// @return True if the address recovered from the provided signature matches the input signer address.
-    function isValidValidatorSignature(
-        address validatorAddress,
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        internal
-        view
-        returns (bool isValid)
-    {
-        bytes memory calldata = abi.encodeWithSelector(
-            IValidator(signerAddress).isValidSignature.selector,
-            hash,
-            signerAddress,
-            signature
-        );
-        assembly {
-            let cdStart := add(calldata, 32)
-            let success := staticcall(
-                gas,               // forward all gas
-                validatorAddress,  // address of Validator contract
-                cdStart,           // pointer to start of input
-                mload(calldata),   // length of input
-                cdStart,           // write output over input
-                32                 // output size is 32 bytes
-            )
-
-            switch success
-            case 0 {
-                // Revert with `Error("VALIDATOR_ERROR")`
-                mstore(0, 0x08c379a000000000000000000000000000000000000000000000000000000000)
-                mstore(32, 0x0000002000000000000000000000000000000000000000000000000000000000)
-                mstore(64, 0x0000000f56414c494441544f525f4552524f5200000000000000000000000000)
-                mstore(96, 0)
-                revert(0, 100)
-            }
-            case 1 {
-                // Signature is valid if call did not revert and returned true
-                isValid := mload(cdStart)
-            }
-        }
-        return isValid;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol
deleted file mode 100644
index 3a76ca202..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-pragma solidity 0.4.24;
-
-import "./libs/LibExchangeErrors.sol";
-import "./mixins/MSignatureValidator.sol";
-import "./mixins/MTransactions.sol";
-import "./libs/LibEIP712.sol";
-
-
-contract MixinTransactions is
-    LibEIP712,
-    MSignatureValidator,
-    MTransactions
-{
-    // Mapping of transaction hash => executed
-    // This prevents transactions from being executed more than once.
-    mapping (bytes32 => bool) public transactions;
-
-    // Address of current transaction signer
-    address public currentContextAddress;
-
-    /// @dev Executes an exchange method call in the context of signer.
-    /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
-    /// @param signerAddress Address of transaction signer.
-    /// @param data AbiV2 encoded calldata.
-    /// @param signature Proof of signer transaction by signer.
-    function executeTransaction(
-        uint256 salt,
-        address signerAddress,
-        bytes data,
-        bytes signature
-    )
-        external
-    {
-        // Prevent reentrancy
-        require(
-            currentContextAddress == address(0),
-            "REENTRANCY_ILLEGAL"
-        );
-
-        bytes32 transactionHash = hashEIP712Message(hashZeroExTransaction(
-            salt,
-            signerAddress,
-            data
-        ));
-
-        // Validate transaction has not been executed
-        require(
-            !transactions[transactionHash],
-            "INVALID_TX_HASH"
-        );
-
-        // Transaction always valid if signer is sender of transaction
-        if (signerAddress != msg.sender) {
-            // Validate signature
-            require(
-                isValidSignature(
-                    transactionHash,
-                    signerAddress,
-                    signature
-                ),
-                "INVALID_TX_SIGNATURE"
-            );
-
-            // Set the current transaction signer
-            currentContextAddress = signerAddress;
-        }
-
-        // Execute transaction
-        transactions[transactionHash] = true;
-        require(
-            address(this).delegatecall(data),
-            "FAILED_EXECUTION"
-        );
-
-        // Reset current transaction signer if it was previously updated
-        if (signerAddress != msg.sender) {
-            currentContextAddress = address(0);
-        }
-    }
-
-    /// @dev Calculates EIP712 hash of the Transaction.
-    /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
-    /// @param signerAddress Address of transaction signer.
-    /// @param data AbiV2 encoded calldata.
-    /// @return EIP712 hash of the Transaction.
-    function hashZeroExTransaction(
-        uint256 salt,
-        address signerAddress,
-        bytes memory data
-    )
-        internal
-        pure
-        returns (bytes32 result)
-    {
-        bytes32 schemaHash = EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH;
-        bytes32 dataHash = keccak256(data);
-
-        // Assembly for more efficiently computing:
-        // keccak256(abi.encodePacked(
-        //     EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH,
-        //     salt,
-        //     bytes32(signerAddress),
-        //     keccak256(data)
-        // ));
-
-        assembly {
-            // Load free memory pointer
-            let memPtr := mload(64)
-
-            mstore(memPtr, schemaHash)                                                               // hash of schema
-            mstore(add(memPtr, 32), salt)                                                            // salt
-            mstore(add(memPtr, 64), and(signerAddress, 0xffffffffffffffffffffffffffffffffffffffff))  // signerAddress
-            mstore(add(memPtr, 96), dataHash)                                                        // hash of data
-
-            // Compute hash
-            result := keccak256(memPtr, 128)
-        }
-        return result;
-    }
-
-    /// @dev The current function will be called in the context of this address (either 0x transaction signer or `msg.sender`).
-    ///      If calling a fill function, this address will represent the taker.
-    ///      If calling a cancel function, this address will represent the maker.
-    /// @return Signer of 0x transaction if entry point is `executeTransaction`.
-    ///         `msg.sender` if entry point is any other function.
-    function getCurrentContextAddress()
-        internal
-        view
-        returns (address)
-    {
-        address currentContextAddress_ = currentContextAddress;
-        address contextAddress = currentContextAddress_ == address(0) ? msg.sender : currentContextAddress_;
-        return contextAddress;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol
deleted file mode 100644
index cddff0e5f..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinWrapperFunctions.sol
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../utils/ReentrancyGuard/ReentrancyGuard.sol";
-import "./libs/LibMath.sol";
-import "./libs/LibOrder.sol";
-import "./libs/LibFillResults.sol";
-import "./libs/LibAbiEncoder.sol";
-import "./mixins/MExchangeCore.sol";
-import "./mixins/MWrapperFunctions.sol";
-
-
-contract MixinWrapperFunctions is
-    ReentrancyGuard,
-    LibMath,
-    LibFillResults,
-    LibAbiEncoder,
-    MExchangeCore,
-    MWrapperFunctions
-{
-    /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    function fillOrKillOrder(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        nonReentrant
-        returns (FillResults memory fillResults)
-    {
-        fillResults = fillOrKillOrderInternal(
-            order,
-            takerAssetFillAmount,
-            signature
-        );
-        return fillResults;
-    }
-
-    /// @dev Fills the input order.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrderNoThrow(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        returns (FillResults memory fillResults)
-    {
-        // ABI encode calldata for `fillOrder`
-        bytes memory fillOrderCalldata = abiEncodeFillOrder(
-            order,
-            takerAssetFillAmount,
-            signature
-        );
-
-        // Delegate to `fillOrder` and handle any exceptions gracefully
-        assembly {
-            let success := delegatecall(
-                gas,                                // forward all gas
-                address,                            // call address of this contract
-                add(fillOrderCalldata, 32),         // pointer to start of input (skip array length in first 32 bytes)
-                mload(fillOrderCalldata),           // length of input
-                fillOrderCalldata,                  // write output over input
-                128                                 // output size is 128 bytes
-            )
-            if success {
-                mstore(fillResults, mload(fillOrderCalldata))
-                mstore(add(fillResults, 32), mload(add(fillOrderCalldata, 32)))
-                mstore(add(fillResults, 64), mload(add(fillOrderCalldata, 64)))
-                mstore(add(fillResults, 96), mload(add(fillOrderCalldata, 96)))
-            }
-        }
-        // fillResults values will be 0 by default if call was unsuccessful
-        return fillResults;
-    }
-
-    /// @dev Synchronously executes multiple calls of fillOrder.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    ///         NOTE: makerAssetFilledAmount and takerAssetFilledAmount may include amounts filled of different assets.
-    function batchFillOrders(
-        LibOrder.Order[] memory orders,
-        uint256[] memory takerAssetFillAmounts,
-        bytes[] memory signatures
-    )
-        public
-        nonReentrant
-        returns (FillResults memory totalFillResults)
-    {
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-            FillResults memory singleFillResults = fillOrderInternal(
-                orders[i],
-                takerAssetFillAmounts[i],
-                signatures[i]
-            );
-            addFillResults(totalFillResults, singleFillResults);
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Synchronously executes multiple calls of fillOrKill.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    ///         NOTE: makerAssetFilledAmount and takerAssetFilledAmount may include amounts filled of different assets.
-    function batchFillOrKillOrders(
-        LibOrder.Order[] memory orders,
-        uint256[] memory takerAssetFillAmounts,
-        bytes[] memory signatures
-    )
-        public
-        nonReentrant
-        returns (FillResults memory totalFillResults)
-    {
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-            FillResults memory singleFillResults = fillOrKillOrderInternal(
-                orders[i],
-                takerAssetFillAmounts[i],
-                signatures[i]
-            );
-            addFillResults(totalFillResults, singleFillResults);
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Fills an order with specified parameters and ECDSA signature.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    ///         NOTE: makerAssetFilledAmount and takerAssetFilledAmount may include amounts filled of different assets.
-    function batchFillOrdersNoThrow(
-        LibOrder.Order[] memory orders,
-        uint256[] memory takerAssetFillAmounts,
-        bytes[] memory signatures
-    )
-        public
-        returns (FillResults memory totalFillResults)
-    {
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-            FillResults memory singleFillResults = fillOrderNoThrow(
-                orders[i],
-                takerAssetFillAmounts[i],
-                signatures[i]
-            );
-            addFillResults(totalFillResults, singleFillResults);
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of takerAsset is sold by taker.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketSellOrders(
-        LibOrder.Order[] memory orders,
-        uint256 takerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        nonReentrant
-        returns (FillResults memory totalFillResults)
-    {
-        bytes memory takerAssetData = orders[0].takerAssetData;
-    
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-
-            // We assume that asset being sold by taker is the same for each order.
-            // Rather than passing this in as calldata, we use the takerAssetData from the first order in all later orders.
-            orders[i].takerAssetData = takerAssetData;
-
-            // Calculate the remaining amount of takerAsset to sell
-            uint256 remainingTakerAssetFillAmount = safeSub(takerAssetFillAmount, totalFillResults.takerAssetFilledAmount);
-
-            // Attempt to sell the remaining amount of takerAsset
-            FillResults memory singleFillResults = fillOrderInternal(
-                orders[i],
-                remainingTakerAssetFillAmount,
-                signatures[i]
-            );
-
-            // Update amounts filled and fees paid by maker and taker
-            addFillResults(totalFillResults, singleFillResults);
-
-            // Stop execution if the entire amount of takerAsset has been sold
-            if (totalFillResults.takerAssetFilledAmount >= takerAssetFillAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of takerAsset is sold by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketSellOrdersNoThrow(
-        LibOrder.Order[] memory orders,
-        uint256 takerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        returns (FillResults memory totalFillResults)
-    {
-        bytes memory takerAssetData = orders[0].takerAssetData;
-
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-
-            // We assume that asset being sold by taker is the same for each order.
-            // Rather than passing this in as calldata, we use the takerAssetData from the first order in all later orders.
-            orders[i].takerAssetData = takerAssetData;
-
-            // Calculate the remaining amount of takerAsset to sell
-            uint256 remainingTakerAssetFillAmount = safeSub(takerAssetFillAmount, totalFillResults.takerAssetFilledAmount);
-
-            // Attempt to sell the remaining amount of takerAsset
-            FillResults memory singleFillResults = fillOrderNoThrow(
-                orders[i],
-                remainingTakerAssetFillAmount,
-                signatures[i]
-            );
-
-            // Update amounts filled and fees paid by maker and taker
-            addFillResults(totalFillResults, singleFillResults);
-
-            // Stop execution if the entire amount of takerAsset has been sold
-            if (totalFillResults.takerAssetFilledAmount >= takerAssetFillAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of makerAsset is bought by taker.
-    /// @param orders Array of order specifications.
-    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketBuyOrders(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        nonReentrant
-        returns (FillResults memory totalFillResults)
-    {
-        bytes memory makerAssetData = orders[0].makerAssetData;
-
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-
-            // We assume that asset being bought by taker is the same for each order.
-            // Rather than passing this in as calldata, we copy the makerAssetData from the first order onto all later orders.
-            orders[i].makerAssetData = makerAssetData;
-
-            // Calculate the remaining amount of makerAsset to buy
-            uint256 remainingMakerAssetFillAmount = safeSub(makerAssetFillAmount, totalFillResults.makerAssetFilledAmount);
-
-            // Convert the remaining amount of makerAsset to buy into remaining amount
-            // of takerAsset to sell, assuming entire amount can be sold in the current order
-            uint256 remainingTakerAssetFillAmount = getPartialAmountFloor(
-                orders[i].takerAssetAmount,
-                orders[i].makerAssetAmount,
-                remainingMakerAssetFillAmount
-            );
-
-            // Attempt to sell the remaining amount of takerAsset
-            FillResults memory singleFillResults = fillOrderInternal(
-                orders[i],
-                remainingTakerAssetFillAmount,
-                signatures[i]
-            );
-
-            // Update amounts filled and fees paid by maker and taker
-            addFillResults(totalFillResults, singleFillResults);
-
-            // Stop execution if the entire amount of makerAsset has been bought
-            if (totalFillResults.makerAssetFilledAmount >= makerAssetFillAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction until total amount is bought by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketBuyOrdersNoThrow(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        returns (FillResults memory totalFillResults)
-    {
-        bytes memory makerAssetData = orders[0].makerAssetData;
-
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-
-            // We assume that asset being bought by taker is the same for each order.
-            // Rather than passing this in as calldata, we copy the makerAssetData from the first order onto all later orders.
-            orders[i].makerAssetData = makerAssetData;
-
-            // Calculate the remaining amount of makerAsset to buy
-            uint256 remainingMakerAssetFillAmount = safeSub(makerAssetFillAmount, totalFillResults.makerAssetFilledAmount);
-
-            // Convert the remaining amount of makerAsset to buy into remaining amount
-            // of takerAsset to sell, assuming entire amount can be sold in the current order
-            uint256 remainingTakerAssetFillAmount = getPartialAmountFloor(
-                orders[i].takerAssetAmount,
-                orders[i].makerAssetAmount,
-                remainingMakerAssetFillAmount
-            );
-
-            // Attempt to sell the remaining amount of takerAsset
-            FillResults memory singleFillResults = fillOrderNoThrow(
-                orders[i],
-                remainingTakerAssetFillAmount,
-                signatures[i]
-            );
-
-            // Update amounts filled and fees paid by maker and taker
-            addFillResults(totalFillResults, singleFillResults);
-
-            // Stop execution if the entire amount of makerAsset has been bought
-            if (totalFillResults.makerAssetFilledAmount >= makerAssetFillAmount) {
-                break;
-            }
-        }
-        return totalFillResults;
-    }
-
-    /// @dev Synchronously cancels multiple orders in a single transaction.
-    /// @param orders Array of order specifications.
-    function batchCancelOrders(LibOrder.Order[] memory orders)
-        public
-        nonReentrant
-    {
-        uint256 ordersLength = orders.length;
-        for (uint256 i = 0; i != ordersLength; i++) {
-            cancelOrderInternal(orders[i]);
-        }
-    }
-
-    /// @dev Fetches information for all passed in orders.
-    /// @param orders Array of order specifications.
-    /// @return Array of OrderInfo instances that correspond to each order.
-    function getOrdersInfo(LibOrder.Order[] memory orders)
-        public
-        view
-        returns (LibOrder.OrderInfo[] memory)
-    {
-        uint256 ordersLength = orders.length;
-        LibOrder.OrderInfo[] memory ordersInfo = new LibOrder.OrderInfo[](ordersLength);
-        for (uint256 i = 0; i != ordersLength; i++) {
-            ordersInfo[i] = getOrderInfo(orders[i]);
-        }
-        return ordersInfo;
-    }
-
-    /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    function fillOrKillOrderInternal(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        internal
-        returns (FillResults memory fillResults)
-    {
-        fillResults = fillOrderInternal(
-            order,
-            takerAssetFillAmount,
-            signature
-        );
-        require(
-            fillResults.takerAssetFilledAmount == takerAssetFillAmount,
-            "COMPLETE_FILL_FAILED"
-        );
-        return fillResults;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol
deleted file mode 100644
index 8db8d6f6c..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IAssetProxyDispatcher.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract IAssetProxyDispatcher {
-
-    /// @dev Registers an asset proxy to its asset proxy id.
-    ///      Once an asset proxy is registered, it cannot be unregistered.
-    /// @param assetProxy Address of new asset proxy to register.
-    function registerAssetProxy(address assetProxy)
-        external;
-
-    /// @dev Gets an asset proxy.
-    /// @param assetProxyId Id of the asset proxy.
-    /// @return The asset proxy registered to assetProxyId. Returns 0x0 if no proxy is registered.
-    function getAssetProxy(bytes4 assetProxyId)
-        external
-        view
-        returns (address);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IExchange.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IExchange.sol
deleted file mode 100644
index b92abba04..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IExchange.sol
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "./IExchangeCore.sol";
-import "./IMatchOrders.sol";
-import "./ISignatureValidator.sol";
-import "./ITransactions.sol";
-import "./IAssetProxyDispatcher.sol";
-import "./IWrapperFunctions.sol";
-
-
-// solhint-disable no-empty-blocks
-contract IExchange is
-    IExchangeCore,
-    IMatchOrders,
-    ISignatureValidator,
-    ITransactions,
-    IAssetProxyDispatcher,
-    IWrapperFunctions
-{}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IExchangeCore.sol
deleted file mode 100644
index 9995e0385..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IExchangeCore.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../libs/LibOrder.sol";
-import "../libs/LibFillResults.sol";
-
-
-contract IExchangeCore {
-
-    /// @dev Cancels all orders created by makerAddress with a salt less than or equal to the targetOrderEpoch
-    ///      and senderAddress equal to msg.sender (or null address if msg.sender == makerAddress).
-    /// @param targetOrderEpoch Orders created with a salt less or equal to this value will be cancelled.
-    function cancelOrdersUpTo(uint256 targetOrderEpoch)
-        external;
-
-    /// @dev Fills the input order.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrder(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        returns (LibFillResults.FillResults memory fillResults);
-
-    /// @dev After calling, the order can not be filled anymore.
-    /// @param order Order struct containing order specifications.
-    function cancelOrder(LibOrder.Order memory order)
-        public;
-
-    /// @dev Gets information about an order: status, hash, and amount filled.
-    /// @param order Order to gather information on.
-    /// @return OrderInfo Information about the order and its state.
-    ///                   See LibOrder.OrderInfo for a complete description.
-    function getOrderInfo(LibOrder.Order memory order)
-        public
-        view
-        returns (LibOrder.OrderInfo memory orderInfo);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol
deleted file mode 100644
index 73447f3ae..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IMatchOrders.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../libs/LibOrder.sol";
-import "../libs/LibFillResults.sol";
-
-
-contract IMatchOrders {
-
-    /// @dev Match two complementary orders that have a profitable spread.
-    ///      Each order is filled at their respective price point. However, the calculations are
-    ///      carried out as though the orders are both being filled at the right order's price point.
-    ///      The profit made by the left order goes to the taker (who matched the two orders).
-    /// @param leftOrder First order to match.
-    /// @param rightOrder Second order to match.
-    /// @param leftSignature Proof that order was created by the left maker.
-    /// @param rightSignature Proof that order was created by the right maker.
-    /// @return matchedFillResults Amounts filled and fees paid by maker and taker of matched orders.
-    function matchOrders(
-        LibOrder.Order memory leftOrder,
-        LibOrder.Order memory rightOrder,
-        bytes memory leftSignature,
-        bytes memory rightSignature
-    )
-        public
-        returns (LibFillResults.MatchedFillResults memory matchedFillResults);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/ISignatureValidator.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/ISignatureValidator.sol
deleted file mode 100644
index 1fd0eccf0..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/ISignatureValidator.sol
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract ISignatureValidator {
-
-    /// @dev Approves a hash on-chain using any valid signature type.
-    ///      After presigning a hash, the preSign signature type will become valid for that hash and signer.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof that the hash has been signed by signer.
-    function preSign(
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        external;
-    
-    /// @dev Approves/unnapproves a Validator contract to verify signatures on signer's behalf.
-    /// @param validatorAddress Address of Validator contract.
-    /// @param approval Approval or disapproval of  Validator contract.
-    function setSignatureValidatorApproval(
-        address validatorAddress,
-        bool approval
-    )
-        external;
-
-    /// @dev Verifies that a signature is valid.
-    /// @param hash Message hash that is signed.
-    /// @param signerAddress Address of signer.
-    /// @param signature Proof of signing.
-    /// @return Validity of order signature.
-    function isValidSignature(
-        bytes32 hash,
-        address signerAddress,
-        bytes memory signature
-    )
-        public
-        view
-        returns (bool isValid);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/ITransactions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/ITransactions.sol
deleted file mode 100644
index 4446c55ce..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/ITransactions.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-pragma solidity 0.4.24;
-
-
-contract ITransactions {
-
-    /// @dev Executes an exchange method call in the context of signer.
-    /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
-    /// @param signerAddress Address of transaction signer.
-    /// @param data AbiV2 encoded calldata.
-    /// @param signature Proof of signer transaction by signer.
-    function executeTransaction(
-        uint256 salt,
-        address signerAddress,
-        bytes data,
-        bytes signature
-    )
-        external;
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IValidator.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IValidator.sol
deleted file mode 100644
index 2dd69100c..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IValidator.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract IValidator {
-
-    /// @dev Verifies that a signature is valid.
-    /// @param hash Message hash that is signed.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof of signing.
-    /// @return Validity of order signature.
-    function isValidSignature(
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        external
-        view
-        returns (bool isValid);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWallet.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWallet.sol
deleted file mode 100644
index c97161ca6..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWallet.sol
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract IWallet {
-
-    /// @dev Verifies that a signature is valid.
-    /// @param hash Message hash that is signed.
-    /// @param signature Proof of signing.
-    /// @return Validity of order signature.
-    function isValidSignature(
-        bytes32 hash,
-        bytes signature
-    )
-        external
-        view
-        returns (bool isValid);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol
deleted file mode 100644
index 56a533646..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/interfaces/IWrapperFunctions.sol
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../libs/LibOrder.sol";
-import "../libs/LibFillResults.sol";
-
-
-contract IWrapperFunctions {
-
-    /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
-    /// @param order LibOrder.Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    function fillOrKillOrder(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        returns (LibFillResults.FillResults memory fillResults);
-
-    /// @dev Fills an order with specified parameters and ECDSA signature.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param order LibOrder.Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrderNoThrow(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        returns (LibFillResults.FillResults memory fillResults);
-
-    /// @dev Synchronously executes multiple calls of fillOrder.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function batchFillOrders(
-        LibOrder.Order[] memory orders,
-        uint256[] memory takerAssetFillAmounts,
-        bytes[] memory signatures
-    )
-        public
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Synchronously executes multiple calls of fillOrKill.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function batchFillOrKillOrders(
-        LibOrder.Order[] memory orders,
-        uint256[] memory takerAssetFillAmounts,
-        bytes[] memory signatures
-    )
-        public
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Fills an order with specified parameters and ECDSA signature.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function batchFillOrdersNoThrow(
-        LibOrder.Order[] memory orders,
-        uint256[] memory takerAssetFillAmounts,
-        bytes[] memory signatures
-    )
-        public
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of takerAsset is sold by taker.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signatures Proofs that orders have been created by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketSellOrders(
-        LibOrder.Order[] memory orders,
-        uint256 takerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of takerAsset is sold by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketSellOrdersNoThrow(
-        LibOrder.Order[] memory orders,
-        uint256 takerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Synchronously executes multiple calls of fillOrder until total amount of makerAsset is bought by taker.
-    /// @param orders Array of order specifications.
-    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketBuyOrders(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Synchronously executes multiple fill orders in a single transaction until total amount is bought by taker.
-    ///      Returns false if the transaction would otherwise revert.
-    /// @param orders Array of order specifications.
-    /// @param makerAssetFillAmount Desired amount of makerAsset to buy.
-    /// @param signatures Proofs that orders have been signed by makers.
-    /// @return Amounts filled and fees paid by makers and taker.
-    function marketBuyOrdersNoThrow(
-        LibOrder.Order[] memory orders,
-        uint256 makerAssetFillAmount,
-        bytes[] memory signatures
-    )
-        public
-        returns (LibFillResults.FillResults memory totalFillResults);
-
-    /// @dev Synchronously cancels multiple orders in a single transaction.
-    /// @param orders Array of order specifications.
-    function batchCancelOrders(LibOrder.Order[] memory orders)
-        public;
-
-    /// @dev Fetches information for all passed in orders
-    /// @param orders Array of order specifications.
-    /// @return Array of OrderInfo instances that correspond to each order.
-    function getOrdersInfo(LibOrder.Order[] memory orders)
-        public
-        view
-        returns (LibOrder.OrderInfo[] memory);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol
deleted file mode 100644
index 4aad37709..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibAbiEncoder.sol
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "./LibOrder.sol";
-
-
-contract LibAbiEncoder {
-
-    /// @dev ABI encodes calldata for `fillOrder`.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return ABI encoded calldata for `fillOrder`.
-    function abiEncodeFillOrder(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        internal
-        pure
-        returns (bytes memory fillOrderCalldata)
-    {
-        // We need to call MExchangeCore.fillOrder using a delegatecall in
-        // assembly so that we can intercept a call that throws. For this, we
-        // need the input encoded in memory in the Ethereum ABIv2 format [1].
-
-        // | Area     | Offset | Length  | Contents                                    |
-        // | -------- |--------|---------|-------------------------------------------- |
-        // | Header   | 0x00   | 4       | function selector                           |
-        // | Params   |        | 3 * 32  | function parameters:                        |
-        // |          | 0x00   |         |   1. offset to order (*)                    |
-        // |          | 0x20   |         |   2. takerAssetFillAmount                   |
-        // |          | 0x40   |         |   3. offset to signature (*)                |
-        // | Data     |        | 12 * 32 | order:                                      |
-        // |          | 0x000  |         |   1.  senderAddress                         |
-        // |          | 0x020  |         |   2.  makerAddress                          |
-        // |          | 0x040  |         |   3.  takerAddress                          |
-        // |          | 0x060  |         |   4.  feeRecipientAddress                   |
-        // |          | 0x080  |         |   5.  makerAssetAmount                      |
-        // |          | 0x0A0  |         |   6.  takerAssetAmount                      |
-        // |          | 0x0C0  |         |   7.  makerFeeAmount                        |
-        // |          | 0x0E0  |         |   8.  takerFeeAmount                        |
-        // |          | 0x100  |         |   9.  expirationTimeSeconds                 |
-        // |          | 0x120  |         |   10. salt                                  |
-        // |          | 0x140  |         |   11. Offset to makerAssetData (*)          |
-        // |          | 0x160  |         |   12. Offset to takerAssetData (*)          |
-        // |          | 0x180  | 32      | makerAssetData Length                       |
-        // |          | 0x1A0  | **      | makerAssetData Contents                     |
-        // |          | 0x1C0  | 32      | takerAssetData Length                       |
-        // |          | 0x1E0  | **      | takerAssetData Contents                     |
-        // |          | 0x200  | 32      | signature Length                            |
-        // |          | 0x220  | **      | signature Contents                          |
-
-        // * Offsets are calculated from the beginning of the current area: Header, Params, Data:
-        //     An offset stored in the Params area is calculated from the beginning of the Params section.
-        //     An offset stored in the Data area is calculated from the beginning of the Data section.
-
-        // ** The length of dynamic array contents are stored in the field immediately preceeding the contents.
-
-        // [1]: https://solidity.readthedocs.io/en/develop/abi-spec.html
-
-        assembly {
-
-            // Areas below may use the following variables:
-            //   1. <area>Start   -- Start of this area in memory
-            //   2. <area>End     -- End of this area in memory. This value may
-            //                       be precomputed (before writing contents),
-            //                       or it may be computed as contents are written.
-            //   3. <area>Offset  -- Current offset into area. If an area's End
-            //                       is precomputed, this variable tracks the
-            //                       offsets of contents as they are written.
-
-            /////// Setup Header Area ///////
-            // Load free memory pointer
-            fillOrderCalldata := mload(0x40)
-            // bytes4(keccak256("fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes),uint256,bytes)"))
-            // = 0xb4be83d5
-            // Leave 0x20 bytes to store the length
-            mstore(add(fillOrderCalldata, 0x20), 0xb4be83d500000000000000000000000000000000000000000000000000000000)
-            let headerAreaEnd := add(fillOrderCalldata, 0x24)
-
-            /////// Setup Params Area ///////
-            // This area is preallocated and written to later.
-            // This is because we need to fill in offsets that have not yet been calculated.
-            let paramsAreaStart := headerAreaEnd
-            let paramsAreaEnd := add(paramsAreaStart, 0x60)
-            let paramsAreaOffset := paramsAreaStart
-
-            /////// Setup Data Area ///////
-            let dataAreaStart := paramsAreaEnd
-            let dataAreaEnd := dataAreaStart
-
-            // Offset from the source data we're reading from
-            let sourceOffset := order
-            // arrayLenBytes and arrayLenWords track the length of a dynamically-allocated bytes array.
-            let arrayLenBytes := 0
-            let arrayLenWords := 0
-
-            /////// Write order Struct ///////
-            // Write memory location of Order, relative to the start of the
-            // parameter list, then increment the paramsAreaOffset respectively.
-            mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
-            paramsAreaOffset := add(paramsAreaOffset, 0x20)
-
-            // Write values for each field in the order
-            // It would be nice to use a loop, but we save on gas by writing
-            // the stores sequentially.
-            mstore(dataAreaEnd, mload(sourceOffset))                            // makerAddress
-            mstore(add(dataAreaEnd, 0x20), mload(add(sourceOffset, 0x20)))      // takerAddress
-            mstore(add(dataAreaEnd, 0x40), mload(add(sourceOffset, 0x40)))      // feeRecipientAddress
-            mstore(add(dataAreaEnd, 0x60), mload(add(sourceOffset, 0x60)))      // senderAddress
-            mstore(add(dataAreaEnd, 0x80), mload(add(sourceOffset, 0x80)))      // makerAssetAmount
-            mstore(add(dataAreaEnd, 0xA0), mload(add(sourceOffset, 0xA0)))      // takerAssetAmount
-            mstore(add(dataAreaEnd, 0xC0), mload(add(sourceOffset, 0xC0)))      // makerFeeAmount
-            mstore(add(dataAreaEnd, 0xE0), mload(add(sourceOffset, 0xE0)))      // takerFeeAmount
-            mstore(add(dataAreaEnd, 0x100), mload(add(sourceOffset, 0x100)))    // expirationTimeSeconds
-            mstore(add(dataAreaEnd, 0x120), mload(add(sourceOffset, 0x120)))    // salt
-            mstore(add(dataAreaEnd, 0x140), mload(add(sourceOffset, 0x140)))    // Offset to makerAssetData
-            mstore(add(dataAreaEnd, 0x160), mload(add(sourceOffset, 0x160)))    // Offset to takerAssetData
-            dataAreaEnd := add(dataAreaEnd, 0x180)
-            sourceOffset := add(sourceOffset, 0x180)
-
-            // Write offset to <order.makerAssetData>
-            mstore(add(dataAreaStart, mul(10, 0x20)), sub(dataAreaEnd, dataAreaStart))
-
-            // Calculate length of <order.makerAssetData>
-            sourceOffset := mload(add(order, 0x140)) // makerAssetData
-            arrayLenBytes := mload(sourceOffset)
-            sourceOffset := add(sourceOffset, 0x20)
-            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
-
-            // Write length of <order.makerAssetData>
-            mstore(dataAreaEnd, arrayLenBytes)
-            dataAreaEnd := add(dataAreaEnd, 0x20)
-
-            // Write contents of <order.makerAssetData>
-            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
-                mstore(dataAreaEnd, mload(sourceOffset))
-                dataAreaEnd := add(dataAreaEnd, 0x20)
-                sourceOffset := add(sourceOffset, 0x20)
-            }
-
-            // Write offset to <order.takerAssetData>
-            mstore(add(dataAreaStart, mul(11, 0x20)), sub(dataAreaEnd, dataAreaStart))
-
-            // Calculate length of <order.takerAssetData>
-            sourceOffset := mload(add(order, 0x160)) // takerAssetData
-            arrayLenBytes := mload(sourceOffset)
-            sourceOffset := add(sourceOffset, 0x20)
-            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
-
-            // Write length of <order.takerAssetData>
-            mstore(dataAreaEnd, arrayLenBytes)
-            dataAreaEnd := add(dataAreaEnd, 0x20)
-
-            // Write contents of  <order.takerAssetData>
-            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
-                mstore(dataAreaEnd, mload(sourceOffset))
-                dataAreaEnd := add(dataAreaEnd, 0x20)
-                sourceOffset := add(sourceOffset, 0x20)
-            }
-
-            /////// Write takerAssetFillAmount ///////
-            mstore(paramsAreaOffset, takerAssetFillAmount)
-            paramsAreaOffset := add(paramsAreaOffset, 0x20)
-
-            /////// Write signature ///////
-            // Write offset to paramsArea
-            mstore(paramsAreaOffset, sub(dataAreaEnd, paramsAreaStart))
-
-            // Calculate length of signature
-            sourceOffset := signature
-            arrayLenBytes := mload(sourceOffset)
-            sourceOffset := add(sourceOffset, 0x20)
-            arrayLenWords := div(add(arrayLenBytes, 0x1F), 0x20)
-
-            // Write length of signature
-            mstore(dataAreaEnd, arrayLenBytes)
-            dataAreaEnd := add(dataAreaEnd, 0x20)
-
-            // Write contents of signature
-            for {let i := 0} lt(i, arrayLenWords) {i := add(i, 1)} {
-                mstore(dataAreaEnd, mload(sourceOffset))
-                dataAreaEnd := add(dataAreaEnd, 0x20)
-                sourceOffset := add(sourceOffset, 0x20)
-            }
-
-            // Set length of calldata
-            mstore(fillOrderCalldata, sub(dataAreaEnd, add(fillOrderCalldata, 0x20)))
-
-            // Increment free memory pointer
-            mstore(0x40, dataAreaEnd)
-        }
-
-        return fillOrderCalldata;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibConstants.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibConstants.sol
deleted file mode 100644
index 8d2732cd3..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibConstants.sol
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-// solhint-disable max-line-length
-contract LibConstants {
-   
-    // Asset data for ZRX token. Used for fee transfers.
-    // @TODO: Hardcode constant when we deploy. Currently 
-    //        not constant to make testing easier.
-
-    // The proxyId for ZRX_ASSET_DATA is bytes4(keccak256("ERC20Token(address)")) = 0xf47261b0
-    
-    // Kovan ZRX address is 0x6ff6c0ff1d68b964901f986d4c9fa3ac68346570.
-    // The ABI encoded proxyId and address is 0xf47261b00000000000000000000000006ff6c0ff1d68b964901f986d4c9fa3ac68346570
-    // bytes constant public ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6f\xf6\xc0\xff\x1d\x68\xb9\x64\x90\x1f\x98\x6d\x4c\x9f\xa3\xac\x68\x34\x65\x70";
-    
-    // Mainnet ZRX address is 0xe41d2489571d322189246dafa5ebde1f4699f498.
-    // The ABI encoded proxyId and address is 0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498
-    // bytes constant public ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe4\x1d\x24\x89\x57\x1d\x32\x21\x89\x24\x6d\xaf\xa5\xeb\xde\x1f\x46\x99\xf4\x98";
-    
-    // solhint-disable-next-line var-name-mixedcase
-    bytes public ZRX_ASSET_DATA;
-
-    // @TODO: Remove when we deploy.
-    constructor (bytes memory zrxAssetData)
-        public
-    {
-        ZRX_ASSET_DATA = zrxAssetData;
-    }
-}
-// solhint-enable max-line-length
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibEIP712.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibEIP712.sol
deleted file mode 100644
index 203edc1fd..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibEIP712.sol
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract LibEIP712 {
-
-    // EIP191 header for EIP712 prefix
-    string constant internal EIP191_HEADER = "\x19\x01";
-
-    // EIP712 Domain Name value
-    string constant internal EIP712_DOMAIN_NAME = "0x Protocol";
-
-    // EIP712 Domain Version value
-    string constant internal EIP712_DOMAIN_VERSION = "2";
-
-    // Hash of the EIP712 Domain Separator Schema
-    bytes32 constant internal EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH = keccak256(abi.encodePacked(
-        "EIP712Domain(",
-        "string name,",
-        "string version,",
-        "address verifyingContract",
-        ")"
-    ));
-
-    // Hash of the EIP712 Domain Separator data
-    // solhint-disable-next-line var-name-mixedcase
-    bytes32 public EIP712_DOMAIN_HASH;
-
-    constructor ()
-        public
-    {
-        EIP712_DOMAIN_HASH = keccak256(abi.encodePacked(
-            EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH,
-            keccak256(bytes(EIP712_DOMAIN_NAME)),
-            keccak256(bytes(EIP712_DOMAIN_VERSION)),
-            bytes32(address(this))
-        ));
-    }
-
-    /// @dev Calculates EIP712 encoding for a hash struct in this EIP712 Domain.
-    /// @param hashStruct The EIP712 hash struct.
-    /// @return EIP712 hash applied to this EIP712 Domain.
-    function hashEIP712Message(bytes32 hashStruct)
-        internal
-        view
-        returns (bytes32 result)
-    {
-        bytes32 eip712DomainHash = EIP712_DOMAIN_HASH;
-
-        // Assembly for more efficient computing:
-        // keccak256(abi.encodePacked(
-        //     EIP191_HEADER,
-        //     EIP712_DOMAIN_HASH,
-        //     hashStruct    
-        // ));
-
-        assembly {
-            // Load free memory pointer
-            let memPtr := mload(64)
-
-            mstore(memPtr, 0x1901000000000000000000000000000000000000000000000000000000000000)  // EIP191 header
-            mstore(add(memPtr, 2), eip712DomainHash)                                            // EIP712 domain hash
-            mstore(add(memPtr, 34), hashStruct)                                                 // Hash of struct
-
-            // Compute hash
-            result := keccak256(memPtr, 66)
-        }
-        return result;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibExchangeErrors.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibExchangeErrors.sol
deleted file mode 100644
index a0f75bc06..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibExchangeErrors.sol
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-// solhint-disable
-pragma solidity 0.4.24;
-
-
-/// @dev This contract documents the revert reasons used in the Exchange contract.
-/// This contract is intended to serve as a reference, but is not actually used for efficiency reasons.
-contract LibExchangeErrors {
-
-    /// Order validation errors ///
-    string constant ORDER_UNFILLABLE = "ORDER_UNFILLABLE";                              // Order cannot be filled.
-    string constant INVALID_MAKER = "INVALID_MAKER";                                    // Invalid makerAddress.
-    string constant INVALID_TAKER = "INVALID_TAKER";                                    // Invalid takerAddress.
-    string constant INVALID_SENDER = "INVALID_SENDER";                                  // Invalid `msg.sender`.
-    string constant INVALID_ORDER_SIGNATURE = "INVALID_ORDER_SIGNATURE";                // Signature validation failed. 
-    
-    /// fillOrder validation errors ///
-    string constant INVALID_TAKER_AMOUNT = "INVALID_TAKER_AMOUNT";                      // takerAssetFillAmount cannot equal 0.
-    string constant ROUNDING_ERROR = "ROUNDING_ERROR";                                  // Rounding error greater than 0.1% of takerAssetFillAmount. 
-    
-    /// Signature validation errors ///
-    string constant INVALID_SIGNATURE = "INVALID_SIGNATURE";                            // Signature validation failed. 
-    string constant SIGNATURE_ILLEGAL = "SIGNATURE_ILLEGAL";                            // Signature type is illegal.
-    string constant SIGNATURE_UNSUPPORTED = "SIGNATURE_UNSUPPORTED";                    // Signature type unsupported.
-    
-    /// cancelOrdersUptTo errors ///
-    string constant INVALID_NEW_ORDER_EPOCH = "INVALID_NEW_ORDER_EPOCH";                // Specified salt must be greater than or equal to existing orderEpoch.
-
-    /// fillOrKillOrder errors ///
-    string constant COMPLETE_FILL_FAILED = "COMPLETE_FILL_FAILED";                      // Desired takerAssetFillAmount could not be completely filled. 
-
-    /// matchOrders errors ///
-    string constant NEGATIVE_SPREAD_REQUIRED = "NEGATIVE_SPREAD_REQUIRED";              // Matched orders must have a negative spread.
-
-    /// Transaction errors ///
-    string constant REENTRANCY_ILLEGAL = "REENTRANCY_ILLEGAL";                          // Recursive reentrancy is not allowed. 
-    string constant INVALID_TX_HASH = "INVALID_TX_HASH";                                // Transaction has already been executed. 
-    string constant INVALID_TX_SIGNATURE = "INVALID_TX_SIGNATURE";                      // Signature validation failed. 
-    string constant FAILED_EXECUTION = "FAILED_EXECUTION";                              // Transaction execution failed. 
-    
-    /// registerAssetProxy errors ///
-    string constant ASSET_PROXY_ALREADY_EXISTS = "ASSET_PROXY_ALREADY_EXISTS";          // AssetProxy with same id already exists.
-
-    /// dispatchTransferFrom errors ///
-    string constant ASSET_PROXY_DOES_NOT_EXIST = "ASSET_PROXY_DOES_NOT_EXIST";          // No assetProxy registered at given id.
-    string constant TRANSFER_FAILED = "TRANSFER_FAILED";                                // Asset transfer unsuccesful.
-
-    /// Length validation errors ///
-    string constant LENGTH_GREATER_THAN_0_REQUIRED = "LENGTH_GREATER_THAN_0_REQUIRED";  // Byte array must have a length greater than 0.
-    string constant LENGTH_GREATER_THAN_3_REQUIRED = "LENGTH_GREATER_THAN_3_REQUIRED";  // Byte array must have a length greater than 3.
-    string constant LENGTH_0_REQUIRED = "LENGTH_0_REQUIRED";                            // Byte array must have a length of 0.
-    string constant LENGTH_65_REQUIRED = "LENGTH_65_REQUIRED";                          // Byte array must have a length of 65.
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibFillResults.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibFillResults.sol
deleted file mode 100644
index 659ae9a69..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibFillResults.sol
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../../utils/SafeMath/SafeMath.sol";
-
-
-contract LibFillResults is
-    SafeMath
-{
-    struct FillResults {
-        uint256 makerAssetFilledAmount;  // Total amount of makerAsset(s) filled.
-        uint256 takerAssetFilledAmount;  // Total amount of takerAsset(s) filled.
-        uint256 makerFeePaid;            // Total amount of ZRX paid by maker(s) to feeRecipient(s).
-        uint256 takerFeePaid;            // Total amount of ZRX paid by taker to feeRecipients(s).
-    }
-
-    struct MatchedFillResults {
-        FillResults left;                    // Amounts filled and fees paid of left order.
-        FillResults right;                   // Amounts filled and fees paid of right order.
-        uint256 leftMakerAssetSpreadAmount;  // Spread between price of left and right order, denominated in the left order's makerAsset, paid to taker.
-    }
-
-    /// @dev Adds properties of both FillResults instances.
-    ///      Modifies the first FillResults instance specified.
-    /// @param totalFillResults Fill results instance that will be added onto.
-    /// @param singleFillResults Fill results instance that will be added to totalFillResults.
-    function addFillResults(FillResults memory totalFillResults, FillResults memory singleFillResults)
-        internal
-        pure
-    {
-        totalFillResults.makerAssetFilledAmount = safeAdd(totalFillResults.makerAssetFilledAmount, singleFillResults.makerAssetFilledAmount);
-        totalFillResults.takerAssetFilledAmount = safeAdd(totalFillResults.takerAssetFilledAmount, singleFillResults.takerAssetFilledAmount);
-        totalFillResults.makerFeePaid = safeAdd(totalFillResults.makerFeePaid, singleFillResults.makerFeePaid);
-        totalFillResults.takerFeePaid = safeAdd(totalFillResults.takerFeePaid, singleFillResults.takerFeePaid);
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol
deleted file mode 100644
index c0b85ea10..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../../utils/SafeMath/SafeMath.sol";
-
-
-contract LibMath is
-    SafeMath
-{
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded down.
-    function safeGetPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        internal
-        pure
-        returns (uint256 partialAmount)
-    {
-        require(
-            denominator > 0,
-            "DIVISION_BY_ZERO"
-        );
-
-        require(
-            !isRoundingErrorFloor(
-                numerator,
-                denominator,
-                target
-            ),
-            "ROUNDING_ERROR"
-        );
-        
-        partialAmount = safeDiv(
-            safeMul(numerator, target),
-            denominator
-        );
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded up.
-    function safeGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        internal
-        pure
-        returns (uint256 partialAmount)
-    {
-        require(
-            denominator > 0,
-            "DIVISION_BY_ZERO"
-        );
-
-        require(
-            !isRoundingErrorCeil(
-                numerator,
-                denominator,
-                target
-            ),
-            "ROUNDING_ERROR"
-        );
-        
-        // safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
-        //       ceil(a / b) = floor((a + b - 1) / b)
-        // To implement `ceil(a / b)` using safeDiv.
-        partialAmount = safeDiv(
-            safeAdd(
-                safeMul(numerator, target),
-                safeSub(denominator, 1)
-            ),
-            denominator
-        );
-        return partialAmount;
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded down.
-    function getPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        internal
-        pure
-        returns (uint256 partialAmount)
-    {
-        require(
-            denominator > 0,
-            "DIVISION_BY_ZERO"
-        );
-
-        partialAmount = safeDiv(
-            safeMul(numerator, target),
-            denominator
-        );
-        return partialAmount;
-    }
-    
-    /// @dev Calculates partial value given a numerator and denominator rounded down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target rounded up.
-    function getPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        internal
-        pure
-        returns (uint256 partialAmount)
-    {
-        require(
-            denominator > 0,
-            "DIVISION_BY_ZERO"
-        );
-
-        // safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
-        //       ceil(a / b) = floor((a + b - 1) / b)
-        // To implement `ceil(a / b)` using safeDiv.
-        partialAmount = safeDiv(
-            safeAdd(
-                safeMul(numerator, target),
-                safeSub(denominator, 1)
-            ),
-            denominator
-        );
-        return partialAmount;
-    }
-    
-    /// @dev Checks if rounding error >= 0.1% when rounding down.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingErrorFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        internal
-        pure
-        returns (bool isError)
-    {
-        require(
-            denominator > 0,
-            "DIVISION_BY_ZERO"
-        );
-        
-        // The absolute rounding error is the difference between the rounded
-        // value and the ideal value. The relative rounding error is the
-        // absolute rounding error divided by the absolute value of the
-        // ideal value. This is undefined when the ideal value is zero.
-        //
-        // The ideal value is `numerator * target / denominator`.
-        // Let's call `numerator * target % denominator` the remainder.
-        // The absolute error is `remainder / denominator`.
-        //
-        // When the ideal value is zero, we require the absolute error to
-        // be zero. Fortunately, this is always the case. The ideal value is
-        // zero iff `numerator == 0` and/or `target == 0`. In this case the
-        // remainder and absolute error are also zero. 
-        if (target == 0 || numerator == 0) {
-            return false;
-        }
-        
-        // Otherwise, we want the relative rounding error to be strictly
-        // less than 0.1%.
-        // The relative error is `remainder / (numerator * target)`.
-        // We want the relative error less than 1 / 1000:
-        //        remainder / (numerator * denominator)  <  1 / 1000
-        // or equivalently:
-        //        1000 * remainder  <  numerator * target
-        // so we have a rounding error iff:
-        //        1000 * remainder  >=  numerator * target
-        uint256 remainder = mulmod(
-            target,
-            numerator,
-            denominator
-        );
-        isError = safeMul(1000, remainder) >= safeMul(numerator, target);
-        return isError;
-    }
-    
-    /// @dev Checks if rounding error >= 0.1% when rounding up.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function isRoundingErrorCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        internal
-        pure
-        returns (bool isError)
-    {
-        require(
-            denominator > 0,
-            "DIVISION_BY_ZERO"
-        );
-        
-        // See the comments in `isRoundingError`.
-        if (target == 0 || numerator == 0) {
-            // When either is zero, the ideal value and rounded value are zero
-            // and there is no rounding error. (Although the relative error
-            // is undefined.)
-            return false;
-        }
-        // Compute remainder as before
-        uint256 remainder = mulmod(
-            target,
-            numerator,
-            denominator
-        );
-        remainder = safeSub(denominator, remainder) % denominator;
-        isError = safeMul(1000, remainder) >= safeMul(numerator, target);
-        return isError;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol
deleted file mode 100644
index 0fe7c2161..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibOrder.sol
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./LibEIP712.sol";
-
-
-contract LibOrder is
-    LibEIP712
-{
-    // Hash for the EIP712 Order Schema
-    bytes32 constant internal EIP712_ORDER_SCHEMA_HASH = keccak256(abi.encodePacked(
-        "Order(",
-        "address makerAddress,",
-        "address takerAddress,",
-        "address feeRecipientAddress,",
-        "address senderAddress,",
-        "uint256 makerAssetAmount,",
-        "uint256 takerAssetAmount,",
-        "uint256 makerFee,",
-        "uint256 takerFee,",
-        "uint256 expirationTimeSeconds,",
-        "uint256 salt,",
-        "bytes makerAssetData,",
-        "bytes takerAssetData",
-        ")"
-    ));
-
-    // A valid order remains fillable until it is expired, fully filled, or cancelled.
-    // An order's state is unaffected by external factors, like account balances.
-    enum OrderStatus {
-        INVALID,                     // Default value
-        INVALID_MAKER_ASSET_AMOUNT,  // Order does not have a valid maker asset amount
-        INVALID_TAKER_ASSET_AMOUNT,  // Order does not have a valid taker asset amount
-        FILLABLE,                    // Order is fillable
-        EXPIRED,                     // Order has already expired
-        FULLY_FILLED,                // Order is fully filled
-        CANCELLED                    // Order has been cancelled
-    }
-
-    // solhint-disable max-line-length
-    struct Order {
-        address makerAddress;           // Address that created the order.      
-        address takerAddress;           // Address that is allowed to fill the order. If set to 0, any address is allowed to fill the order.          
-        address feeRecipientAddress;    // Address that will recieve fees when order is filled.      
-        address senderAddress;          // Address that is allowed to call Exchange contract methods that affect this order. If set to 0, any address is allowed to call these methods.
-        uint256 makerAssetAmount;       // Amount of makerAsset being offered by maker. Must be greater than 0.        
-        uint256 takerAssetAmount;       // Amount of takerAsset being bid on by maker. Must be greater than 0.        
-        uint256 makerFee;               // Amount of ZRX paid to feeRecipient by maker when order is filled. If set to 0, no transfer of ZRX from maker to feeRecipient will be attempted.
-        uint256 takerFee;               // Amount of ZRX paid to feeRecipient by taker when order is filled. If set to 0, no transfer of ZRX from taker to feeRecipient will be attempted.
-        uint256 expirationTimeSeconds;  // Timestamp in seconds at which order expires.          
-        uint256 salt;                   // Arbitrary number to facilitate uniqueness of the order's hash.     
-        bytes makerAssetData;           // Encoded data that can be decoded by a specified proxy contract when transferring makerAsset. The last byte references the id of this proxy.
-        bytes takerAssetData;           // Encoded data that can be decoded by a specified proxy contract when transferring takerAsset. The last byte references the id of this proxy.
-    }
-    // solhint-enable max-line-length
-
-    struct OrderInfo {
-        uint8 orderStatus;                    // Status that describes order's validity and fillability.
-        bytes32 orderHash;                    // EIP712 hash of the order (see LibOrder.getOrderHash).
-        uint256 orderTakerAssetFilledAmount;  // Amount of order that has already been filled.
-    }
-
-    /// @dev Calculates Keccak-256 hash of the order.
-    /// @param order The order structure.
-    /// @return Keccak-256 EIP712 hash of the order.
-    function getOrderHash(Order memory order)
-        internal
-        view
-        returns (bytes32 orderHash)
-    {
-        orderHash = hashEIP712Message(hashOrder(order));
-        return orderHash;
-    }
-
-    /// @dev Calculates EIP712 hash of the order.
-    /// @param order The order structure.
-    /// @return EIP712 hash of the order.
-    function hashOrder(Order memory order)
-        internal
-        pure
-        returns (bytes32 result)
-    {
-        bytes32 schemaHash = EIP712_ORDER_SCHEMA_HASH;
-        bytes32 makerAssetDataHash = keccak256(order.makerAssetData);
-        bytes32 takerAssetDataHash = keccak256(order.takerAssetData);
-
-        // Assembly for more efficiently computing:
-        // keccak256(abi.encodePacked(
-        //     EIP712_ORDER_SCHEMA_HASH,
-        //     bytes32(order.makerAddress),
-        //     bytes32(order.takerAddress),
-        //     bytes32(order.feeRecipientAddress),
-        //     bytes32(order.senderAddress),
-        //     order.makerAssetAmount,
-        //     order.takerAssetAmount,
-        //     order.makerFee,
-        //     order.takerFee,
-        //     order.expirationTimeSeconds,
-        //     order.salt,
-        //     keccak256(order.makerAssetData),
-        //     keccak256(order.takerAssetData)
-        // ));
-
-        assembly {
-            // Calculate memory addresses that will be swapped out before hashing
-            let pos1 := sub(order, 32)
-            let pos2 := add(order, 320)
-            let pos3 := add(order, 352)
-
-            // Backup
-            let temp1 := mload(pos1)
-            let temp2 := mload(pos2)
-            let temp3 := mload(pos3)
-            
-            // Hash in place
-            mstore(pos1, schemaHash)
-            mstore(pos2, makerAssetDataHash)
-            mstore(pos3, takerAssetDataHash)
-            result := keccak256(pos1, 416)
-            
-            // Restore
-            mstore(pos1, temp1)
-            mstore(pos2, temp2)
-            mstore(pos3, temp3)
-        }
-        return result;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
deleted file mode 100644
index 0ddfca270..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../interfaces/IAssetProxyDispatcher.sol";
-
-
-contract MAssetProxyDispatcher is
-    IAssetProxyDispatcher
-{
-    // Logs registration of new asset proxy
-    event AssetProxyRegistered(
-        bytes4 id,              // Id of new registered AssetProxy.
-        address assetProxy      // Address of new registered AssetProxy.
-    );
-
-    /// @dev Forwards arguments to assetProxy and calls `transferFrom`. Either succeeds or throws.
-    /// @param assetData Byte array encoded for the asset.
-    /// @param from Address to transfer token from.
-    /// @param to Address to transfer token to.
-    /// @param amount Amount of token to transfer.
-    function dispatchTransferFrom(
-        bytes memory assetData,
-        address from,
-        address to,
-        uint256 amount
-    )
-        internal;
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
deleted file mode 100644
index 742499568..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../libs/LibOrder.sol";
-import "../libs/LibFillResults.sol";
-import "../interfaces/IExchangeCore.sol";
-
-
-contract MExchangeCore is
-    IExchangeCore
-{
-    // Fill event is emitted whenever an order is filled.
-    event Fill(
-        address indexed makerAddress,         // Address that created the order.      
-        address indexed feeRecipientAddress,  // Address that received fees.
-        address takerAddress,                 // Address that filled the order.
-        address senderAddress,                // Address that called the Exchange contract (msg.sender).
-        uint256 makerAssetFilledAmount,       // Amount of makerAsset sold by maker and bought by taker. 
-        uint256 takerAssetFilledAmount,       // Amount of takerAsset sold by taker and bought by maker.
-        uint256 makerFeePaid,                 // Amount of ZRX paid to feeRecipient by maker.
-        uint256 takerFeePaid,                 // Amount of ZRX paid to feeRecipient by taker.
-        bytes32 indexed orderHash,            // EIP712 hash of order (see LibOrder.getOrderHash).
-        bytes makerAssetData,                 // Encoded data specific to makerAsset. 
-        bytes takerAssetData                  // Encoded data specific to takerAsset.
-    );
-
-    // Cancel event is emitted whenever an individual order is cancelled.
-    event Cancel(
-        address indexed makerAddress,         // Address that created the order.      
-        address indexed feeRecipientAddress,  // Address that would have recieved fees if order was filled.   
-        address senderAddress,                // Address that called the Exchange contract (msg.sender).
-        bytes32 indexed orderHash,            // EIP712 hash of order (see LibOrder.getOrderHash).
-        bytes makerAssetData,                 // Encoded data specific to makerAsset. 
-        bytes takerAssetData                  // Encoded data specific to takerAsset.
-    );
-
-    // CancelUpTo event is emitted whenever `cancelOrdersUpTo` is executed succesfully.
-    event CancelUpTo(
-        address indexed makerAddress,         // Orders cancelled must have been created by this address.
-        address indexed senderAddress,        // Orders cancelled must have a `senderAddress` equal to this address.
-        uint256 orderEpoch                    // Orders with specified makerAddress and senderAddress with a salt less than this value are considered cancelled.
-    );
-
-    /// @dev Fills the input order.
-    /// @param order Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    /// @return Amounts filled and fees paid by maker and taker.
-    function fillOrderInternal(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        internal
-        returns (LibFillResults.FillResults memory fillResults);
-
-    /// @dev After calling, the order can not be filled anymore.
-    /// @param order Order struct containing order specifications.
-    function cancelOrderInternal(LibOrder.Order memory order)
-        internal;
-
-    /// @dev Updates state with results of a fill order.
-    /// @param order that was filled.
-    /// @param takerAddress Address of taker who filled the order.
-    /// @param orderTakerAssetFilledAmount Amount of order already filled.
-    /// @return fillResults Amounts filled and fees paid by maker and taker.
-    function updateFilledState(
-        LibOrder.Order memory order,
-        address takerAddress,
-        bytes32 orderHash,
-        uint256 orderTakerAssetFilledAmount,
-        LibFillResults.FillResults memory fillResults
-    )
-        internal;
-
-    /// @dev Updates state with results of cancelling an order.
-    ///      State is only updated if the order is currently fillable.
-    ///      Otherwise, updating state would have no effect.
-    /// @param order that was cancelled.
-    /// @param orderHash Hash of order that was cancelled.
-    function updateCancelledState(
-        LibOrder.Order memory order,
-        bytes32 orderHash
-    )
-        internal;
-    
-    /// @dev Validates context for fillOrder. Succeeds or throws.
-    /// @param order to be filled.
-    /// @param orderInfo OrderStatus, orderHash, and amount already filled of order.
-    /// @param takerAddress Address of order taker.
-    /// @param signature Proof that the orders was created by its maker.
-    function assertFillableOrder(
-        LibOrder.Order memory order,
-        LibOrder.OrderInfo memory orderInfo,
-        address takerAddress,
-        bytes memory signature
-    )
-        internal
-        view;
-    
-    /// @dev Validates context for fillOrder. Succeeds or throws.
-    /// @param order to be filled.
-    /// @param orderInfo Status, orderHash, and amount already filled of order.
-    /// @param takerAssetFillAmount Desired amount of order to fill by taker.
-    /// @param takerAssetFilledAmount Amount of takerAsset that will be filled.
-    /// @param makerAssetFilledAmount Amount of makerAsset that will be transfered.
-    function assertValidFill(
-        LibOrder.Order memory order,
-        LibOrder.OrderInfo memory orderInfo,
-        uint256 takerAssetFillAmount,
-        uint256 takerAssetFilledAmount,
-        uint256 makerAssetFilledAmount
-    )
-        internal
-        view;
-
-    /// @dev Validates context for cancelOrder. Succeeds or throws.
-    /// @param order to be cancelled.
-    /// @param orderInfo OrderStatus, orderHash, and amount already filled of order.
-    function assertValidCancel(
-        LibOrder.Order memory order,
-        LibOrder.OrderInfo memory orderInfo
-    )
-        internal
-        view;
-
-    /// @dev Calculates amounts filled and fees paid by maker and taker.
-    /// @param order to be filled.
-    /// @param takerAssetFilledAmount Amount of takerAsset that will be filled.
-    /// @return fillResults Amounts filled and fees paid by maker and taker.
-    function calculateFillResults(
-        LibOrder.Order memory order,
-        uint256 takerAssetFilledAmount
-    )
-        internal
-        pure
-        returns (LibFillResults.FillResults memory fillResults);
-
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MMatchOrders.sol
deleted file mode 100644
index 96fa34bc0..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MMatchOrders.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../libs/LibOrder.sol";
-import "../libs/LibFillResults.sol";
-import "../interfaces/IMatchOrders.sol";
-
-
-contract MMatchOrders is
-    IMatchOrders
-{
-    /// @dev Validates context for matchOrders. Succeeds or throws.
-    /// @param leftOrder First order to match.
-    /// @param rightOrder Second order to match.
-    function assertValidMatch(
-        LibOrder.Order memory leftOrder,
-        LibOrder.Order memory rightOrder
-    )
-        internal
-        pure;
-
-    /// @dev Calculates fill amounts for the matched orders.
-    ///      Each order is filled at their respective price point. However, the calculations are
-    ///      carried out as though the orders are both being filled at the right order's price point.
-    ///      The profit made by the leftOrder order goes to the taker (who matched the two orders).
-    /// @param leftOrder First order to match.
-    /// @param rightOrder Second order to match.
-    /// @param leftOrderTakerAssetFilledAmount Amount of left order already filled.
-    /// @param rightOrderTakerAssetFilledAmount Amount of right order already filled.
-    /// @param matchedFillResults Amounts to fill and fees to pay by maker and taker of matched orders.
-    function calculateMatchedFillResults(
-        LibOrder.Order memory leftOrder,
-        LibOrder.Order memory rightOrder,
-        uint256 leftOrderTakerAssetFilledAmount,
-        uint256 rightOrderTakerAssetFilledAmount
-    )
-        internal
-        pure
-        returns (LibFillResults.MatchedFillResults memory matchedFillResults);
-
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MSignatureValidator.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MSignatureValidator.sol
deleted file mode 100644
index 1fe88b908..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MSignatureValidator.sol
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../interfaces/ISignatureValidator.sol";
-
-
-contract MSignatureValidator is
-    ISignatureValidator
-{
-    event SignatureValidatorApproval(
-        address indexed signerAddress,     // Address that approves or disapproves a contract to verify signatures.
-        address indexed validatorAddress,  // Address of signature validator contract.
-        bool approved                      // Approval or disapproval of validator contract.
-    );
-
-    // Allowed signature types.
-    enum SignatureType {
-        Illegal,         // 0x00, default value
-        Invalid,         // 0x01
-        EIP712,          // 0x02
-        EthSign,         // 0x03
-        Wallet,          // 0x04
-        Validator,       // 0x05
-        PreSigned,       // 0x06
-        NSignatureTypes  // 0x07, number of signature types. Always leave at end.
-    }
-
-    /// @dev Verifies signature using logic defined by Wallet contract.
-    /// @param hash Any 32 byte hash.
-    /// @param walletAddress Address that should have signed the given hash
-    ///                      and defines its own signature verification method.
-    /// @param signature Proof that the hash has been signed by signer.
-    /// @return True if the address recovered from the provided signature matches the input signer address.
-    function isValidWalletSignature(
-        bytes32 hash,
-        address walletAddress,
-        bytes signature
-    )
-        internal
-        view
-        returns (bool isValid);
-
-    /// @dev Verifies signature using logic defined by Validator contract.
-    /// @param validatorAddress Address of validator contract.
-    /// @param hash Any 32 byte hash.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof that the hash has been signed by signer.
-    /// @return True if the address recovered from the provided signature matches the input signer address.
-    function isValidValidatorSignature(
-        address validatorAddress,
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        internal
-        view
-        returns (bool isValid);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MTransactions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MTransactions.sol
deleted file mode 100644
index 4f61a4945..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MTransactions.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-pragma solidity 0.4.24;
-
-import "../interfaces/ITransactions.sol";
-
-
-contract MTransactions is
-    ITransactions
-{
-    // Hash for the EIP712 ZeroEx Transaction Schema
-    bytes32 constant internal EIP712_ZEROEX_TRANSACTION_SCHEMA_HASH = keccak256(abi.encodePacked(
-        "ZeroExTransaction(",
-        "uint256 salt,",
-        "address signerAddress,",
-        "bytes data",
-        ")"
-    ));
-
-    /// @dev Calculates EIP712 hash of the Transaction.
-    /// @param salt Arbitrary number to ensure uniqueness of transaction hash.
-    /// @param signerAddress Address of transaction signer.
-    /// @param data AbiV2 encoded calldata.
-    /// @return EIP712 hash of the Transaction.
-    function hashZeroExTransaction(
-        uint256 salt,
-        address signerAddress,
-        bytes memory data
-    )
-        internal
-        pure
-        returns (bytes32 result);
-
-    /// @dev The current function will be called in the context of this address (either 0x transaction signer or `msg.sender`).
-    ///      If calling a fill function, this address will represent the taker.
-    ///      If calling a cancel function, this address will represent the maker.
-    /// @return Signer of 0x transaction if entry point is `executeTransaction`.
-    ///         `msg.sender` if entry point is any other function.
-    function getCurrentContextAddress()
-        internal
-        view
-        returns (address);
-}
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol
deleted file mode 100644
index 4adfbde01..000000000
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../libs/LibOrder.sol";
-import "../libs/LibFillResults.sol";
-import "../interfaces/IWrapperFunctions.sol";
-
-
-contract MWrapperFunctions is 
-    IWrapperFunctions
-{
-    /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
-    /// @param order LibOrder.Order struct containing order specifications.
-    /// @param takerAssetFillAmount Desired amount of takerAsset to sell.
-    /// @param signature Proof that order has been created by maker.
-    function fillOrKillOrderInternal(
-        LibOrder.Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        internal
-        returns (LibFillResults.FillResults memory fillResults);
-}
diff --git a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol b/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol
deleted file mode 100644
index 412c5d1ad..000000000
--- a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyERC20Token.sol
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/Ownable/Ownable.sol";
-import "../../tokens/ERC20Token/MintableERC20Token.sol";
-
-
-contract DummyERC20Token is 
-    Ownable,
-    MintableERC20Token
-{
-    string public name;
-    string public symbol;
-    uint256 public decimals;
-    uint256 public constant MAX_MINT_AMOUNT = 10000000000000000000000;
-
-    constructor (
-        string _name,
-        string _symbol,
-        uint256 _decimals,
-        uint256 _totalSupply
-    )
-        public
-    {
-        name = _name;
-        symbol = _symbol;
-        decimals = _decimals;
-        _totalSupply = _totalSupply;
-        balances[msg.sender] = _totalSupply;
-    }
-
-    /// @dev Sets the balance of target address
-    /// @param _target Address or which balance will be updated
-    /// @param _value New balance of target address
-    function setBalance(address _target, uint256 _value)
-        external
-        onlyOwner
-    {
-        uint256 currBalance = balances[_target];
-        if (_value < currBalance) {
-            _totalSupply = safeSub(_totalSupply, safeSub(currBalance, _value));
-        } else {
-            _totalSupply = safeAdd(_totalSupply, safeSub(_value, currBalance));
-        }
-        balances[_target] = _value;
-    }
-
-    /// @dev Mints new tokens for sender
-    /// @param _value Amount of tokens to mint
-    function mint(uint256 _value)
-        external
-    {
-        require(
-            _value <= MAX_MINT_AMOUNT,
-            "VALUE_TOO_LARGE"
-        );
-
-        _mint(msg.sender, _value);
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol b/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol
deleted file mode 100644
index 733d4437e..000000000
--- a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyMultipleReturnERC20Token.sol
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./DummyERC20Token.sol";
-
-
-// solhint-disable no-empty-blocks
-contract DummyMultipleReturnERC20Token is
-    DummyERC20Token
-{
-    constructor (
-        string _name,
-        string _symbol,
-        uint256 _decimals,
-        uint256 _totalSupply
-    )
-        public
-        DummyERC20Token(
-            _name,
-            _symbol,
-            _decimals,
-            _totalSupply
-        )
-    {}
-
-    /// @dev send `value` token to `to` from `from` on the condition it is approved by `from`
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
-
-        // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return 64 bytes (equiavalent to true, true)
-        assembly {
-            mstore(0, 1)
-            mstore(32, 1)
-            return(0, 64)
-        }
-    }
-}
-
diff --git a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyNoReturnERC20Token.sol b/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyNoReturnERC20Token.sol
deleted file mode 100644
index e16825a16..000000000
--- a/packages/contracts/src/2.0.0/test/DummyERC20Token/DummyNoReturnERC20Token.sol
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./DummyERC20Token.sol";
-
-
-// solhint-disable no-empty-blocks
-contract DummyNoReturnERC20Token is
-    DummyERC20Token
-{
-    constructor (
-        string _name,
-        string _symbol,
-        uint256 _decimals,
-        uint256 _totalSupply
-    )
-        public
-        DummyERC20Token(
-            _name,
-            _symbol,
-            _decimals,
-            _totalSupply
-        )
-    {}
-
-    /// @dev send `value` token to `to` from `msg.sender`
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    function transfer(address _to, uint256 _value)
-        external
-        returns (bool)
-    {
-        require(
-            balances[msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
-
-        balances[msg.sender] -= _value;
-        balances[_to] += _value;
-
-        emit Transfer(
-            msg.sender,
-            _to,
-            _value
-        );
-
-        // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return no data
-        assembly {
-            return(0, 0)
-        }
-    }
-
-    /// @dev send `value` token to `to` from `from` on the condition it is approved by `from`
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        require(
-            balances[_from] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            allowed[_from][msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_ALLOWANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
-
-        balances[_to] += _value;
-        balances[_from] -= _value;
-        allowed[_from][msg.sender] -= _value;
-    
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
-
-        // HACK: This contract will not compile if we remove `returns (bool)`, so we manually return no data
-        assembly {
-            return(0, 0)
-        }
-    }
-}
-
diff --git a/packages/contracts/src/2.0.0/test/DummyERC721Receiver/DummyERC721Receiver.sol b/packages/contracts/src/2.0.0/test/DummyERC721Receiver/DummyERC721Receiver.sol
deleted file mode 100644
index 6c8371559..000000000
--- a/packages/contracts/src/2.0.0/test/DummyERC721Receiver/DummyERC721Receiver.sol
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../tokens/ERC721Token/IERC721Receiver.sol";
-
-
-contract DummyERC721Receiver is
-    IERC721Receiver
-{
-    // Function selector for ERC721Receiver.onERC721Received
-    // 0x150b7a02
-    bytes4 constant internal ERC721_RECEIVED = bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"));
-
-    event TokenReceived(
-        address operator,
-        address from,
-        uint256 tokenId,
-        bytes data
-    );
-
-    /// @notice Handle the receipt of an NFT
-    /// @dev The ERC721 smart contract calls this function on the recipient
-    ///      after a `transfer`. This function MAY throw to revert and reject the
-    ///      transfer. Return of other than the magic value MUST result in the
-    ///      transaction being reverted.
-    ///      Note: the contract address is always the message sender.
-    /// @param _operator The address which called `safeTransferFrom` function
-    /// @param _from The address which previously owned the token
-    /// @param _tokenId The NFT identifier which is being transferred
-    /// @param _data Additional data with no specified format
-    /// @return `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`
-    ///         unless throwing
-    function onERC721Received(
-        address _operator,
-        address _from,
-        uint256 _tokenId,
-        bytes _data
-    )
-        external
-        returns (bytes4)
-    {
-        emit TokenReceived(
-            _operator,
-            _from,
-            _tokenId,
-            _data
-        );
-        return ERC721_RECEIVED;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/DummyERC721Receiver/InvalidERC721Receiver.sol b/packages/contracts/src/2.0.0/test/DummyERC721Receiver/InvalidERC721Receiver.sol
deleted file mode 100644
index 309633bf5..000000000
--- a/packages/contracts/src/2.0.0/test/DummyERC721Receiver/InvalidERC721Receiver.sol
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../tokens/ERC721Token/IERC721Receiver.sol";
-
-
-contract InvalidERC721Receiver is
-    IERC721Receiver
-{
-    // Actual function signature is `onERC721Received(address,address,uint256,bytes)`
-    bytes4 constant internal INVALID_ERC721_RECEIVED = bytes4(keccak256("onERC721Received(address,uint256,bytes)"));
-
-    event TokenReceived(
-        address operator,
-        address from,
-        uint256 tokenId,
-        bytes data
-    );
-
-    /// @notice Handle the receipt of an NFT
-    /// @dev The ERC721 smart contract calls this function on the recipient
-    ///      after a `transfer`. This function MAY throw to revert and reject the
-    ///      transfer. Return of other than the magic value MUST result in the
-    ///      transaction being reverted.
-    ///      Note: the contract address is always the message sender.
-    /// @param _operator The address which called `safeTransferFrom` function
-    /// @param _from The address which previously owned the token
-    /// @param _tokenId The NFT identifier which is being transferred
-    /// @param _data Additional data with no specified format
-    /// @return `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`
-    ///         unless throwing
-    function onERC721Received(
-        address _operator,
-        address _from,
-        uint256 _tokenId,
-        bytes _data
-    )
-        external
-        returns (bytes4)
-    {
-        emit TokenReceived(
-            _operator,
-            _from,
-            _tokenId,
-            _data
-        );
-        return INVALID_ERC721_RECEIVED;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol b/packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol
deleted file mode 100644
index ac9068d1d..000000000
--- a/packages/contracts/src/2.0.0/test/DummyERC721Token/DummyERC721Token.sol
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../tokens/ERC721Token/MintableERC721Token.sol";
-import "../../utils/Ownable/Ownable.sol";
-
-
-// solhint-disable no-empty-blocks
-contract DummyERC721Token is
-    Ownable,
-    MintableERC721Token
-{
-    string public name;
-    string public symbol;
-
-    constructor (
-        string _name,
-        string _symbol
-    )
-        public
-    {
-        name = _name;
-        symbol = _symbol;
-    }
-
-    /// @dev Function to mint a new token
-    ///      Reverts if the given token ID already exists
-    /// @param _to Address of the beneficiary that will own the minted token
-    /// @param _tokenId ID of the token to be minted by the msg.sender    
-    function mint(address _to, uint256 _tokenId)
-        external
-    {
-        _mint(_to, _tokenId);
-    }
-
-    /// @dev Function to burn a token
-    ///      Reverts if the given token ID doesn't exist or not called by contract owner
-    /// @param _owner Owner of token with given token ID
-    /// @param _tokenId ID of the token to be burned by the msg.sender
-    function burn(address _owner, uint256 _tokenId)
-        external
-        onlyOwner
-    {
-        _burn(_owner, _tokenId);
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol b/packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol
deleted file mode 100644
index 99dd47a78..000000000
--- a/packages/contracts/src/2.0.0/test/ReentrantERC20Token/ReentrantERC20Token.sol
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../utils/LibBytes/LibBytes.sol";
-import "../../tokens/ERC20Token/ERC20Token.sol";
-import "../../protocol/Exchange/interfaces/IExchange.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-
-
-// solhint-disable no-unused-vars
-contract ReentrantERC20Token is
-    ERC20Token
-{
-    using LibBytes for bytes;
-
-    // solhint-disable-next-line var-name-mixedcase
-    IExchange internal EXCHANGE;
-
-    bytes internal constant REENTRANCY_ILLEGAL_REVERT_REASON = abi.encodeWithSelector(
-        bytes4(keccak256("Error(string)")),
-        "REENTRANCY_ILLEGAL"
-    );
-
-    // All of these functions are potentially vulnerable to reentrancy
-    // We do not test any "noThrow" functions because `fillOrderNoThrow` makes a delegatecall to `fillOrder`
-    enum ExchangeFunction {
-        FILL_ORDER,
-        FILL_OR_KILL_ORDER,
-        BATCH_FILL_ORDERS,
-        BATCH_FILL_OR_KILL_ORDERS,
-        MARKET_BUY_ORDERS,
-        MARKET_SELL_ORDERS,
-        MATCH_ORDERS,
-        CANCEL_ORDER,
-        BATCH_CANCEL_ORDERS,
-        CANCEL_ORDERS_UP_TO,
-        SET_SIGNATURE_VALIDATOR_APPROVAL
-    }
-
-    uint8 internal currentFunctionId = 0;
-
-    constructor (address _exchange)
-        public
-    {
-        EXCHANGE = IExchange(_exchange);
-    }
-
-    /// @dev Set the current function that will be called when `transferFrom` is called.
-    /// @param _currentFunctionId Id that corresponds to function name.
-    function setCurrentFunction(uint8 _currentFunctionId)
-        external
-    {
-        currentFunctionId = _currentFunctionId;
-    }
-
-    /// @dev A version of `transferFrom` that attempts to reenter the Exchange contract.
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        // This order would normally be invalid, but it will be used strictly for testing reentrnacy.
-        // Any reentrancy checks will happen before any other checks that invalidate the order.
-        LibOrder.Order memory order;
-
-        // Initialize remaining null parameters
-        bytes memory signature;
-        LibOrder.Order[] memory orders;
-        uint256[] memory takerAssetFillAmounts;
-        bytes[] memory signatures;
-        bytes memory calldata;
-
-        // Create calldata for function that corresponds to currentFunctionId
-        if (currentFunctionId == uint8(ExchangeFunction.FILL_ORDER)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.fillOrder.selector,
-                order,
-                0,
-                signature
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.FILL_OR_KILL_ORDER)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.fillOrKillOrder.selector,
-                order,
-                0,
-                signature
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.BATCH_FILL_ORDERS)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.batchFillOrders.selector,
-                orders,
-                takerAssetFillAmounts,
-                signatures
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.BATCH_FILL_OR_KILL_ORDERS)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.batchFillOrKillOrders.selector,
-                orders,
-                takerAssetFillAmounts,
-                signatures
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.MARKET_BUY_ORDERS)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.marketBuyOrders.selector,
-                orders,
-                0,
-                signatures
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.MARKET_SELL_ORDERS)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.marketSellOrders.selector,
-                orders,
-                0,
-                signatures
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.MATCH_ORDERS)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.matchOrders.selector,
-                order,
-                order,
-                signature,
-                signature
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.CANCEL_ORDER)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.cancelOrder.selector,
-                order
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.BATCH_CANCEL_ORDERS)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.batchCancelOrders.selector,
-                orders
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.CANCEL_ORDERS_UP_TO)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.cancelOrdersUpTo.selector,
-                0
-            );
-        } else if (currentFunctionId == uint8(ExchangeFunction.SET_SIGNATURE_VALIDATOR_APPROVAL)) {
-            calldata = abi.encodeWithSelector(
-                EXCHANGE.setSignatureValidatorApproval.selector,
-                address(0),
-                false
-            );
-        }
-
-        // Call Exchange function, swallow error
-        address(EXCHANGE).call(calldata);
-
-        // Revert reason is 100 bytes
-        bytes memory returnData = new bytes(100);
-
-        // Copy return data
-        assembly {
-            returndatacopy(add(returnData, 32), 0, 100)
-        }
-
-        // Revert if function reverted with REENTRANCY_ILLEGAL error
-        require(!REENTRANCY_ILLEGAL_REVERT_REASON.equals(returnData));
-
-        // Transfer will return true if function failed for any other reason
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol b/packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
deleted file mode 100644
index ad71fc9a1..000000000
--- a/packages/contracts/src/2.0.0/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/Exchange/MixinAssetProxyDispatcher.sol";
-
-
-contract TestAssetProxyDispatcher is 
-    MixinAssetProxyDispatcher
-{
-    function publicDispatchTransferFrom(
-        bytes memory assetData,
-        address from,
-        address to,
-        uint256 amount
-    )
-        public
-    {
-        dispatchTransferFrom(assetData, from, to, amount);
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/TestAssetProxyOwner/TestAssetProxyOwner.sol b/packages/contracts/src/2.0.0/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
deleted file mode 100644
index 52c66cb56..000000000
--- a/packages/contracts/src/2.0.0/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/AssetProxyOwner/AssetProxyOwner.sol";
-
-
-// solhint-disable no-empty-blocks
-contract TestAssetProxyOwner is
-    AssetProxyOwner
-{
-    constructor (
-        address[] memory _owners,
-        address[] memory _assetProxyContracts,
-        uint256 _required,
-        uint256 _secondsTimeLocked
-    )
-        public
-        AssetProxyOwner(_owners, _assetProxyContracts, _required, _secondsTimeLocked)
-    {}
-    
-    function testValidRemoveAuthorizedAddressAtIndexTx(uint256 id)
-        public
-        view
-        validRemoveAuthorizedAddressAtIndexTx(id)
-        returns (bool)
-    {
-        // Do nothing. We expect reverts through the modifier
-        return true;
-    }
-    
-    /// @dev Compares first 4 bytes of byte array to `removeAuthorizedAddressAtIndex` function selector.
-    /// @param data Transaction data.
-    /// @return Successful if data is a call to `removeAuthorizedAddressAtIndex`.
-    function isFunctionRemoveAuthorizedAddressAtIndex(bytes memory data)
-        public
-        pure
-        returns (bool)
-    {
-        return data.readBytes4(0) == REMOVE_AUTHORIZED_ADDRESS_AT_INDEX_SELECTOR;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/TestConstants/TestConstants.sol b/packages/contracts/src/2.0.0/test/TestConstants/TestConstants.sol
deleted file mode 100644
index 1275d007b..000000000
--- a/packages/contracts/src/2.0.0/test/TestConstants/TestConstants.sol
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/LibBytes/LibBytes.sol";
-
-
-// solhint-disable max-line-length
-contract TestConstants {
-   
-    using LibBytes for bytes;
-
-    bytes4 constant internal ERC20_PROXY_ID = bytes4(keccak256("ERC20Token(address)"));
-    
-    address constant internal KOVAN_ZRX_ADDRESS = 0x6Ff6C0Ff1d68b964901F986d4C9FA3ac68346570;
-    bytes constant internal KOVAN_ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6f\xf6\xc0\xff\x1d\x68\xb9\x64\x90\x1f\x98\x6d\x4c\x9f\xa3\xac\x68\x34\x65\x70";
-    
-    address constant internal MAINNET_ZRX_ADDRESS = 0xE41d2489571d322189246DaFA5ebDe1F4699F498;
-    bytes constant public MAINNET_ZRX_ASSET_DATA = "\xf4\x72\x61\xb0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe4\x1d\x24\x89\x57\x1d\x32\x21\x89\x24\x6d\xaf\xa5\xeb\xde\x1f\x46\x99\xf4\x98";
-    
-    function assertValidZrxAssetData()
-        public
-        pure
-        returns (bool)
-    {
-        bytes memory kovanZrxAssetData = abi.encodeWithSelector(ERC20_PROXY_ID, KOVAN_ZRX_ADDRESS);
-        require(
-            kovanZrxAssetData.equals(KOVAN_ZRX_ASSET_DATA),
-            "INVALID_KOVAN_ZRX_ASSET_DATA"
-        );
-
-        bytes memory mainetZrxAssetData = abi.encodeWithSelector(ERC20_PROXY_ID, MAINNET_ZRX_ADDRESS);
-        require(
-            mainetZrxAssetData.equals(MAINNET_ZRX_ASSET_DATA),
-            "INVALID_MAINNET_ZRX_ASSET_DATA"
-        );
-
-        return true;
-    }
-}
-// solhint-enable max-line-length
\ No newline at end of file
diff --git a/packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol b/packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol
deleted file mode 100644
index 27187f8f8..000000000
--- a/packages/contracts/src/2.0.0/test/TestExchangeInternals/TestExchangeInternals.sol
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../protocol/Exchange/Exchange.sol";
-
-
-// solhint-disable no-empty-blocks
-contract TestExchangeInternals is
-    Exchange
-{
-    constructor ()
-        public
-        Exchange("")
-    {}
-
-    /// @dev Adds properties of both FillResults instances.
-    ///      Modifies the first FillResults instance specified.
-    ///      Note that this function has been modified from the original
-    //       internal version to return the FillResults.
-    /// @param totalFillResults Fill results instance that will be added onto.
-    /// @param singleFillResults Fill results instance that will be added to totalFillResults.
-    /// @return newTotalFillResults The result of adding singleFillResults to totalFilResults.
-    function publicAddFillResults(FillResults memory totalFillResults, FillResults memory singleFillResults)
-        public
-        pure
-        returns (FillResults memory)
-    {
-        addFillResults(totalFillResults, singleFillResults);
-        return totalFillResults;
-    }
-
-    /// @dev Calculates amounts filled and fees paid by maker and taker.
-    /// @param order to be filled.
-    /// @param takerAssetFilledAmount Amount of takerAsset that will be filled.
-    /// @return fillResults Amounts filled and fees paid by maker and taker.
-    function publicCalculateFillResults(
-        Order memory order,
-        uint256 takerAssetFilledAmount
-    )
-        public
-        pure
-        returns (FillResults memory fillResults)
-    {
-        return calculateFillResults(order, takerAssetFilledAmount);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function publicSafeGetPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (uint256 partialAmount)
-    {
-        return safeGetPartialAmountFloor(numerator, denominator, target);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    ///      Reverts if rounding error is >= 0.1%
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function publicSafeGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (uint256 partialAmount)
-    {
-        return safeGetPartialAmountCeil(numerator, denominator, target);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function publicGetPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (uint256 partialAmount)
-    {
-        return getPartialAmountFloor(numerator, denominator, target);
-    }
-
-    /// @dev Calculates partial value given a numerator and denominator.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to calculate partial of.
-    /// @return Partial value of target.
-    function publicGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (uint256 partialAmount)
-    {
-        return getPartialAmountCeil(numerator, denominator, target);
-    }
-
-    /// @dev Checks if rounding error >= 0.1%.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function publicIsRoundingErrorFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (bool isError)
-    {
-        return isRoundingErrorFloor(numerator, denominator, target);
-    }
-
-    /// @dev Checks if rounding error >= 0.1%.
-    /// @param numerator Numerator.
-    /// @param denominator Denominator.
-    /// @param target Value to multiply with numerator/denominator.
-    /// @return Rounding error is present.
-    function publicIsRoundingErrorCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (bool isError)
-    {
-        return isRoundingErrorCeil(numerator, denominator, target);
-    }
- 
-    /// @dev Updates state with results of a fill order.
-    /// @param order that was filled.
-    /// @param takerAddress Address of taker who filled the order.
-    /// @param orderTakerAssetFilledAmount Amount of order already filled.
-    /// @return fillResults Amounts filled and fees paid by maker and taker.
-    function publicUpdateFilledState(
-        Order memory order,
-        address takerAddress,
-        bytes32 orderHash,
-        uint256 orderTakerAssetFilledAmount,
-        FillResults memory fillResults
-    )
-        public
-    {
-        updateFilledState(
-            order,
-            takerAddress,
-            orderHash,
-            orderTakerAssetFilledAmount,
-            fillResults
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol b/packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol
deleted file mode 100644
index 00d861e61..000000000
--- a/packages/contracts/src/2.0.0/test/TestLibBytes/TestLibBytes.sol
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/LibBytes/LibBytes.sol";
-
-
-contract TestLibBytes {
-    
-    using LibBytes for bytes;
-
-    /// @dev Pops the last byte off of a byte array by modifying its length.
-    /// @param b Byte array that will be modified.
-    /// @return The byte that was popped off.
-    function publicPopLastByte(bytes memory b)
-        public
-        pure
-        returns (bytes memory, bytes1 result)
-    {
-        result = b.popLastByte();
-        return (b, result);
-    }
-
-    /// @dev Pops the last 20 bytes off of a byte array by modifying its length.
-    /// @param b Byte array that will be modified.
-    /// @return The 20 byte address that was popped off.
-    function publicPopLast20Bytes(bytes memory b)
-        public
-        pure
-        returns (bytes memory, address result)
-    {
-        result = b.popLast20Bytes();
-        return (b, result);
-    }
-
-    /// @dev Tests equality of two byte arrays.
-    /// @param lhs First byte array to compare.
-    /// @param rhs Second byte array to compare.
-    /// @return True if arrays are the same. False otherwise.
-    function publicEquals(bytes memory lhs, bytes memory rhs)
-        public
-        pure
-        returns (bool equal)
-    {
-        equal = lhs.equals(rhs);
-        return equal;
-    }
-    
-    function publicEqualsPop1(bytes memory lhs, bytes memory rhs)
-        public
-        pure
-        returns (bool equal)
-    {
-        lhs.popLastByte();
-        rhs.popLastByte();
-        equal = lhs.equals(rhs);
-        return equal;
-    }
-
-    /// @dev Performs a deep copy of a byte array onto another byte array of greater than or equal length.
-    /// @param dest Byte array that will be overwritten with source bytes.
-    /// @param source Byte array to copy onto dest bytes.
-    function publicDeepCopyBytes(
-        bytes memory dest,
-        bytes memory source
-    )
-        public
-        pure
-        returns (bytes memory)
-    {
-        LibBytes.deepCopyBytes(dest, source);
-        return dest;
-    }
-
-    /// @dev Reads an address from a position in a byte array.
-    /// @param b Byte array containing an address.
-    /// @param index Index in byte array of address.
-    /// @return address from byte array.
-    function publicReadAddress(
-        bytes memory b,
-        uint256 index
-    )
-        public
-        pure
-        returns (address result)
-    {
-        result = b.readAddress(index);
-        return result;
-    }
-
-    /// @dev Writes an address into a specific position in a byte array.
-    /// @param b Byte array to insert address into.
-    /// @param index Index in byte array of address.
-    /// @param input Address to put into byte array.
-    function publicWriteAddress(
-        bytes memory b,
-        uint256 index,
-        address input
-    )
-        public
-        pure
-        returns (bytes memory)
-    {
-        b.writeAddress(index, input);
-        return b;
-    }
-
-    /// @dev Reads a bytes32 value from a position in a byte array.
-    /// @param b Byte array containing a bytes32 value.
-    /// @param index Index in byte array of bytes32 value.
-    /// @return bytes32 value from byte array.
-    function publicReadBytes32(
-        bytes memory b,
-        uint256 index
-    )
-        public
-        pure
-        returns (bytes32 result)
-    {
-        result = b.readBytes32(index);
-        return result;
-    }
-
-    /// @dev Writes a bytes32 into a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input bytes32 to put into byte array.
-    function publicWriteBytes32(
-        bytes memory b,
-        uint256 index,
-        bytes32 input
-    )
-        public
-        pure
-        returns (bytes memory)
-    {
-        b.writeBytes32(index, input);
-        return b;
-    }
-
-    /// @dev Reads a uint256 value from a position in a byte array.
-    /// @param b Byte array containing a uint256 value.
-    /// @param index Index in byte array of uint256 value.
-    /// @return uint256 value from byte array.
-    function publicReadUint256(
-        bytes memory b,
-        uint256 index
-    )
-        public
-        pure
-        returns (uint256 result)
-    {
-        result = b.readUint256(index);
-        return result;
-    }
-
-    /// @dev Writes a uint256 into a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input uint256 to put into byte array.
-    function publicWriteUint256(
-        bytes memory b,
-        uint256 index,
-        uint256 input
-    )
-        public
-        pure
-        returns (bytes memory)
-    {
-        b.writeUint256(index, input);
-        return b;
-    }
-
-    /// @dev Reads an unpadded bytes4 value from a position in a byte array.
-    /// @param b Byte array containing a bytes4 value.
-    /// @param index Index in byte array of bytes4 value.
-    /// @return bytes4 value from byte array.
-    function publicReadBytes4(
-        bytes memory b,
-        uint256 index
-    )
-        public
-        pure
-        returns (bytes4 result)
-    {
-        result = b.readBytes4(index);
-        return result;
-    }
-
-    /// @dev Reads nested bytes from a specific position.
-    /// @param b Byte array containing nested bytes.
-    /// @param index Index of nested bytes.
-    /// @return result Nested bytes.
-    function publicReadBytesWithLength(
-        bytes memory b,
-        uint256 index
-    )
-        public
-        pure
-        returns (bytes memory result)
-    {
-        result = b.readBytesWithLength(index);
-        return result;
-    }
-
-    /// @dev Inserts bytes at a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input bytes to insert.
-    /// @return b Updated input byte array
-    function publicWriteBytesWithLength(
-        bytes memory b,
-        uint256 index,
-        bytes memory input
-    )
-        public
-        pure
-        returns (bytes memory)
-    {
-        b.writeBytesWithLength(index, input);
-        return b;
-    }
-    
-    /// @dev Copies a block of memory from one location to another.
-    /// @param mem Memory contents we want to apply memCopy to
-    /// @param dest Destination offset into <mem>.
-    /// @param source Source offset into <mem>.
-    /// @param length Length of bytes to copy from <source> to <dest>
-    /// @return mem Memory contents after calling memCopy.
-    function testMemcpy(
-        bytes mem,
-        uint256 dest,
-        uint256 source,
-        uint256 length
-    )
-        public // not external, we need input in memory
-        pure
-        returns (bytes)
-    {
-        // Sanity check. Overflows are not checked.
-        require(source + length <= mem.length);
-        require(dest + length <= mem.length);
-
-        // Get pointer to memory contents
-        uint256 offset = mem.contentAddress();
-
-        // Execute memCopy adjusted for memory array location
-        LibBytes.memCopy(offset + dest, offset + source, length);
-
-        // Return modified memory contents
-        return mem;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol b/packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol
deleted file mode 100644
index a10f981fc..000000000
--- a/packages/contracts/src/2.0.0/test/TestLibs/TestLibs.sol
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-pragma experimental ABIEncoderV2;
-
-import "../../protocol/Exchange/libs/LibMath.sol";
-import "../../protocol/Exchange/libs/LibOrder.sol";
-import "../../protocol/Exchange/libs/LibFillResults.sol";
-import "../../protocol/Exchange/libs/LibAbiEncoder.sol";
-
-
-contract TestLibs is 
-    LibMath,
-    LibOrder,
-    LibFillResults,
-    LibAbiEncoder
-{
-    function publicAbiEncodeFillOrder(
-        Order memory order,
-        uint256 takerAssetFillAmount,
-        bytes memory signature
-    )
-        public
-        pure
-        returns (bytes memory fillOrderCalldata)
-    {
-        fillOrderCalldata = abiEncodeFillOrder(
-            order,
-            takerAssetFillAmount,
-            signature
-        );
-        return fillOrderCalldata;
-    }
-
-    function publicGetPartialAmountFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (uint256 partialAmount)
-    {
-        partialAmount = getPartialAmountFloor(
-            numerator,
-            denominator,
-            target
-        );
-        return partialAmount;
-    }
-
-    function publicGetPartialAmountCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (uint256 partialAmount)
-    {
-        partialAmount = getPartialAmountCeil(
-            numerator,
-            denominator,
-            target
-        );
-        return partialAmount;
-    }
-
-    function publicIsRoundingErrorFloor(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (bool isError)
-    {
-        isError = isRoundingErrorFloor(
-            numerator,
-            denominator,
-            target
-        );
-        return isError;
-    }
-
-    function publicIsRoundingErrorCeil(
-        uint256 numerator,
-        uint256 denominator,
-        uint256 target
-    )
-        public
-        pure
-        returns (bool isError)
-    {
-        isError = isRoundingErrorCeil(
-            numerator,
-            denominator,
-            target
-        );
-        return isError;
-    }
-
-    function publicGetOrderHash(Order memory order)
-        public
-        view
-        returns (bytes32 orderHash)
-    {
-        orderHash = getOrderHash(order);
-        return orderHash;
-    }
-
-    function getOrderSchemaHash()
-        public
-        pure
-        returns (bytes32)
-    {
-        return EIP712_ORDER_SCHEMA_HASH;
-    }
-
-    function getDomainSeparatorSchemaHash()
-        public
-        pure
-        returns (bytes32)
-    {
-        return EIP712_DOMAIN_SEPARATOR_SCHEMA_HASH;
-    }
-
-    function publicAddFillResults(FillResults memory totalFillResults, FillResults memory singleFillResults)
-        public
-        pure
-        returns (FillResults memory)
-    {
-        addFillResults(totalFillResults, singleFillResults);
-        return totalFillResults;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol b/packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol
deleted file mode 100644
index ea3e2de59..000000000
--- a/packages/contracts/src/2.0.0/test/TestSignatureValidator/TestSignatureValidator.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../protocol/Exchange/MixinSignatureValidator.sol";
-import "../../protocol/Exchange/MixinTransactions.sol";
-
-
-contract TestSignatureValidator is
-    MixinSignatureValidator,
-    MixinTransactions
-{
-    function publicIsValidSignature(
-        bytes32 hash,
-        address signer,
-        bytes memory signature
-    )
-        public
-        view
-        returns (bool isValid)
-    {
-        isValid = isValidSignature(
-            hash,
-            signer,
-            signature
-        );
-        return isValid;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/test/TestStaticCallReceiver/TestStaticCallReceiver.sol b/packages/contracts/src/2.0.0/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
deleted file mode 100644
index 41aab01c8..000000000
--- a/packages/contracts/src/2.0.0/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../tokens/ERC20Token/IERC20Token.sol";
-
-
-// solhint-disable no-unused-vars
-contract TestStaticCallReceiver {
-
-    uint256 internal state = 1;
-
-    /// @dev Updates state and returns true. Intended to be used with `Validator` signature type.
-    /// @param hash Message hash that is signed.
-    /// @param signerAddress Address that should have signed the given hash.
-    /// @param signature Proof of signing.
-    /// @return Validity of order signature.
-    function isValidSignature(
-        bytes32 hash,
-        address signerAddress,
-        bytes signature
-    )
-        external
-        returns (bool isValid)
-    {
-        updateState();
-        return true;
-    }
-
-    /// @dev Updates state and returns true. Intended to be used with `Wallet` signature type.
-    /// @param hash Message hash that is signed.
-    /// @param signature Proof of signing.
-    /// @return Validity of order signature.
-    function isValidSignature(
-        bytes32 hash,
-        bytes signature
-    )
-        external
-        returns (bool isValid)
-    {
-        updateState();
-        return true;
-    }
-
-    /// @dev Approves an ERC20 token to spend tokens from this address.
-    /// @param token Address of ERC20 token.
-    /// @param spender Address that will spend tokens.
-    /// @param value Amount of tokens spender is approved to spend.
-    function approveERC20(
-        address token,
-        address spender,
-        uint256 value
-    )
-        external
-    {
-        IERC20Token(token).approve(spender, value);
-    }
-
-    /// @dev Increments state variable.
-    function updateState()
-        internal
-    {
-        state++;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol b/packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol
deleted file mode 100644
index 725d304df..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC20Token/ERC20Token.sol
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./IERC20Token.sol";
-
-
-contract ERC20Token is
-    IERC20Token
-{
-    mapping (address => uint256) internal balances;
-    mapping (address => mapping (address => uint256)) internal allowed;
-
-    uint256 internal _totalSupply;
-
-    /// @dev send `value` token to `to` from `msg.sender`
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return True if transfer was successful
-    function transfer(address _to, uint256 _value)
-        external
-        returns (bool)
-    {
-        require(
-            balances[msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
-
-        balances[msg.sender] -= _value;
-        balances[_to] += _value;
-
-        emit Transfer(
-            msg.sender,
-            _to,
-            _value
-        );
-
-        return true;
-    }
-
-    /// @dev send `value` token to `to` from `from` on the condition it is approved by `from`
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return True if transfer was successful
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        require(
-            balances[_from] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            allowed[_from][msg.sender] >= _value,
-            "ERC20_INSUFFICIENT_ALLOWANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
-
-        balances[_to] += _value;
-        balances[_from] -= _value;
-        allowed[_from][msg.sender] -= _value;
-    
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
-    
-        return true;
-    }
-
-    /// @dev `msg.sender` approves `_spender` to spend `_value` tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @param _value The amount of wei to be approved for transfer
-    /// @return Always true if the call has enough gas to complete execution
-    function approve(address _spender, uint256 _value)
-        external
-        returns (bool)
-    {
-        allowed[msg.sender][_spender] = _value;
-        emit Approval(
-            msg.sender,
-            _spender,
-            _value
-        );
-        return true;
-    }
-
-    /// @dev Query total supply of token
-    /// @return Total supply of token
-    function totalSupply()
-        external
-        view
-        returns (uint256)
-    {
-        return _totalSupply;
-    }
-
-    /// @dev Query the balance of owner
-    /// @param _owner The address from which the balance will be retrieved
-    /// @return Balance of owner
-    function balanceOf(address _owner)
-        external
-        view
-        returns (uint256)
-    {
-        return balances[_owner];
-    }
-
-    /// @param _owner The address of the account owning tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @return Amount of remaining tokens allowed to spent
-    function allowance(address _owner, address _spender)
-        external
-        view
-        returns (uint256)
-    {
-        return allowed[_owner][_spender];
-    }
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol b/packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol
deleted file mode 100644
index 258d47393..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC20Token/IERC20Token.sol
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract IERC20Token {
-
-    // solhint-disable no-simple-event-func-name
-    event Transfer(
-        address indexed _from,
-        address indexed _to,
-        uint256 _value
-    );
-
-    event Approval(
-        address indexed _owner,
-        address indexed _spender,
-        uint256 _value
-    );
-
-    /// @dev send `value` token to `to` from `msg.sender`
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return True if transfer was successful
-    function transfer(address _to, uint256 _value)
-        external
-        returns (bool);
-
-    /// @dev send `value` token to `to` from `from` on the condition it is approved by `from`
-    /// @param _from The address of the sender
-    /// @param _to The address of the recipient
-    /// @param _value The amount of token to be transferred
-    /// @return True if transfer was successful
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool);
-    
-    /// @dev `msg.sender` approves `_spender` to spend `_value` tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @param _value The amount of wei to be approved for transfer
-    /// @return Always true if the call has enough gas to complete execution
-    function approve(address _spender, uint256 _value)
-        external
-        returns (bool);
-
-    /// @dev Query total supply of token
-    /// @return Total supply of token
-    function totalSupply()
-        external
-        view
-        returns (uint256);
-    
-    /// @param _owner The address from which the balance will be retrieved
-    /// @return Balance of owner
-    function balanceOf(address _owner)
-        external
-        view
-        returns (uint256);
-
-    /// @param _owner The address of the account owning tokens
-    /// @param _spender The address of the account able to transfer the tokens
-    /// @return Amount of remaining tokens allowed to spent
-    function allowance(address _owner, address _spender)
-        external
-        view
-        returns (uint256);
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC20Token/MintableERC20Token.sol b/packages/contracts/src/2.0.0/tokens/ERC20Token/MintableERC20Token.sol
deleted file mode 100644
index 9dc924422..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC20Token/MintableERC20Token.sol
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../../utils/SafeMath/SafeMath.sol";
-import "./UnlimitedAllowanceERC20Token.sol";
-
-
-contract MintableERC20Token is 
-    SafeMath,
-    UnlimitedAllowanceERC20Token
-{
-    /// @dev Mints new tokens
-    /// @param _to Address of the beneficiary that will own the minted token
-    /// @param _value Amount of tokens to mint
-    function _mint(address _to, uint256 _value)
-        internal
-    {
-        balances[_to] = safeAdd(_value, balances[_to]);
-        _totalSupply = safeAdd(_totalSupply, _value);
-
-        emit Transfer(
-            address(0),
-            _to,
-            _value
-        );
-    }
-
-    /// @dev Mints new tokens
-    /// @param _owner Owner of tokens that will be burned
-    /// @param _value Amount of tokens to burn
-    function _burn(address _owner, uint256 _value)
-        internal
-    {
-        balances[_owner] = safeSub(balances[_owner], _value);
-        _totalSupply = safeSub(_totalSupply, _value);
-
-        emit Transfer(
-            _owner,
-            address(0),
-            _value
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol b/packages/contracts/src/2.0.0/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
deleted file mode 100644
index 2e5bd4348..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../ERC20Token/ERC20Token.sol";
-
-
-contract UnlimitedAllowanceERC20Token is
-    ERC20Token
-{
-    uint256 constant internal MAX_UINT = 2**256 - 1;
-
-    /// @dev ERC20 transferFrom, modified such that an allowance of MAX_UINT represents an unlimited allowance. See https://github.com/ethereum/EIPs/issues/717
-    /// @param _from Address to transfer from.
-    /// @param _to Address to transfer to.
-    /// @param _value Amount to transfer.
-    /// @return Success of transfer.
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _value
-    )
-        external
-        returns (bool)
-    {
-        uint256 allowance = allowed[_from][msg.sender];
-        require(
-            balances[_from] >= _value,
-            "ERC20_INSUFFICIENT_BALANCE"
-        );
-        require(
-            allowance >= _value,
-            "ERC20_INSUFFICIENT_ALLOWANCE"
-        );
-        require(
-            balances[_to] + _value >= balances[_to],
-            "UINT256_OVERFLOW"
-        );
-
-        balances[_to] += _value;
-        balances[_from] -= _value;
-        if (allowance < MAX_UINT) {
-            allowed[_from][msg.sender] -= _value;
-        }
-
-        emit Transfer(
-            _from,
-            _to,
-            _value
-        );
-
-        return true;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC721Token/ERC721Token.sol b/packages/contracts/src/2.0.0/tokens/ERC721Token/ERC721Token.sol
deleted file mode 100644
index 530f080c0..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC721Token/ERC721Token.sol
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./IERC721Token.sol";
-import "./IERC721Receiver.sol";
-import "../../utils/SafeMath/SafeMath.sol";
-
-
-contract ERC721Token is
-    IERC721Token,
-    SafeMath
-{
-    // Function selector for ERC721Receiver.onERC721Received
-    // 0x150b7a02
-    bytes4 constant internal ERC721_RECEIVED = bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"));
-
-    // Mapping of tokenId => owner
-    mapping (uint256 => address) internal owners;
-
-    // Mapping of tokenId => approved address
-    mapping (uint256 => address) internal approvals;
-
-    // Mapping of owner => number of tokens owned
-    mapping (address => uint256) internal balances;
-
-    // Mapping of owner => operator => approved
-    mapping (address => mapping (address => bool)) internal operatorApprovals;
-
-    /// @notice Transfers the ownership of an NFT from one address to another address
-    /// @dev Throws unless `msg.sender` is the current owner, an authorized
-    ///      operator, or the approved address for this NFT. Throws if `_from` is
-    ///      not the current owner. Throws if `_to` is the zero address. Throws if
-    ///      `_tokenId` is not a valid NFT. When transfer is complete, this function
-    ///      checks if `_to` is a smart contract (code size > 0). If so, it calls
-    ///      `onERC721Received` on `_to` and throws if the return value is not
-    ///      `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`.
-    /// @param _from The current owner of the NFT
-    /// @param _to The new owner
-    /// @param _tokenId The NFT to transfer
-    /// @param _data Additional data with no specified format, sent in call to `_to`
-    function safeTransferFrom(
-        address _from,
-        address _to,
-        uint256 _tokenId,
-        bytes _data
-    )
-        external
-    {
-        transferFrom(
-            _from,
-            _to,
-            _tokenId
-        );
-
-        uint256 receiverCodeSize;
-        assembly {
-            receiverCodeSize := extcodesize(_to)
-        }
-        if (receiverCodeSize > 0) {
-            bytes4 selector = IERC721Receiver(_to).onERC721Received(
-                msg.sender,
-                _from,
-                _tokenId,
-                _data
-            );
-            require(
-                selector == ERC721_RECEIVED,
-                "ERC721_INVALID_SELECTOR"
-            );
-        }
-    }
-
-    /// @notice Transfers the ownership of an NFT from one address to another address
-    /// @dev This works identically to the other function with an extra data parameter,
-    ///      except this function just sets data to "".
-    /// @param _from The current owner of the NFT
-    /// @param _to The new owner
-    /// @param _tokenId The NFT to transfer
-    function safeTransferFrom(
-        address _from,
-        address _to,
-        uint256 _tokenId
-    )
-        external
-    {
-        transferFrom(
-            _from,
-            _to,
-            _tokenId
-        );
-
-        uint256 receiverCodeSize;
-        assembly {
-            receiverCodeSize := extcodesize(_to)
-        }
-        if (receiverCodeSize > 0) {
-            bytes4 selector = IERC721Receiver(_to).onERC721Received(
-                msg.sender,
-                _from,
-                _tokenId,
-                ""
-            );
-            require(
-                selector == ERC721_RECEIVED,
-                "ERC721_INVALID_SELECTOR"
-            );
-        }
-    }
-
-    /// @notice Change or reaffirm the approved address for an NFT
-    /// @dev The zero address indicates there is no approved address.
-    ///      Throws unless `msg.sender` is the current NFT owner, or an authorized
-    ///      operator of the current owner.
-    /// @param _approved The new approved NFT controller
-    /// @param _tokenId The NFT to approve
-    function approve(address _approved, uint256 _tokenId)
-        external
-    {
-        address owner = ownerOf(_tokenId);
-        require(
-            msg.sender == owner || isApprovedForAll(owner, msg.sender),
-            "ERC721_INVALID_SENDER"
-        );
-
-        approvals[_tokenId] = _approved;
-        emit Approval(
-            owner,
-            _approved,
-            _tokenId
-        );
-    }
-
-    /// @notice Enable or disable approval for a third party ("operator") to manage
-    ///         all of `msg.sender`'s assets
-    /// @dev Emits the ApprovalForAll event. The contract MUST allow
-    ///      multiple operators per owner.
-    /// @param _operator Address to add to the set of authorized operators
-    /// @param _approved True if the operator is approved, false to revoke approval
-    function setApprovalForAll(address _operator, bool _approved)
-        external
-    {
-        operatorApprovals[msg.sender][_operator] = _approved;
-        emit ApprovalForAll(
-            msg.sender,
-            _operator,
-            _approved
-        );
-    }
-    
-    /// @notice Count all NFTs assigned to an owner
-    /// @dev NFTs assigned to the zero address are considered invalid, and this
-    ///      function throws for queries about the zero address.
-    /// @param _owner An address for whom to query the balance
-    /// @return The number of NFTs owned by `_owner`, possibly zero
-    function balanceOf(address _owner)
-        external
-        view
-        returns (uint256)
-    {
-        require(
-            _owner != address(0),
-            "ERC721_ZERO_OWNER"
-        );
-        return balances[_owner];
-    }
-
-    /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE
-    ///         TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
-    ///         THEY MAY BE PERMANENTLY LOST
-    /// @dev Throws unless `msg.sender` is the current owner, an authorized
-    ///      operator, or the approved address for this NFT. Throws if `_from` is
-    ///      not the current owner. Throws if `_to` is the zero address. Throws if
-    ///      `_tokenId` is not a valid NFT.
-    /// @param _from The current owner of the NFT
-    /// @param _to The new owner
-    /// @param _tokenId The NFT to transfer
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _tokenId
-    )
-        public
-    {
-        require(
-            _to != address(0),
-            "ERC721_ZERO_TO_ADDRESS"
-        );
-
-        address owner = ownerOf(_tokenId);
-        require(
-            _from == owner,
-            "ERC721_OWNER_MISMATCH"
-        );
-
-        address spender = msg.sender;
-        address approvedAddress = getApproved(_tokenId);
-        require(
-            spender == owner ||
-            isApprovedForAll(owner, spender) ||
-            approvedAddress == spender,
-            "ERC721_INVALID_SPENDER"
-        );
-
-        if (approvedAddress != address(0)) {
-            approvals[_tokenId] = address(0);
-        }
-
-        owners[_tokenId] = _to;
-        balances[_from] = safeSub(balances[_from], 1);
-        balances[_to] = safeAdd(balances[_to], 1);
-    
-        emit Transfer(
-            _from,
-            _to,
-            _tokenId
-        );
-    }
-
-    /// @notice Find the owner of an NFT
-    /// @dev NFTs assigned to zero address are considered invalid, and queries
-    ///      about them do throw.
-    /// @param _tokenId The identifier for an NFT
-    /// @return The address of the owner of the NFT
-    function ownerOf(uint256 _tokenId)
-        public
-        view
-        returns (address)
-    {
-        address owner = owners[_tokenId];
-        require(
-            owner != address(0),
-            "ERC721_ZERO_OWNER"
-        );
-        return owner;
-    }
-
-    /// @notice Get the approved address for a single NFT
-    /// @dev Throws if `_tokenId` is not a valid NFT.
-    /// @param _tokenId The NFT to find the approved address for
-    /// @return The approved address for this NFT, or the zero address if there is none
-    function getApproved(uint256 _tokenId)
-        public
-        view
-        returns (address)
-    {
-        return approvals[_tokenId];
-    }
-
-    /// @notice Query if an address is an authorized operator for another address
-    /// @param _owner The address that owns the NFTs
-    /// @param _operator The address that acts on behalf of the owner
-    /// @return True if `_operator` is an approved operator for `_owner`, false otherwise
-    function isApprovedForAll(address _owner, address _operator)
-        public
-        view
-        returns (bool)
-    {
-        return operatorApprovals[_owner][_operator];
-    }
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC721Token/IERC721Receiver.sol b/packages/contracts/src/2.0.0/tokens/ERC721Token/IERC721Receiver.sol
deleted file mode 100644
index 8e0e32ab2..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC721Token/IERC721Receiver.sol
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract IERC721Receiver {
-
-    /// @notice Handle the receipt of an NFT
-    /// @dev The ERC721 smart contract calls this function on the recipient
-    ///  after a `transfer`. This function MAY throw to revert and reject the
-    ///  transfer. Return of other than the magic value MUST result in the
-    ///  transaction being reverted.
-    ///  Note: the contract address is always the message sender.
-    /// @param _operator The address which called `safeTransferFrom` function
-    /// @param _from The address which previously owned the token
-    /// @param _tokenId The NFT identifier which is being transferred
-    /// @param _data Additional data with no specified format
-    /// @return `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`
-    ///  unless throwing
-    function onERC721Received(
-        address _operator,
-        address _from,
-        uint256 _tokenId,
-        bytes _data
-    )
-        external
-        returns (bytes4);
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC721Token/IERC721Token.sol b/packages/contracts/src/2.0.0/tokens/ERC721Token/IERC721Token.sol
deleted file mode 100644
index ac992c80d..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC721Token/IERC721Token.sol
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract IERC721Token {
-
-    /// @dev This emits when ownership of any NFT changes by any mechanism.
-    ///      This event emits when NFTs are created (`from` == 0) and destroyed
-    ///      (`to` == 0). Exception: during contract creation, any number of NFTs
-    ///      may be created and assigned without emitting Transfer. At the time of
-    ///      any transfer, the approved address for that NFT (if any) is reset to none.
-    event Transfer(
-        address indexed _from,
-        address indexed _to,
-        uint256 indexed _tokenId
-    );
-
-    /// @dev This emits when the approved address for an NFT is changed or
-    ///      reaffirmed. The zero address indicates there is no approved address.
-    ///      When a Transfer event emits, this also indicates that the approved
-    ///      address for that NFT (if any) is reset to none.
-    event Approval(
-        address indexed _owner,
-        address indexed _approved,
-        uint256 indexed _tokenId
-    );
-
-    /// @dev This emits when an operator is enabled or disabled for an owner.
-    ///      The operator can manage all NFTs of the owner.
-    event ApprovalForAll(
-        address indexed _owner,
-        address indexed _operator,
-        bool _approved
-    );
-
-    /// @notice Transfers the ownership of an NFT from one address to another address
-    /// @dev Throws unless `msg.sender` is the current owner, an authorized
-    ///      perator, or the approved address for this NFT. Throws if `_from` is
-    ///      not the current owner. Throws if `_to` is the zero address. Throws if
-    ///      `_tokenId` is not a valid NFT. When transfer is complete, this function
-    ///      checks if `_to` is a smart contract (code size > 0). If so, it calls
-    ///      `onERC721Received` on `_to` and throws if the return value is not
-    ///      `bytes4(keccak256("onERC721Received(address,address,uint256,bytes)"))`.
-    /// @param _from The current owner of the NFT
-    /// @param _to The new owner
-    /// @param _tokenId The NFT to transfer
-    /// @param _data Additional data with no specified format, sent in call to `_to`
-    function safeTransferFrom(
-        address _from,
-        address _to,
-        uint256 _tokenId,
-        bytes _data
-    )
-        external;
-
-    /// @notice Transfers the ownership of an NFT from one address to another address
-    /// @dev This works identically to the other function with an extra data parameter,
-    ///      except this function just sets data to "".
-    /// @param _from The current owner of the NFT
-    /// @param _to The new owner
-    /// @param _tokenId The NFT to transfer
-    function safeTransferFrom(
-        address _from,
-        address _to,
-        uint256 _tokenId
-    )
-        external;
-
-    /// @notice Change or reaffirm the approved address for an NFT
-    /// @dev The zero address indicates there is no approved address.
-    ///      Throws unless `msg.sender` is the current NFT owner, or an authorized
-    ///      operator of the current owner.
-    /// @param _approved The new approved NFT controller
-    /// @param _tokenId The NFT to approve
-    function approve(address _approved, uint256 _tokenId)
-        external;
-
-    /// @notice Enable or disable approval for a third party ("operator") to manage
-    ///         all of `msg.sender`'s assets
-    /// @dev Emits the ApprovalForAll event. The contract MUST allow
-    ///      multiple operators per owner.
-    /// @param _operator Address to add to the set of authorized operators
-    /// @param _approved True if the operator is approved, false to revoke approval
-    function setApprovalForAll(address _operator, bool _approved)
-        external;
-
-    /// @notice Count all NFTs assigned to an owner
-    /// @dev NFTs assigned to the zero address are considered invalid, and this
-    ///      function throws for queries about the zero address.
-    /// @param _owner An address for whom to query the balance
-    /// @return The number of NFTs owned by `_owner`, possibly zero
-    function balanceOf(address _owner)
-        external
-        view
-        returns (uint256);
-
-    /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE
-    ///         TO CONFIRM THAT `_to` IS CAPABLE OF RECEIVING NFTS OR ELSE
-    ///         THEY MAY BE PERMANENTLY LOST
-    /// @dev Throws unless `msg.sender` is the current owner, an authorized
-    ///      operator, or the approved address for this NFT. Throws if `_from` is
-    ///      not the current owner. Throws if `_to` is the zero address. Throws if
-    ///      `_tokenId` is not a valid NFT.
-    /// @param _from The current owner of the NFT
-    /// @param _to The new owner
-    /// @param _tokenId The NFT to transfer
-    function transferFrom(
-        address _from,
-        address _to,
-        uint256 _tokenId
-    )
-        public;
-
-    /// @notice Find the owner of an NFT
-    /// @dev NFTs assigned to zero address are considered invalid, and queries
-    ///      about them do throw.
-    /// @param _tokenId The identifier for an NFT
-    /// @return The address of the owner of the NFT
-    function ownerOf(uint256 _tokenId)
-        public
-        view
-        returns (address);
-
-    /// @notice Get the approved address for a single NFT
-    /// @dev Throws if `_tokenId` is not a valid NFT.
-    /// @param _tokenId The NFT to find the approved address for
-    /// @return The approved address for this NFT, or the zero address if there is none
-    function getApproved(uint256 _tokenId) 
-        public
-        view
-        returns (address);
-    
-    /// @notice Query if an address is an authorized operator for another address
-    /// @param _owner The address that owns the NFTs
-    /// @param _operator The address that acts on behalf of the owner
-    /// @return True if `_operator` is an approved operator for `_owner`, false otherwise
-    function isApprovedForAll(address _owner, address _operator)
-        public
-        view
-        returns (bool);
-}
diff --git a/packages/contracts/src/2.0.0/tokens/ERC721Token/MintableERC721Token.sol b/packages/contracts/src/2.0.0/tokens/ERC721Token/MintableERC721Token.sol
deleted file mode 100644
index bc5cd2cc2..000000000
--- a/packages/contracts/src/2.0.0/tokens/ERC721Token/MintableERC721Token.sol
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "./ERC721Token.sol";
-
-
-contract MintableERC721Token is
-    ERC721Token
-{
-    /// @dev Function to mint a new token
-    ///      Reverts if the given token ID already exists
-    /// @param _to Address of the beneficiary that will own the minted token
-    /// @param _tokenId ID of the token to be minted by the msg.sender    
-    function _mint(address _to, uint256 _tokenId)
-        internal
-    {
-        require(
-            _to != address(0),
-            "ERC721_ZERO_TO_ADDRESS"
-        );
-
-        address owner = owners[_tokenId];
-        require(
-            owner == address(0),
-            "ERC721_OWNER_ALREADY_EXISTS"
-        );
-
-        owners[_tokenId] = _to;
-        balances[_to] = safeAdd(balances[_to], 1);
-
-        emit Transfer(
-            address(0),
-            _to,
-            _tokenId
-        );
-    }
-
-    /// @dev Function to burn a token
-    ///      Reverts if the given token ID doesn't exist
-    /// @param _owner Owner of token with given token ID
-    /// @param _tokenId ID of the token to be burned by the msg.sender
-    function _burn(address _owner, uint256 _tokenId)
-        internal
-    {
-        require(
-            _owner != address(0),
-            "ERC721_ZERO_OWNER_ADDRESS"
-        );
-
-        address owner = owners[_tokenId];
-        require(
-            owner == _owner,
-            "ERC721_OWNER_MISMATCH"
-        );
-
-        owners[_tokenId] = address(0);
-        balances[_owner] = safeSub(balances[_owner], 1);
-
-        emit Transfer(
-            _owner,
-            address(0),
-            _tokenId
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/tokens/EtherToken/IEtherToken.sol b/packages/contracts/src/2.0.0/tokens/EtherToken/IEtherToken.sol
deleted file mode 100644
index 9e2e68766..000000000
--- a/packages/contracts/src/2.0.0/tokens/EtherToken/IEtherToken.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-import "../ERC20Token/IERC20Token.sol";
-
-
-contract IEtherToken is
-    IERC20Token
-{
-    function deposit()
-        public
-        payable;
-    
-    function withdraw(uint256 amount)
-        public;
-}
diff --git a/packages/contracts/src/2.0.0/tokens/EtherToken/WETH9.sol b/packages/contracts/src/2.0.0/tokens/EtherToken/WETH9.sol
deleted file mode 100644
index 17876b86d..000000000
--- a/packages/contracts/src/2.0.0/tokens/EtherToken/WETH9.sol
+++ /dev/null
@@ -1,758 +0,0 @@
-// Copyright (C) 2015, 2016, 2017 Dapphub
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-// solhint-disable
-pragma solidity ^0.4.18;
-
-
-contract WETH9 {
-    string public name     = "Wrapped Ether";
-    string public symbol   = "WETH";
-    uint8  public decimals = 18;
-
-    event  Approval(address indexed _owner, address indexed _spender, uint _value);
-    event  Transfer(address indexed _from, address indexed _to, uint _value);
-    event  Deposit(address indexed _owner, uint _value);
-    event  Withdrawal(address indexed _owner, uint _value);
-
-    mapping (address => uint)                       public  balanceOf;
-    mapping (address => mapping (address => uint))  public  allowance;
-
-    function() public payable {
-        deposit();
-    }
-    function deposit() public payable {
-        balanceOf[msg.sender] += msg.value;
-        Deposit(msg.sender, msg.value);
-    }
-    function withdraw(uint wad) public {
-        require(balanceOf[msg.sender] >= wad);
-        balanceOf[msg.sender] -= wad;
-        msg.sender.transfer(wad);
-        Withdrawal(msg.sender, wad);
-    }
-
-    function totalSupply() public view returns (uint) {
-        return this.balance;
-    }
-
-    function approve(address guy, uint wad) public returns (bool) {
-        allowance[msg.sender][guy] = wad;
-        Approval(msg.sender, guy, wad);
-        return true;
-    }
-
-    function transfer(address dst, uint wad) public returns (bool) {
-        return transferFrom(msg.sender, dst, wad);
-    }
-
-    function transferFrom(address src, address dst, uint wad)
-        public
-        returns (bool)
-    {
-        require(balanceOf[src] >= wad);
-
-        if (src != msg.sender && allowance[src][msg.sender] != uint(-1)) {
-            require(allowance[src][msg.sender] >= wad);
-            allowance[src][msg.sender] -= wad;
-        }
-
-        balanceOf[src] -= wad;
-        balanceOf[dst] += wad;
-
-        Transfer(src, dst, wad);
-
-        return true;
-    }
-}
-
-
-/*
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-*/
diff --git a/packages/contracts/src/2.0.0/tokens/ZRXToken/ZRXToken.sol b/packages/contracts/src/2.0.0/tokens/ZRXToken/ZRXToken.sol
deleted file mode 100644
index f4855759c..000000000
--- a/packages/contracts/src/2.0.0/tokens/ZRXToken/ZRXToken.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.11;
-
-// solhint-disable-next-line max-line-length
-import { UnlimitedAllowanceToken_v1 as UnlimitedAllowanceToken } from "../../../1.0.0/UnlimitedAllowanceToken/UnlimitedAllowanceToken_v1.sol";
-
-
-contract ZRXToken is 
-    UnlimitedAllowanceToken
-{
-
-    // solhint-disable const-name-snakecase
-    uint8 constant public decimals = 18;
-    uint256 public totalSupply = 10**27; // 1 billion tokens, 18 decimal places
-    string constant public name = "0x Protocol Token";
-    string constant public symbol = "ZRX";
-    // solhint-enableconst-name-snakecase
-
-    function ZRXToken()
-        public
-    {
-        balances[msg.sender] = totalSupply;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/utils/LibBytes/LibBytes.sol b/packages/contracts/src/2.0.0/utils/LibBytes/LibBytes.sol
deleted file mode 100644
index 369f588ad..000000000
--- a/packages/contracts/src/2.0.0/utils/LibBytes/LibBytes.sol
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-library LibBytes {
-
-    using LibBytes for bytes;
-
-    /// @dev Gets the memory address for a byte array.
-    /// @param input Byte array to lookup.
-    /// @return memoryAddress Memory address of byte array. This
-    ///         points to the header of the byte array which contains
-    ///         the length.
-    function rawAddress(bytes memory input)
-        internal
-        pure
-        returns (uint256 memoryAddress)
-    {
-        assembly {
-            memoryAddress := input
-        }
-        return memoryAddress;
-    }
-    
-    /// @dev Gets the memory address for the contents of a byte array.
-    /// @param input Byte array to lookup.
-    /// @return memoryAddress Memory address of the contents of the byte array.
-    function contentAddress(bytes memory input)
-        internal
-        pure
-        returns (uint256 memoryAddress)
-    {
-        assembly {
-            memoryAddress := add(input, 32)
-        }
-        return memoryAddress;
-    }
-
-    /// @dev Copies `length` bytes from memory location `source` to `dest`.
-    /// @param dest memory address to copy bytes to.
-    /// @param source memory address to copy bytes from.
-    /// @param length number of bytes to copy.
-    function memCopy(
-        uint256 dest,
-        uint256 source,
-        uint256 length
-    )
-        internal
-        pure
-    {
-        if (length < 32) {
-            // Handle a partial word by reading destination and masking
-            // off the bits we are interested in.
-            // This correctly handles overlap, zero lengths and source == dest
-            assembly {
-                let mask := sub(exp(256, sub(32, length)), 1)
-                let s := and(mload(source), not(mask))
-                let d := and(mload(dest), mask)
-                mstore(dest, or(s, d))
-            }
-        } else {
-            // Skip the O(length) loop when source == dest.
-            if (source == dest) {
-                return;
-            }
-
-            // For large copies we copy whole words at a time. The final
-            // word is aligned to the end of the range (instead of after the
-            // previous) to handle partial words. So a copy will look like this:
-            //
-            //  ####
-            //      ####
-            //          ####
-            //            ####
-            //
-            // We handle overlap in the source and destination range by
-            // changing the copying direction. This prevents us from
-            // overwriting parts of source that we still need to copy.
-            //
-            // This correctly handles source == dest
-            //
-            if (source > dest) {
-                assembly {
-                    // We subtract 32 from `sEnd` and `dEnd` because it
-                    // is easier to compare with in the loop, and these
-                    // are also the addresses we need for copying the
-                    // last bytes.
-                    length := sub(length, 32)
-                    let sEnd := add(source, length)
-                    let dEnd := add(dest, length)
-
-                    // Remember the last 32 bytes of source
-                    // This needs to be done here and not after the loop
-                    // because we may have overwritten the last bytes in
-                    // source already due to overlap.
-                    let last := mload(sEnd)
-
-                    // Copy whole words front to back
-                    // Note: the first check is always true,
-                    // this could have been a do-while loop.
-                    // solhint-disable-next-line no-empty-blocks
-                    for {} lt(source, sEnd) {} {
-                        mstore(dest, mload(source))
-                        source := add(source, 32)
-                        dest := add(dest, 32)
-                    }
-                    
-                    // Write the last 32 bytes
-                    mstore(dEnd, last)
-                }
-            } else {
-                assembly {
-                    // We subtract 32 from `sEnd` and `dEnd` because those
-                    // are the starting points when copying a word at the end.
-                    length := sub(length, 32)
-                    let sEnd := add(source, length)
-                    let dEnd := add(dest, length)
-
-                    // Remember the first 32 bytes of source
-                    // This needs to be done here and not after the loop
-                    // because we may have overwritten the first bytes in
-                    // source already due to overlap.
-                    let first := mload(source)
-
-                    // Copy whole words back to front
-                    // We use a signed comparisson here to allow dEnd to become
-                    // negative (happens when source and dest < 32). Valid
-                    // addresses in local memory will never be larger than
-                    // 2**255, so they can be safely re-interpreted as signed.
-                    // Note: the first check is always true,
-                    // this could have been a do-while loop.
-                    // solhint-disable-next-line no-empty-blocks
-                    for {} slt(dest, dEnd) {} {
-                        mstore(dEnd, mload(sEnd))
-                        sEnd := sub(sEnd, 32)
-                        dEnd := sub(dEnd, 32)
-                    }
-                    
-                    // Write the first 32 bytes
-                    mstore(dest, first)
-                }
-            }
-        }
-    }
-
-    /// @dev Returns a slices from a byte array.
-    /// @param b The byte array to take a slice from.
-    /// @param from The starting index for the slice (inclusive).
-    /// @param to The final index for the slice (exclusive).
-    /// @return result The slice containing bytes at indices [from, to)
-    function slice(
-        bytes memory b,
-        uint256 from,
-        uint256 to
-    )
-        internal
-        pure
-        returns (bytes memory result)
-    {
-        require(
-            from <= to,
-            "FROM_LESS_THAN_TO_REQUIRED"
-        );
-        require(
-            to < b.length,
-            "TO_LESS_THAN_LENGTH_REQUIRED"
-        );
-        
-        // Create a new bytes structure and copy contents
-        result = new bytes(to - from);
-        memCopy(
-            result.contentAddress(),
-            b.contentAddress() + from,
-            result.length
-        );
-        return result;
-    }
-    
-    /// @dev Returns a slice from a byte array without preserving the input.
-    /// @param b The byte array to take a slice from. Will be destroyed in the process.
-    /// @param from The starting index for the slice (inclusive).
-    /// @param to The final index for the slice (exclusive).
-    /// @return result The slice containing bytes at indices [from, to)
-    /// @dev When `from == 0`, the original array will match the slice. In other cases its state will be corrupted.
-    function sliceDestructive(
-        bytes memory b,
-        uint256 from,
-        uint256 to
-    )
-        internal
-        pure
-        returns (bytes memory result)
-    {
-        require(
-            from <= to,
-            "FROM_LESS_THAN_TO_REQUIRED"
-        );
-        require(
-            to < b.length,
-            "TO_LESS_THAN_LENGTH_REQUIRED"
-        );
-        
-        // Create a new bytes structure around [from, to) in-place.
-        assembly {
-            result := add(b, from)
-            mstore(result, sub(to, from))
-        }
-        return result;
-    }
-
-    /// @dev Pops the last byte off of a byte array by modifying its length.
-    /// @param b Byte array that will be modified.
-    /// @return The byte that was popped off.
-    function popLastByte(bytes memory b)
-        internal
-        pure
-        returns (bytes1 result)
-    {
-        require(
-            b.length > 0,
-            "GREATER_THAN_ZERO_LENGTH_REQUIRED"
-        );
-
-        // Store last byte.
-        result = b[b.length - 1];
-
-        assembly {
-            // Decrement length of byte array.
-            let newLen := sub(mload(b), 1)
-            mstore(b, newLen)
-        }
-        return result;
-    }
-
-    /// @dev Pops the last 20 bytes off of a byte array by modifying its length.
-    /// @param b Byte array that will be modified.
-    /// @return The 20 byte address that was popped off.
-    function popLast20Bytes(bytes memory b)
-        internal
-        pure
-        returns (address result)
-    {
-        require(
-            b.length >= 20,
-            "GREATER_OR_EQUAL_TO_20_LENGTH_REQUIRED"
-        );
-
-        // Store last 20 bytes.
-        result = readAddress(b, b.length - 20);
-
-        assembly {
-            // Subtract 20 from byte array length.
-            let newLen := sub(mload(b), 20)
-            mstore(b, newLen)
-        }
-        return result;
-    }
-
-    /// @dev Tests equality of two byte arrays.
-    /// @param lhs First byte array to compare.
-    /// @param rhs Second byte array to compare.
-    /// @return True if arrays are the same. False otherwise.
-    function equals(
-        bytes memory lhs,
-        bytes memory rhs
-    )
-        internal
-        pure
-        returns (bool equal)
-    {
-        // Keccak gas cost is 30 + numWords * 6. This is a cheap way to compare.
-        // We early exit on unequal lengths, but keccak would also correctly
-        // handle this.
-        return lhs.length == rhs.length && keccak256(lhs) == keccak256(rhs);
-    }
-
-    /// @dev Reads an address from a position in a byte array.
-    /// @param b Byte array containing an address.
-    /// @param index Index in byte array of address.
-    /// @return address from byte array.
-    function readAddress(
-        bytes memory b,
-        uint256 index
-    )
-        internal
-        pure
-        returns (address result)
-    {
-        require(
-            b.length >= index + 20,  // 20 is length of address
-            "GREATER_OR_EQUAL_TO_20_LENGTH_REQUIRED"
-        );
-
-        // Add offset to index:
-        // 1. Arrays are prefixed by 32-byte length parameter (add 32 to index)
-        // 2. Account for size difference between address length and 32-byte storage word (subtract 12 from index)
-        index += 20;
-
-        // Read address from array memory
-        assembly {
-            // 1. Add index to address of bytes array
-            // 2. Load 32-byte word from memory
-            // 3. Apply 20-byte mask to obtain address
-            result := and(mload(add(b, index)), 0xffffffffffffffffffffffffffffffffffffffff)
-        }
-        return result;
-    }
-
-    /// @dev Writes an address into a specific position in a byte array.
-    /// @param b Byte array to insert address into.
-    /// @param index Index in byte array of address.
-    /// @param input Address to put into byte array.
-    function writeAddress(
-        bytes memory b,
-        uint256 index,
-        address input
-    )
-        internal
-        pure
-    {
-        require(
-            b.length >= index + 20,  // 20 is length of address
-            "GREATER_OR_EQUAL_TO_20_LENGTH_REQUIRED"
-        );
-
-        // Add offset to index:
-        // 1. Arrays are prefixed by 32-byte length parameter (add 32 to index)
-        // 2. Account for size difference between address length and 32-byte storage word (subtract 12 from index)
-        index += 20;
-
-        // Store address into array memory
-        assembly {
-            // The address occupies 20 bytes and mstore stores 32 bytes.
-            // First fetch the 32-byte word where we'll be storing the address, then
-            // apply a mask so we have only the bytes in the word that the address will not occupy.
-            // Then combine these bytes with the address and store the 32 bytes back to memory with mstore.
-
-            // 1. Add index to address of bytes array
-            // 2. Load 32-byte word from memory
-            // 3. Apply 12-byte mask to obtain extra bytes occupying word of memory where we'll store the address
-            let neighbors := and(
-                mload(add(b, index)),
-                0xffffffffffffffffffffffff0000000000000000000000000000000000000000
-            )
-            
-            // Make sure input address is clean.
-            // (Solidity does not guarantee this)
-            input := and(input, 0xffffffffffffffffffffffffffffffffffffffff)
-
-            // Store the neighbors and address into memory
-            mstore(add(b, index), xor(input, neighbors))
-        }
-    }
-
-    /// @dev Reads a bytes32 value from a position in a byte array.
-    /// @param b Byte array containing a bytes32 value.
-    /// @param index Index in byte array of bytes32 value.
-    /// @return bytes32 value from byte array.
-    function readBytes32(
-        bytes memory b,
-        uint256 index
-    )
-        internal
-        pure
-        returns (bytes32 result)
-    {
-        require(
-            b.length >= index + 32,
-            "GREATER_OR_EQUAL_TO_32_LENGTH_REQUIRED"
-        );
-
-        // Arrays are prefixed by a 256 bit length parameter
-        index += 32;
-
-        // Read the bytes32 from array memory
-        assembly {
-            result := mload(add(b, index))
-        }
-        return result;
-    }
-
-    /// @dev Writes a bytes32 into a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input bytes32 to put into byte array.
-    function writeBytes32(
-        bytes memory b,
-        uint256 index,
-        bytes32 input
-    )
-        internal
-        pure
-    {
-        require(
-            b.length >= index + 32,
-            "GREATER_OR_EQUAL_TO_32_LENGTH_REQUIRED"
-        );
-
-        // Arrays are prefixed by a 256 bit length parameter
-        index += 32;
-
-        // Read the bytes32 from array memory
-        assembly {
-            mstore(add(b, index), input)
-        }
-    }
-
-    /// @dev Reads a uint256 value from a position in a byte array.
-    /// @param b Byte array containing a uint256 value.
-    /// @param index Index in byte array of uint256 value.
-    /// @return uint256 value from byte array.
-    function readUint256(
-        bytes memory b,
-        uint256 index
-    )
-        internal
-        pure
-        returns (uint256 result)
-    {
-        result = uint256(readBytes32(b, index));
-        return result;
-    }
-
-    /// @dev Writes a uint256 into a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input uint256 to put into byte array.
-    function writeUint256(
-        bytes memory b,
-        uint256 index,
-        uint256 input
-    )
-        internal
-        pure
-    {
-        writeBytes32(b, index, bytes32(input));
-    }
-
-    /// @dev Reads an unpadded bytes4 value from a position in a byte array.
-    /// @param b Byte array containing a bytes4 value.
-    /// @param index Index in byte array of bytes4 value.
-    /// @return bytes4 value from byte array.
-    function readBytes4(
-        bytes memory b,
-        uint256 index
-    )
-        internal
-        pure
-        returns (bytes4 result)
-    {
-        require(
-            b.length >= index + 4,
-            "GREATER_OR_EQUAL_TO_4_LENGTH_REQUIRED"
-        );
-
-        // Arrays are prefixed by a 32 byte length field
-        index += 32;
-
-        // Read the bytes4 from array memory
-        assembly {
-            result := mload(add(b, index))
-            // Solidity does not require us to clean the trailing bytes.
-            // We do it anyway
-            result := and(result, 0xFFFFFFFF00000000000000000000000000000000000000000000000000000000)
-        }
-        return result;
-    }
-
-    /// @dev Reads nested bytes from a specific position.
-    /// @dev NOTE: the returned value overlaps with the input value.
-    ///            Both should be treated as immutable.
-    /// @param b Byte array containing nested bytes.
-    /// @param index Index of nested bytes.
-    /// @return result Nested bytes.
-    function readBytesWithLength(
-        bytes memory b,
-        uint256 index
-    )
-        internal
-        pure
-        returns (bytes memory result)
-    {
-        // Read length of nested bytes
-        uint256 nestedBytesLength = readUint256(b, index);
-        index += 32;
-
-        // Assert length of <b> is valid, given
-        // length of nested bytes
-        require(
-            b.length >= index + nestedBytesLength,
-            "GREATER_OR_EQUAL_TO_NESTED_BYTES_LENGTH_REQUIRED"
-        );
-        
-        // Return a pointer to the byte array as it exists inside `b`
-        assembly {
-            result := add(b, index)
-        }
-        return result;
-    }
-
-    /// @dev Inserts bytes at a specific position in a byte array.
-    /// @param b Byte array to insert <input> into.
-    /// @param index Index in byte array of <input>.
-    /// @param input bytes to insert.
-    function writeBytesWithLength(
-        bytes memory b,
-        uint256 index,
-        bytes memory input
-    )
-        internal
-        pure
-    {
-        // Assert length of <b> is valid, given
-        // length of input
-        require(
-            b.length >= index + 32 + input.length,  // 32 bytes to store length
-            "GREATER_OR_EQUAL_TO_NESTED_BYTES_LENGTH_REQUIRED"
-        );
-
-        // Copy <input> into <b>
-        memCopy(
-            b.contentAddress() + index,
-            input.rawAddress(), // includes length of <input>
-            input.length + 32   // +32 bytes to store <input> length
-        );
-    }
-
-    /// @dev Performs a deep copy of a byte array onto another byte array of greater than or equal length.
-    /// @param dest Byte array that will be overwritten with source bytes.
-    /// @param source Byte array to copy onto dest bytes.
-    function deepCopyBytes(
-        bytes memory dest,
-        bytes memory source
-    )
-        internal
-        pure
-    {
-        uint256 sourceLen = source.length;
-        // Dest length must be >= source length, or some bytes would not be copied.
-        require(
-            dest.length >= sourceLen,
-            "GREATER_OR_EQUAL_TO_SOURCE_BYTES_LENGTH_REQUIRED"
-        );
-        memCopy(
-            dest.contentAddress(),
-            source.contentAddress(),
-            sourceLen
-        );
-    }
-}
diff --git a/packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol b/packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol
deleted file mode 100644
index 5deb13497..000000000
--- a/packages/contracts/src/2.0.0/utils/Ownable/IOwnable.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-pragma solidity 0.4.24;
-
-
-contract IOwnable {
-
-    function transferOwnership(address newOwner)
-        public;
-}
diff --git a/packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol b/packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol
deleted file mode 100644
index 0c830be68..000000000
--- a/packages/contracts/src/2.0.0/utils/Ownable/Ownable.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-pragma solidity 0.4.24;
-
-import "./IOwnable.sol";
-
-
-contract Ownable is
-    IOwnable
-{
-    address public owner;
-
-    constructor ()
-        public
-    {
-        owner = msg.sender;
-    }
-
-    modifier onlyOwner() {
-        require(
-            msg.sender == owner,
-            "ONLY_CONTRACT_OWNER"
-        );
-        _;
-    }
-
-    function transferOwnership(address newOwner)
-        public
-        onlyOwner
-    {
-        if (newOwner != address(0)) {
-            owner = newOwner;
-        }
-    }
-}
diff --git a/packages/contracts/src/2.0.0/utils/ReentrancyGuard/ReentrancyGuard.sol b/packages/contracts/src/2.0.0/utils/ReentrancyGuard/ReentrancyGuard.sol
deleted file mode 100644
index 9f98a7a16..000000000
--- a/packages/contracts/src/2.0.0/utils/ReentrancyGuard/ReentrancyGuard.sol
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-
-  Copyright 2018 ZeroEx Intl.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-*/
-
-pragma solidity 0.4.24;
-
-
-contract ReentrancyGuard {
-
-    // Locked state of mutex
-    bool private locked = false;
-
-    /// @dev Functions with this modifer cannot be reentered. The mutex will be locked
-    ///      before function execution and unlocked after.
-    modifier nonReentrant() {
-        // Ensure mutex is unlocked
-        require(
-            !locked,
-            "REENTRANCY_ILLEGAL"
-        );
-
-        // Lock mutex before function call
-        locked = true;
-
-        // Perform function call
-        _;
-
-        // Unlock mutex after function call
-        locked = false;
-    }
-}
diff --git a/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol b/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
deleted file mode 100644
index 2855edb9d..000000000
--- a/packages/contracts/src/2.0.0/utils/SafeMath/SafeMath.sol
+++ /dev/null
@@ -1,87 +0,0 @@
-pragma solidity 0.4.24;
-
-
-contract SafeMath {
-
-    function safeMul(uint256 a, uint256 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        if (a == 0) {
-            return 0;
-        }
-        uint256 c = a * b;
-        require(
-            c / a == b,
-            "UINT256_OVERFLOW"
-        );
-        return c;
-    }
-
-    function safeDiv(uint256 a, uint256 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        uint256 c = a / b;
-        return c;
-    }
-
-    function safeSub(uint256 a, uint256 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        require(
-            b <= a,
-            "UINT256_UNDERFLOW"
-        );
-        return a - b;
-    }
-
-    function safeAdd(uint256 a, uint256 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        uint256 c = a + b;
-        require(
-            c >= a,
-            "UINT256_OVERFLOW"
-        );
-        return c;
-    }
-
-    function max64(uint64 a, uint64 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        return a >= b ? a : b;
-    }
-
-    function min64(uint64 a, uint64 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        return a < b ? a : b;
-    }
-
-    function max256(uint256 a, uint256 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        return a >= b ? a : b;
-    }
-
-    function min256(uint256 a, uint256 b)
-        internal
-        pure
-        returns (uint256)
-    {
-        return a < b ? a : b;
-    }
-}
diff --git a/packages/contracts/src/artifacts/index.ts b/packages/contracts/src/artifacts/index.ts
new file mode 100644
index 000000000..c30972a91
--- /dev/null
+++ b/packages/contracts/src/artifacts/index.ts
@@ -0,0 +1,79 @@
+import { ContractArtifact } from 'ethereum-types';
+
+import * as AssetProxyOwner from '../../generated-artifacts/AssetProxyOwner.json';
+import * as DummyERC20Token from '../../generated-artifacts/DummyERC20Token.json';
+import * as DummyERC721Receiver from '../../generated-artifacts/DummyERC721Receiver.json';
+import * as DummyERC721Token from '../../generated-artifacts/DummyERC721Token.json';
+import * as DummyMultipleReturnERC20Token from '../../generated-artifacts/DummyMultipleReturnERC20Token.json';
+import * as DummyNoReturnERC20Token from '../../generated-artifacts/DummyNoReturnERC20Token.json';
+import * as ERC20Proxy from '../../generated-artifacts/ERC20Proxy.json';
+import * as ERC20Token from '../../generated-artifacts/ERC20Token.json';
+import * as ERC721Proxy from '../../generated-artifacts/ERC721Proxy.json';
+import * as ERC721Token from '../../generated-artifacts/ERC721Token.json';
+import * as Exchange from '../../generated-artifacts/Exchange.json';
+import * as ExchangeWrapper from '../../generated-artifacts/ExchangeWrapper.json';
+import * as Forwarder from '../../generated-artifacts/Forwarder.json';
+import * as IAssetData from '../../generated-artifacts/IAssetData.json';
+import * as IAssetProxy from '../../generated-artifacts/IAssetProxy.json';
+import * as InvalidERC721Receiver from '../../generated-artifacts/InvalidERC721Receiver.json';
+import * as IValidator from '../../generated-artifacts/IValidator.json';
+import * as IWallet from '../../generated-artifacts/IWallet.json';
+import * as MixinAuthorizable from '../../generated-artifacts/MixinAuthorizable.json';
+import * as MultiSigWallet from '../../generated-artifacts/MultiSigWallet.json';
+import * as MultiSigWalletWithTimeLock from '../../generated-artifacts/MultiSigWalletWithTimeLock.json';
+import * as OrderValidator from '../../generated-artifacts/OrderValidator.json';
+import * as ReentrantERC20Token from '../../generated-artifacts/ReentrantERC20Token.json';
+import * as TestAssetProxyDispatcher from '../../generated-artifacts/TestAssetProxyDispatcher.json';
+import * as TestAssetProxyOwner from '../../generated-artifacts/TestAssetProxyOwner.json';
+import * as TestConstants from '../../generated-artifacts/TestConstants.json';
+import * as TestExchangeInternals from '../../generated-artifacts/TestExchangeInternals.json';
+import * as TestLibBytes from '../../generated-artifacts/TestLibBytes.json';
+import * as TestLibs from '../../generated-artifacts/TestLibs.json';
+import * as TestSignatureValidator from '../../generated-artifacts/TestSignatureValidator.json';
+import * as TestStaticCallReceiver from '../../generated-artifacts/TestStaticCallReceiver.json';
+import * as Validator from '../../generated-artifacts/Validator.json';
+import * as Wallet from '../../generated-artifacts/Wallet.json';
+import * as WETH9 from '../../generated-artifacts/WETH9.json';
+import * as Whitelist from '../../generated-artifacts/Whitelist.json';
+import * as ZRXToken from '../../generated-artifacts/ZRXToken.json';
+
+export const artifacts = {
+    AssetProxyOwner: AssetProxyOwner as ContractArtifact,
+    DummyERC20Token: DummyERC20Token as ContractArtifact,
+    DummyERC721Receiver: DummyERC721Receiver as ContractArtifact,
+    DummyERC721Token: DummyERC721Token as ContractArtifact,
+    DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,
+    DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact,
+    ERC20Proxy: ERC20Proxy as ContractArtifact,
+    ERC20Token: ERC20Token as ContractArtifact,
+    ERC721Proxy: ERC721Proxy as ContractArtifact,
+    ERC721Token: ERC721Token as ContractArtifact,
+    Exchange: Exchange as ContractArtifact,
+    ExchangeWrapper: ExchangeWrapper as ContractArtifact,
+    Forwarder: Forwarder as ContractArtifact,
+    IAssetData: IAssetData as ContractArtifact,
+    IAssetProxy: IAssetProxy as ContractArtifact,
+    IValidator: IValidator as ContractArtifact,
+    IWallet: IWallet as ContractArtifact,
+    InvalidERC721Receiver: InvalidERC721Receiver as ContractArtifact,
+    MixinAuthorizable: MixinAuthorizable as ContractArtifact,
+    MultiSigWallet: MultiSigWallet as ContractArtifact,
+    MultiSigWalletWithTimeLock: MultiSigWalletWithTimeLock as ContractArtifact,
+    OrderValidator: OrderValidator as ContractArtifact,
+    ReentrantERC20Token: ReentrantERC20Token as ContractArtifact,
+    TestAssetProxyDispatcher: TestAssetProxyDispatcher as ContractArtifact,
+    TestAssetProxyOwner: TestAssetProxyOwner as ContractArtifact,
+    TestConstants: TestConstants as ContractArtifact,
+    TestExchangeInternals: TestExchangeInternals as ContractArtifact,
+    TestLibBytes: TestLibBytes as ContractArtifact,
+    TestLibs: TestLibs as ContractArtifact,
+    TestSignatureValidator: TestSignatureValidator as ContractArtifact,
+    TestStaticCallReceiver: TestStaticCallReceiver as ContractArtifact,
+    Validator: Validator as ContractArtifact,
+    WETH9: WETH9 as ContractArtifact,
+    Wallet: Wallet as ContractArtifact,
+    Whitelist: Whitelist as ContractArtifact,
+    // Note(albrow): "as any" hack still required here because ZRXToken does not
+    // conform to the v2 artifact type.
+    ZRXToken: (ZRXToken as any) as ContractArtifact,
+};
diff --git a/packages/contracts/src/wrappers/index.ts b/packages/contracts/src/wrappers/index.ts
new file mode 100644
index 000000000..9ca676b56
--- /dev/null
+++ b/packages/contracts/src/wrappers/index.ts
@@ -0,0 +1,34 @@
+export * from '../../generated-wrappers/asset_proxy_owner';
+export * from '../../generated-wrappers/dummy_erc20_token';
+export * from '../../generated-wrappers/dummy_erc721_receiver';
+export * from '../../generated-wrappers/dummy_erc721_token';
+export * from '../../generated-wrappers/dummy_multiple_return_erc20_token';
+export * from '../../generated-wrappers/dummy_no_return_erc20_token';
+export * from '../../generated-wrappers/erc20_proxy';
+export * from '../../generated-wrappers/erc721_proxy';
+export * from '../../generated-wrappers/erc20_token';
+export * from '../../generated-wrappers/erc721_token';
+export * from '../../generated-wrappers/exchange';
+export * from '../../generated-wrappers/exchange_wrapper';
+export * from '../../generated-wrappers/forwarder';
+export * from '../../generated-wrappers/i_asset_data';
+export * from '../../generated-wrappers/i_asset_proxy';
+export * from '../../generated-wrappers/invalid_erc721_receiver';
+export * from '../../generated-wrappers/mixin_authorizable';
+export * from '../../generated-wrappers/multi_sig_wallet';
+export * from '../../generated-wrappers/multi_sig_wallet_with_time_lock';
+export * from '../../generated-wrappers/order_validator';
+export * from '../../generated-wrappers/reentrant_erc20_token';
+export * from '../../generated-wrappers/test_asset_proxy_dispatcher';
+export * from '../../generated-wrappers/test_asset_proxy_owner';
+export * from '../../generated-wrappers/test_constants';
+export * from '../../generated-wrappers/test_exchange_internals';
+export * from '../../generated-wrappers/test_lib_bytes';
+export * from '../../generated-wrappers/test_libs';
+export * from '../../generated-wrappers/test_signature_validator';
+export * from '../../generated-wrappers/test_static_call_receiver';
+export * from '../../generated-wrappers/validator';
+export * from '../../generated-wrappers/wallet';
+export * from '../../generated-wrappers/weth9';
+export * from '../../generated-wrappers/whitelist';
+export * from '../../generated-wrappers/zrx_token';