Merge branch 'dev-3.0.0' into add-protocolVersion

Author: adamdossa

contracts/datastore/DataStoreFactory.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import "../proxy/DataStoreProxy.sol";
+import "./DataStoreProxy.sol";
 
 contract DataStoreFactory {
 

contracts/proxy/DataStoreProxy.sol renamed to contracts/datastore/DataStoreProxy.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.0;
 
-import "./OwnedProxy.sol";
-import "../datastore/DataStoreStorage.sol";
+import "../proxy/OwnedProxy.sol";
+import "./DataStoreStorage.sol";
 
 /**
  * @title DataStoreProxy Proxy

contracts/interfaces/token/IERC1643.sol

@@ -6,11 +6,12 @@ pragma solidity ^0.5.0;
 interface IERC1643 {
 
     // Document Management
-    //function getDocument(bytes32 _name) external view returns (string memory, bytes32, uint256);
+    //-- Included in interface but commented because getDocuement() & getAllDocuments() body is provided in the STGetter 
+    // function getDocument(bytes32 _name) external view returns (string memory, bytes32, uint256);
+    // function getAllDocuments() external view returns (bytes32[] memory);
     function setDocument(bytes32 _name, string calldata _uri, bytes32 _documentHash) external;
     function removeDocument(bytes32 _name) external;
-    //function getAllDocuments() external view returns (bytes32[] memory);
-
+    
     // Document Events
     event DocumentRemoved(bytes32 indexed _name, string _uri, bytes32 _documentHash);
     event DocumentUpdated(bytes32 indexed _name, string _uri, bytes32 _documentHash);

contracts/libraries/VolumeRestrictionLib.sol

@@ -2,7 +2,7 @@ pragma solidity ^0.5.0;
 
 import "../interfaces/IDataStore.sol";
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
-import "../storage/modules/TransferManager/VolumeRestrictionTMStorage.sol";
+import "../modules/TransferManager/VRTM/VolumeRestrictionTMStorage.sol";
 
 library VolumeRestrictionLib {
 

contracts/mocks/MockCountTransferManager.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import "../modules/TransferManager/CountTransferManager.sol";
+import "../modules/TransferManager/CTM/CountTransferManager.sol";
 
 /**
  * @title Transfer Manager for limiting maximum number of token holders

contracts/mocks/MockFactory.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import "../modules/STO/DummySTOFactory.sol";
+import "../modules/STO/Dummy/DummySTOFactory.sol";
 
 /**
  * @title Mock Contract Not fit for production environment

contracts/mocks/TestSTOFactory.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.5.0;
 
-import "../modules/STO/DummySTOFactory.sol";
+import "../modules/STO/Dummy/DummySTOFactory.sol";
 
 contract TestSTOFactory is DummySTOFactory {
     /**

contracts/modules/Checkpoint/ERC20DividendCheckpoint.sol renamed to contracts/modules/Checkpoint/ERC20/ERC20DividendCheckpoint.sol

@@ -1,8 +1,8 @@
 pragma solidity ^0.5.0;
 
-import "./DividendCheckpoint.sol";
-import "../../storage/modules/Checkpoint/ERC20DividendCheckpointStorage.sol";
-import "../../interfaces/IOwnable.sol";
+import "../DividendCheckpoint.sol";
+import "./ERC20DividendCheckpointStorage.sol";
+import "../../../interfaces/IOwnable.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
 
 /**

contracts/modules/Checkpoint/ERC20DividendCheckpointFactory.sol renamed to contracts/modules/Checkpoint/ERC20/ERC20DividendCheckpointFactory.sol

@@ -1,9 +1,9 @@
 pragma solidity ^0.5.0;
 
-import "../../proxy/ERC20DividendCheckpointProxy.sol";
-import "../../libraries/Util.sol";
-import "../../interfaces/IBoot.sol";
-import "../UpgradableModuleFactory.sol";
+import "./ERC20DividendCheckpointProxy.sol";
+import "../../../libraries/Util.sol";
+import "../../../interfaces/IBoot.sol";
+import "../../UpgradableModuleFactory.sol";
 
 /**
  * @title Factory for deploying ERC20DividendCheckpoint module

contracts/proxy/ERC20DividendCheckpointProxy.sol renamed to contracts/modules/Checkpoint/ERC20/ERC20DividendCheckpointProxy.sol

@@ -1,10 +1,10 @@
 pragma solidity ^0.5.0;
 
-import "./OwnedUpgradeabilityProxy.sol";
-import "../storage/modules/Checkpoint/ERC20DividendCheckpointStorage.sol";
-import "../storage/modules/Checkpoint/DividendCheckpointStorage.sol";
-import "../Pausable.sol";
-import "../storage/modules/ModuleStorage.sol";
+import "../../../proxy/OwnedUpgradeabilityProxy.sol";
+import "./ERC20DividendCheckpointStorage.sol";
+import "../../../storage/modules/Checkpoint/DividendCheckpointStorage.sol";
+import "../../../Pausable.sol";
+import "../../../storage/modules/ModuleStorage.sol";
 
 /**
  * @title Transfer Manager module for core transfer validation functionality