diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol
index d0f8f2a92..e09dbc9d1 100644
--- a/contracts/access/SignatureBouncer.sol
+++ b/contracts/access/SignatureBouncer.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.24;
 
 import "../ownership/Ownable.sol";
-import "../ownership/rbac/RBAC.sol";
+import "../access/rbac/RBAC.sol";
 import "../ECRecovery.sol";
 
 
diff --git a/contracts/access/Whitelist.sol b/contracts/access/Whitelist.sol
index 7f9c60f7a..e10360c61 100644
--- a/contracts/access/Whitelist.sol
+++ b/contracts/access/Whitelist.sol
@@ -2,7 +2,7 @@ pragma solidity ^0.4.24;
 
 
 import "../ownership/Ownable.sol";
-import "../ownership/rbac/RBAC.sol";
+import "../access/rbac/RBAC.sol";
 
 
 /**
diff --git a/contracts/ownership/rbac/RBAC.sol b/contracts/access/rbac/RBAC.sol
similarity index 100%
rename from contracts/ownership/rbac/RBAC.sol
rename to contracts/access/rbac/RBAC.sol
diff --git a/contracts/ownership/rbac/Roles.sol b/contracts/access/rbac/Roles.sol
similarity index 100%
rename from contracts/ownership/rbac/Roles.sol
rename to contracts/access/rbac/Roles.sol
diff --git a/contracts/examples/RBACWithAdmin.sol b/contracts/examples/RBACWithAdmin.sol
index af76bf8f7..59d7ed42a 100644
--- a/contracts/examples/RBACWithAdmin.sol
+++ b/contracts/examples/RBACWithAdmin.sol
@@ -1,6 +1,6 @@
 pragma solidity ^0.4.24;
 
-import "../ownership/rbac/RBAC.sol";
+import "../access/rbac/RBAC.sol";
 
 
 /**
diff --git a/contracts/ownership/Superuser.sol b/contracts/ownership/Superuser.sol
index abfef4069..690dbf0b9 100644
--- a/contracts/ownership/Superuser.sol
+++ b/contracts/ownership/Superuser.sol
@@ -2,14 +2,14 @@ pragma solidity ^0.4.24;
 
 
 import "./Ownable.sol";
-import "./rbac/RBAC.sol";
+import "../access/rbac/RBAC.sol";
 
 
 /**
  * @title Superuser
- * @dev The Superuser contract defines a single superuser who can transfer the ownership 
- * of a contract to a new address, even if he is not the owner. 
- * A superuser can transfer his role to a new address. 
+ * @dev The Superuser contract defines a single superuser who can transfer the ownership
+ * of a contract to a new address, even if he is not the owner.
+ * A superuser can transfer his role to a new address.
  */
 contract Superuser is Ownable, RBAC {
   string public constant ROLE_SUPERUSER = "superuser";
diff --git a/contracts/token/ERC20/RBACMintableToken.sol b/contracts/token/ERC20/RBACMintableToken.sol
index e2dd760ba..4922e33f4 100644
--- a/contracts/token/ERC20/RBACMintableToken.sol
+++ b/contracts/token/ERC20/RBACMintableToken.sol
@@ -1,7 +1,7 @@
 pragma solidity ^0.4.24;
 
 import "./MintableToken.sol";
-import "../../ownership/rbac/RBAC.sol";
+import "../../access/rbac/RBAC.sol";
 
 
 /**