Introduce /interfaces directory WIP

contracts/bridging/WormholeBridgeForColony.sol

@@ -19,8 +19,7 @@
 pragma solidity 0.8.27;
 
 import { IWormhole } from "../../lib/wormhole/ethereum/contracts/interfaces/IWormhole.sol";
-import { IColonyNetwork } from "../colonyNetwork/IColonyNetwork.sol";
-import { IColonyBridge } from "./IColonyBridge.sol";
+import { IColonyBridge } from "../interfaces/IColonyBridge.sol";
 import { CallWithGuards } from "../common/CallWithGuards.sol";
 import { DSAuth } from "../../lib/dappsys/auth.sol";
 

contracts/colony/Colony.sol

@@ -21,10 +21,10 @@ pragma experimental ABIEncoderV2;
 
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { Multicall } from "./../common/Multicall.sol";
-import { IEtherRouter } from "./../common/IEtherRouter.sol";
+import { IEtherRouter } from "./../interfaces/IEtherRouter.sol";
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
 import { ColonyAuthority } from "./ColonyAuthority.sol";

contracts/colony/ColonyArbitraryTransaction.sol

@@ -20,11 +20,11 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IEtherRouter } from "./../common/IEtherRouter.sol";
+import { IEtherRouter } from "./../interfaces/IEtherRouter.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
 
 contract ColonyArbitraryTransaction is ColonyStorage {

contracts/colony/ColonyDomains.sol

@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ColonyStorage } from "./ColonyStorage.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 contract ColonyDomains is ColonyStorage {
   // prettier-ignore

contracts/colony/ColonyFunding.sol

@@ -19,10 +19,10 @@
 pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 contract ColonyFunding is
   ColonyStorage // ignore-swc-123

contracts/colony/ColonyRewards.sol

@@ -19,11 +19,11 @@
 pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyStorage } from "./ColonyStorage.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 contract ColonyRewards is
   ColonyStorage,

contracts/colony/ColonyStorage.sol

@@ -23,7 +23,7 @@ import { DSMath } from "./../../lib/dappsys/math.sol";
 import { CommonStorage } from "./../common/CommonStorage.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { DomainRoles } from "./../common/DomainRoles.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyNetworkDataTypes } from "./../colonyNetwork/ColonyNetworkDataTypes.sol";
 import { ColonyExtension } from "./../extensions/ColonyExtension.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";

contracts/colony/IColony.sol.flattened

@@ -0,0 +1 @@
+

contracts/colonyNetwork/ColonyNetwork.sol

@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
-import { IReputationMiningCycle } from "./../reputationMiningCycle/IReputationMiningCycle.sol";
+import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
 import { Multicall } from "./../common/Multicall.sol";
 

contracts/colonyNetwork/ColonyNetworkAuction.sol

@@ -22,7 +22,7 @@ import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
 import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
-import { IMetaColony } from "./../colony/IMetaColony.sol";
+import { IMetaColony } from "./../interfaces/IMetaColony.sol";
 import { DSMath } from "./../../lib/dappsys/math.sol";
 
 contract ColonyNetworkAuction is ColonyNetworkStorage {

contracts/colonyNetwork/ColonyNetworkDeployer.sol

@@ -20,9 +20,9 @@ pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 import { EtherRouter } from "./../common/EtherRouter.sol";
 import { ColonyAuthority } from "./../colony/ColonyAuthority.sol";
-import { IColony } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
-import { IColonyNetwork } from "./IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { MetaTxToken } from "./../metaTxToken/MetaTxToken.sol";
 import { DSAuth, DSAuthority } from "./../../lib/dappsys/auth.sol";
 import { ICreateX } from "./../../lib/createx/src/ICreateX.sol";

contracts/colonyNetwork/ColonyNetworkExtensions.sol

@@ -20,7 +20,7 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ColonyDataTypes } from "../colony/ColonyDataTypes.sol";
-import { IColonyNetwork } from "../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "../interfaces/IColonyNetwork.sol";
 import { ColonyExtension } from "../extensions/ColonyExtension.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
 import { MetaTxToken } from "./../metaTxToken/MetaTxToken.sol";

contracts/colonyNetwork/ColonyNetworkMining.sol

