refactor: Adapt contracts file tree (#238)

Author: zguesmi

.solcover.js

@@ -21,7 +21,7 @@ module.exports = {
         'tools/testing/ERC1271Mock.sol',
         'tools/testing/TestClient.sol',
         'tools/testing/TestReceiver.sol',
-        'modules/facets/SignatureVerifier.sol',
+        'facets/SignatureVerifier.sol',
     ],
     istanbulFolder: BASE_FOLDER,
 };

contracts/IexecInterfaceNative.sol

@@ -4,12 +4,16 @@
 pragma solidity ^0.6.0;
 
 import "../Store.sol";
-import "./interfaces/IOwnable.sol";
+import "../interfaces/IOwnable.sol";
 
 // Functions that were declared in ERC1538Store are re-declared here.
 // TODO clean this (use LibDiamond)
 //      - All calls to `owner()` should use `LibDiamond.contractOwner()`.
 
+/**
+ * @title Base contract of all Facet contracts.
+ * @dev Every facet must inherit from this contract.
+ */
 abstract contract FacetBase is Store {
     modifier onlyOwner() {
         require(_msgSender() == owner(), "Ownable: caller is not the owner");

contracts/IexecInterfaceNativeABILegacy.sol

@@ -12,7 +12,7 @@ import {Store} from "../Store.v8.sol";
 
 /**
  * @title Base contract of all Facet contracts.
- * @dev Every module must inherit from this contract.
+ * @dev Every facet must inherit from this contract.
  */
 abstract contract FacetBase is Store {
     modifier onlyOwner() {

contracts/IexecInterfaceTokenABILegacy.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecAccessorsABILegacy.sol";
 
 contract IexecAccessorsABILegacyFacet is IexecAccessorsABILegacy, FacetBase {

contracts/modules/FacetBase.sol contracts/facets/FacetBase.solcontracts/modules/FacetBase.sol renamed to contracts/facets/FacetBase.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecAccessors.sol";
 
 contract IexecAccessorsFacet is IexecAccessors, FacetBase {

contracts/modules/FacetBase.v8.sol contracts/facets/FacetBase.v8.solcontracts/modules/FacetBase.v8.sol renamed to contracts/facets/FacetBase.v8.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecCategoryManager.sol";
 
 contract IexecCategoryManagerFacet is IexecCategoryManager, FacetBase {

…/facets/IexecAccessorsABILegacyFacet.sol …/facets/IexecAccessorsABILegacyFacet.solcontracts/modules/facets/IexecAccessorsABILegacyFacet.sol renamed to contracts/facets/IexecAccessorsABILegacyFacet.sol contracts/modules/facets/IexecAccessorsABILegacyFacet.sol renamed to contracts/facets/IexecAccessorsABILegacyFacet.sol

@@ -4,7 +4,7 @@
 pragma solidity ^0.6.0;
 pragma experimental ABIEncoderV2;
 
-import "../FacetBase.sol";
+import "./FacetBase.sol";
 import "../interfaces/IexecConfigurationExtra.sol";
 
 contract IexecConfigurationExtraFacet is IexecConfigurationExtra, FacetBase {