chore: renames

src/AggregationLayerVaultFactory.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.0;
 
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 // core modules
-import {Rewards} from "./modules/Rewards.sol";
-import {Hooks} from "./modules/Hooks.sol";
-import {Fee} from "./modules/Fee.sol";
+import {Rewards} from "./module/Rewards.sol";
+import {Hooks} from "./module/Hooks.sol";
+import {Fee} from "./module/Fee.sol";
 // core plugins
-import {WithdrawalQueue} from "./WithdrawalQueue.sol";
+import {WithdrawalQueue} from "./plugin/WithdrawalQueue.sol";
 import {AggregationLayerVault} from "./AggregationLayerVault.sol";
 
 contract AggregationLayerVaultFactory {

src/Dispatch.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-
 pragma solidity ^0.8.0;
 
+//contracts
 import {Shared} from "./Shared.sol";
-import {HooksModule} from "./modules/Hooks.sol";
-import {RewardsModule} from "./modules/Rewards.sol";
+import {HooksModule} from "./module/Hooks.sol";
+import {RewardsModule} from "./module/Rewards.sol";
 
 abstract contract Dispatch is RewardsModule, HooksModule {
     address public immutable MODULE_REWARDS;

src/Shared.sol

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {StorageLib, AggregationVaultStorage} from "./lib/StorageLib.sol";
-import {ErrorsLib} from "./lib/ErrorsLib.sol";
+// interfaces
 import {IEVC} from "ethereum-vault-connector/utils/EVCUtil.sol";
 import {IHookTarget} from "evk/src/interfaces/IHookTarget.sol";
+// libs
+import {StorageLib, AggregationVaultStorage} from "./lib/StorageLib.sol";
+import {ErrorsLib} from "./lib/ErrorsLib.sol";
 import {HooksLib} from "./lib/HooksLib.sol";
 
 contract Shared {

src/Rebalancer.sol → src/plugin/Rebalancer.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {IFourSixTwoSixAgg, Strategy} from "./interface/IFourSixTwoSixAgg.sol";
+// interfaces
+import {IFourSixTwoSixAgg, Strategy} from "../interface/IFourSixTwoSixAgg.sol";
 import {IERC4626} from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
 
 contract Rebalancer {

src/WithdrawalQueue.sol → src/plugin/WithdrawalQueue.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 // interfaces
 import {IERC4626} from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
 // internal dep
-import {IFourSixTwoSixAgg} from "./interface/IFourSixTwoSixAgg.sol";
+import {IFourSixTwoSixAgg} from "../interface/IFourSixTwoSixAgg.sol";
 // contracts
 import {AccessControlEnumerableUpgradeable} from
     "@openzeppelin-upgradeable/access/extensions/AccessControlEnumerableUpgradeable.sol";

test/common/AggregationLayerVaultBase.t.sol

@@ -1,18 +1,21 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
+// interfaces
+import {IHookTarget} from "evk/src/interfaces/IHookTarget.sol";
+import {IWithdrawalQueue} from "../../src/interface/IWithdrawalQueue.sol";
+// contracts
 import "evk/test/unit/evault/EVaultTestBase.t.sol";
 import {AggregationLayerVault, Strategy} from "../../src/AggregationLayerVault.sol";
-import {Rebalancer} from "../../src/Rebalancer.sol";
-import {IHookTarget} from "evk/src/interfaces/IHookTarget.sol";
-import {Hooks, HooksModule} from "../../src/modules/Hooks.sol";
-import {Rewards} from "../../src/modules/Rewards.sol";
-import {Fee} from "../../src/modules/Fee.sol";
+import {Rebalancer} from "../../src/plugin/Rebalancer.sol";
+import {Hooks, HooksModule} from "../../src/module/Hooks.sol";
+import {Rewards} from "../../src/module/Rewards.sol";
+import {Fee} from "../../src/module/Fee.sol";
 import {AggregationLayerVaultFactory} from "../../src/AggregationLayerVaultFactory.sol";
-import {WithdrawalQueue} from "../../src/WithdrawalQueue.sol";
-import {IWithdrawalQueue} from "../../src/interface/IWithdrawalQueue.sol";
+import {WithdrawalQueue} from "../../src/plugin/WithdrawalQueue.sol";
+import {AllocationPoints} from "../../src/module/AllocationPoints.sol";
+// libs
 import {ErrorsLib} from "../../src/lib/ErrorsLib.sol";
-import {AllocationPoints} from "../../src/modules/AllocationPoints.sol";
 
 contract AggregationLayerVaultBase is EVaultTestBase {
     uint256 public constant CASH_RESERVE_ALLOCATION_POINTS = 1000e18;

test/e2e/BalanceForwarderE2ETest.t.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
+import {TrackingRewardStreams} from "reward-streams/TrackingRewardStreams.sol";
 import {
     AggregationLayerVaultBase,
     AggregationLayerVault,
@@ -12,7 +13,6 @@ import {
     AggregationLayerVaultFactory,
     Rewards
 } from "../common/AggregationLayerVaultBase.t.sol";
-import {TrackingRewardStreams} from "reward-streams/TrackingRewardStreams.sol";
 
 contract BalanceForwarderE2ETest is AggregationLayerVaultBase {
     uint256 user1InitialBalance = 100000e18;