diff --git a/src/accounts/nexus/interfaces/INexusBootstrap.sol b/src/accounts/nexus/interfaces/INexusBootstrap.sol
index 5b06d00d..0437d5fd 100644
--- a/src/accounts/nexus/interfaces/INexusBootstrap.sol
+++ b/src/accounts/nexus/interfaces/INexusBootstrap.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { IERC7579Module } from "../../../external/ERC7579.sol";
+import { IERC7579Module } from "src/external/ERC7579.sol";
 import { IERC7484 } from "src/Interfaces.sol";
 
 struct BootstrapConfig {
diff --git a/src/integrations/registry/ExampleFactory.sol b/src/integrations/registry/ExampleFactory.sol
index a1dbd847..49af526a 100644
--- a/src/integrations/registry/ExampleFactory.sol
+++ b/src/integrations/registry/ExampleFactory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.25;
 
-import { IMSA, ERC7579Bootstrap, IERC7579Module } from "../../external/ERC7579.sol";
+import { IMSA, ERC7579Bootstrap, IERC7579Module } from "src/external/ERC7579.sol";
 import { FactoryBase } from "./FactoryBase.sol";
 import { IMSA } from "erc7579/interfaces/IMSA.sol";
 import { MSAProxy } from "erc7579/utils/MSAProxy.sol";
diff --git a/src/test/helpers/ERC7579Helpers.sol b/src/test/helpers/ERC7579Helpers.sol
index bf1ebf8f..f3e9c41e 100644
--- a/src/test/helpers/ERC7579Helpers.sol
+++ b/src/test/helpers/ERC7579Helpers.sol
@@ -6,7 +6,7 @@ import { AccountInstance } from "../RhinestoneModuleKit.sol";
 import { HelperBase } from "./HelperBase.sol";
 import { IAccountModulesPaginated } from "./interfaces/IAccountModulesPaginated.sol";
 import { IERC1271, EIP1271_MAGIC_VALUE } from "src/Interfaces.sol";
-import { CallType } from "../../external/ERC7579.sol";
+import { CallType } from "src/external/ERC7579.sol";
 
 contract ERC7579Helpers is HelperBase {
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/src/test/helpers/KernelHelpers.sol b/src/test/helpers/KernelHelpers.sol
index 3975debe..94a15fda 100644
--- a/src/test/helpers/KernelHelpers.sol
+++ b/src/test/helpers/KernelHelpers.sol
@@ -24,7 +24,7 @@ import { Kernel } from "kernel/Kernel.sol";
 import { etch } from "../utils/Vm.sol";
 import { IValidator, IModule } from "kernel/interfaces/IERC7579Modules.sol";
 import { IERC1271, EIP1271_MAGIC_VALUE } from "src/Interfaces.sol";
-import { CallType, Execution } from "../../external/ERC7579.sol";
+import { CallType, Execution } from "src/external/ERC7579.sol";
 import { MockHookMultiPlexer } from "src/Mocks.sol";
 import { TrustedForwarder } from "src/Modules.sol";
 import { PackedUserOperation } from "src/external/ERC4337.sol";
diff --git a/src/test/helpers/NexusHelpers.sol b/src/test/helpers/NexusHelpers.sol
index ea45ce6a..85e35593 100644
--- a/src/test/helpers/NexusHelpers.sol
+++ b/src/test/helpers/NexusHelpers.sol
@@ -6,7 +6,7 @@ import { AccountInstance } from "../RhinestoneModuleKit.sol";
 import { HelperBase } from "./HelperBase.sol";
 import { IAccountModulesPaginated } from "./interfaces/IAccountModulesPaginated.sol";
 import { IERC1271, EIP1271_MAGIC_VALUE } from "src/Interfaces.sol";
-import { CallType } from "../../external/ERC7579.sol";
+import { CallType } from "src/external/ERC7579.sol";
 
 contract NexusHelpers is HelperBase {
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/src/test/helpers/SafeHelpers.sol b/src/test/helpers/SafeHelpers.sol
index ef243eb5..82ae9474 100644
--- a/src/test/helpers/SafeHelpers.sol
+++ b/src/test/helpers/SafeHelpers.sol
@@ -19,7 +19,7 @@ import { IAccountModulesPaginated } from "./interfaces/IAccountModulesPaginated.
 import { CALLTYPE_STATIC } from "safe7579/lib/ModeLib.sol";
 import { IERC1271, EIP1271_MAGIC_VALUE } from "src/Interfaces.sol";
 import { startPrank, stopPrank } from "../utils/Vm.sol";
-import { CallType } from "../../external/ERC7579.sol";
+import { CallType } from "src/external/ERC7579.sol";
 
 contract SafeHelpers is HelperBase {
     /*//////////////////////////////////////////////////////////////////////////