diff --git a/contracts/proposals/.gitkeep b/contracts/drafts/.gitkeep
similarity index 100%
rename from contracts/proposals/.gitkeep
rename to contracts/drafts/.gitkeep
diff --git a/contracts/proposals/ERC1046/TokenMetadata.sol b/contracts/drafts/ERC1046/TokenMetadata.sol
similarity index 100%
rename from contracts/proposals/ERC1046/TokenMetadata.sol
rename to contracts/drafts/ERC1046/TokenMetadata.sol
diff --git a/contracts/access/SignatureBouncer.sol b/contracts/drafts/SignatureBouncer.sol
similarity index 100%
rename from contracts/access/SignatureBouncer.sol
rename to contracts/drafts/SignatureBouncer.sol
diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/drafts/TokenVesting.sol
similarity index 97%
rename from contracts/token/ERC20/TokenVesting.sol
rename to contracts/drafts/TokenVesting.sol
index 31fac8882..4d9f00575 100644
--- a/contracts/token/ERC20/TokenVesting.sol
+++ b/contracts/drafts/TokenVesting.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.4.24;
 
-import "./SafeERC20.sol";
-import "../../ownership/Ownable.sol";
-import "../../math/SafeMath.sol";
+import "../token/ERC20/SafeERC20.sol";
+import "../ownership/Ownable.sol";
+import "../math/SafeMath.sol";
 
 
 /**
diff --git a/contracts/mocks/ERC20WithMetadataMock.sol b/contracts/mocks/ERC20WithMetadataMock.sol
index 025f154ab..e42e46f96 100644
--- a/contracts/mocks/ERC20WithMetadataMock.sol
+++ b/contracts/mocks/ERC20WithMetadataMock.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.21;
 
 import "../token/ERC20/ERC20.sol";
-import "../proposals/ERC1046/TokenMetadata.sol";
+import "../drafts/ERC1046/TokenMetadata.sol";
 
 
 contract ERC20WithMetadataMock is ERC20, ERC20WithMetadata {
diff --git a/contracts/mocks/BouncerMock.sol b/contracts/mocks/SignatureBouncerMock.sol
similarity index 96%
rename from contracts/mocks/BouncerMock.sol
rename to contracts/mocks/SignatureBouncerMock.sol
index 7f8f02d05..d9fea81f4 100644
--- a/contracts/mocks/BouncerMock.sol
+++ b/contracts/mocks/SignatureBouncerMock.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.4.24;
 
-import "../access/SignatureBouncer.sol";
+import "../drafts/SignatureBouncer.sol";
 
 
 contract SignatureBouncerMock is SignatureBouncer {