20 files changed, 13 insertions, 14 deletions
diff --git a/contracts/tokens/contracts/tokens/ERC20Token/ERC20Token.sol b/contracts/tokens/contracts/ERC20Token/ERC20Token.sol
index 190eead76..190eead76 100644
--- a/contracts/tokens/contracts/tokens/ERC20Token/ERC20Token.sol
+++ b/contracts/tokens/contracts/ERC20Token/ERC20Token.sol
diff --git a/contracts/tokens/contracts/tokens/ERC20Token/IERC20Token.sol b/contracts/tokens/contracts/ERC20Token/IERC20Token.sol
index 9f9b89585..9f9b89585 100644
--- a/contracts/tokens/contracts/tokens/ERC20Token/IERC20Token.sol
+++ b/contracts/tokens/contracts/ERC20Token/IERC20Token.sol
diff --git a/contracts/tokens/contracts/tokens/ERC20Token/MintableERC20Token.sol b/contracts/tokens/contracts/ERC20Token/MintableERC20Token.sol
index 6592a24a0..1108db53d 100644
--- a/contracts/tokens/contracts/tokens/ERC20Token/MintableERC20Token.sol
+++ b/contracts/tokens/contracts/ERC20Token/MintableERC20Token.sol
@@ -18,7 +18,7 @@
 
 pragma solidity ^0.4.24;
 
-import "@0x/contracts-utils/contracts/utils/SafeMath.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";
 import "./UnlimitedAllowanceERC20Token.sol";
 
 
diff --git a/contracts/tokens/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol b/contracts/tokens/contracts/ERC20Token/UnlimitedAllowanceERC20Token.sol
index 869d16147..3a43c250d 100644
--- a/contracts/tokens/contracts/tokens/ERC20Token/UnlimitedAllowanceERC20Token.sol
+++ b/contracts/tokens/contracts/ERC20Token/UnlimitedAllowanceERC20Token.sol
@@ -18,7 +18,7 @@
 
 pragma solidity ^0.4.24;
 
-import "../ERC20Token/ERC20Token.sol";
+import "./ERC20Token.sol";
 
 
 contract UnlimitedAllowanceERC20Token is
diff --git a/contracts/tokens/contracts/tokens/ERC721Token/ERC721Token.sol b/contracts/tokens/contracts/ERC721Token/ERC721Token.sol
index f8d4a6a41..3cd7e13a1 100644
--- a/contracts/tokens/contracts/tokens/ERC721Token/ERC721Token.sol
+++ b/contracts/tokens/contracts/ERC721Token/ERC721Token.sol
@@ -20,7 +20,7 @@ pragma solidity ^0.4.24;
 
 import "./IERC721Token.sol";
 import "./IERC721Receiver.sol";
-import "@0x/contracts-utils/contracts/utils/SafeMath.sol";
+import "@0x/contracts-utils/contracts/src/SafeMath.sol";
 
 
 contract ERC721Token is
diff --git a/contracts/tokens/contracts/tokens/ERC721Token/IERC721Receiver.sol b/contracts/tokens/contracts/ERC721Token/IERC721Receiver.sol
index c3ad35ede..c3ad35ede 100644
--- a/contracts/tokens/contracts/tokens/ERC721Token/IERC721Receiver.sol
+++ b/contracts/tokens/contracts/ERC721Token/IERC721Receiver.sol
diff --git a/contracts/tokens/contracts/tokens/ERC721Token/IERC721Token.sol b/contracts/tokens/contracts/ERC721Token/IERC721Token.sol
index 56a3314df..56a3314df 100644
--- a/contracts/tokens/contracts/tokens/ERC721Token/IERC721Token.sol
+++ b/contracts/tokens/contracts/ERC721Token/IERC721Token.sol
diff --git a/contracts/tokens/contracts/tokens/ERC721Token/MintableERC721Token.sol b/contracts/tokens/contracts/ERC721Token/MintableERC721Token.sol
index 27326d857..27326d857 100644
--- a/contracts/tokens/contracts/tokens/ERC721Token/MintableERC721Token.sol
+++ b/contracts/tokens/contracts/ERC721Token/MintableERC721Token.sol
diff --git a/contracts/tokens/contracts/tokens/EtherToken/IEtherToken.sol b/contracts/tokens/contracts/EtherToken/IEtherToken.sol
index 32baa3eb0..32baa3eb0 100644
--- a/contracts/tokens/contracts/tokens/EtherToken/IEtherToken.sol
+++ b/contracts/tokens/contracts/EtherToken/IEtherToken.sol
diff --git a/contracts/tokens/contracts/tokens/EtherToken/WETH9.sol b/contracts/tokens/contracts/EtherToken/WETH9.sol
index 17876b86d..17876b86d 100644
--- a/contracts/tokens/contracts/tokens/EtherToken/WETH9.sol
+++ b/contracts/tokens/contracts/EtherToken/WETH9.sol
diff --git a/contracts/tokens/contracts/tokens/ZRXToken/ERC20Token_v1.sol b/contracts/tokens/contracts/ZRXToken/ERC20Token_v1.sol
index 4920c4aac..4920c4aac 100644
--- a/contracts/tokens/contracts/tokens/ZRXToken/ERC20Token_v1.sol
+++ b/contracts/tokens/contracts/ZRXToken/ERC20Token_v1.sol
diff --git a/contracts/tokens/contracts/tokens/ZRXToken/Token_v1.sol b/contracts/tokens/contracts/ZRXToken/Token_v1.sol
index de619fb7e..de619fb7e 100644
--- a/contracts/tokens/contracts/tokens/ZRXToken/Token_v1.sol
+++ b/contracts/tokens/contracts/ZRXToken/Token_v1.sol
diff --git a/contracts/tokens/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol b/contracts/tokens/contracts/ZRXToken/UnlimitedAllowanceToken_v1.sol
index bf1b0335a..bf1b0335a 100644
--- a/contracts/tokens/contracts/tokens/ZRXToken/UnlimitedAllowanceToken_v1.sol
+++ b/contracts/tokens/contracts/ZRXToken/UnlimitedAllowanceToken_v1.sol
diff --git a/contracts/tokens/contracts/tokens/ZRXToken/ZRXToken.sol b/contracts/tokens/contracts/ZRXToken/ZRXToken.sol
index 831e1822c..831e1822c 100644
--- a/contracts/tokens/contracts/tokens/ZRXToken/ZRXToken.sol
+++ b/contracts/tokens/contracts/ZRXToken/ZRXToken.sol
diff --git a/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol b/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
index bc8eee367..93f0dd9c7 100644
--- a/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC20Token/DummyERC20Token.sol
@@ -18,8 +18,8 @@
 
 pragma solidity 0.4.24;
 
