From 2c58b8a88650fcc4f3622546c02a14bbf211cd07 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 10 Dec 2018 14:37:48 -0800
Subject: [PATCH] Rename core package to protocol

---
 .circleci/config.yml                                      | 4 ++--
 .gitignore                                                | 4 ++--
 .prettierignore                                           | 6 ++++--
 contracts/examples/package.json                           | 2 +-
 contracts/extensions/package.json                         | 4 ++--
 contracts/extensions/test/extensions/dutch_auction.ts     | 6 +++---
 contracts/extensions/test/extensions/forwarder.ts         | 8 ++++----
 contracts/extensions/test/extensions/order_validator.ts   | 6 +++---
 contracts/extensions/test/utils/forwarder_wrapper.ts      | 8 ++++++--
 contracts/multisig/package.json                           | 2 +-
 contracts/{core => protocol}/.solhint.json                | 0
 contracts/{core => protocol}/CHANGELOG.json               | 0
 contracts/{core => protocol}/README.md                    | 4 ++--
 contracts/{core => protocol}/compiler.json                | 0
 .../contracts/protocol/AssetProxy/ERC20Proxy.sol          | 0
 .../contracts/protocol/AssetProxy/ERC721Proxy.sol         | 0
 .../contracts/protocol/AssetProxy/MixinAuthorizable.sol   | 0
 .../contracts/protocol/AssetProxy/MultiAssetProxy.sol     | 0
 .../protocol/AssetProxy/mixins/MAuthorizable.sol          | 0
 .../protocol/AssetProxyOwner/AssetProxyOwner.sol          | 0
 .../contracts/protocol/Exchange/Exchange.sol              | 0
 .../protocol/Exchange/MixinAssetProxyDispatcher.sol       | 0
 .../contracts/protocol/Exchange/MixinExchangeCore.sol     | 0
 .../contracts/protocol/Exchange/MixinMatchOrders.sol      | 0
 .../protocol/Exchange/MixinSignatureValidator.sol         | 0
 .../contracts/protocol/Exchange/MixinTransactions.sol     | 0
 .../contracts/protocol/Exchange/MixinWrapperFunctions.sol | 0
 .../protocol/Exchange/mixins/MAssetProxyDispatcher.sol    | 0
 .../contracts/protocol/Exchange/mixins/MExchangeCore.sol  | 0
 .../contracts/protocol/Exchange/mixins/MMatchOrders.sol   | 0
 .../protocol/Exchange/mixins/MSignatureValidator.sol      | 0
 .../contracts/protocol/Exchange/mixins/MTransactions.sol  | 0
 .../protocol/Exchange/mixins/MWrapperFunctions.sol        | 0
 .../TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol | 0
 .../test/TestAssetProxyOwner/TestAssetProxyOwner.sol      | 0
 .../test/TestExchangeInternals/TestExchangeInternals.sol  | 0
 .../TestSignatureValidator/TestSignatureValidator.sol     | 0
 .../TestStaticCallReceiver/TestStaticCallReceiver.sol     | 0
 contracts/{core => protocol}/package.json                 | 4 ++--
 contracts/{core => protocol}/src/artifacts/index.ts       | 0
 contracts/{core => protocol}/src/index.ts                 | 0
 contracts/{core => protocol}/src/wrappers/index.ts        | 0
 .../{core => protocol}/test/asset_proxy/authorizable.ts   | 0
 contracts/{core => protocol}/test/asset_proxy/proxies.ts  | 0
 contracts/{core => protocol}/test/exchange/core.ts        | 0
 contracts/{core => protocol}/test/exchange/dispatcher.ts  | 0
 contracts/{core => protocol}/test/exchange/fill_order.ts  | 0
 contracts/{core => protocol}/test/exchange/internal.ts    | 0
 .../{core => protocol}/test/exchange/match_orders.ts      | 0
 .../test/exchange/signature_validator.ts                  | 0
 .../{core => protocol}/test/exchange/transactions.ts      | 0
 contracts/{core => protocol}/test/exchange/wrapper.ts     | 0
 contracts/{core => protocol}/test/global_hooks.ts         | 0
 .../{core => protocol}/test/multisig/asset_proxy_owner.ts | 0
 .../test/utils/asset_proxy_owner_wrapper.ts               | 0
 contracts/{core => protocol}/test/utils/asset_wrapper.ts  | 0
 contracts/{core => protocol}/test/utils/erc20_wrapper.ts  | 0
 contracts/{core => protocol}/test/utils/erc721_wrapper.ts | 0
 .../{core => protocol}/test/utils/exchange_wrapper.ts     | 0
 .../test/utils/fill_order_combinatorial_utils.ts          | 0
 contracts/{core => protocol}/test/utils/index.ts          | 0
 .../{core => protocol}/test/utils/match_order_tester.ts   | 0
 .../test/utils/order_factory_from_scenario.ts             | 0
 .../simple_asset_balance_and_proxy_allowance_fetcher.ts   | 0
 .../test/utils/simple_order_filled_cancelled_fetcher.ts   | 0
 contracts/{core => protocol}/tsconfig.json                | 0
 contracts/{core => protocol}/tslint.json                  | 0
 67 files changed, 32 insertions(+), 26 deletions(-)
 rename contracts/{core => protocol}/.solhint.json (100%)
 rename contracts/{core => protocol}/CHANGELOG.json (100%)
 rename contracts/{core => protocol}/README.md (96%)
 rename contracts/{core => protocol}/compiler.json (100%)
 rename contracts/{core => protocol}/contracts/protocol/AssetProxy/ERC20Proxy.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/AssetProxy/ERC721Proxy.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/AssetProxy/MixinAuthorizable.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/AssetProxy/MultiAssetProxy.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/Exchange.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/MixinExchangeCore.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/MixinMatchOrders.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/MixinSignatureValidator.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/MixinTransactions.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/MixinWrapperFunctions.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/mixins/MExchangeCore.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/mixins/MMatchOrders.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/mixins/MSignatureValidator.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/mixins/MTransactions.sol (100%)
 rename contracts/{core => protocol}/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol (100%)
 rename contracts/{core => protocol}/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol (100%)
 rename contracts/{core => protocol}/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol (100%)
 rename contracts/{core => protocol}/contracts/test/TestExchangeInternals/TestExchangeInternals.sol (100%)
 rename contracts/{core => protocol}/contracts/test/TestSignatureValidator/TestSignatureValidator.sol (100%)
 rename contracts/{core => protocol}/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol (100%)
 rename contracts/{core => protocol}/package.json (98%)
 rename contracts/{core => protocol}/src/artifacts/index.ts (100%)
 rename contracts/{core => protocol}/src/index.ts (100%)
 rename contracts/{core => protocol}/src/wrappers/index.ts (100%)
 rename contracts/{core => protocol}/test/asset_proxy/authorizable.ts (100%)
 rename contracts/{core => protocol}/test/asset_proxy/proxies.ts (100%)
 rename contracts/{core => protocol}/test/exchange/core.ts (100%)
 rename contracts/{core => protocol}/test/exchange/dispatcher.ts (100%)
 rename contracts/{core => protocol}/test/exchange/fill_order.ts (100%)
 rename contracts/{core => protocol}/test/exchange/internal.ts (100%)
 rename contracts/{core => protocol}/test/exchange/match_orders.ts (100%)
 rename contracts/{core => protocol}/test/exchange/signature_validator.ts (100%)
 rename contracts/{core => protocol}/test/exchange/transactions.ts (100%)
 rename contracts/{core => protocol}/test/exchange/wrapper.ts (100%)
 rename contracts/{core => protocol}/test/global_hooks.ts (100%)
 rename contracts/{core => protocol}/test/multisig/asset_proxy_owner.ts (100%)
 rename contracts/{core => protocol}/test/utils/asset_proxy_owner_wrapper.ts (100%)
 rename contracts/{core => protocol}/test/utils/asset_wrapper.ts (100%)
 rename contracts/{core => protocol}/test/utils/erc20_wrapper.ts (100%)
 rename contracts/{core => protocol}/test/utils/erc721_wrapper.ts (100%)
 rename contracts/{core => protocol}/test/utils/exchange_wrapper.ts (100%)
 rename contracts/{core => protocol}/test/utils/fill_order_combinatorial_utils.ts (100%)
 rename contracts/{core => protocol}/test/utils/index.ts (100%)
 rename contracts/{core => protocol}/test/utils/match_order_tester.ts (100%)
 rename contracts/{core => protocol}/test/utils/order_factory_from_scenario.ts (100%)
 rename contracts/{core => protocol}/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts (100%)
 rename contracts/{core => protocol}/test/utils/simple_order_filled_cancelled_fetcher.ts (100%)
 rename contracts/{core => protocol}/tsconfig.json (100%)
 rename contracts/{core => protocol}/tslint.json (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2698a1ec35..6e018c62d7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,7 +45,7 @@ jobs:
             - run: yarn wsrun test:circleci @0x/contracts-libs
             - run: yarn wsrun test:circleci @0x/contracts-tokens
             - run: yarn wsrun test:circleci @0x/contracts-extensions
-            - run: yarn wsrun test:circleci @0x/contracts-core
+            - run: yarn wsrun test:circleci @0x/contracts-protocol
     test-contracts-geth:
         docker:
             - image: circleci/node:9
@@ -62,7 +62,7 @@ jobs:
             - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-libs
             - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-tokens
             - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-extensions
-            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-core
+            - run: TEST_PROVIDER=geth yarn wsrun test @0x/contracts-protocol
     test-publish:
         resource_class: medium+
         docker:
diff --git a/.gitignore b/.gitignore
index 2a0baa57c8..27793d0e47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,7 @@ packages/react-docs/example/public/bundle*
 packages/testnet-faucets/server/
 
 # generated contract artifacts/
-contracts/core/generated-artifacts/
+contracts/protocol/generated-artifacts/
 contracts/multisig/generated-artifacts/
 contracts/utils/generated-artifacts/
 contracts/libs/generated-artifacts/
@@ -99,7 +99,7 @@ packages/metacoin/artifacts/
 
 # generated contract wrappers
 packages/abi-gen-wrappers/wrappers
-contracts/core/generated-wrappers/
+contracts/protocol/generated-wrappers/
 contracts/multisig/generated-wrappers/
 contracts/utils/generated-wrappers/
 contracts/libs/generated-wrappers/
diff --git a/.prettierignore b/.prettierignore
index d502458273..7f8662b0a2 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,7 +1,7 @@
 lib
 .nyc_output
-/contracts/core/generated-wrappers
-/contracts/core/generated-artifacts
+/contracts/protocol/generated-wrappers
+/contracts/protocol/generated-artifacts
 /contracts/multisig/generated-wrappers
 /contracts/multisig/generated-artifacts
 /contracts/utils/generated-wrappers
@@ -14,6 +14,8 @@ lib
 /contracts/tokens/generated-artifacts
 /contracts/examples/generated-wrappers
 /contracts/examples/generated-artifacts
+/contracts/extensions/generated-wrappers
+/contracts/extensions/generated-artifacts
 /packages/abi-gen-wrappers/src/generated-wrappers
 /packages/contract-artifacts/artifacts
 /python-packages/order_utils/src/zero_ex/contract_artifacts/artifacts
diff --git a/contracts/examples/package.json b/contracts/examples/package.json
index 7682e0d45f..5413f9e613 100644
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -31,7 +31,7 @@
     "bugs": {
         "url": "https://github.com/0xProject/0x-monorepo/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md",
+    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/examples/README.md",
     "devDependencies": {
         "@0x/contracts-test-utils": "^1.0.0",
         "@0x/abi-gen": "^1.0.17",
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 95db0c5ac6..45838c8258 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -43,7 +43,7 @@
     "bugs": {
         "url": "https://github.com/0xProject/0x-monorepo/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md",
+    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
         "@0x/contracts-test-utils": "^1.0.0",
         "@0x/abi-gen": "^1.0.17",
@@ -75,7 +75,7 @@
         "@0x/base-contract": "^3.0.8",
         "@0x/order-utils": "^3.0.4",
         "@0x/contracts-utils": "^1.0.0",
-        "@0x/contracts-core": "^2.1.56",
+        "@0x/contracts-protocol": "^2.1.56",
         "@0x/contracts-tokens": "^1.0.0",
         "@0x/contracts-libs": "^1.0.0",
         "@0x/contracts-interfaces": "^1.0.0",
diff --git a/contracts/extensions/test/extensions/dutch_auction.ts b/contracts/extensions/test/extensions/dutch_auction.ts
index 2db3be752a..6c3b2f0f32 100644
--- a/contracts/extensions/test/extensions/dutch_auction.ts
+++ b/contracts/extensions/test/extensions/dutch_auction.ts
@@ -1,10 +1,10 @@
 import {
-    artifacts as coreArtifacts,
+    artifacts as protocolArtifacts,
     ERC20Wrapper,
     ERC721Wrapper,
     ExchangeContract,
     ExchangeWrapper,
-} from '@0x/contracts-core';
+} from '@0x/contracts-protocol';
 import {
     chaiSetup,
     constants,
@@ -109,7 +109,7 @@ describe(ContractName.DutchAuction, () => {
 
         const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            coreArtifacts.Exchange,
+            protocolArtifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,
diff --git a/contracts/extensions/test/extensions/forwarder.ts b/contracts/extensions/test/extensions/forwarder.ts
index 245d8eab94..4027f493de 100644
--- a/contracts/extensions/test/extensions/forwarder.ts
+++ b/contracts/extensions/test/extensions/forwarder.ts
@@ -1,10 +1,10 @@
 import {
-    artifacts as coreArtifacts,
+    artifacts as protocolArtifacts,
     ERC20Wrapper,
     ERC721Wrapper,
     ExchangeContract,
     ExchangeWrapper,
-} from '@0x/contracts-core';
+} from '@0x/contracts-protocol';
 import {
     chaiSetup,
     constants,
@@ -108,7 +108,7 @@ describe(ContractName.Forwarder, () => {
         wethAssetData = assetDataUtils.encodeERC20AssetData(wethContract.address);
         zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-            coreArtifacts.Exchange,
+            protocolArtifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,
@@ -179,7 +179,7 @@ describe(ContractName.Forwarder, () => {
     describe('constructor', () => {
         it('should revert if assetProxy is unregistered', async () => {
             const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
-                coreArtifacts.Exchange,
+                protocolArtifacts.Exchange,
                 provider,
                 txDefaults,
                 zrxAssetData,
diff --git a/contracts/extensions/test/extensions/order_validator.ts b/contracts/extensions/test/extensions/order_validator.ts
index 9a1dc06362..f0f3b43c72 100644
--- a/contracts/extensions/test/extensions/order_validator.ts
+++ b/contracts/extensions/test/extensions/order_validator.ts
@@ -1,12 +1,12 @@
 import {
-    artifacts as coreArtifacts,
+    artifacts as protocolArtifacts,
     ERC20ProxyContract,
     ERC20Wrapper,
     ERC721ProxyContract,
     ERC721Wrapper,
     ExchangeContract,
     ExchangeWrapper,
-} from '@0x/contracts-core';
+} from '@0x/contracts-protocol';
 import {
     chaiSetup,
     constants,
@@ -81,7 +81,7 @@ describe('OrderValidator', () => {
 
         const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
         exchange = await ExchangeContract.deployFrom0xArtifactAsync(
-            coreArtifacts.Exchange,
+            protocolArtifacts.Exchange,
             provider,
             txDefaults,
             zrxAssetData,
diff --git a/contracts/extensions/test/utils/forwarder_wrapper.ts b/contracts/extensions/test/utils/forwarder_wrapper.ts
index 767a81ca6c..9e44ff6b90 100644
--- a/contracts/extensions/test/utils/forwarder_wrapper.ts
+++ b/contracts/extensions/test/utils/forwarder_wrapper.ts
@@ -1,4 +1,4 @@
-import { artifacts as coreArtifacts } from '@0x/contracts-core';
+import { artifacts as protocolArtifacts } from '@0x/contracts-protocol';
 import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils';
 import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
 import { SignedOrder } from '@0x/types';
@@ -60,7 +60,11 @@ export class ForwarderWrapper {
     constructor(contractInstance: ForwarderContract, provider: Provider) {
         this._forwarderContract = contractInstance;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...tokensArtifacts, ...coreArtifacts });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, {
+            ...artifacts,
+            ...tokensArtifacts,
+            ...protocolArtifacts,
+        });
     }
     public async marketSellOrdersWithEthAsync(
         orders: SignedOrder[],
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index 37d064fef4..5b8b8dc145 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -42,7 +42,7 @@
     "bugs": {
         "url": "https://github.com/0xProject/0x-monorepo/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md",
+    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/multisig/README.md",
     "devDependencies": {
         "@0x/contracts-test-utils": "^1.0.0",
         "@0x/abi-gen": "^1.0.17",
diff --git a/contracts/core/.solhint.json b/contracts/protocol/.solhint.json
similarity index 100%
rename from contracts/core/.solhint.json
rename to contracts/protocol/.solhint.json
diff --git a/contracts/core/CHANGELOG.json b/contracts/protocol/CHANGELOG.json
similarity index 100%
rename from contracts/core/CHANGELOG.json
rename to contracts/protocol/CHANGELOG.json
diff --git a/contracts/core/README.md b/contracts/protocol/README.md
similarity index 96%
rename from contracts/core/README.md
rename to contracts/protocol/README.md
index d055705c2b..5fc9c0a891 100644
--- a/contracts/core/README.md
+++ b/contracts/protocol/README.md
@@ -42,13 +42,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0x/contracts-core yarn build
+PKG=@0x/contracts-protocol yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0x/contracts-core yarn watch
+PKG=@0x/contracts-protocol yarn watch
 ```
 
 ### Clean
diff --git a/contracts/core/compiler.json b/contracts/protocol/compiler.json
similarity index 100%
rename from contracts/core/compiler.json
rename to contracts/protocol/compiler.json
diff --git a/contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol b/contracts/protocol/contracts/protocol/AssetProxy/ERC20Proxy.sol
similarity index 100%
rename from contracts/core/contracts/protocol/AssetProxy/ERC20Proxy.sol
rename to contracts/protocol/contracts/protocol/AssetProxy/ERC20Proxy.sol
diff --git a/contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol b/contracts/protocol/contracts/protocol/AssetProxy/ERC721Proxy.sol
similarity index 100%
rename from contracts/core/contracts/protocol/AssetProxy/ERC721Proxy.sol
rename to contracts/protocol/contracts/protocol/AssetProxy/ERC721Proxy.sol
diff --git a/contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol b/contracts/protocol/contracts/protocol/AssetProxy/MixinAuthorizable.sol
similarity index 100%
rename from contracts/core/contracts/protocol/AssetProxy/MixinAuthorizable.sol
rename to contracts/protocol/contracts/protocol/AssetProxy/MixinAuthorizable.sol
diff --git a/contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol b/contracts/protocol/contracts/protocol/AssetProxy/MultiAssetProxy.sol
similarity index 100%
rename from contracts/core/contracts/protocol/AssetProxy/MultiAssetProxy.sol
rename to contracts/protocol/contracts/protocol/AssetProxy/MultiAssetProxy.sol
diff --git a/contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol b/contracts/protocol/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
similarity index 100%
rename from contracts/core/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
rename to contracts/protocol/contracts/protocol/AssetProxy/mixins/MAuthorizable.sol
diff --git a/contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol b/contracts/protocol/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol
similarity index 100%
rename from contracts/core/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol
rename to contracts/protocol/contracts/protocol/AssetProxyOwner/AssetProxyOwner.sol
diff --git a/contracts/core/contracts/protocol/Exchange/Exchange.sol b/contracts/protocol/contracts/protocol/Exchange/Exchange.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/Exchange.sol
rename to contracts/protocol/contracts/protocol/Exchange/Exchange.sol
diff --git a/contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol b/contracts/protocol/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
rename to contracts/protocol/contracts/protocol/Exchange/MixinAssetProxyDispatcher.sol
diff --git a/contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol b/contracts/protocol/contracts/protocol/Exchange/MixinExchangeCore.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/MixinExchangeCore.sol
rename to contracts/protocol/contracts/protocol/Exchange/MixinExchangeCore.sol
diff --git a/contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol b/contracts/protocol/contracts/protocol/Exchange/MixinMatchOrders.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/MixinMatchOrders.sol
rename to contracts/protocol/contracts/protocol/Exchange/MixinMatchOrders.sol
diff --git a/contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol b/contracts/protocol/contracts/protocol/Exchange/MixinSignatureValidator.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/MixinSignatureValidator.sol
rename to contracts/protocol/contracts/protocol/Exchange/MixinSignatureValidator.sol
diff --git a/contracts/core/contracts/protocol/Exchange/MixinTransactions.sol b/contracts/protocol/contracts/protocol/Exchange/MixinTransactions.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/MixinTransactions.sol
rename to contracts/protocol/contracts/protocol/Exchange/MixinTransactions.sol
diff --git a/contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol b/contracts/protocol/contracts/protocol/Exchange/MixinWrapperFunctions.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/MixinWrapperFunctions.sol
rename to contracts/protocol/contracts/protocol/Exchange/MixinWrapperFunctions.sol
diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
rename to contracts/protocol/contracts/protocol/Exchange/mixins/MAssetProxyDispatcher.sol
diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MExchangeCore.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/mixins/MExchangeCore.sol
rename to contracts/protocol/contracts/protocol/Exchange/mixins/MExchangeCore.sol
diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MMatchOrders.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/mixins/MMatchOrders.sol
rename to contracts/protocol/contracts/protocol/Exchange/mixins/MMatchOrders.sol
diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MSignatureValidator.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/mixins/MSignatureValidator.sol
rename to contracts/protocol/contracts/protocol/Exchange/mixins/MSignatureValidator.sol
diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MTransactions.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/mixins/MTransactions.sol
rename to contracts/protocol/contracts/protocol/Exchange/mixins/MTransactions.sol
diff --git a/contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol b/contracts/protocol/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol
similarity index 100%
rename from contracts/core/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol
rename to contracts/protocol/contracts/protocol/Exchange/mixins/MWrapperFunctions.sol
diff --git a/contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol b/contracts/protocol/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
similarity index 100%
rename from contracts/core/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
rename to contracts/protocol/contracts/test/TestAssetProxyDispatcher/TestAssetProxyDispatcher.sol
diff --git a/contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol b/contracts/protocol/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
similarity index 100%
rename from contracts/core/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
rename to contracts/protocol/contracts/test/TestAssetProxyOwner/TestAssetProxyOwner.sol
diff --git a/contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol b/contracts/protocol/contracts/test/TestExchangeInternals/TestExchangeInternals.sol
similarity index 100%
rename from contracts/core/contracts/test/TestExchangeInternals/TestExchangeInternals.sol
rename to contracts/protocol/contracts/test/TestExchangeInternals/TestExchangeInternals.sol
diff --git a/contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol b/contracts/protocol/contracts/test/TestSignatureValidator/TestSignatureValidator.sol
similarity index 100%
rename from contracts/core/contracts/test/TestSignatureValidator/TestSignatureValidator.sol
rename to contracts/protocol/contracts/test/TestSignatureValidator/TestSignatureValidator.sol
diff --git a/contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol b/contracts/protocol/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
similarity index 100%
rename from contracts/core/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
rename to contracts/protocol/contracts/test/TestStaticCallReceiver/TestStaticCallReceiver.sol
diff --git a/contracts/core/package.json b/contracts/protocol/package.json
similarity index 98%
rename from contracts/core/package.json
rename to contracts/protocol/package.json
index b7077f4b43..936d1bf5bf 100644
--- a/contracts/core/package.json
+++ b/contracts/protocol/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
-    "name": "@0x/contracts-core",
+    "name": "@0x/contracts-protocol",
     "version": "2.1.56",
     "engines": {
         "node": ">=6.12"
@@ -43,7 +43,7 @@
     "bugs": {
         "url": "https://github.com/0xProject/0x-monorepo/issues"
     },
-    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/core/README.md",
+    "homepage": "https://github.com/0xProject/0x-monorepo/contracts/protocol/README.md",
     "devDependencies": {
         "@0x/contracts-test-utils": "^1.0.0",
         "@0x/abi-gen": "^1.0.17",
diff --git a/contracts/core/src/artifacts/index.ts b/contracts/protocol/src/artifacts/index.ts
similarity index 100%
rename from contracts/core/src/artifacts/index.ts
rename to contracts/protocol/src/artifacts/index.ts
diff --git a/contracts/core/src/index.ts b/contracts/protocol/src/index.ts
similarity index 100%
rename from contracts/core/src/index.ts
rename to contracts/protocol/src/index.ts
diff --git a/contracts/core/src/wrappers/index.ts b/contracts/protocol/src/wrappers/index.ts
similarity index 100%
rename from contracts/core/src/wrappers/index.ts
rename to contracts/protocol/src/wrappers/index.ts
diff --git a/contracts/core/test/asset_proxy/authorizable.ts b/contracts/protocol/test/asset_proxy/authorizable.ts
similarity index 100%
rename from contracts/core/test/asset_proxy/authorizable.ts
rename to contracts/protocol/test/asset_proxy/authorizable.ts
diff --git a/contracts/core/test/asset_proxy/proxies.ts b/contracts/protocol/test/asset_proxy/proxies.ts
similarity index 100%
rename from contracts/core/test/asset_proxy/proxies.ts
rename to contracts/protocol/test/asset_proxy/proxies.ts
diff --git a/contracts/core/test/exchange/core.ts b/contracts/protocol/test/exchange/core.ts
similarity index 100%
rename from contracts/core/test/exchange/core.ts
rename to contracts/protocol/test/exchange/core.ts
diff --git a/contracts/core/test/exchange/dispatcher.ts b/contracts/protocol/test/exchange/dispatcher.ts
similarity index 100%
rename from contracts/core/test/exchange/dispatcher.ts
rename to contracts/protocol/test/exchange/dispatcher.ts
diff --git a/contracts/core/test/exchange/fill_order.ts b/contracts/protocol/test/exchange/fill_order.ts
similarity index 100%
rename from contracts/core/test/exchange/fill_order.ts
rename to contracts/protocol/test/exchange/fill_order.ts
diff --git a/contracts/core/test/exchange/internal.ts b/contracts/protocol/test/exchange/internal.ts
similarity index 100%
rename from contracts/core/test/exchange/internal.ts
rename to contracts/protocol/test/exchange/internal.ts
diff --git a/contracts/core/test/exchange/match_orders.ts b/contracts/protocol/test/exchange/match_orders.ts
similarity index 100%
rename from contracts/core/test/exchange/match_orders.ts
rename to contracts/protocol/test/exchange/match_orders.ts
diff --git a/contracts/core/test/exchange/signature_validator.ts b/contracts/protocol/test/exchange/signature_validator.ts
similarity index 100%
rename from contracts/core/test/exchange/signature_validator.ts
rename to contracts/protocol/test/exchange/signature_validator.ts
diff --git a/contracts/core/test/exchange/transactions.ts b/contracts/protocol/test/exchange/transactions.ts
similarity index 100%
rename from contracts/core/test/exchange/transactions.ts
rename to contracts/protocol/test/exchange/transactions.ts
diff --git a/contracts/core/test/exchange/wrapper.ts b/contracts/protocol/test/exchange/wrapper.ts
similarity index 100%
rename from contracts/core/test/exchange/wrapper.ts
rename to contracts/protocol/test/exchange/wrapper.ts
diff --git a/contracts/core/test/global_hooks.ts b/contracts/protocol/test/global_hooks.ts
similarity index 100%
rename from contracts/core/test/global_hooks.ts
rename to contracts/protocol/test/global_hooks.ts
diff --git a/contracts/core/test/multisig/asset_proxy_owner.ts b/contracts/protocol/test/multisig/asset_proxy_owner.ts
similarity index 100%
rename from contracts/core/test/multisig/asset_proxy_owner.ts
rename to contracts/protocol/test/multisig/asset_proxy_owner.ts
diff --git a/contracts/core/test/utils/asset_proxy_owner_wrapper.ts b/contracts/protocol/test/utils/asset_proxy_owner_wrapper.ts
similarity index 100%
rename from contracts/core/test/utils/asset_proxy_owner_wrapper.ts
rename to contracts/protocol/test/utils/asset_proxy_owner_wrapper.ts
diff --git a/contracts/core/test/utils/asset_wrapper.ts b/contracts/protocol/test/utils/asset_wrapper.ts
similarity index 100%
rename from contracts/core/test/utils/asset_wrapper.ts
rename to contracts/protocol/test/utils/asset_wrapper.ts
diff --git a/contracts/core/test/utils/erc20_wrapper.ts b/contracts/protocol/test/utils/erc20_wrapper.ts
similarity index 100%
rename from contracts/core/test/utils/erc20_wrapper.ts
rename to contracts/protocol/test/utils/erc20_wrapper.ts
diff --git a/contracts/core/test/utils/erc721_wrapper.ts b/contracts/protocol/test/utils/erc721_wrapper.ts
similarity index 100%
rename from contracts/core/test/utils/erc721_wrapper.ts
rename to contracts/protocol/test/utils/erc721_wrapper.ts
diff --git a/contracts/core/test/utils/exchange_wrapper.ts b/contracts/protocol/test/utils/exchange_wrapper.ts
similarity index 100%
rename from contracts/core/test/utils/exchange_wrapper.ts
rename to contracts/protocol/test/utils/exchange_wrapper.ts
diff --git a/contracts/core/test/utils/fill_order_combinatorial_utils.ts b/contracts/protocol/test/utils/fill_order_combinatorial_utils.ts
similarity index 100%
rename from contracts/core/test/utils/fill_order_combinatorial_utils.ts
rename to contracts/protocol/test/utils/fill_order_combinatorial_utils.ts
diff --git a/contracts/core/test/utils/index.ts b/contracts/protocol/test/utils/index.ts
similarity index 100%
rename from contracts/core/test/utils/index.ts
rename to contracts/protocol/test/utils/index.ts
diff --git a/contracts/core/test/utils/match_order_tester.ts b/contracts/protocol/test/utils/match_order_tester.ts
similarity index 100%
rename from contracts/core/test/utils/match_order_tester.ts
rename to contracts/protocol/test/utils/match_order_tester.ts
diff --git a/contracts/core/test/utils/order_factory_from_scenario.ts b/contracts/protocol/test/utils/order_factory_from_scenario.ts
similarity index 100%
rename from contracts/core/test/utils/order_factory_from_scenario.ts
rename to contracts/protocol/test/utils/order_factory_from_scenario.ts
diff --git a/contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts b/contracts/protocol/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts
similarity index 100%
rename from contracts/core/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts
rename to contracts/protocol/test/utils/simple_asset_balance_and_proxy_allowance_fetcher.ts
diff --git a/contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts b/contracts/protocol/test/utils/simple_order_filled_cancelled_fetcher.ts
similarity index 100%
rename from contracts/core/test/utils/simple_order_filled_cancelled_fetcher.ts
rename to contracts/protocol/test/utils/simple_order_filled_cancelled_fetcher.ts
diff --git a/contracts/core/tsconfig.json b/contracts/protocol/tsconfig.json
similarity index 100%
rename from contracts/core/tsconfig.json
rename to contracts/protocol/tsconfig.json
diff --git a/contracts/core/tslint.json b/contracts/protocol/tslint.json
similarity index 100%
rename from contracts/core/tslint.json
rename to contracts/protocol/tslint.json