refactor: move AccountStorage under account/ (#25)

Author: jaypaik

src/account/AccountLoupe.sol

@@ -5,16 +5,16 @@ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeab
 import {EnumerableMap} from "@openzeppelin/contracts/utils/structs/EnumerableMap.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {IAccountLoupe} from "../interfaces/IAccountLoupe.sol";
-import {IPluginManager} from "../interfaces/IPluginManager.sol";
-import {IStandardExecutor} from "../interfaces/IStandardExecutor.sol";
 import {
     AccountStorage,
     getAccountStorage,
     getPermittedCallKey,
     HookGroup,
     toFunctionReferenceArray
-} from "../libraries/AccountStorage.sol";
+} from "./AccountStorage.sol";
+import {IAccountLoupe} from "../interfaces/IAccountLoupe.sol";
+import {IPluginManager} from "../interfaces/IPluginManager.sol";
+import {IStandardExecutor} from "../interfaces/IStandardExecutor.sol";
 import {FunctionReference} from "../libraries/FunctionReferenceLib.sol";
 
 abstract contract AccountLoupe is IAccountLoupe {

src/libraries/AccountStorage.sol renamed to src/account/AccountStorage.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 
-import {AccountStorage, getAccountStorage} from "../libraries/AccountStorage.sol";
+import {AccountStorage, getAccountStorage} from "./AccountStorage.sol";
 
 abstract contract AccountStorageInitializable {
     error AlreadyInitialized();

src/account/AccountStorageInitializable.sol

@@ -14,7 +14,7 @@ import {
     HookGroup,
     PermittedExternalCallData,
     StoredInjectedHook
-} from "../libraries/AccountStorage.sol";
+} from "./AccountStorage.sol";
 import {FunctionReference, FunctionReferenceLib} from "../libraries/FunctionReferenceLib.sol";
 import {IPluginManager} from "../interfaces/IPluginManager.sol";
 import {

src/account/PluginManagerInternals.sol

@@ -11,7 +11,7 @@ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeab
 
 import {AccountExecutor} from "./AccountExecutor.sol";
 import {AccountLoupe} from "./AccountLoupe.sol";
-import {AccountStorage, HookGroup, getAccountStorage, getPermittedCallKey} from "../libraries/AccountStorage.sol";
+import {AccountStorage, HookGroup, getAccountStorage, getPermittedCallKey} from "./AccountStorage.sol";
 import {AccountStorageInitializable} from "./AccountStorageInitializable.sol";
 import {FunctionReference, FunctionReferenceLib} from "../libraries/FunctionReferenceLib.sol";
 import {IPlugin, PluginManifest} from "../interfaces/IPlugin.sol";

src/account/UpgradeableModularAccount.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import {Test} from "forge-std/Test.sol";
-import {_ACCOUNT_STORAGE_SLOT, getPermittedCallKey} from "../../src/libraries/AccountStorage.sol";
+import {_ACCOUNT_STORAGE_SLOT, getPermittedCallKey} from "../../src/account/AccountStorage.sol";
 import {AccountStorageInitializable} from "../../src/account/AccountStorageInitializable.sol";
 import {MockDiamondStorageContract} from "../mocks/MockDiamondStorageContract.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";