-import "@0x/contracts-utils/contracts/utils/Ownable.sol";
-import "../../tokens/ERC20Token/MintableERC20Token.sol";
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
+import "../../ERC20Token/MintableERC20Token.sol";
 
 
 contract DummyERC20Token is 
diff --git a/contracts/tokens/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol b/contracts/tokens/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
index 6c8371559..cf190b919 100644
--- a/contracts/tokens/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
+++ b/contracts/tokens/contracts/test/DummyERC721Receiver/DummyERC721Receiver.sol
@@ -18,7 +18,7 @@
 
 pragma solidity 0.4.24;
 
-import "../../tokens/ERC721Token/IERC721Receiver.sol";
+import "../../ERC721Token/IERC721Receiver.sol";
 
 
 contract DummyERC721Receiver is
diff --git a/contracts/tokens/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol b/contracts/tokens/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
index 309633bf5..338e0e802 100644
--- a/contracts/tokens/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
+++ b/contracts/tokens/contracts/test/DummyERC721Receiver/InvalidERC721Receiver.sol
@@ -18,7 +18,7 @@
 
 pragma solidity 0.4.24;
 
-import "../../tokens/ERC721Token/IERC721Receiver.sol";
+import "../../ERC721Token/IERC721Receiver.sol";
 
 
 contract InvalidERC721Receiver is
diff --git a/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol b/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
index 82bd583c5..a0c6ead89 100644
--- a/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
+++ b/contracts/tokens/contracts/test/DummyERC721Token/DummyERC721Token.sol
@@ -18,8 +18,8 @@
 
 pragma solidity 0.4.24;
 
-import "../../tokens/ERC721Token/MintableERC721Token.sol";
-import "@0x/contracts-utils/contracts/utils/Ownable.sol";
+import "../../ERC721Token/MintableERC721Token.sol";
+import "@0x/contracts-utils/contracts/src/Ownable.sol";
 
 
 // solhint-disable no-empty-blocks
diff --git a/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol b/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
index f6ccda900..2fc48fdca 100644
--- a/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
+++ b/contracts/tokens/contracts/test/ReentrantERC20Token/ReentrantERC20Token.sol
@@ -19,10 +19,10 @@
 pragma solidity 0.4.24;
 pragma experimental ABIEncoderV2;
 
-import "@0x/contracts-utils/contracts/utils/LibBytes.sol";
-import "../../tokens/ERC20Token/ERC20Token.sol";
-import "@0x/contracts-interfaces/contracts/protocol/Exchange/IExchange.sol";
-import "@0x/contracts-exchange-libs/contracts/exchange-libs/LibOrder.sol";
+import "@0x/contracts-utils/contracts/src/LibBytes.sol";
+import "../../ERC20Token/ERC20Token.sol";
+import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
+import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
 
 
 // solhint-disable no-unused-vars
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index caa6c34d3..001b99f16 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -70,7 +70,6 @@
     },
     "dependencies": {
         "@0x/base-contract": "^3.0.13",
-        "@0x/contracts-interfaces": "^1.0.6",
         "@0x/contracts-exchange-libs": "^1.0.6",
         "@0x/contracts-utils": "^1.0.6",
         "@0x/order-utils": "^3.1.2",