diff --git a/src/accounts/erc7579/ERC7579Factory.sol b/src/accounts/erc7579/ERC7579Factory.sol
index ec2ed9d2..8050bde8 100644
--- a/src/accounts/erc7579/ERC7579Factory.sol
+++ b/src/accounts/erc7579/ERC7579Factory.sol
@@ -7,7 +7,7 @@ import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.
 import {
     IERC7579Bootstrap,
     BootstrapConfig as ERC7579BootstrapConfig
-} from "./interfaces/IERC7579Bootstrap.sol";
+} from "src/accounts/erc7579/interfaces/IERC7579Bootstrap.sol";
 import { ERC7579Precompiles } from "src/test/precompiles/ERC7579Precompiles.sol";
 import { MSAProxy } from "./MSAProxy.sol";
 
diff --git a/src/accounts/kernel/KernelFactory.sol b/src/accounts/kernel/KernelFactory.sol
index 335eb1bd..266f6949 100644
--- a/src/accounts/kernel/KernelFactory.sol
+++ b/src/accounts/kernel/KernelFactory.sol
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0 <0.9.0;
 
-import { IKernelFactory as IKernelAccountFactory } from "./interfaces/IKernelFactory.sol";
-import { IKernel } from "./interfaces/IKernel.sol";
+import { IKernelFactory as IKernelAccountFactory } from
+    "src/accounts/kernel/interfaces/IKernelFactory.sol";
+import { IKernel } from "src/accounts/kernel/interfaces/IKernel.sol";
 import { IEntryPoint } from "@ERC4337/account-abstraction/contracts/interfaces/IEntryPoint.sol";
 import { ENTRYPOINT_ADDR } from "../../test/predeploy/EntryPoint.sol";
 import { ValidatorLib } from "./lib/ValidationTypeLib.sol";
diff --git a/src/accounts/safe/SafeFactory.sol b/src/accounts/safe/SafeFactory.sol
index e2cbba2f..3f9f8311 100644
--- a/src/accounts/safe/SafeFactory.sol
+++ b/src/accounts/safe/SafeFactory.sol
@@ -1,12 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0 <0.9.0;
 
-import { ISafe7579 } from "./interfaces/ISafe7579.sol";
+import { ISafe7579 } from "src/accounts/safe/interfaces/ISafe7579.sol";
 import { Safe } from "@safe-global/safe-contracts/contracts/Safe.sol";
 import { SafeProxy } from "@safe-global/safe-contracts/contracts/proxies/SafeProxy.sol";
 import { SafeProxyFactory } from
     "@safe-global/safe-contracts/contracts/proxies/SafeProxyFactory.sol";
-import { ISafe7579Launchpad, IERC7484, ModuleInit } from "./interfaces/ISafe7579Launchpad.sol";
+import {
+    ISafe7579Launchpad,
+    IERC7484,
+    ModuleInit
+} from "src/accounts/safe/interfaces/ISafe7579Launchpad.sol";
 import { ENTRYPOINT_ADDR } from "src/test/predeploy/EntryPoint.sol";
 import { REGISTRY_ADDR } from "src/test/predeploy/Registry.sol";
 import { makeAddr } from "src/test/utils/Vm.sol";