Grouping plugins in folders

packages/contracts/plugin-setup-params.ts

@@ -1,9 +1,9 @@
-import governanceBuildMetadata from './src/governance-build-metadata.json';
-import governanceReleaseMetadata from './src/governance-release-metadata.json';
-import personalSpaceAdminBuildMetadata from './src/personal-space-admin-build-metadata.json';
-import personalSpaceAdminReleaseMetadata from './src/personal-space-admin-release-metadata.json';
-import spaceBuildMetadata from './src/space-build-metadata.json';
-import spaceReleaseMetadata from './src/space-release-metadata.json';
+import governanceBuildMetadata from './src/governance/governance-build-metadata.json';
+import governanceReleaseMetadata from './src/governance/governance-release-metadata.json';
+import personalSpaceAdminBuildMetadata from './src/personal/personal-space-admin-build-metadata.json';
+import personalSpaceAdminReleaseMetadata from './src/personal/personal-space-admin-release-metadata.json';
+import spaceBuildMetadata from './src/space/space-build-metadata.json';
+import spaceReleaseMetadata from './src/space/space-release-metadata.json';
 
 export const SpacePluginSetupParams: PluginSetupParams = {
   PLUGIN_REPO_ENS_NAME: 'geo-browser-space',

packages/contracts/src/MemberAccessExecuteCondition.sol → packages/contracts/src/conditions/MemberAccessExecuteCondition.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.17;
 import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
 import {PermissionCondition} from "@aragon/osx/core/permission/PermissionCondition.sol";
 import {PermissionManager} from "@aragon/osx/core/permission/PermissionManager.sol";
-import {MEMBER_PERMISSION_ID} from "./constants.sol";
+import {MEMBER_PERMISSION_ID} from "../constants.sol";
 
 /// @notice The condition associated with `TestSharedPlugin`
 contract MemberAccessExecuteCondition is PermissionCondition {

packages/contracts/src/GovernancePluginsSetup.sol → packages/contracts/src/governance/GovernancePluginsSetup.sol

@@ -8,8 +8,8 @@ import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
 import {PluginSetup, IPluginSetup} from "@aragon/osx/framework/plugin/setup/PluginSetup.sol";
 import {PluginSetupProcessor} from "@aragon/osx/framework/plugin/setup/PluginSetupProcessor.sol";
 import {MemberAccessPlugin} from "./MemberAccessPlugin.sol";
-import {MemberAccessExecuteCondition} from "./MemberAccessExecuteCondition.sol";
-import {OnlyPluginUpgraderCondition} from "./OnlyPluginUpgraderCondition.sol";
+import {MemberAccessExecuteCondition} from "../conditions/MemberAccessExecuteCondition.sol";
+import {OnlyPluginUpgraderCondition} from "../conditions/OnlyPluginUpgraderCondition.sol";
 import {MainVotingPlugin} from "./MainVotingPlugin.sol";
 import {MajorityVotingBase} from "@aragon/osx/plugins/governance/majority-voting/MajorityVotingBase.sol";
 

packages/contracts/src/MainVotingPlugin.sol → packages/contracts/src/governance/MainVotingPlugin.sol

@@ -9,7 +9,7 @@ import {Addresslist} from "@aragon/osx/plugins/utils/Addresslist.sol";
 import {RATIO_BASE, _applyRatioCeiled} from "@aragon/osx/plugins/utils/Ratio.sol";
 import {IMajorityVoting} from "@aragon/osx/plugins/governance/majority-voting/IMajorityVoting.sol";
 import {MajorityVotingBase} from "@aragon/osx/plugins/governance/majority-voting/MajorityVotingBase.sol";
-import {MEMBER_PERMISSION_ID} from "./constants.sol";
+import {MEMBER_PERMISSION_ID} from "../constants.sol";
 
 // The [ERC-165](https://eips.ethereum.org/EIPS/eip-165) interface ID of the contract.
 bytes4 constant MAIN_SPACE_VOTING_INTERFACE_ID = MainVotingPlugin.initialize.selector ^

packages/contracts/src/MemberAccessPlugin.sol → packages/contracts/src/governance/MemberAccessPlugin.sol

@@ -10,7 +10,7 @@ import {PluginUUPSUpgradeable} from "@aragon/osx/core/plugin/PluginUUPSUpgradeab
 import {ProposalUpgradeable} from "@aragon/osx/core/plugin/proposal/ProposalUpgradeable.sol";
 import {IMultisig} from "@aragon/osx/plugins/governance/multisig/IMultisig.sol";
 import {MainVotingPlugin, MAIN_SPACE_VOTING_INTERFACE_ID} from "./MainVotingPlugin.sol";
-import {MEMBER_PERMISSION_ID} from "./constants.sol";
+import {MEMBER_PERMISSION_ID} from "../constants.sol";
 
 bytes4 constant MEMBER_ACCESS_INTERFACE_ID = MemberAccessPlugin.initialize.selector ^
     MemberAccessPlugin.updateMultisigSettings.selector ^

packages/contracts/src/PersonalSpaceAdminPlugin.sol → packages/contracts/src/personal/PersonalSpaceAdminPlugin.sol

@@ -5,7 +5,7 @@ import {SafeCastUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/mat
 import {ProposalUpgradeable} from "@aragon/osx/core/plugin/proposal/ProposalUpgradeable.sol";
 import {PluginCloneable} from "@aragon/osx/core/plugin/PluginCloneable.sol";
 import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
-import {EDITOR_PERMISSION_ID, MEMBER_PERMISSION_ID} from "./constants.sol";
+import {EDITOR_PERMISSION_ID, MEMBER_PERMISSION_ID} from "../constants.sol";
 
 /// @title PersonalSpaceAdminPlugin
 /// @author Aragon - 2023

packages/contracts/src/PersonalSpaceAdminPluginSetup.sol → packages/contracts/src/personal/PersonalSpaceAdminPluginSetup.sol

@@ -9,7 +9,7 @@ import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
 import {DAO} from "@aragon/osx/core/dao/DAO.sol";
 import {PermissionLib} from "@aragon/osx/core/permission/PermissionLib.sol";
 import {PersonalSpaceAdminPlugin} from "./PersonalSpaceAdminPlugin.sol";
-import {EDITOR_PERMISSION_ID} from "./constants.sol";
+import {EDITOR_PERMISSION_ID} from "../constants.sol";
 
 /// @title PersonalSpaceAdminPluginSetup
 /// @author Aragon - 2023

packages/contracts/src/SpacePlugin.sol → packages/contracts/src/space/SpacePlugin.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.8;
 
 import {IDAO, PluginUUPSUpgradeable} from "@aragon/osx/core/plugin/PluginUUPSUpgradeable.sol";
-import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "./constants.sol";
+import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "../constants.sol";
 
 bytes4 constant SPACE_INTERFACE_ID = SpacePlugin.initialize.selector ^
     SpacePlugin.processGeoProposal.selector ^

packages/contracts/src/SpacePluginSetup.sol → packages/contracts/src/space/SpacePluginSetup.sol

@@ -8,8 +8,8 @@ import {PermissionLib} from "@aragon/osx/core/permission/PermissionLib.sol";
 import {PluginSetup, IPluginSetup} from "@aragon/osx/framework/plugin/setup/PluginSetup.sol";
 import {PluginSetupProcessor} from "@aragon/osx/framework/plugin/setup/PluginSetupProcessor.sol";
 import {SpacePlugin} from "./SpacePlugin.sol";
-import {OnlyPluginUpgraderCondition} from "./OnlyPluginUpgraderCondition.sol";
-import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "./constants.sol";
+import {OnlyPluginUpgraderCondition} from "../conditions/OnlyPluginUpgraderCondition.sol";
+import {CONTENT_PERMISSION_ID, SUBSPACE_PERMISSION_ID} from "../constants.sol";
 
 /// @title SpacePluginSetup
 /// @dev Release 1, Build 1

packages/contracts/src/test/PersonalSpaceAdminCloneFactory.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.17;
 
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 
-import {PersonalSpaceAdminPlugin} from "../PersonalSpaceAdminPlugin.sol";
+import {PersonalSpaceAdminPlugin} from "../personal/PersonalSpaceAdminPlugin.sol";
 
 contract PersonalSpaceAdminCloneFactory {
     using Clones for address;

packages/contracts/src/test/TestGovernancePluginsSetup.sol

@@ -8,9 +8,9 @@ import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
 import {PluginSetup, IPluginSetup} from "@aragon/osx/framework/plugin/setup/PluginSetup.sol";
 import {PluginSetupProcessor} from "@aragon/osx/framework/plugin/setup/PluginSetupProcessor.sol";
 import {TestMemberAccessPlugin} from "./TestMemberAccessPlugin.sol";
-import {MemberAccessExecuteCondition} from "../MemberAccessExecuteCondition.sol";
-import {OnlyPluginUpgraderCondition} from "../OnlyPluginUpgraderCondition.sol";
-import {MainVotingPlugin} from "../MainVotingPlugin.sol";
+import {MemberAccessExecuteCondition} from "../conditions/MemberAccessExecuteCondition.sol";
+import {OnlyPluginUpgraderCondition} from "../conditions/OnlyPluginUpgraderCondition.sol";
+import {MainVotingPlugin} from "../governance/MainVotingPlugin.sol";
 import {MajorityVotingBase} from "@aragon/osx/plugins/governance/majority-voting/MajorityVotingBase.sol";
 
 // Not ideal, but to test this E2E, the contract needs to be cloned

packages/contracts/src/test/TestMemberAccessPlugin.sol

@@ -3,7 +3,7 @@
 pragma solidity ^0.8.8;
 
 import {IDAO} from "@aragon/osx/core/dao/IDAO.sol";
-import {MemberAccessPlugin} from "../MemberAccessPlugin.sol";
+import {MemberAccessPlugin} from "../governance/MemberAccessPlugin.sol";
 
 /// @notice A clone of the MemberAccessPlugin contract, just to test
 contract TestMemberAccessPlugin is MemberAccessPlugin {

packages/contracts/test/unit-testing/governance-plugins-setup.ts

@@ -1,4 +1,4 @@
-import buildMetadata from '../../src/governance-build-metadata.json';
+import buildMetadata from '../../src/governance/governance-build-metadata.json';
 import {
   DAO,
   GovernancePluginsSetup,

packages/contracts/test/unit-testing/personal-space-admin-plugin-setup.ts

@@ -1,4 +1,4 @@
-import metadata from '../../src/personal-space-admin-build-metadata.json';
+import metadata from '../../src/personal/personal-space-admin-build-metadata.json';
 import {
   PersonalSpaceAdminPlugin__factory,
   PersonalSpaceAdminPluginSetup,

packages/contracts/test/unit-testing/space-plugin-setup.ts

@@ -1,4 +1,4 @@
-import buildMetadata from '../../src/space-build-metadata.json';
+import buildMetadata from '../../src/space/space-build-metadata.json';
 import {
   DAO,
   SpacePlugin__factory,