@@ -22,12 +22,12 @@ pragma experimental "ABIEncoderV2";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { EtherRouter } from "./../common/EtherRouter.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
-import { IReputationMiningCycle } from "./../reputationMiningCycle/IReputationMiningCycle.sol";
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
-import { IMetaColony } from "./../colony/IMetaColony.sol";
-import { IColonyBridge } from "./../bridging/IColonyBridge.sol";
-import { IColonyNetwork } from "./IColonyNetwork.sol";
+import { IMetaColony } from "./../interfaces/IMetaColony.sol";
+import { IColonyBridge } from "./../interfaces/IColonyBridge.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
 
 contract ColonyNetworkMining is ColonyNetworkStorage {

contracts/colonyNetwork/ColonyNetworkSkills.sol

@@ -18,10 +18,10 @@
 pragma solidity 0.8.27;
 pragma experimental "ABIEncoderV2";
 
-import "./../reputationMiningCycle/IReputationMiningCycle.sol";
-import "./../common/Multicall.sol";
-import "./ColonyNetworkStorage.sol";
-import { IColonyBridge } from "./../bridging/IColonyBridge.sol";
+import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
+import { Multicall } from "./../common/Multicall.sol";
+import { ColonyNetworkStorage } from "./ColonyNetworkStorage.sol";
+import { IColonyBridge } from "./../interfaces/IColonyBridge.sol";
 import { CallWithGuards } from "../common/CallWithGuards.sol";
 
 contract ColonyNetworkSkills is ColonyNetworkStorage, Multicall, CallWithGuards {

contracts/colonyNetwork/ColonyNetworkStorage.sol

@@ -19,7 +19,7 @@
 pragma solidity 0.8.27;
 
 import { DSMath } from "./../../lib/dappsys/math.sol";
-import { IMetaColony } from "./../colony/IMetaColony.sol";
+import { IMetaColony } from "./../interfaces/IMetaColony.sol";
 import { CommonStorage } from "./../common/CommonStorage.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";

contracts/common/BasicMetaTransaction.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.27;
 import { DSMath } from "../../lib/dappsys/math.sol";
 import { MetaTransactionMsgSender } from "./MetaTransactionMsgSender.sol";
 import { MultiChain } from "./MultiChain.sol";
-import { IBasicMetaTransaction } from "./IBasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
 
 abstract contract BasicMetaTransaction is
   IBasicMetaTransaction,

contracts/common/ContractRecovery.sol

@@ -22,7 +22,7 @@ import { CommonDataTypes } from "./CommonDataTypes.sol";
 import { ContractRecoveryDataTypes } from "./ContractRecoveryDataTypes.sol";
 import { CommonAuthority } from "./CommonAuthority.sol";
 import { CommonStorage } from "./CommonStorage.sol";
-import { IRecovery } from "./IRecovery.sol";
+import { IRecovery } from "./../interfaces/IRecovery.sol";
 
 contract ContractRecovery is
   ContractRecoveryDataTypes,

contracts/common/GetActionDomainSkillId.sol

@@ -15,8 +15,8 @@
   along with The Colony Network. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { IColony } from "./../colony/IColony.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColony } from "./../interfaces/IColony.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;

contracts/common/GetActionSummary.sol

@@ -15,7 +15,7 @@
   along with The Colony Network. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { IColony } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
 import { ExtractCallData } from "./ExtractCallData.sol";
 import { GetActionDomainSkillId } from "./GetActionDomainSkillId.sol";
 import { CommonDataTypes } from "./CommonDataTypes.sol";

contracts/extensions/CoinMachine.sol

@@ -20,7 +20,8 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ERC20 } from "./../../lib/dappsys/erc20.sol";
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
 import { Whitelist } from "./Whitelist.sol";
 import { CommonDataTypes } from "./../common/CommonDataTypes.sol";

contracts/extensions/ColonyExtension.sol

@@ -23,15 +23,15 @@ import { DSMath } from "./../../lib/dappsys/math.sol";
 import { DSAuth } from "./../../lib/dappsys/auth.sol";
 import { EtherRouter } from "./../common/EtherRouter.sol";
 import { Multicall } from "./../common/Multicall.sol";
-import { IColony } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
 import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { PatriciaTreeProofs } from "./../patriciaTree/PatriciaTreeProofs.sol";
 import { MultiChain } from "./../common/MultiChain.sol";
-import { IColonyExtension } from "./IColonyExtension.sol";
+import { IColonyExtension } from "./../interfaces/IColonyExtension.sol";
 
 // This is a 'dummy' import to ensure that functions implemented from DSAuth get commented
-import { IDSAuth } from "./../common/IDSAuth.sol";
+import { IDSAuth } from "./../interfaces/IDSAuth.sol";
 
 abstract contract ColonyExtension is
   IColonyExtension,

contracts/extensions/ColonyExtensionMeta.sol

@@ -19,7 +19,8 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
 
 abstract contract ColonyExtensionMeta is BasicMetaTransaction, ColonyExtension {

contracts/extensions/EvaluatedExpenditure.sol

@@ -20,7 +20,8 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ColonyExtension } from "./ColonyExtension.sol";
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 
 // ignore-file-swc-108
 

contracts/extensions/FundingQueue.sol

@@ -20,9 +20,10 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
-import { ITokenLocking } from "./../tokenLocking/ITokenLocking.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
+import { ITokenLocking } from "./../interfaces/ITokenLocking.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
 
 contract FundingQueue is ColonyExtension, BasicMetaTransaction {

contracts/extensions/MultisigPermissions.sol

@@ -18,9 +18,10 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IColony, ColonyDataTypes } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
+import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
 import { ColonyRoles } from "./../colony/ColonyRoles.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyNetworkDataTypes } from "./../colonyNetwork/ColonyNetworkDataTypes.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
 import { GetActionSummary, ActionSummary } from "./../common/GetActionSummary.sol";

contracts/extensions/OneTxPayment.sol

@@ -21,7 +21,8 @@ pragma experimental ABIEncoderV2;
 
 import { CommonDataTypes } from "../common/CommonDataTypes.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 
 // ignore-file-swc-108
 

contracts/extensions/ReputationBootstrapper.sol

@@ -20,8 +20,8 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { ERC20 } from "./../../lib/dappsys/erc20.sol";
-import { IReputationMiningCycle } from "./../reputationMiningCycle/IReputationMiningCycle.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IReputationMiningCycle } from "./../interfaces/IReputationMiningCycle.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
 import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
 

contracts/extensions/StagedExpenditure.sol

@@ -19,7 +19,8 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IColony, ColonyDataTypes } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
+import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
 import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
 

