diff --git a/contracts/drafts/ERC1820Implementer.sol b/contracts/introspection/ERC1820Implementer.sol
similarity index 100%
rename from contracts/drafts/ERC1820Implementer.sol
rename to contracts/introspection/ERC1820Implementer.sol
diff --git a/contracts/drafts/IERC1820Implementer.sol b/contracts/introspection/IERC1820Implementer.sol
similarity index 100%
rename from contracts/drafts/IERC1820Implementer.sol
rename to contracts/introspection/IERC1820Implementer.sol
diff --git a/contracts/drafts/IERC1820Registry.sol b/contracts/introspection/IERC1820Registry.sol
similarity index 100%
rename from contracts/drafts/IERC1820Registry.sol
rename to contracts/introspection/IERC1820Registry.sol
diff --git a/contracts/mocks/ERC1820ImplementerMock.sol b/contracts/mocks/ERC1820ImplementerMock.sol
index 94f1db951..e3b2e3a05 100644
--- a/contracts/mocks/ERC1820ImplementerMock.sol
+++ b/contracts/mocks/ERC1820ImplementerMock.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import "../drafts/ERC1820Implementer.sol";
+import "../introspection/ERC1820Implementer.sol";
 
 contract ERC1820ImplementerMock is ERC1820Implementer {
     function registerInterfaceForAddress(bytes32 interfaceHash, address account) public {
diff --git a/contracts/mocks/ERC777Mock.sol b/contracts/mocks/ERC777Mock.sol
index bb4c4ead2..5df02dd46 100644
--- a/contracts/mocks/ERC777Mock.sol
+++ b/contracts/mocks/ERC777Mock.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import "../drafts/ERC777/ERC777.sol";
+import "../token/ERC777/ERC777.sol";
 
 contract ERC777Mock is ERC777 {
     constructor(
diff --git a/contracts/mocks/ERC777SenderRecipientMock.sol b/contracts/mocks/ERC777SenderRecipientMock.sol
index abebfc6e2..d329c221e 100644
--- a/contracts/mocks/ERC777SenderRecipientMock.sol
+++ b/contracts/mocks/ERC777SenderRecipientMock.sol
@@ -1,10 +1,10 @@
 pragma solidity ^0.5.0;
 
-import "../drafts/ERC777/IERC777.sol";
-import "../drafts/ERC777/IERC777Sender.sol";
-import "../drafts/ERC777/IERC777Recipient.sol";
-import "../drafts/IERC1820Registry.sol";
-import "../drafts/ERC1820Implementer.sol";
+import "../token/ERC777/IERC777.sol";
+import "../token/ERC777/IERC777Sender.sol";
+import "../token/ERC777/IERC777Recipient.sol";
+import "../introspection/IERC1820Registry.sol";
+import "../introspection/ERC1820Implementer.sol";
 
 contract ERC777SenderRecipientMock is IERC777Sender, IERC777Recipient, ERC1820Implementer {
     event TokensToSendCalled(
diff --git a/contracts/drafts/ERC777/ERC777.sol b/contracts/token/ERC777/ERC777.sol
similarity index 99%
rename from contracts/drafts/ERC777/ERC777.sol
rename to contracts/token/ERC777/ERC777.sol
index 7a46276e4..b431c3532 100644
--- a/contracts/drafts/ERC777/ERC777.sol
+++ b/contracts/token/ERC777/ERC777.sol
@@ -6,7 +6,7 @@ import "./IERC777Sender.sol";
 import "../../token/ERC20/IERC20.sol";
 import "../../math/SafeMath.sol";
 import "../../utils/Address.sol";
-import "../IERC1820Registry.sol";
+import "../../introspection/IERC1820Registry.sol";
 
 /**
  * @title ERC777 token implementation, with granularity harcoded to 1.
diff --git a/contracts/drafts/ERC777/IERC777.sol b/contracts/token/ERC777/IERC777.sol
similarity index 100%
rename from contracts/drafts/ERC777/IERC777.sol
rename to contracts/token/ERC777/IERC777.sol
diff --git a/contracts/drafts/ERC777/IERC777Recipient.sol b/contracts/token/ERC777/IERC777Recipient.sol
similarity index 100%
rename from contracts/drafts/ERC777/IERC777Recipient.sol
rename to contracts/token/ERC777/IERC777Recipient.sol
diff --git a/contracts/drafts/ERC777/IERC777Sender.sol b/contracts/token/ERC777/IERC777Sender.sol
similarity index 100%
rename from contracts/drafts/ERC777/IERC777Sender.sol
rename to contracts/token/ERC777/IERC777Sender.sol