diff --git a/contracts/src/plugin/majority-voting/IMajorityVoting.sol b/contracts/src/governance/majority-voting/IMajorityVoting.sol
similarity index 100%
rename from contracts/src/plugin/majority-voting/IMajorityVoting.sol
rename to contracts/src/governance/majority-voting/IMajorityVoting.sol
diff --git a/contracts/src/plugin/majority-voting/MajorityVotingBase.sol b/contracts/src/governance/majority-voting/MajorityVotingBase.sol
similarity index 100%
rename from contracts/src/plugin/majority-voting/MajorityVotingBase.sol
rename to contracts/src/governance/majority-voting/MajorityVotingBase.sol
diff --git a/contracts/src/utils/Addresslist.sol b/contracts/src/governance/membership/Addresslist.sol
similarity index 98%
rename from contracts/src/utils/Addresslist.sol
rename to contracts/src/governance/membership/Addresslist.sol
index 88596be8..9f2c422a 100644
--- a/contracts/src/utils/Addresslist.sol
+++ b/contracts/src/governance/membership/Addresslist.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.8;
 
 import {CheckpointsUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/CheckpointsUpgradeable.sol";
 
-import {_uncheckedAdd, _uncheckedSub} from "../utils/math/UncheckedMath.sol";
+import {_uncheckedAdd, _uncheckedSub} from "../../utils/math/UncheckedMath.sol";
 
 /// @title Addresslist
 /// @author Aragon Association - 2021-2023
diff --git a/contracts/src/plugin/membership/IMembership.sol b/contracts/src/governance/membership/IMembership.sol
similarity index 100%
rename from contracts/src/plugin/membership/IMembership.sol
rename to contracts/src/governance/membership/IMembership.sol
diff --git a/contracts/src/plugin/placeholder-version/PlaceholderSetup.sol b/contracts/src/governance/placeholder-version/PlaceholderSetup.sol
similarity index 100%
rename from contracts/src/plugin/placeholder-version/PlaceholderSetup.sol
rename to contracts/src/governance/placeholder-version/PlaceholderSetup.sol
diff --git a/contracts/src/plugin/placeholder-version/build-metadata.json b/contracts/src/governance/placeholder-version/build-metadata.json
similarity index 100%
rename from contracts/src/plugin/placeholder-version/build-metadata.json
rename to contracts/src/governance/placeholder-version/build-metadata.json
diff --git a/contracts/src/plugin/proposal/IProposal.sol b/contracts/src/governance/proposal/IProposal.sol
similarity index 100%
rename from contracts/src/plugin/proposal/IProposal.sol
rename to contracts/src/governance/proposal/IProposal.sol
diff --git a/contracts/src/plugin/proposal/Proposal.sol b/contracts/src/governance/proposal/Proposal.sol
similarity index 100%
rename from contracts/src/plugin/proposal/Proposal.sol
rename to contracts/src/governance/proposal/Proposal.sol
diff --git a/contracts/src/plugin/proposal/ProposalUpgradeable.sol b/contracts/src/governance/proposal/ProposalUpgradeable.sol
similarity index 100%
rename from contracts/src/plugin/proposal/ProposalUpgradeable.sol
rename to contracts/src/governance/proposal/ProposalUpgradeable.sol
diff --git a/contracts/src/token/erc20/GovernanceERC20.sol b/contracts/src/governance/token/erc20/GovernanceERC20.sol
similarity index 100%
rename from contracts/src/token/erc20/GovernanceERC20.sol
rename to contracts/src/governance/token/erc20/GovernanceERC20.sol
diff --git a/contracts/src/token/erc20/GovernanceWrappedERC20.sol b/contracts/src/governance/token/erc20/GovernanceWrappedERC20.sol
similarity index 100%
rename from contracts/src/token/erc20/GovernanceWrappedERC20.sol
rename to contracts/src/governance/token/erc20/GovernanceWrappedERC20.sol
diff --git a/contracts/src/token/erc20/IERC20MintableUpgradeable.sol b/contracts/src/governance/token/erc20/IERC20MintableUpgradeable.sol
similarity index 100%
rename from contracts/src/token/erc20/IERC20MintableUpgradeable.sol
rename to contracts/src/governance/token/erc20/IERC20MintableUpgradeable.sol
diff --git a/contracts/src/token/erc20/IGovernanceWrappedERC20.sol b/contracts/src/governance/token/erc20/IGovernanceWrappedERC20.sol
similarity index 100%
rename from contracts/src/token/erc20/IGovernanceWrappedERC20.sol
rename to contracts/src/governance/token/erc20/IGovernanceWrappedERC20.sol
diff --git a/contracts/src/test/plugin/AddresslistMock.sol b/contracts/src/test/governance/AddresslistMock.sol
similarity index 83%
rename from contracts/src/test/plugin/AddresslistMock.sol
rename to contracts/src/test/governance/AddresslistMock.sol
index 1e900d8c..30da3f6b 100644
--- a/contracts/src/test/plugin/AddresslistMock.sol
+++ b/contracts/src/test/governance/AddresslistMock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.8;
 
-import {Addresslist} from "../../utils/Addresslist.sol";
+import {Addresslist} from "../../governance/membership/Addresslist.sol";
 
 contract AddresslistMock is Addresslist {
     function addAddresses(address[] calldata _newAddresses) external {
diff --git a/contracts/src/test/plugin/MajorityVotingMock.sol b/contracts/src/test/governance/MajorityVotingMock.sol
similarity index 93%
rename from contracts/src/test/plugin/MajorityVotingMock.sol
rename to contracts/src/test/governance/MajorityVotingMock.sol
index c0780043..e2cace0c 100644
--- a/contracts/src/test/plugin/MajorityVotingMock.sol
+++ b/contracts/src/test/governance/MajorityVotingMock.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.8;
 
 import {IDAO} from "@aragon/osx/packages/contracts/src/core/dao/IDAO.sol";
 
-import {MajorityVotingBase} from "../../plugin/majority-voting/MajorityVotingBase.sol";
+import {MajorityVotingBase} from "../../governance/majority-voting/MajorityVotingBase.sol";
 
 contract MajorityVotingMock is MajorityVotingBase {
     function initializeMock(IDAO _dao, VotingSettings calldata _votingSettings) public initializer {
diff --git a/contracts/src/test/token/TestGovernanceERC20.sol b/contracts/src/test/token/TestGovernanceERC20.sol
index a95088cf..d09dbd80 100644
--- a/contracts/src/test/token/TestGovernanceERC20.sol
+++ b/contracts/src/test/token/TestGovernanceERC20.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.8;
 
 import {IDAO} from "@aragon/osx/packages/contracts/src/core/dao/IDAO.sol";
 
-import {GovernanceERC20} from "../../token/erc20/GovernanceERC20.sol";
+import {GovernanceERC20} from "../../governance/token/erc20/GovernanceERC20.sol";
 
 /// @title TestGovernanceERC20
 /// @author Aragon Association - 2022-2023