contracts/extensions/StakedExpenditure.sol

@@ -21,7 +21,7 @@ pragma experimental ABIEncoderV2;
 
 import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
 import { ColonyDataTypes } from "./../colony/ColonyDataTypes.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 import { ColonyExtensionMeta } from "./ColonyExtensionMeta.sol";
 
 // ignore-file-swc-108

contracts/extensions/TokenSupplier.sol

@@ -19,10 +19,11 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ERC20Extended } from "./../common/ERC20Extended.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
-import { IColony } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
 import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
 contract TokenSupplier is ColonyExtension, BasicMetaTransaction {
   uint256 constant ISSUANCE_PERIOD = 1 days;

contracts/extensions/Whitelist.sol

@@ -19,11 +19,12 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../common/BasicMetaTransaction.sol";
 import { ColonyExtension } from "./ColonyExtension.sol";
-import { IColony } from "./../colony/IColony.sol";
+import { IColony } from "./../interfaces/IColony.sol";
 import { CommonDataTypes } from "./../common/CommonDataTypes.sol";
-import { IColonyNetwork } from "./../colonyNetwork/IColonyNetwork.sol";
+import { IColonyNetwork } from "./../interfaces/IColonyNetwork.sol";
 
 // ignore-file-swc-108
 

contracts/extensions/votingReputation/IVotingReputation.sol.flattened

@@ -0,0 +1 @@
+

contracts/extensions/votingReputation/VotingReputation.sol

@@ -20,7 +20,8 @@ pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
 import { VotingReputationStorage } from "./VotingReputationStorage.sol";
-import { IColony, ColonyDataTypes } from "./../../colony/IColony.sol";
+import { IColony } from "./../../interfaces/IColony.sol";
+import { ColonyDataTypes } from "./../../colony/ColonyDataTypes.sol";
 import { ActionSummary } from "./../../common/GetActionSummary.sol";
 
 contract VotingReputation is VotingReputationStorage {

contracts/extensions/votingReputation/VotingReputationMisalignedRecovery.sol

@@ -19,9 +19,9 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IColonyNetwork } from "./../../colonyNetwork/IColonyNetwork.sol";
-import { IColony } from "./../../colony/IColony.sol";
-import { ITokenLocking } from "./../../tokenLocking/ITokenLocking.sol";
+import { IColonyNetwork } from "./../../interfaces/IColonyNetwork.sol";
+import { IColony } from "./../../interfaces/IColony.sol";
+import { ITokenLocking } from "./../../interfaces/ITokenLocking.sol";
 import { DSMath } from "./../../../lib/dappsys/math.sol";
 import { DSAuth } from "./../../../lib/dappsys/auth.sol";
 import { VotingReputationDataTypes } from "./VotingReputationDataTypes.sol";

contracts/extensions/votingReputation/VotingReputationStorage.sol

@@ -19,12 +19,13 @@
 pragma solidity 0.8.27;
 pragma experimental ABIEncoderV2;
 
-import { IColonyNetwork } from "./../../colonyNetwork/IColonyNetwork.sol";
-import { IColony } from "./../../colony/IColony.sol";
+import { IColonyNetwork } from "./../../interfaces/IColonyNetwork.sol";
+import { IColony } from "./../../interfaces/IColony.sol";
 import { CommonDataTypes } from "./../../common/CommonDataTypes.sol";
-import { IBasicMetaTransaction, BasicMetaTransaction } from "./../../common/BasicMetaTransaction.sol";
+import { IBasicMetaTransaction } from "./../../interfaces/IBasicMetaTransaction.sol";
+import { BasicMetaTransaction } from "./../../common/BasicMetaTransaction.sol";
 import { ActionSummary, GetActionSummary } from "./../../common/GetActionSummary.sol";
-import { ITokenLocking } from "./../../tokenLocking/ITokenLocking.sol";
+import { ITokenLocking } from "./../../interfaces/ITokenLocking.sol";
 import { ColonyExtension } from "./../ColonyExtension.sol";
 import { VotingReputationDataTypes } from "./VotingReputationDataTypes.sol";