diff --git a/contracts/mocks/ERC721TokenMock.sol b/contracts/mocks/ERC721TokenMock.sol
index 42b12cc29a0..5cb6cb67961 100644
--- a/contracts/mocks/ERC721TokenMock.sol
+++ b/contracts/mocks/ERC721TokenMock.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.4.18;
 
-import "../token/ERC721Token.sol";
+import "../token/ERC721/ERC721Token.sol";
 
 /**
  * @title ERC721TokenMock
diff --git a/contracts/token/ERC721.sol b/contracts/token/ERC721/ERC721.sol
similarity index 100%
rename from contracts/token/ERC721.sol
rename to contracts/token/ERC721/ERC721.sol
diff --git a/contracts/token/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol
similarity index 99%
rename from contracts/token/ERC721Token.sol
rename to contracts/token/ERC721/ERC721Token.sol
index 0b86886ee21..4f8f268c3ba 100644
--- a/contracts/token/ERC721Token.sol
+++ b/contracts/token/ERC721/ERC721Token.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
 import "./ERC721.sol";
-import "../math/SafeMath.sol";
+import "../../math/SafeMath.sol";
 
 /**
  * @title ERC721Token
diff --git a/test/token/ERC721Token.test.js b/test/token/ERC721/ERC721Token.test.js
similarity index 99%
rename from test/token/ERC721Token.test.js
rename to test/token/ERC721/ERC721Token.test.js
index 9d03f944b5a..cb6546f4246 100644
--- a/test/token/ERC721Token.test.js
+++ b/test/token/ERC721/ERC721Token.test.js
@@ -1,4 +1,4 @@
-import assertRevert from '../helpers/assertRevert';
+import assertRevert from '../../helpers/assertRevert';
 const BigNumber = web3.BigNumber;
 const ERC721Token = artifacts.require('ERC721TokenMock.sol');