diff --git a/src/accounts/erc7579/ERC7579Factory.sol b/src/accounts/erc7579/ERC7579Factory.sol
index 12c50d59..e63ac7a0 100644
--- a/src/accounts/erc7579/ERC7579Factory.sol
+++ b/src/accounts/erc7579/ERC7579Factory.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { IAccountFactory } from "src/accounts/interface/IAccountFactory.sol";
+import { IAccountFactory } from "../../accounts/interface/IAccountFactory.sol";
 import { IMSA } from "./interfaces/IMSA.sol";
-import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";
+import { IERC7579Account } from "../../accounts/common/interfaces/IERC7579Account.sol";
 import {
     IERC7579Bootstrap,
     BootstrapConfig as ERC7579BootstrapConfig
-} from "src/accounts/erc7579/interfaces/IERC7579Bootstrap.sol";
-import { ERC7579Precompiles } from "src/test/precompiles/ERC7579Precompiles.sol";
+} from "../../accounts/erc7579/interfaces/IERC7579Bootstrap.sol";
+import { ERC7579Precompiles } from "../../test/precompiles/ERC7579Precompiles.sol";
 
 contract ERC7579Factory is IAccountFactory, ERC7579Precompiles {
     IERC7579Account internal implementation;
diff --git a/src/accounts/kernel/KernelFactory.sol b/src/accounts/kernel/KernelFactory.sol
index 463bbe9c..5874cce5 100644
--- a/src/accounts/kernel/KernelFactory.sol
+++ b/src/accounts/kernel/KernelFactory.sol
@@ -2,17 +2,17 @@
 pragma solidity >=0.8.23 <0.9.0;
 
 import { IKernelFactory as IKernelAccountFactory } from
-    "src/accounts/kernel/interfaces/IKernelFactory.sol";
-import { IKernel } from "src/accounts/kernel/interfaces/IKernel.sol";
+    "../../accounts/kernel/interfaces/IKernelFactory.sol";
+import { IKernel } from "../../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 "src/accounts/kernel/lib/ValidationTypeLib.sol";
-import { ValidationId } from "src/accounts/kernel/types/Types.sol";
-import { IValidator } from "src/accounts/common/interfaces/IERC7579Module.sol";
-import { IHook } from "src/accounts/kernel/interfaces/IERC7579Modules.sol";
-import { IAccountFactory } from "src/accounts/interface/IAccountFactory.sol";
-import { MockHookMultiPlexer } from "src/Mocks.sol";
-import { KernelPrecompiles } from "src/test/precompiles/KernelPrecompiles.sol";
+import { ValidatorLib } from "../../accounts/kernel/lib/ValidationTypeLib.sol";
+import { ValidationId } from "../../accounts/kernel/types/Types.sol";
+import { IValidator } from "../../accounts/common/interfaces/IERC7579Module.sol";
+import { IHook } from "../../accounts/kernel/interfaces/IERC7579Modules.sol";
+import { IAccountFactory } from "../../accounts/interface/IAccountFactory.sol";
+import { MockHookMultiPlexer } from "../../Mocks.sol";
+import { KernelPrecompiles } from "../../test/precompiles/KernelPrecompiles.sol";
 
 contract KernelFactory is IAccountFactory, KernelPrecompiles {
     IKernelAccountFactory internal factory;
diff --git a/src/accounts/kernel/interfaces/IValidationManager.sol b/src/accounts/kernel/interfaces/IValidationManager.sol
index 99495a9d..51f30e91 100644
--- a/src/accounts/kernel/interfaces/IValidationManager.sol
+++ b/src/accounts/kernel/interfaces/IValidationManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { IHook, ISigner } from "src/accounts/common/interfaces/IERC7579Module.sol";
+import { IHook, ISigner } from "../../../accounts/common/interfaces/IERC7579Module.sol";
 import { PassFlag, PolicyData, ValidationId, PermissionId } from "../lib/ValidationTypeLib.sol";
 
 // erc7579 plugins
diff --git a/src/accounts/kernel/lib/ValidationTypeLib.sol b/src/accounts/kernel/lib/ValidationTypeLib.sol
index 42fbc6bc..583b5fbc 100644
--- a/src/accounts/kernel/lib/ValidationTypeLib.sol
+++ b/src/accounts/kernel/lib/ValidationTypeLib.sol
@@ -1,9 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import {
-    IValidator, IPolicy, IHook, ISigner
-} from "src/accounts/common/interfaces/IERC7579Module.sol";
+import { IValidator, IPolicy, IHook, ISigner } from "../../common/interfaces/IERC7579Module.sol";
 import {
     PassFlag,
     ValidationType,
diff --git a/src/accounts/safe/SafeFactory.sol b/src/accounts/safe/SafeFactory.sol
index d74102c8..e4bf5489 100644
--- a/src/accounts/safe/SafeFactory.sol
+++ b/src/accounts/safe/SafeFactory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { ISafe7579 } from "src/accounts/safe/interfaces/ISafe7579.sol";
+import { ISafe7579 } from "../../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
@@ -10,13 +10,13 @@ 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";
+} from "../../accounts/safe/interfaces/ISafe7579Launchpad.sol";
+import { ENTRYPOINT_ADDR } from "../../test/predeploy/EntryPoint.sol";
+import { REGISTRY_ADDR } from "../../test/predeploy/Registry.sol";
+import { makeAddr } from "../../test/utils/Vm.sol";
 import { Solarray } from "solarray/Solarray.sol";
-import { IAccountFactory } from "src/accounts/interface/IAccountFactory.sol";
-import { Safe7579Precompiles } from "src/test/precompiles/Safe7579Precompiles.sol";
+import { IAccountFactory } from "../../accounts/interface/IAccountFactory.sol";
+import { Safe7579Precompiles } from "../../test/precompiles/Safe7579Precompiles.sol";
 
 contract SafeFactory is IAccountFactory, Safe7579Precompiles {
     // singletons
diff --git a/src/deployment/RegistryDeployer.sol b/src/deployment/RegistryDeployer.sol
index 19090218..c0072239 100644
--- a/src/deployment/RegistryDeployer.sol
+++ b/src/deployment/RegistryDeployer.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { IRegistry, IExternalResolver } from "src/deployment/registry/interfaces/IRegistry.sol";
+import { IRegistry, IExternalResolver } from "./registry/interfaces/IRegistry.sol";
 import {
     ResolverRecord,
     ModuleRecord,
@@ -11,9 +11,8 @@ import {
     ModuleType,
     SchemaUID,
     SchemaRecord
-} from "src/deployment/registry/types/DataTypes.sol";
-import { IExternalSchemaValidator } from
-    "src/deployment/registry/interfaces/IExternalSchemaValidator.sol";
+} from "./registry/types/DataTypes.sol";
+import { IExternalSchemaValidator } from "./registry/interfaces/IExternalSchemaValidator.sol";
 
 address constant REGISTRY_ADDR = 0x000000000069E2a187AEFFb852bF3cCdC95151B2;
 
diff --git a/src/deployment/registry/interfaces/IERC7484.sol b/src/deployment/registry/interfaces/IERC7484.sol
index b7bf16da..60a3a711 100644
--- a/src/deployment/registry/interfaces/IERC7484.sol
+++ b/src/deployment/registry/interfaces/IERC7484.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { ModuleType } from "src/deployment/registry/types/DataTypes.sol";
+import { ModuleType } from "../types/DataTypes.sol";
 
 interface IERC7484 {
     event NewTrustedAttesters(address indexed smartAccount);
diff --git a/src/deployment/registry/interfaces/IExternalResolver.sol b/src/deployment/registry/interfaces/IExternalResolver.sol
index 65ce9e86..8eccb978 100644
--- a/src/deployment/registry/interfaces/IExternalResolver.sol
+++ b/src/deployment/registry/interfaces/IExternalResolver.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { AttestationRecord, ModuleRecord } from "src/deployment/registry/types/DataTypes.sol";
+import { AttestationRecord, ModuleRecord } from "../types/DataTypes.sol";
 import { IERC165 } from "forge-std/interfaces/IERC165.sol";
 
 /**
diff --git a/src/deployment/registry/interfaces/IExternalSchemaValidator.sol b/src/deployment/registry/interfaces/IExternalSchemaValidator.sol
index 5ec36149..2d9f651a 100644
--- a/src/deployment/registry/interfaces/IExternalSchemaValidator.sol
+++ b/src/deployment/registry/interfaces/IExternalSchemaValidator.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { AttestationRecord } from "src/deployment/registry/types/DataTypes.sol";
+import { AttestationRecord } from "../types/DataTypes.sol";
 import { IERC165 } from "forge-std/interfaces/IERC165.sol";
 
 /**
diff --git a/src/deployment/registry/interfaces/IRegistry.sol b/src/deployment/registry/interfaces/IRegistry.sol
index 7120f33e..24642968 100644
--- a/src/deployment/registry/interfaces/IRegistry.sol
+++ b/src/deployment/registry/interfaces/IRegistry.sol
@@ -12,11 +12,10 @@ import {
     RevocationRequest,
     SchemaUID,
     SchemaRecord
-} from "src/deployment/registry/types/DataTypes.sol";
-import { IExternalSchemaValidator } from
-    "src/deployment/registry/interfaces/IExternalSchemaValidator.sol";
-import { IExternalResolver } from "src/deployment/registry/interfaces/IExternalResolver.sol";
-import { IERC7484 } from "src/deployment/registry/interfaces/IERC7484.sol";
+} from "../types/DataTypes.sol";
+import { IExternalSchemaValidator } from "./IExternalSchemaValidator.sol";
+import { IExternalResolver } from "./IExternalResolver.sol";
+import { IERC7484 } from "./IERC7484.sol";
 
 /**
  * Interface definition of all features of the registry:
diff --git a/src/deployment/registry/types/DataTypes.sol b/src/deployment/registry/types/DataTypes.sol
index fca9ac2b..1ae07f05 100644
--- a/src/deployment/registry/types/DataTypes.sol
+++ b/src/deployment/registry/types/DataTypes.sol
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { IExternalSchemaValidator } from
-    "src/deployment/registry/interfaces/IExternalSchemaValidator.sol";
-import { IExternalResolver } from "src/deployment/registry/interfaces/IExternalResolver.sol";
+import { IExternalSchemaValidator } from "../interfaces/IExternalSchemaValidator.sol";
+import { IExternalResolver } from "../interfaces/IExternalResolver.sol";
 
 /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
 /*                     Storage Structs                        */
diff --git a/src/integrations/ERC20.sol b/src/integrations/ERC20.sol
index 9ac2216e..0969fdee 100644
--- a/src/integrations/ERC20.sol
+++ b/src/integrations/ERC20.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.23 <0.9.0;
 
 import { IERC20 } from "forge-std/interfaces/IERC20.sol";
-import { Execution } from "src/accounts/erc7579/lib/ExecutionLib.sol";
+import { Execution } from "../accounts/erc7579/lib/ExecutionLib.sol";
 import { ERC7579Exec } from "./ERC7579Exec.sol";
 
 library ERC20Integration {
diff --git a/src/integrations/ERC7579Exec.sol b/src/integrations/ERC7579Exec.sol
index c202f54f..24c1ccc2 100644
--- a/src/integrations/ERC7579Exec.sol
+++ b/src/integrations/ERC7579Exec.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.0 <0.9.0;
 import {
     Execution,
     ExecutionLib as ERC7579ExecutionLib
-} from "src/accounts/erc7579/lib/ExecutionLib.sol";
+} from "../accounts/erc7579/lib/ExecutionLib.sol";
 import {
     ModeLib as ERC7579ModeLib,
     CALLTYPE_SINGLE,
@@ -14,8 +14,8 @@ import {
     MODE_DEFAULT,
     ModePayload,
     ModeCode
-} from "src/accounts/common/lib/ModeLib.sol";
-import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";
+} from "../accounts/common/lib/ModeLib.sol";
+import { IERC7579Account } from "../accounts/common/interfaces/IERC7579Account.sol";
 
 library ERC7579Exec {
     function exec7579(
diff --git a/src/integrations/registry/ExampleFactory.sol b/src/integrations/registry/ExampleFactory.sol
index 466f7446..7521c09d 100644
--- a/src/integrations/registry/ExampleFactory.sol
+++ b/src/integrations/registry/ExampleFactory.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { IMSA } from "src/accounts/erc7579/interfaces/IMSA.sol";
+import { IMSA } from "../../accounts/erc7579/interfaces/IMSA.sol";
 import { FactoryBase } from "./FactoryBase.sol";
-import { IERC7579Bootstrap } from "src/accounts/erc7579/interfaces/IERC7579Bootstrap.sol";
-import { IModule as IERC7579Module } from "src/accounts/common/interfaces/IERC7579Module.sol";
-import { ERC7579Precompiles } from "src/test/precompiles/ERC7579Precompiles.sol";
+import { IERC7579Bootstrap } from "../../accounts/erc7579/interfaces/IERC7579Bootstrap.sol";
+import { IModule as IERC7579Module } from "../../accounts/common/interfaces/IERC7579Module.sol";
+import { ERC7579Precompiles } from "../../test/precompiles/ERC7579Precompiles.sol";
 
 contract ExampleFactory is FactoryBase, ERC7579Precompiles {
     address public immutable IMPLEMENTATION;
diff --git a/src/test/helpers/ERC7579Helpers.sol b/src/test/helpers/ERC7579Helpers.sol
index 62b29981..09757ef3 100644
--- a/src/test/helpers/ERC7579Helpers.sol
+++ b/src/test/helpers/ERC7579Helpers.sol
@@ -5,8 +5,8 @@ pragma solidity >=0.8.23 <0.9.0;
 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 "src/accounts/common/lib/ModeLib.sol";
+import { IERC1271, EIP1271_MAGIC_VALUE } from "../../Interfaces.sol";
+import { CallType } from "../../accounts/common/lib/ModeLib.sol";
 
 contract ERC7579Helpers is HelperBase {
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/src/test/helpers/HelperBase.sol b/src/test/helpers/HelperBase.sol
index 1f53f5c4..ddb3a5b0 100644
--- a/src/test/helpers/HelperBase.sol
+++ b/src/test/helpers/HelperBase.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.23 <0.9.0;
 
-import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";
+import { IERC7579Account } from "../../accounts/common/interfaces/IERC7579Account.sol";
 import {
     ModeLib,
     ModeCode,
@@ -11,19 +11,19 @@ import {
     EXECTYPE_DEFAULT,
     CALLTYPE_BATCH,
     ModePayload
-} from "src/accounts/common/lib/ModeLib.sol";
+} from "../../accounts/common/lib/ModeLib.sol";
 import {
     IModule as IERC7579Module,
     MODULE_TYPE_VALIDATOR,
     MODULE_TYPE_EXECUTOR,
     MODULE_TYPE_HOOK,
     MODULE_TYPE_FALLBACK
-} from "src/accounts/common/interfaces/IERC7579Module.sol";
+} from "../../accounts/common/interfaces/IERC7579Module.sol";
 import { PackedUserOperation } from "../../external/ERC4337.sol";
 import { AccountInstance } from "../RhinestoneModuleKit.sol";
 import "../utils/Vm.sol";
-import { IERC1271, EIP1271_MAGIC_VALUE } from "src/Interfaces.sol";
-import { Execution } from "src/accounts/erc7579/lib/ExecutionLib.sol";
+import { IERC1271, EIP1271_MAGIC_VALUE } from "../../Interfaces.sol";
+import { Execution } from "../../accounts/erc7579/lib/ExecutionLib.sol";
 
 abstract contract HelperBase {
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/src/test/helpers/KernelHelpers.sol b/src/test/helpers/KernelHelpers.sol
index 2fb6dded..fe2ee421 100644
--- a/src/test/helpers/KernelHelpers.sol
+++ b/src/test/helpers/KernelHelpers.sol
@@ -2,8 +2,8 @@
 pragma solidity >=0.8.23 <0.9.0;
 
 import { AccountInstance } from "../RhinestoneModuleKit.sol";
-import { ValidatorLib, ValidationConfig } from "src/accounts/kernel/lib/ValidationTypeLib.sol";
-import { ValidationType, ValidationMode, ValidationId } from "src/accounts/kernel/types/Types.sol";
+import { ValidatorLib, ValidationConfig } from "../../accounts/kernel/lib/ValidationTypeLib.sol";
+import { ValidationType, ValidationMode, ValidationId } from "../../accounts/kernel/types/Types.sol";
 import {
     VALIDATION_TYPE_PERMISSION,
     VALIDATION_TYPE_ROOT,
@@ -14,24 +14,24 @@ import {
     MODULE_TYPE_HOOK,
     MODULE_TYPE_VALIDATOR,
     KERNEL_WRAPPER_TYPE_HASH
-} from "src/accounts/kernel/types/Constants.sol";
+} from "../../accounts/kernel/types/Constants.sol";
 import { ENTRYPOINT_ADDR } from "../predeploy/EntryPoint.sol";
 import { IEntryPoint } from "@ERC4337/account-abstraction/contracts/interfaces/IEntryPoint.sol";
-import { IERC7579Account } from "src/accounts/kernel/interfaces/IERC7579Account.sol";
-import { MockFallback } from "src/accounts/kernel/mock/MockFallback.sol";
+import { IERC7579Account } from "../../accounts/kernel/interfaces/IERC7579Account.sol";
+import { MockFallback } from "../../accounts/kernel/mock/MockFallback.sol";
 import { HelperBase } from "./HelperBase.sol";
-import { IKernel } from "src/accounts/kernel/interfaces/IKernel.sol";
+import { IKernel } from "../../accounts/kernel/interfaces/IKernel.sol";
 import { etch } from "../utils/Vm.sol";
-import { IValidator, IModule } from "src/accounts/common/interfaces/IERC7579Module.sol";
-import { IERC1271, EIP1271_MAGIC_VALUE } from "src/Interfaces.sol";
-import { CallType } from "src/accounts/common/lib/ModeLib.sol";
-import { Execution } from "src/accounts/erc7579/lib/ExecutionLib.sol";
-import { MockHookMultiPlexer } from "src/Mocks.sol";
-import { TrustedForwarder } from "src/Modules.sol";
-import { PackedUserOperation } from "src/external/ERC4337.sol";
-import { KernelFactory } from "src/accounts/kernel/KernelFactory.sol";
+import { IValidator, IModule } from "../../accounts/common/interfaces/IERC7579Module.sol";
+import { IERC1271, EIP1271_MAGIC_VALUE } from "../../Interfaces.sol";
+import { CallType } from "../../accounts/common/lib/ModeLib.sol";
+import { Execution } from "../../accounts/erc7579/lib/ExecutionLib.sol";
+import { MockHookMultiPlexer } from "../../Mocks.sol";
+import { TrustedForwarder } from "../../Modules.sol";
+import { PackedUserOperation } from "../../external/ERC4337.sol";
+import { KernelFactory } from "../../accounts/kernel/KernelFactory.sol";
 import { EIP712 } from "solady/utils/EIP712.sol";
-import { KernelPrecompiles, ISetSelector } from "src/test/precompiles/KernelPrecompiles.sol";
+import { KernelPrecompiles, ISetSelector } from "../../test/precompiles/KernelPrecompiles.sol";
 
 contract KernelHelpers is HelperBase, KernelPrecompiles {
     /*//////////////////////////////////////////////////////////////////////////
@@ -224,7 +224,7 @@ contract KernelHelpers is HelperBase, KernelPrecompiles {
 
     /**
      * @dev
-     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/src/Kernel.sol#L311-L321
+     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/../../Kernel.sol#L311-L321
      */
     function getInstallValidatorData(
         AccountInstance memory instance,
@@ -244,7 +244,7 @@ contract KernelHelpers is HelperBase, KernelPrecompiles {
 
     /**
      * @dev
-     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/src/Kernel.sol#L324-L334
+     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/../../Kernel.sol#L324-L334
      */
     function getInstallExecutorData(
         AccountInstance memory instance,
@@ -264,7 +264,7 @@ contract KernelHelpers is HelperBase, KernelPrecompiles {
 
     /**
      * @dev
-     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/src/Kernel.sol#L336-L345
+     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/../../Kernel.sol#L336-L345
      */
     function getInstallFallbackData(
         AccountInstance memory instance,
@@ -288,7 +288,7 @@ contract KernelHelpers is HelperBase, KernelPrecompiles {
 
     /**
      * @dev
-     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/src/Kernel.sol#L402-L403
+     * https://github.com/zerodevapp/kernel/blob/a807c8ec354a77ebb7cdb73c5be9dd315cda0df2/../../Kernel.sol#L402-L403
      */
     function getUninstallFallbackData(
         AccountInstance memory, // instance
diff --git a/src/test/helpers/NexusHelpers.sol b/src/test/helpers/NexusHelpers.sol
index bf9cfb16..16280e2c 100644
--- a/src/test/helpers/NexusHelpers.sol
+++ b/src/test/helpers/NexusHelpers.sol
@@ -5,8 +5,8 @@ import { PackedUserOperation } from "../../external/ERC4337.sol";
 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 "src/accounts/common/lib/ModeLib.sol";
+import { IERC1271, EIP1271_MAGIC_VALUE } from "../../Interfaces.sol";
+import { CallType } from "../../accounts/common/lib/ModeLib.sol";
 
 contract NexusHelpers is HelperBase {
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/src/test/helpers/SafeHelpers.sol b/src/test/helpers/SafeHelpers.sol
index 1425b7ec..8e5c9b5a 100644
--- a/src/test/helpers/SafeHelpers.sol
+++ b/src/test/helpers/SafeHelpers.sol
@@ -3,23 +3,23 @@ pragma solidity >=0.8.23 <0.9.0;
 
 import { HelperBase } from "./HelperBase.sol";
 import { AccountInstance } from "../RhinestoneModuleKit.sol";
-import { ISafe7579Launchpad } from "src/accounts/safe/interfaces/ISafe7579Launchpad.sol";
-import { SafeFactory } from "src/accounts/safe/SafeFactory.sol";
+import { ISafe7579Launchpad } from "../../accounts/safe/interfaces/ISafe7579Launchpad.sol";
+import { SafeFactory } from "../../accounts/safe/SafeFactory.sol";
 import { PackedUserOperation } from "../../external/ERC4337.sol";
 import {
     MODULE_TYPE_HOOK,
     MODULE_TYPE_VALIDATOR,
     MODULE_TYPE_EXECUTOR,
     MODULE_TYPE_FALLBACK
-} from "src/accounts/common/interfaces/IERC7579Module.sol";
-import { IERC7579Account } from "src/accounts/common/interfaces/IERC7579Account.sol";
-import { HookType } from "src/accounts/safe/types/DataTypes.sol";
-import { IAccountFactory } from "src/accounts/interface/IAccountFactory.sol";
+} from "../../accounts/common/interfaces/IERC7579Module.sol";
+import { IERC7579Account } from "../../accounts/common/interfaces/IERC7579Account.sol";
+import { HookType } from "../../accounts/safe/types/DataTypes.sol";
+import { IAccountFactory } from "../../accounts/interface/IAccountFactory.sol";
 import { IAccountModulesPaginated } from "./interfaces/IAccountModulesPaginated.sol";
-import { CALLTYPE_STATIC } from "src/accounts/common/lib/ModeLib.sol";
-import { IERC1271, EIP1271_MAGIC_VALUE } from "src/Interfaces.sol";
+import { CALLTYPE_STATIC } from "../../accounts/common/lib/ModeLib.sol";
+import { IERC1271, EIP1271_MAGIC_VALUE } from "../../Interfaces.sol";
 import { startPrank, stopPrank } from "../utils/Vm.sol";
-import { CallType } from "src/accounts/common/lib/ModeLib.sol";
+import { CallType } from "../../accounts/common/lib/ModeLib.sol";
 
 contract SafeHelpers is HelperBase {
     /*//////////////////////////////////////////////////////////////////////////
diff --git a/src/test/helpers/SmartSessionHelpers.sol b/src/test/helpers/SmartSessionHelpers.sol
index 4da17ab0..8b9c79a6 100644
--- a/src/test/helpers/SmartSessionHelpers.sol
+++ b/src/test/helpers/SmartSessionHelpers.sol
@@ -10,9 +10,9 @@ import {
     PolicyData,
     ActionData,
     ERC7739Data
-} from "src/test/helpers/interfaces/ISmartSession.sol";
+} from "../../test/helpers/interfaces/ISmartSession.sol";
 import { LibZip } from "solady/utils/LibZip.sol";
-import { ModeCode as ExecutionMode } from "src/accounts/common/lib/ModeLib.sol";
+import { ModeCode as ExecutionMode } from "../../accounts/common/lib/ModeLib.sol";
 import { EfficientHashLib } from "solady/utils/EfficientHashLib.sol";
 import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 
diff --git a/src/test/helpers/interfaces/ISmartSession.sol b/src/test/helpers/interfaces/ISmartSession.sol
index 484e8a34..5178dfd0 100644
--- a/src/test/helpers/interfaces/ISmartSession.sol
+++ b/src/test/helpers/interfaces/ISmartSession.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.8.0 <0.9.0;
 
-import { IModule } from "src/accounts/common/interfaces/IERC7579Module.sol";
+import { IModule } from "../../../accounts/common/interfaces/IERC7579Module.sol";
 
-import { PackedUserOperation } from "src/external/ERC4337.sol";
+import { PackedUserOperation } from "../../../external/ERC4337.sol";
 
 /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
 /*                 Custom Types & Constants                   */