diff --git a/frontend/src/lib/api/accounts.api.ts b/frontend/src/lib/api/accounts.api.ts
index ee80b7c0749..5fcedda8926 100644
--- a/frontend/src/lib/api/accounts.api.ts
+++ b/frontend/src/lib/api/accounts.api.ts
@@ -1,7 +1,7 @@
+import { nnsDappCanister } from "$lib/api/nns-dapp.api";
 import type { AccountIdentifierString } from "$lib/canisters/nns-dapp/nns-dapp.types";
 import { hashCode, logWithTimestamp } from "$lib/utils/dev.utils";
 import type { Identity } from "@dfinity/agent";
-import { nnsDappCanister } from "./nns-dapp.api";
 
 export const createSubAccount = async ({
   name,
diff --git a/frontend/src/lib/api/canisters.api.ts b/frontend/src/lib/api/canisters.api.ts
index 8dc861d8681..d58898c0134 100644
--- a/frontend/src/lib/api/canisters.api.ts
+++ b/frontend/src/lib/api/canisters.api.ts
@@ -1,4 +1,6 @@
 import { createAgent } from "$lib/api/agent.api";
+import { sendICP } from "$lib/api/icp-ledger.api";
+import { nnsDappCanister } from "$lib/api/nns-dapp.api";
 import { ICManagementCanister } from "$lib/canisters/ic-management/ic-management.canister";
 import type {
   CanisterDetails,
@@ -30,8 +32,6 @@ import { CMCCanister, ProcessingError, type Cycles } from "@dfinity/cmc";
 import { AccountIdentifier, SubAccount } from "@dfinity/ledger-icp";
 import type { Principal } from "@dfinity/principal";
 import { nonNullish, principalToSubAccount } from "@dfinity/utils";
-import { sendICP } from "./icp-ledger.api";
-import { nnsDappCanister } from "./nns-dapp.api";
 
 // This way, TS understands that if it's invalid, then the name is a string
 type LongName = string;
diff --git a/frontend/src/lib/api/dev.api.ts b/frontend/src/lib/api/dev.api.ts
index eb1859cf471..274b9b24d96 100644
--- a/frontend/src/lib/api/dev.api.ts
+++ b/frontend/src/lib/api/dev.api.ts
@@ -1,3 +1,6 @@
+import { createAgent } from "$lib/api/agent.api";
+import { governanceCanister } from "$lib/api/governance.api";
+import { wrapper } from "$lib/api/sns-wrapper.api";
 import { LEDGER_CANISTER_ID } from "$lib/constants/canister-ids.constants";
 import { HOST, IS_TESTNET } from "$lib/constants/environment.constants";
 import type { Account } from "$lib/types/account";
@@ -22,9 +25,6 @@ import {
   createAgent as createAgentUtils,
   toNullable,
 } from "@dfinity/utils";
-import { createAgent } from "./agent.api";
-import { governanceCanister } from "./governance.api";
-import { wrapper } from "./sns-wrapper.api";
 
 export const testAccountPrincipal =
   "jg6qm-uw64t-m6ppo-oluwn-ogr5j-dc5pm-lgy2p-eh6px-hebcd-5v73i-nqe";
diff --git a/frontend/src/lib/api/governace-test.api.ts b/frontend/src/lib/api/governace-test.api.ts
index e853c9ddadb..311257f3f50 100644
--- a/frontend/src/lib/api/governace-test.api.ts
+++ b/frontend/src/lib/api/governace-test.api.ts
@@ -1,8 +1,8 @@
+import { createAgent } from "$lib/api/agent.api";
 import { GOVERNANCE_CANISTER_ID } from "$lib/constants/canister-ids.constants";
 import { HOST } from "$lib/constants/environment.constants";
 import type { Identity } from "@dfinity/agent";
 import { GovernanceTestCanister, type Neuron } from "@dfinity/nns";
-import { createAgent } from "./agent.api";
 
 const governanceTestCanister = async (identity: Identity) => {
   const agent = await createAgent({
diff --git a/frontend/src/lib/api/governance.api.ts b/frontend/src/lib/api/governance.api.ts
index d97e0553826..bab89b62684 100644
--- a/frontend/src/lib/api/governance.api.ts
+++ b/frontend/src/lib/api/governance.api.ts
@@ -1,4 +1,5 @@
 import { createAgent } from "$lib/api/agent.api";
+import { ledgerCanister as getLedgerCanister } from "$lib/api/icp-ledger.api";
 import type { SubAccountArray } from "$lib/canisters/nns-dapp/nns-dapp.types";
 import { GOVERNANCE_CANISTER_ID } from "$lib/constants/canister-ids.constants";
 import { HOST } from "$lib/constants/environment.constants";
@@ -20,7 +21,6 @@ import {
   type RewardEvent,
 } from "@dfinity/nns";
 import type { Principal } from "@dfinity/principal";
-import { ledgerCanister as getLedgerCanister } from "./icp-ledger.api";
 
 /**
  * COMMON TYPES
diff --git a/frontend/src/lib/api/icp-index.api.ts b/frontend/src/lib/api/icp-index.api.ts
index 9ac36e2110b..d4d177f06ee 100644
--- a/frontend/src/lib/api/icp-index.api.ts
+++ b/frontend/src/lib/api/icp-index.api.ts
@@ -1,3 +1,4 @@
+import { createAgent } from "$lib/api/agent.api";
 import { INDEX_CANISTER_ID } from "$lib/constants/canister-ids.constants";
 import { HOST } from "$lib/constants/environment.constants";
 import { logWithTimestamp } from "$lib/utils/dev.utils";
@@ -7,7 +8,6 @@ import {
   type GetAccountIdentifierTransactionsResponse,
 } from "@dfinity/ledger-icp";
 import { fromNullable } from "@dfinity/utils";
-import { createAgent } from "./agent.api";
 
 export interface GetTransactionsParams {
   identity: Identity;
diff --git a/frontend/src/lib/api/icrc-index.api.ts b/frontend/src/lib/api/icrc-index.api.ts
index 1df05afa861..37733ccb5bf 100644
--- a/frontend/src/lib/api/icrc-index.api.ts
+++ b/frontend/src/lib/api/icrc-index.api.ts
@@ -1,3 +1,4 @@
+import { createAgent } from "$lib/api/agent.api";
 import { HOST } from "$lib/constants/environment.constants";
 import type { Agent, Identity } from "@dfinity/agent";
 import {
@@ -7,7 +8,6 @@ import {
 } from "@dfinity/ledger-icrc";
 import type { Principal } from "@dfinity/principal";
 import { fromNullable } from "@dfinity/utils";
-import { createAgent } from "./agent.api";
 
 export interface GetTransactionsParams {
   identity: Identity;
diff --git a/frontend/src/lib/api/proposals.api.ts b/frontend/src/lib/api/proposals.api.ts
index 74dae91725a..5d05bd24650 100644
--- a/frontend/src/lib/api/proposals.api.ts
+++ b/frontend/src/lib/api/proposals.api.ts
@@ -1,4 +1,5 @@
 import { createAgent } from "$lib/api/agent.api";
+import { nnsDappCanister } from "$lib/api/nns-dapp.api";
 import { DEFAULT_LIST_PAGINATION_LIMIT } from "$lib/constants/constants";
 import { HOST } from "$lib/constants/environment.constants";
 import { hashCode, logWithTimestamp } from "$lib/utils/dev.utils";
@@ -13,7 +14,6 @@ import {
   type ProposalId,
   type ProposalInfo,
 } from "@dfinity/nns";
-import { nnsDappCanister } from "./nns-dapp.api";
 
 export const queryProposals = async ({
   beforeProposal,
diff --git a/frontend/src/lib/api/sns-governance.api.ts b/frontend/src/lib/api/sns-governance.api.ts
index 9c8d40c5552..e836414da3f 100644
--- a/frontend/src/lib/api/sns-governance.api.ts
+++ b/frontend/src/lib/api/sns-governance.api.ts
@@ -1,3 +1,4 @@
+import { wrapper } from "$lib/api/sns-wrapper.api";
 import { logWithTimestamp } from "$lib/utils/dev.utils";
 import { subaccountToHexString } from "$lib/utils/sns-neuron.utils";
 import type { Identity } from "@dfinity/agent";
@@ -12,7 +13,6 @@ import type {
   SnsProposalId,
   SnsVote,
 } from "@dfinity/sns";
-import { wrapper } from "./sns-wrapper.api";
 
 export const querySnsNeurons = async ({
   identity,
diff --git a/frontend/src/lib/api/sns-sale.api.ts b/frontend/src/lib/api/sns-sale.api.ts
index 9f7d72fe5c6..70fc602a37a 100644
--- a/frontend/src/lib/api/sns-sale.api.ts
+++ b/frontend/src/lib/api/sns-sale.api.ts
@@ -1,4 +1,5 @@
 import { createAgent } from "$lib/api/agent.api";
+import { wrapper } from "$lib/api/sns-wrapper.api";
 import { HOST } from "$lib/constants/environment.constants";
 import { logWithTimestamp } from "$lib/utils/dev.utils";
 import { isMethodNotSupportedError } from "$lib/utils/error.utils";
@@ -11,7 +12,6 @@ import type {
 } from "@dfinity/sns";
 import { SnsSwapCanister } from "@dfinity/sns";
 import { toNullable } from "@dfinity/utils";
-import { wrapper } from "./sns-wrapper.api";
 
 export const getOpenTicket = async ({
   identity,
diff --git a/frontend/src/lib/api/sns.api.ts b/frontend/src/lib/api/sns.api.ts
index de8715f18d3..ada50fda0d1 100644
--- a/frontend/src/lib/api/sns.api.ts
+++ b/frontend/src/lib/api/sns.api.ts
@@ -1,3 +1,4 @@
+import { wrapper, wrappers } from "$lib/api/sns-wrapper.api";
 import type { SnsSwapCommitment } from "$lib/types/sns";
 import type {
   QueryRootCanisterId,
@@ -16,7 +17,6 @@ import type {
   SnsSwapBuyerState,
   SnsWrapper,
 } from "@dfinity/sns";
-import { wrapper, wrappers } from "./sns-wrapper.api";
 
 export const queryAllSnsMetadata = async ({
   identity,
diff --git a/frontend/src/lib/canisters/ic-management/converters.ts b/frontend/src/lib/canisters/ic-management/converters.ts
index 3860314ef30..325b89668e9 100644
--- a/frontend/src/lib/canisters/ic-management/converters.ts
+++ b/frontend/src/lib/canisters/ic-management/converters.ts
@@ -1,7 +1,7 @@
+import type { CanisterDetails } from "$lib/canisters/ic-management/ic-management.canister.types";
+import { CanisterStatus } from "$lib/canisters/ic-management/ic-management.canister.types";
 import type { CanisterStatusResponse } from "@dfinity/ic-management";
 import type { Principal } from "@dfinity/principal";
-import type { CanisterDetails } from "./ic-management.canister.types";
-import { CanisterStatus } from "./ic-management.canister.types";
 
 const getCanisterStatus = (
   status:
diff --git a/frontend/src/lib/canisters/ic-management/ic-management.canister.ts b/frontend/src/lib/canisters/ic-management/ic-management.canister.ts
index 38d9882f05c..78b830327f0 100644
--- a/frontend/src/lib/canisters/ic-management/ic-management.canister.ts
+++ b/frontend/src/lib/canisters/ic-management/ic-management.canister.ts
@@ -1,15 +1,15 @@
+import { toCanisterDetails } from "$lib/canisters/ic-management/converters";
+import { mapError } from "$lib/canisters/ic-management/ic-management.errors";
 import type { ICManagementCanisterOptions } from "@dfinity/ic-management";
 import {
   ICManagementCanister as ICMgmtCanister,
   type CanisterStatusResponse,
 } from "@dfinity/ic-management";
 import type { Principal } from "@dfinity/principal";
-import { toCanisterDetails } from "./converters";
 import type {
   CanisterDetails,
   CanisterSettings,
 } from "./ic-management.canister.types";
-import { mapError } from "./ic-management.errors";
 
 /**
  * The ICManagementCanister was initially implemented here, but it has since been moved to ic-js and packaged as a standalone library.
diff --git a/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.ts b/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.ts
index 7c1c6dc048f..824be7d63b4 100644
--- a/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.ts
+++ b/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.ts
@@ -1,10 +1,12 @@
+import type { NNSDappCanisterOptions } from "$lib/canisters/nns-dapp/nns-dapp.canister.types";
+import { idlFactory as certifiedIdlFactory } from "$lib/canisters/nns-dapp/nns-dapp.certified.idl";
+import type { NNSDappService } from "$lib/canisters/nns-dapp/nns-dapp.idl";
+import { idlFactory } from "$lib/canisters/nns-dapp/nns-dapp.idl";
 import { Actor } from "@dfinity/agent";
 import { AccountIdentifier } from "@dfinity/ledger-icp";
 import type { ProposalId } from "@dfinity/nns";
 import type { Principal } from "@dfinity/principal";
 import { nonNullish, toNullable } from "@dfinity/utils";
-import type { NNSDappCanisterOptions } from "./nns-dapp.canister.types";
-import { idlFactory as certifiedIdlFactory } from "./nns-dapp.certified.idl";
 import {
   AccountNotFoundError,
   CanisterAlreadyAttachedError,
@@ -20,8 +22,6 @@ import {
   TooManyImportedTokensError,
   UnknownProposalPayloadError,
 } from "./nns-dapp.errors";
-import type { NNSDappService } from "./nns-dapp.idl";
-import { idlFactory } from "./nns-dapp.idl";
 import type {
   AccountDetails,
   CanisterDetails,
diff --git a/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.types.ts b/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.types.ts
index 627de2302f8..71458d9a18e 100644
--- a/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.types.ts
+++ b/frontend/src/lib/canisters/nns-dapp/nns-dapp.canister.types.ts
@@ -1,6 +1,6 @@
+import type { NNSDappService } from "$lib/canisters/nns-dapp/nns-dapp.idl";
 import type { Agent } from "@dfinity/agent";
 import type { Principal } from "@dfinity/principal";
-import type { NNSDappService } from "./nns-dapp.idl";
 
 export interface NNSDappCanisterOptions {
   // The agent to use when communicating with the governance canister.
diff --git a/frontend/src/lib/canisters/nns-dapp/nns-dapp.idl.d.ts b/frontend/src/lib/canisters/nns-dapp/nns-dapp.idl.d.ts
index ec349fe05ad..07b4c096555 100644
--- a/frontend/src/lib/canisters/nns-dapp/nns-dapp.idl.d.ts
+++ b/frontend/src/lib/canisters/nns-dapp/nns-dapp.idl.d.ts
@@ -1,5 +1,5 @@
+import _SERVICE from "$lib/canisters/nns-dapp/nns-dapp.types";
 import type { IDL } from "@dfinity/candid";
-import _SERVICE from "./nns-dapp.types";
 export const idlFactory: IDL.InterfaceFactory;
 
 export { _SERVICE as NNSDappService };
diff --git a/frontend/src/lib/canisters/tvl/tvl.canister.ts b/frontend/src/lib/canisters/tvl/tvl.canister.ts
index 40260e97a6e..db7978921ea 100644
--- a/frontend/src/lib/canisters/tvl/tvl.canister.ts
+++ b/frontend/src/lib/canisters/tvl/tvl.canister.ts
@@ -3,11 +3,11 @@ import type {
   GetTVLResult,
   TVLCanisterOptions,
 } from "$lib/canisters/tvl/tvl.canister.types";
+import { idlFactory as certifiedIdlFactory } from "$lib/canisters/tvl/tvl.certified.idl";
+import { idlFactory } from "$lib/canisters/tvl/tvl.idl";
+import type { _SERVICE as TVLService } from "$lib/canisters/tvl/tvl.types";
 import { Actor } from "@dfinity/agent";
 import { Canister, nonNullish, toNullable } from "@dfinity/utils";
-import { idlFactory as certifiedIdlFactory } from "./tvl.certified.idl";
-import { idlFactory } from "./tvl.idl";
-import type { _SERVICE as TVLService } from "./tvl.types";
 
 export class TVLCanister extends Canister<TVLService> {
   public static create(options: TVLCanisterOptions): TVLCanister {
diff --git a/frontend/src/lib/components/accounts/AddSubAccount.svelte b/frontend/src/lib/components/accounts/AddSubAccount.svelte
index 31f407b789a..28cb8c7e424 100644
--- a/frontend/src/lib/components/accounts/AddSubAccount.svelte
+++ b/frontend/src/lib/components/accounts/AddSubAccount.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import TextInputForm from "$lib/components/common/TextInputForm.svelte";
   import { addSubAccount } from "$lib/services/icp-accounts.services";
   import { startBusy, stopBusy } from "$lib/stores/busy.store";
   import { i18n } from "$lib/stores/i18n";
@@ -6,7 +7,6 @@
     ADD_ACCOUNT_CONTEXT_KEY,
     type AddAccountContext,
   } from "$lib/types/add-account.context";
-  import TextInputForm from "../common/TextInputForm.svelte";
   import { busy } from "@dfinity/gix-components";
   import { createEventDispatcher, getContext } from "svelte";
 
diff --git a/frontend/src/lib/components/accounts/HardwareWalletConnect.svelte b/frontend/src/lib/components/accounts/HardwareWalletConnect.svelte
index 65f15f4dd12..37a1c750e5c 100644
--- a/frontend/src/lib/components/accounts/HardwareWalletConnect.svelte
+++ b/frontend/src/lib/components/accounts/HardwareWalletConnect.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import HardwareWalletConnectAction from "$lib/components/accounts/HardwareWalletConnectAction.svelte";
   import { LedgerConnectionState } from "$lib/constants/ledger.constants";
   import type { LedgerIdentity } from "$lib/identities/ledger.identity";
   import { registerHardwareWalletProxy } from "$lib/proxy/icp-ledger.services.proxy";
@@ -9,7 +10,6 @@
     ADD_ACCOUNT_CONTEXT_KEY,
     type AddAccountContext,
   } from "$lib/types/add-account.context";
-  import HardwareWalletConnectAction from "./HardwareWalletConnectAction.svelte";
   import { busy } from "@dfinity/gix-components";
   import { createEventDispatcher, getContext } from "svelte";
 
diff --git a/frontend/src/lib/components/accounts/HardwareWalletConnectAction.svelte b/frontend/src/lib/components/accounts/HardwareWalletConnectAction.svelte
index 7de5d531131..616af328083 100644
--- a/frontend/src/lib/components/accounts/HardwareWalletConnectAction.svelte
+++ b/frontend/src/lib/components/accounts/HardwareWalletConnectAction.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import HardwareWalletInfo from "$lib/components/accounts/HardwareWalletInfo.svelte";
   import { LedgerConnectionState } from "$lib/constants/ledger.constants";
   import type { LedgerIdentity } from "$lib/identities/ledger.identity";
   import { connectToHardwareWalletProxy } from "$lib/proxy/icp-ledger.services.proxy";
   import { i18n } from "$lib/stores/i18n";
-  import HardwareWalletInfo from "./HardwareWalletInfo.svelte";
   import { Spinner } from "@dfinity/gix-components";
 
   export let connectionState: LedgerConnectionState =
diff --git a/frontend/src/lib/components/accounts/HardwareWalletNeurons.svelte b/frontend/src/lib/components/accounts/HardwareWalletNeurons.svelte
index 78b161fcf8f..7e5906871dd 100644
--- a/frontend/src/lib/components/accounts/HardwareWalletNeurons.svelte
+++ b/frontend/src/lib/components/accounts/HardwareWalletNeurons.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import HardwareWalletNeuronAddHotkeyButton from "$lib/components/accounts/HardwareWalletNeuronAddHotkeyButton.svelte";
   import { i18n } from "$lib/stores/i18n";
   import type {
     HardwareWalletNeuronInfo,
@@ -6,7 +7,6 @@
   } from "$lib/types/wallet.context";
   import { WALLET_CONTEXT_KEY } from "$lib/types/wallet.context";
   import { formatTokenE8s } from "$lib/utils/token.utils";
-  import HardwareWalletNeuronAddHotkeyButton from "./HardwareWalletNeuronAddHotkeyButton.svelte";
   import { getContext } from "svelte";
 
   const context: WalletContext = getContext<WalletContext>(WALLET_CONTEXT_KEY);
diff --git a/frontend/src/lib/components/accounts/IcrcWalletPage.svelte b/frontend/src/lib/components/accounts/IcrcWalletPage.svelte
index 9fbe0f31ce5..b099e2c609f 100644
--- a/frontend/src/lib/components/accounts/IcrcWalletPage.svelte
+++ b/frontend/src/lib/components/accounts/IcrcWalletPage.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
   import IcrcBalancesObserver from "$lib/components/accounts/IcrcBalancesObserver.svelte";
+  import ImportTokenRemoveConfirmation from "$lib/components/accounts/ImportTokenRemoveConfirmation.svelte";
+  import WalletMorePopover from "$lib/components/accounts/WalletMorePopover.svelte";
   import WalletPageHeader from "$lib/components/accounts/WalletPageHeader.svelte";
   import WalletPageHeading from "$lib/components/accounts/WalletPageHeading.svelte";
   import SignInGuard from "$lib/components/common/SignInGuard.svelte";
@@ -26,8 +28,6 @@
   } from "$lib/utils/accounts.utils";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import { isImportedToken as checkImportedToken } from "$lib/utils/imported-tokens.utils";
-  import ImportTokenRemoveConfirmation from "./ImportTokenRemoveConfirmation.svelte";
-  import WalletMorePopover from "./WalletMorePopover.svelte";
   import { IconDots, Island, Spinner, Tag } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import { TokenAmountV2, isNullish, nonNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/accounts/LedgerNeuronHotkeyWarning.svelte b/frontend/src/lib/components/accounts/LedgerNeuronHotkeyWarning.svelte
index 5f88f943728..19c4ee2fc7b 100644
--- a/frontend/src/lib/components/accounts/LedgerNeuronHotkeyWarning.svelte
+++ b/frontend/src/lib/components/accounts/LedgerNeuronHotkeyWarning.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { browser } from "$app/environment";
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import Banner from "$lib/components/ui/Banner.svelte";
+  import BannerIcon from "$lib/components/ui/BannerIcon.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { IconInfo } from "@dfinity/gix-components";
-  import Banner from "../ui/Banner.svelte";
-  import BannerIcon from "../ui/BannerIcon.svelte";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
 
   const LOCAL_STORAGE_KEY = "isLedgerNeuronHotkeyWarningDisabled";
 
diff --git a/frontend/src/lib/components/accounts/RenameSubAccountAction.svelte b/frontend/src/lib/components/accounts/RenameSubAccountAction.svelte
index fda7fd3477f..51b61616dd5 100644
--- a/frontend/src/lib/components/accounts/RenameSubAccountAction.svelte
+++ b/frontend/src/lib/components/accounts/RenameSubAccountAction.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import TextInputForm from "$lib/components/common/TextInputForm.svelte";
   import { renameSubAccount } from "$lib/services/icp-accounts.services";
   import { startBusy, stopBusy } from "$lib/stores/busy.store";
   import { i18n } from "$lib/stores/i18n";
@@ -7,7 +8,6 @@
     WALLET_CONTEXT_KEY,
     type WalletContext,
   } from "$lib/types/wallet.context";
-  import TextInputForm from "../common/TextInputForm.svelte";
   import { busy } from "@dfinity/gix-components";
   import { createEventDispatcher, getContext } from "svelte";
 
diff --git a/frontend/src/lib/components/accounts/SelectAccountDropdown.svelte b/frontend/src/lib/components/accounts/SelectAccountDropdown.svelte
index a15f3f6ed4b..c74e30b3373 100644
--- a/frontend/src/lib/components/accounts/SelectAccountDropdown.svelte
+++ b/frontend/src/lib/components/accounts/SelectAccountDropdown.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { universesAccountsStore } from "$lib/derived/universes-accounts.derived";
   import { i18n } from "$lib/stores/i18n";
   import type { Account } from "$lib/types/account";
@@ -6,7 +7,6 @@
     getAccountByRootCanister,
     getAccountsByRootCanister,
   } from "$lib/utils/accounts.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
   import { Dropdown, DropdownItem, Spinner } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import { isNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/accounts/SelectDestinationAddress.svelte b/frontend/src/lib/components/accounts/SelectDestinationAddress.svelte
index 9d786d1e06e..807305879be 100644
--- a/frontend/src/lib/components/accounts/SelectDestinationAddress.svelte
+++ b/frontend/src/lib/components/accounts/SelectDestinationAddress.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import AddressInput from "$lib/components/accounts/AddressInput.svelte";
+  import SelectAccountDropdown from "$lib/components/accounts/SelectAccountDropdown.svelte";
   import { universesAccountsStore } from "$lib/derived/universes-accounts.derived";
   import { i18n } from "$lib/stores/i18n";
   import type { Account } from "$lib/types/account";
@@ -11,8 +13,6 @@
     getAccountsByRootCanister,
     invalidAddress,
   } from "$lib/utils/accounts.utils";
-  import AddressInput from "./AddressInput.svelte";
-  import SelectAccountDropdown from "./SelectAccountDropdown.svelte";
   import { Toggle } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import { nonNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/accounts/TransactionCard.svelte b/frontend/src/lib/components/accounts/TransactionCard.svelte
index fe703a88bfe..610c73cd7bb 100644
--- a/frontend/src/lib/components/accounts/TransactionCard.svelte
+++ b/frontend/src/lib/components/accounts/TransactionCard.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import TransactionIcon from "$lib/components/accounts/TransactionIcon.svelte";
   import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import ColumnRow from "$lib/components/ui/ColumnRow.svelte";
   import DateSeconds from "$lib/components/ui/DateSeconds.svelte";
@@ -8,7 +9,6 @@
     TransactionIconType,
     UiTransaction,
   } from "$lib/types/transaction";
-  import TransactionIcon from "./TransactionIcon.svelte";
   import { KeyValuePair } from "@dfinity/gix-components";
   import {
     nonNullish,
diff --git a/frontend/src/lib/components/accounts/UiTransactionsList.svelte b/frontend/src/lib/components/accounts/UiTransactionsList.svelte
index 1723fdc749a..ed1b3638727 100644
--- a/frontend/src/lib/components/accounts/UiTransactionsList.svelte
+++ b/frontend/src/lib/components/accounts/UiTransactionsList.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   // TODO: Rename to TransactionList once we remove the old one.
+  import NoTransactions from "$lib/components/accounts/NoTransactions.svelte";
+  import TransactionCard from "$lib/components/accounts/TransactionCard.svelte";
+  import SkeletonCard from "$lib/components/ui/SkeletonCard.svelte";
   import type { UiTransaction } from "$lib/types/transaction";
-  import SkeletonCard from "../ui/SkeletonCard.svelte";
-  import NoTransactions from "./NoTransactions.svelte";
-  import TransactionCard from "./TransactionCard.svelte";
   import { InfiniteScroll, Spinner } from "@dfinity/gix-components";
   import { flip } from "svelte/animate";
 
diff --git a/frontend/src/lib/components/accounts/WalletMorePopover.svelte b/frontend/src/lib/components/accounts/WalletMorePopover.svelte
index f98f1502399..522ab10792c 100644
--- a/frontend/src/lib/components/accounts/WalletMorePopover.svelte
+++ b/frontend/src/lib/components/accounts/WalletMorePopover.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import LinkToDashboardCanister from "$lib/components/tokens/LinkToDashboardCanister.svelte";
+  import Separator from "$lib/components/ui/Separator.svelte";
   import { i18n } from "$lib/stores/i18n";
-  import Separator from "../ui/Separator.svelte";
   import { IconBin, Popover } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import { nonNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/accounts/WalletPageHeader.svelte b/frontend/src/lib/components/accounts/WalletPageHeader.svelte
index dfd2d786300..407fe329532 100644
--- a/frontend/src/lib/components/accounts/WalletPageHeader.svelte
+++ b/frontend/src/lib/components/accounts/WalletPageHeader.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import PageHeader from "$lib/components/common/PageHeader.svelte";
+  import IdentifierHash from "$lib/components/ui/IdentifierHash.svelte";
+  import UniverseSummary from "$lib/components/universe/UniverseSummary.svelte";
   import type { Universe } from "$lib/types/universe";
-  import PageHeader from "../common/PageHeader.svelte";
-  import IdentifierHash from "../ui/IdentifierHash.svelte";
-  import UniverseSummary from "../universe/UniverseSummary.svelte";
   import { nonNullish } from "@dfinity/utils";
 
   export let universe: Universe;
diff --git a/frontend/src/lib/components/accounts/WalletPageHeading.svelte b/frontend/src/lib/components/accounts/WalletPageHeading.svelte
index 19fa71ec972..29239a16bfb 100644
--- a/frontend/src/lib/components/accounts/WalletPageHeading.svelte
+++ b/frontend/src/lib/components/accounts/WalletPageHeading.svelte
@@ -1,4 +1,9 @@
 <script lang="ts">
+  import HeadingSubtitle from "$lib/components/common/HeadingSubtitle.svelte";
+  import HeadingSubtitleWithUsdValue from "$lib/components/common/HeadingSubtitleWithUsdValue.svelte";
+  import PageHeading from "$lib/components/common/PageHeading.svelte";
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
+  import IdentifierHash from "$lib/components/ui/IdentifierHash.svelte";
   import { onIntersection } from "$lib/directives/intersection.directives";
   import { ENABLE_USD_VALUES } from "$lib/stores/feature-flags.store";
   import { i18n } from "$lib/stores/i18n";
@@ -6,11 +11,6 @@
   import type { IntersectingDetail } from "$lib/types/intersection.types";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import { formatTokenV2 } from "$lib/utils/token.utils";
-  import HeadingSubtitle from "../common/HeadingSubtitle.svelte";
-  import HeadingSubtitleWithUsdValue from "../common/HeadingSubtitleWithUsdValue.svelte";
-  import PageHeading from "../common/PageHeading.svelte";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
-  import IdentifierHash from "../ui/IdentifierHash.svelte";
   import { Tooltip } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import { isNullish, nonNullish, type TokenAmountV2 } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/canister-detail/CanisterHeadingTitle.svelte b/frontend/src/lib/components/canister-detail/CanisterHeadingTitle.svelte
index 39437f1c619..c5270677bfc 100644
--- a/frontend/src/lib/components/canister-detail/CanisterHeadingTitle.svelte
+++ b/frontend/src/lib/components/canister-detail/CanisterHeadingTitle.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { CanisterDetails } from "$lib/canisters/ic-management/ic-management.canister.types";
   import type { CanisterDetails as CanisterInfo } from "$lib/canisters/nns-dapp/nns-dapp.types";
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { formatCyclesToTCycles } from "$lib/utils/canisters.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
   import { SkeletonText } from "@dfinity/gix-components";
   import { nonNullish } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/canister-detail/CanisterPageHeader.svelte b/frontend/src/lib/components/canister-detail/CanisterPageHeader.svelte
index bb65650112b..6bee58d40d2 100644
--- a/frontend/src/lib/components/canister-detail/CanisterPageHeader.svelte
+++ b/frontend/src/lib/components/canister-detail/CanisterPageHeader.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { CanisterDetails as CanisterInfo } from "$lib/canisters/nns-dapp/nns-dapp.types";
+  import PageHeader from "$lib/components/common/PageHeader.svelte";
+  import IdentifierHash from "$lib/components/ui/IdentifierHash.svelte";
+  import UniverseSummary from "$lib/components/universe/UniverseSummary.svelte";
   import { nnsUniverseStore } from "$lib/derived/nns-universe.derived";
-  import PageHeader from "../common/PageHeader.svelte";
-  import IdentifierHash from "../ui/IdentifierHash.svelte";
-  import UniverseSummary from "../universe/UniverseSummary.svelte";
 
   export let canister: CanisterInfo;
 </script>
diff --git a/frontend/src/lib/components/canister-detail/CanisterPageHeading.svelte b/frontend/src/lib/components/canister-detail/CanisterPageHeading.svelte
index b9c7c388405..8e49cc9e685 100644
--- a/frontend/src/lib/components/canister-detail/CanisterPageHeading.svelte
+++ b/frontend/src/lib/components/canister-detail/CanisterPageHeading.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import type { CanisterDetails } from "$lib/canisters/ic-management/ic-management.canister.types";
   import type { CanisterDetails as CanisterInfo } from "$lib/canisters/nns-dapp/nns-dapp.types";
-  import HeadingSubtitle from "../common/HeadingSubtitle.svelte";
-  import PageHeading from "../common/PageHeading.svelte";
-  import CanisterHeadingTitle from "./CanisterHeadingTitle.svelte";
-  import RenameCanisterButton from "./RenameCanisterButton.svelte";
-  import UnlinkCanisterButton from "./UnlinkCanisterButton.svelte";
+  import CanisterHeadingTitle from "$lib/components/canister-detail/CanisterHeadingTitle.svelte";
+  import RenameCanisterButton from "$lib/components/canister-detail/RenameCanisterButton.svelte";
+  import UnlinkCanisterButton from "$lib/components/canister-detail/UnlinkCanisterButton.svelte";
+  import HeadingSubtitle from "$lib/components/common/HeadingSubtitle.svelte";
+  import PageHeading from "$lib/components/common/PageHeading.svelte";
 
   export let canisterDetails: CanisterDetails | undefined;
   export let canister: CanisterInfo;
diff --git a/frontend/src/lib/components/canister-detail/ControllersCard.svelte b/frontend/src/lib/components/canister-detail/ControllersCard.svelte
index a8db6f6e2a8..547a3a90358 100644
--- a/frontend/src/lib/components/canister-detail/ControllersCard.svelte
+++ b/frontend/src/lib/components/canister-detail/ControllersCard.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import type { CanisterDetails } from "$lib/canisters/ic-management/ic-management.canister.types";
+  import AddCanisterControllerButton from "$lib/components/canister-detail/AddCanisterControllerButton.svelte";
+  import RemoveCanisterControllerButton from "$lib/components/canister-detail/RemoveCanisterControllerButton.svelte";
   import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import { i18n } from "$lib/stores/i18n";
   import {
     CANISTER_DETAILS_CONTEXT_KEY,
     type CanisterDetailsContext,
   } from "$lib/types/canister-detail.context";
-  import AddCanisterControllerButton from "./AddCanisterControllerButton.svelte";
-  import RemoveCanisterControllerButton from "./RemoveCanisterControllerButton.svelte";
   import { Value } from "@dfinity/gix-components";
   import { getContext } from "svelte";
 
diff --git a/frontend/src/lib/components/canisters/CanisterCard.svelte b/frontend/src/lib/components/canisters/CanisterCard.svelte
index ae4f8730ad9..f8fcdf900eb 100644
--- a/frontend/src/lib/components/canisters/CanisterCard.svelte
+++ b/frontend/src/lib/components/canisters/CanisterCard.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import type { CanisterDetails } from "$lib/canisters/nns-dapp/nns-dapp.types";
   import CanisterCardCycles from "$lib/components/canisters/CanisterCardCycles.svelte";
-  import CanisterCardSubTitle from "./CanisterCardSubTitle.svelte";
-  import CanisterCardTitle from "./CanisterCardTitle.svelte";
+  import CanisterCardSubTitle from "$lib/components/canisters/CanisterCardSubTitle.svelte";
+  import CanisterCardTitle from "$lib/components/canisters/CanisterCardTitle.svelte";
   import { Card } from "@dfinity/gix-components";
 
   export let canister: CanisterDetails;
diff --git a/frontend/src/lib/components/common/HeadingSubtitleWithUsdValue.svelte b/frontend/src/lib/components/common/HeadingSubtitleWithUsdValue.svelte
index 85c66d92793..54b7868f424 100644
--- a/frontend/src/lib/components/common/HeadingSubtitleWithUsdValue.svelte
+++ b/frontend/src/lib/components/common/HeadingSubtitleWithUsdValue.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import HeadingSubtitle from "$lib/components/common/HeadingSubtitle.svelte";
   import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { icpSwapUsdPricesStore } from "$lib/derived/icp-swap.derived";
   import { i18n } from "$lib/stores/i18n";
   import { formatNumber } from "$lib/utils/format.utils";
-  import HeadingSubtitle from "../common/HeadingSubtitle.svelte";
   import type { Principal } from "@dfinity/principal";
   import { nonNullish, type TokenAmountV2 } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/common/MenuItems.svelte b/frontend/src/lib/components/common/MenuItems.svelte
index 65d02670ff0..015137894ca 100644
--- a/frontend/src/lib/components/common/MenuItems.svelte
+++ b/frontend/src/lib/components/common/MenuItems.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import SourceCodeButton from "$lib/components/common/SourceCodeButton.svelte";
   import GetTokens from "$lib/components/ic/GetTokens.svelte";
   import TotalValueLocked from "$lib/components/metrics/TotalValueLocked.svelte";
   import NnsNeuronsMissingRewardsBadge from "$lib/components/neurons/NnsNeuronsMissingRewardsBadge.svelte";
@@ -31,7 +32,6 @@
   import type { ComponentType } from "svelte";
   import { cubicIn, cubicOut } from "svelte/easing";
   import { scale } from "svelte/transition";
-  import SourceCodeButton from "./SourceCodeButton.svelte";
 
   let routes: {
     context: string;
diff --git a/frontend/src/lib/components/common/TextInputForm.svelte b/frontend/src/lib/components/common/TextInputForm.svelte
index c709cf35c3b..99b0241bca8 100644
--- a/frontend/src/lib/components/common/TextInputForm.svelte
+++ b/frontend/src/lib/components/common/TextInputForm.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import InputWithError from "../ui/InputWithError.svelte";
+  import InputWithError from "$lib/components/ui/InputWithError.svelte";
   import { nonNullish } from "@dfinity/utils";
   import { createEventDispatcher } from "svelte";
 
diff --git a/frontend/src/lib/components/header/AccountDetails.svelte b/frontend/src/lib/components/header/AccountDetails.svelte
index a675f1197b8..84eb1341b89 100644
--- a/frontend/src/lib/components/header/AccountDetails.svelte
+++ b/frontend/src/lib/components/header/AccountDetails.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import IdentifierHash from "$lib/components/ui/IdentifierHash.svelte";
+  import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
-  import IdentifierHash from "../ui/IdentifierHash.svelte";
-  import TooltipIcon from "../ui/TooltipIcon.svelte";
   import { nonNullish } from "@dfinity/utils";
 
   let principalId: string | undefined;
diff --git a/frontend/src/lib/components/header/AccountMenu.svelte b/frontend/src/lib/components/header/AccountMenu.svelte
index 24004dc0b37..0903f295087 100644
--- a/frontend/src/lib/components/header/AccountMenu.svelte
+++ b/frontend/src/lib/components/header/AccountMenu.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
-  import ManageInternetIdentityButton from "$lib/components/header/ManageInternetIdentityButton.svelte";
+  import AccountDetails from "$lib/components/header/AccountDetails.svelte";
+  import LinkToCanisters from "$lib/components/header/LinkToCanisters.svelte";
+  import LinkToReporting from "$lib/components/header/LinkToReporting.svelte";
   import LinkToSettings from "$lib/components/header/LinkToSettings.svelte";
+  import LoginIconOnly from "$lib/components/header/LoginIconOnly.svelte";
+  import Logout from "$lib/components/header/Logout.svelte";
+  import ManageInternetIdentityButton from "$lib/components/header/ManageInternetIdentityButton.svelte";
   import { authSignedInStore } from "$lib/derived/auth.derived";
   import { ENABLE_EXPORT_NEURONS_REPORT } from "$lib/stores/feature-flags.store";
   import { i18n } from "$lib/stores/i18n";
-  import AccountDetails from "./AccountDetails.svelte";
-  import LinkToCanisters from "./LinkToCanisters.svelte";
-  import LoginIconOnly from "./LoginIconOnly.svelte";
-  import Logout from "./Logout.svelte";
   import { IconUser, Popover } from "@dfinity/gix-components";
-  import LinkToReporting from "$lib/components/header/LinkToReporting.svelte";
 
   let visible = false;
   let button: HTMLButtonElement | undefined;
diff --git a/frontend/src/lib/components/ic/GetTokens.svelte b/frontend/src/lib/components/ic/GetTokens.svelte
index 1b288b87e39..33d8bc3985a 100644
--- a/frontend/src/lib/components/ic/GetTokens.svelte
+++ b/frontend/src/lib/components/ic/GetTokens.svelte
@@ -3,8 +3,8 @@
    * Transfer ICP to current principal. For test purpose only and only available on "testnet" too.
    */
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import GetTokensModal from "$lib/components/ic/GetTokensModal.svelte";
   import { authSignedInStore } from "$lib/derived/auth.derived";
-  import GetTokensModal from "./GetTokensModal.svelte";
   import { IconAccountBalance } from "@dfinity/gix-components";
 
   let visible = false;
diff --git a/frontend/src/lib/components/launchpad/ProjectCard.svelte b/frontend/src/lib/components/launchpad/ProjectCard.svelte
index fe06228fb84..eba0fa2b368 100644
--- a/frontend/src/lib/components/launchpad/ProjectCard.svelte
+++ b/frontend/src/lib/components/launchpad/ProjectCard.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import SignedInOnly from "$lib/components/common/SignedInOnly.svelte";
+  import ProjectCardSwapInfo from "$lib/components/launchpad/ProjectCardSwapInfo.svelte";
   import Logo from "$lib/components/ui/Logo.svelte";
   import { AppPath } from "$lib/constants/routes.constants";
   import type { SnsFullProject } from "$lib/derived/sns/sns-projects.derived";
@@ -13,7 +14,6 @@
   import { nonNullish } from "@dfinity/utils";
   import { onMount } from "svelte";
   import type { Readable } from "svelte/store";
-  import ProjectCardSwapInfo from "./ProjectCardSwapInfo.svelte";
 
   export let project: SnsFullProject;
 
diff --git a/frontend/src/lib/components/launchpad/ProjectCardSwapInfo.svelte b/frontend/src/lib/components/launchpad/ProjectCardSwapInfo.svelte
index dd89ab323db..8810c0bc261 100644
--- a/frontend/src/lib/components/launchpad/ProjectCardSwapInfo.svelte
+++ b/frontend/src/lib/components/launchpad/ProjectCardSwapInfo.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import ProjectUserCommitmentLabel from "$lib/components/project-detail/ProjectUserCommitmentLabel.svelte";
   import type { SnsFullProject } from "$lib/derived/sns/sns-projects.derived";
@@ -13,11 +14,10 @@
   import { SnsSwapLifecycle } from "@dfinity/sns";
   import {
     ICPToken,
+    TokenAmountV2,
     nonNullish,
     secondsToDuration,
-    TokenAmountV2,
   } from "@dfinity/utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
 
   export let project: SnsFullProject;
   // The data to know whether it's finalizing or not is not in the SnsFullProject.
diff --git a/frontend/src/lib/components/launchpad/Projects.svelte b/frontend/src/lib/components/launchpad/Projects.svelte
index 14f5d76d134..886777e2ea8 100644
--- a/frontend/src/lib/components/launchpad/Projects.svelte
+++ b/frontend/src/lib/components/launchpad/Projects.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import ProjectCard from "$lib/components/launchpad/ProjectCard.svelte";
   import SkeletonProjectCard from "$lib/components/ui/SkeletonProjectCard.svelte";
   import {
     snsProjectsActivePadStore,
@@ -11,7 +12,6 @@
     comparesByDecentralizationSaleOpenTimestampDesc,
     filterProjectsStatus,
   } from "$lib/utils/projects.utils";
-  import ProjectCard from "./ProjectCard.svelte";
   import { Html } from "@dfinity/gix-components";
   import { SnsSwapLifecycle } from "@dfinity/sns";
 
diff --git a/frontend/src/lib/components/launchpad/Proposals.svelte b/frontend/src/lib/components/launchpad/Proposals.svelte
index 16fc379dca9..b8a78751032 100644
--- a/frontend/src/lib/components/launchpad/Proposals.svelte
+++ b/frontend/src/lib/components/launchpad/Proposals.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import NnsProposalCard from "$lib/components/proposals/NnsProposalCard.svelte";
   import SkeletonProposalCard from "$lib/components/ui/SkeletonProposalCard.svelte";
   import { loadProposalsSnsCF } from "$lib/services/public/sns.services";
   import { i18n } from "$lib/stores/i18n";
@@ -6,7 +7,6 @@
     openSnsProposalsStore,
     snsProposalsStoreIsLoading,
   } from "$lib/stores/sns.store";
-  import NnsProposalCard from "../proposals/NnsProposalCard.svelte";
   import { onMount } from "svelte";
 
   let loading = false;
diff --git a/frontend/src/lib/components/neuron-detail/Ballots/Ballots.svelte b/frontend/src/lib/components/neuron-detail/Ballots/Ballots.svelte
index 221ca52abac..600513a50b1 100644
--- a/frontend/src/lib/components/neuron-detail/Ballots/Ballots.svelte
+++ b/frontend/src/lib/components/neuron-detail/Ballots/Ballots.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import BallotSummary from "$lib/components/neuron-detail/Ballots/BallotSummary.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { ballotsWithDefinedProposal } from "$lib/utils/neuron.utils";
-  import BallotSummary from "./BallotSummary.svelte";
   import { InfiniteScroll } from "@dfinity/gix-components";
   import type { BallotInfo, NeuronInfo } from "@dfinity/nns";
   import { debounce } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/neuron-detail/NeuronFollowingCard/NeuronFollowingCard.svelte b/frontend/src/lib/components/neuron-detail/NeuronFollowingCard/NeuronFollowingCard.svelte
index a6d7cb44a7b..0195479705f 100644
--- a/frontend/src/lib/components/neuron-detail/NeuronFollowingCard/NeuronFollowingCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/NeuronFollowingCard/NeuronFollowingCard.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import Followee from "$lib/components/neuron-detail/NeuronFollowingCard/Followee.svelte";
+  import FollowNeuronsButton from "$lib/components/neuron-detail/actions/FollowNeuronsButton.svelte";
   import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { listKnownNeurons } from "$lib/services/known-neurons.services";
@@ -10,8 +12,6 @@
     isNeuronControllable,
     type FolloweesNeuron,
   } from "$lib/utils/neuron.utils";
-  import FollowNeuronsButton from "../actions/FollowNeuronsButton.svelte";
-  import Followee from "./Followee.svelte";
   import { KeyValuePairInfo } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
   import { nonNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/neuron-detail/NeuronVotingHistoryCard.svelte b/frontend/src/lib/components/neuron-detail/NeuronVotingHistoryCard.svelte
index 4f4e974f165..5180fb284a3 100644
--- a/frontend/src/lib/components/neuron-detail/NeuronVotingHistoryCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/NeuronVotingHistoryCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import Ballots from "$lib/components/neuron-detail/Ballots/Ballots.svelte";
   import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import { i18n } from "$lib/stores/i18n";
-  import Ballots from "./Ballots/Ballots.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
 
   export let neuron: NeuronInfo;
diff --git a/frontend/src/lib/components/neuron-detail/NnsAvailableMaturityItemAction.svelte b/frontend/src/lib/components/neuron-detail/NnsAvailableMaturityItemAction.svelte
index 773f6ffee22..498891cee1b 100644
--- a/frontend/src/lib/components/neuron-detail/NnsAvailableMaturityItemAction.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsAvailableMaturityItemAction.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+  import NnsStakeMaturityButton from "$lib/components/neuron-detail/actions/NnsStakeMaturityButton.svelte";
+  import SpawnNeuronButton from "$lib/components/neuron-detail/actions/SpawnNeuronButton.svelte";
+  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
+  import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
@@ -6,10 +10,6 @@
     formattedMaturity,
     isNeuronControllable,
   } from "$lib/utils/neuron.utils";
-  import CommonItemAction from "../ui/CommonItemAction.svelte";
-  import TooltipIcon from "../ui/TooltipIcon.svelte";
-  import NnsStakeMaturityButton from "./actions/NnsStakeMaturityButton.svelte";
-  import SpawnNeuronButton from "./actions/SpawnNeuronButton.svelte";
   import { IconExpandCircleDown } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronAdvancedSection.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronAdvancedSection.svelte
index 4619273987b..c78f7815633 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronAdvancedSection.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronAdvancedSection.svelte
@@ -1,4 +1,10 @@
 <script lang="ts">
+  import NnsNeuronPublicVisibilityAction from "$lib/components/neuron-detail/NnsNeuronPublicVisibilityAction.svelte";
+  import JoinCommunityFundCheckbox from "$lib/components/neuron-detail/actions/JoinCommunityFundCheckbox.svelte";
+  import NnsAutoStakeMaturity from "$lib/components/neuron-detail/actions/NnsAutoStakeMaturity.svelte";
+  import SplitNnsNeuronButton from "$lib/components/neuron-detail/actions/SplitNnsNeuronButton.svelte";
+  import NnsNeuronAge from "$lib/components/neurons/NnsNeuronAge.svelte";
+  import Hash from "$lib/components/ui/Hash.svelte";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
@@ -10,12 +16,6 @@
     isNeuronControllable,
     maturityLastDistribution,
   } from "$lib/utils/neuron.utils";
-  import NnsNeuronAge from "../neurons/NnsNeuronAge.svelte";
-  import Hash from "../ui/Hash.svelte";
-  import NnsNeuronPublicVisibilityAction from "./NnsNeuronPublicVisibilityAction.svelte";
-  import JoinCommunityFundCheckbox from "./actions/JoinCommunityFundCheckbox.svelte";
-  import NnsAutoStakeMaturity from "./actions/NnsAutoStakeMaturity.svelte";
-  import SplitNnsNeuronButton from "./actions/SplitNnsNeuronButton.svelte";
   import {
     Html,
     KeyValuePair,
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronDissolveDelayItemAction.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronDissolveDelayItemAction.svelte
index bc92c24c71d..783e2363c0a 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronDissolveDelayItemAction.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronDissolveDelayItemAction.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import DissolveDelayBonusText from "$lib/components/neuron-detail/DissolveDelayBonusText.svelte";
+  import IncreaseDissolveDelayButton from "$lib/components/neuron-detail/actions/IncreaseDissolveDelayButton.svelte";
+  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
   import { NNS_MINIMUM_DISSOLVE_DELAY_TO_VOTE } from "$lib/constants/neurons.constants";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { authStore } from "$lib/stores/auth.store";
@@ -10,9 +13,6 @@
     getSpawningTimeInSeconds,
     isNeuronControllable,
   } from "$lib/utils/neuron.utils";
-  import CommonItemAction from "../ui/CommonItemAction.svelte";
-  import DissolveDelayBonusText from "./DissolveDelayBonusText.svelte";
-  import IncreaseDissolveDelayButton from "./actions/IncreaseDissolveDelayButton.svelte";
   import { IconClockNoFill } from "@dfinity/gix-components";
   import { NeuronState, type NeuronInfo } from "@dfinity/nns";
   import { ICPToken, secondsToDuration } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronHotkeysCard.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronHotkeysCard.svelte
index 008ec85b5c7..bb9e0dfcb9f 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronHotkeysCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronHotkeysCard.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
+  import AddHotkeyButton from "$lib/components/neuron-detail/actions/AddHotkeyButton.svelte";
   import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import { ICON_SIZE_LARGE } from "$lib/constants/layout.constants";
   import { AppPath } from "$lib/constants/routes.constants";
@@ -12,7 +13,6 @@
   import { i18n } from "$lib/stores/i18n";
   import { toastsShow } from "$lib/stores/toasts.store";
   import { isNeuronControllable } from "$lib/utils/neuron.utils";
-  import AddHotkeyButton from "./actions/AddHotkeyButton.svelte";
   import { IconClose, IconWarning, Value } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronMaturitySection.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronMaturitySection.svelte
index b2ecdbc224d..64b5db834e5 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronMaturitySection.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronMaturitySection.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import NnsAvailableMaturityItemAction from "$lib/components/neuron-detail/NnsAvailableMaturityItemAction.svelte";
+  import NnsStakedMaturityItemAction from "$lib/components/neuron-detail/NnsStakedMaturityItemAction.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { formattedTotalMaturity } from "$lib/utils/neuron.utils";
-  import NnsAvailableMaturityItemAction from "./NnsAvailableMaturityItemAction.svelte";
-  import NnsStakedMaturityItemAction from "./NnsStakedMaturityItemAction.svelte";
   import { Section } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeader.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeader.svelte
index 955a939b0be..ae8967aa37f 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeader.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeader.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
+  import PageHeader from "$lib/components/common/PageHeader.svelte";
+  import NeuronNavigation from "$lib/components/neuron-detail/NeuronNavigation.svelte";
+  import IdentifierHash from "$lib/components/ui/IdentifierHash.svelte";
+  import UniverseSummary from "$lib/components/universe/UniverseSummary.svelte";
   import { MAX_NEURON_ID_DIGITS } from "$lib/constants/neurons.constants";
   import { nnsUniverseStore } from "$lib/derived/nns-universe.derived";
   import { onIntersection } from "$lib/directives/intersection.directives";
   import { i18n } from "$lib/stores/i18n";
   import { layoutTitleStore } from "$lib/stores/layout.store";
+  import { neuronsTableOrderSortedNeuronIdsStore } from "$lib/stores/neurons-table-order-sorted-neuron-ids-store";
   import type { IntersectingDetail } from "$lib/types/intersection.types";
-  import PageHeader from "../common/PageHeader.svelte";
-  import IdentifierHash from "../ui/IdentifierHash.svelte";
-  import UniverseSummary from "../universe/UniverseSummary.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
-  import NeuronNavigation from "./NeuronNavigation.svelte";
-  import { neuronsTableOrderSortedNeuronIdsStore } from "$lib/stores/neurons-table-order-sorted-neuron-ids-store";
 
   export let neuron: NeuronInfo;
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeading.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeading.svelte
index 747b8b36b7b..209a2c052a1 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeading.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronPageHeading.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+  import HeadingSubtitle from "$lib/components/common/HeadingSubtitle.svelte";
+  import HeadingSubtitleWithUsdValue from "$lib/components/common/HeadingSubtitleWithUsdValue.svelte";
+  import PageHeading from "$lib/components/common/PageHeading.svelte";
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import NeuronTag from "$lib/components/ui/NeuronTag.svelte";
   import { LEDGER_CANISTER_ID } from "$lib/constants/canister-ids.constants";
   import { NNS_MINIMUM_DISSOLVE_DELAY_TO_VOTE } from "$lib/constants/neurons.constants";
@@ -13,10 +17,6 @@
     neuronStake,
     type NeuronTagData,
   } from "$lib/utils/neuron.utils";
-  import HeadingSubtitle from "../common/HeadingSubtitle.svelte";
-  import HeadingSubtitleWithUsdValue from "../common/HeadingSubtitleWithUsdValue.svelte";
-  import PageHeading from "../common/PageHeading.svelte";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
   import { ICPToken, TokenAmountV2 } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronProposalsCard.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronProposalsCard.svelte
index abe13b4969f..d6b3fc24746 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronProposalsCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronProposalsCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import NeuronProposalsCard from "$lib/components/neuron-detail/NeuronProposalsCard.svelte";
   import { makeDummyProposals } from "$lib/services/neurons.services";
-  import NeuronProposalsCard from "./NeuronProposalsCard.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
 
   export let neuron: NeuronInfo;
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronPublicVisibilityAction.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronPublicVisibilityAction.svelte
index f1d048990a7..80e99329f3c 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronPublicVisibilityAction.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronPublicVisibilityAction.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import NnsChangeNeuronVisibilityButton from "$lib/components/neuron-detail/actions/NnsChangeNeuronVisibilityButton.svelte";
+  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { i18n } from "$lib/stores/i18n";
   import {
@@ -6,8 +8,6 @@
     isNeuronControlledByHardwareWallet,
     isPublicNeuron,
   } from "$lib/utils/neuron.utils";
-  import CommonItemAction from "../ui/CommonItemAction.svelte";
-  import NnsChangeNeuronVisibilityButton from "./actions/NnsChangeNeuronVisibilityButton.svelte";
   import { IconPublicBadge, Tooltip } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronRewardStatusAction.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronRewardStatusAction.svelte
index 2f92e8a91a9..733f5645deb 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronRewardStatusAction.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronRewardStatusAction.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
+  import ConfirmFollowingActionButton from "$lib/components/neuron-detail/actions/ConfirmFollowingActionButton.svelte";
+  import FollowNeuronsButton from "$lib/components/neuron-detail/actions/FollowNeuronsButton.svelte";
+  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
+  import { START_REDUCING_VOTING_POWER_AFTER_SECONDS } from "$lib/constants/neurons.constants";
   import { i18n } from "$lib/stores/i18n";
+  import { secondsToDissolveDelayDuration } from "$lib/utils/date.utils";
+  import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import {
     isNeuronFollowingReset,
     isNeuronLosingRewards,
@@ -11,14 +17,8 @@
     IconError,
     IconWarning,
   } from "@dfinity/gix-components";
-  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
   import { type NeuronInfo } from "@dfinity/nns";
   import { secondsToDuration } from "@dfinity/utils";
-  import { replacePlaceholders } from "$lib/utils/i18n.utils";
-  import FollowNeuronsButton from "./actions/FollowNeuronsButton.svelte";
-  import { secondsToDissolveDelayDuration } from "$lib/utils/date.utils";
-  import { START_REDUCING_VOTING_POWER_AFTER_SECONDS } from "$lib/constants/neurons.constants";
-  import ConfirmFollowingActionButton from "$lib/components/neuron-detail/actions/ConfirmFollowingActionButton.svelte";
 
   export let neuron: NeuronInfo;
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronStateItemAction.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronStateItemAction.svelte
index 9f6c48831b2..23df36b980f 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronStateItemAction.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronStateItemAction.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+  import AgeBonusText from "$lib/components/neuron-detail/AgeBonusText.svelte";
+  import DisburseButton from "$lib/components/neuron-detail/actions/DisburseButton.svelte";
+  import DissolveActionButton from "$lib/components/neuron-detail/actions/DissolveActionButton.svelte";
+  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
@@ -10,10 +14,6 @@
     type StateInfo,
   } from "$lib/utils/neuron.utils";
   import { keyOf } from "$lib/utils/utils";
-  import CommonItemAction from "../ui/CommonItemAction.svelte";
-  import AgeBonusText from "./AgeBonusText.svelte";
-  import DisburseButton from "./actions/DisburseButton.svelte";
-  import DissolveActionButton from "./actions/DissolveActionButton.svelte";
   import { NeuronState, type NeuronInfo } from "@dfinity/nns";
   import { ICPToken } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronTestnetFunctionsCard.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronTestnetFunctionsCard.svelte
index dba5a9e8f7f..a32868c38dd 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronTestnetFunctionsCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronTestnetFunctionsCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import { unlockNeuron } from "$lib/services/nns-neurons-dev.services";
   import { openNnsNeuronModal } from "$lib/utils/modals.utils";
-  import CardInfo from "../ui/CardInfo.svelte";
   import { Spinner } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte
index 2e7a5ac63cc..8a9e9996017 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte
@@ -1,5 +1,10 @@
 <script lang="ts">
+  import NnsNeuronDissolveDelayItemAction from "$lib/components/neuron-detail/NnsNeuronDissolveDelayItemAction.svelte";
+  import NnsNeuronRewardStatusAction from "$lib/components/neuron-detail/NnsNeuronRewardStatusAction.svelte";
+  import NnsNeuronStateItemAction from "$lib/components/neuron-detail/NnsNeuronStateItemAction.svelte";
+  import NnsStakeItemAction from "$lib/components/neuron-detail/NnsStakeItemAction.svelte";
   import { NNS_MINIMUM_DISSOLVE_DELAY_TO_VOTE } from "$lib/constants/neurons.constants";
+  import { ENABLE_PERIODIC_FOLLOWING_CONFIRMATION } from "$lib/stores/feature-flags.store";
   import { i18n } from "$lib/stores/i18n";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import {
@@ -12,13 +17,8 @@
     neuronStake,
   } from "$lib/utils/neuron.utils";
   import { formatTokenE8s } from "$lib/utils/token.utils";
-  import NnsNeuronRewardStatusAction from "./NnsNeuronRewardStatusAction.svelte";
-  import NnsNeuronDissolveDelayItemAction from "./NnsNeuronDissolveDelayItemAction.svelte";
-  import NnsNeuronStateItemAction from "./NnsNeuronStateItemAction.svelte";
-  import NnsStakeItemAction from "./NnsStakeItemAction.svelte";
   import { Html, KeyValuePairInfo, Section } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
-  import { ENABLE_PERIODIC_FOLLOWING_CONFIRMATION } from "$lib/stores/feature-flags.store";
 
   export let neuron: NeuronInfo;
 
diff --git a/frontend/src/lib/components/neuron-detail/NnsStakedMaturityItemAction.svelte b/frontend/src/lib/components/neuron-detail/NnsStakedMaturityItemAction.svelte
index 88af4adaf32..4a7fdf8ae52 100644
--- a/frontend/src/lib/components/neuron-detail/NnsStakedMaturityItemAction.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsStakedMaturityItemAction.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
+  import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { formattedStakedMaturity } from "$lib/utils/neuron.utils";
-  import CommonItemAction from "../ui/CommonItemAction.svelte";
-  import TooltipIcon from "../ui/TooltipIcon.svelte";
   import { IconStakedMaturity } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
 
diff --git a/frontend/src/lib/components/neuron-detail/SnsNeuronProposalsCard.svelte b/frontend/src/lib/components/neuron-detail/SnsNeuronProposalsCard.svelte
index 2aa4a20bffa..e75e476f5f2 100644
--- a/frontend/src/lib/components/neuron-detail/SnsNeuronProposalsCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/SnsNeuronProposalsCard.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
+  import NeuronProposalsCard from "$lib/components/neuron-detail/NeuronProposalsCard.svelte";
   import { makeDummyProposals } from "$lib/services/sns-neurons.services";
   import {
     SELECTED_SNS_NEURON_CONTEXT_KEY,
     type SelectedSnsNeuronContext,
   } from "$lib/types/sns-neuron-detail.context";
-  import NeuronProposalsCard from "./NeuronProposalsCard.svelte";
   import { getContext } from "svelte";
 
   const { store }: SelectedSnsNeuronContext =
diff --git a/frontend/src/lib/components/neuron-detail/SnsNeuronTestnetFunctionsCard.svelte b/frontend/src/lib/components/neuron-detail/SnsNeuronTestnetFunctionsCard.svelte
index 88d72f70237..22f50f788da 100644
--- a/frontend/src/lib/components/neuron-detail/SnsNeuronTestnetFunctionsCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/SnsNeuronTestnetFunctionsCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import { openSnsNeuronModal } from "$lib/utils/modals.utils";
-  import CardInfo from "../ui/CardInfo.svelte";
 
   const openAddMaturityModal = async () => {
     openSnsNeuronModal({ type: "dev-add-maturity" });
diff --git a/frontend/src/lib/components/neuron-detail/SnsPermissionsCard.svelte b/frontend/src/lib/components/neuron-detail/SnsPermissionsCard.svelte
index 53616431226..3eb3ff49e50 100644
--- a/frontend/src/lib/components/neuron-detail/SnsPermissionsCard.svelte
+++ b/frontend/src/lib/components/neuron-detail/SnsPermissionsCard.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
+  import CardInfo from "$lib/components/ui/CardInfo.svelte";
+  import Hash from "$lib/components/ui/Hash.svelte";
+  import TagsList from "$lib/components/ui/TagsList.svelte";
   import {
     SELECTED_SNS_NEURON_CONTEXT_KEY,
     type SelectedSnsNeuronContext,
   } from "$lib/types/sns-neuron-detail.context";
   import { openSnsNeuronModal } from "$lib/utils/modals.utils";
-  import CardInfo from "../ui/CardInfo.svelte";
-  import Hash from "../ui/Hash.svelte";
-  import TagsList from "../ui/TagsList.svelte";
   import { Tag } from "@dfinity/gix-components";
   import { SnsNeuronPermissionType, type SnsNeuron } from "@dfinity/sns";
   import { getContext } from "svelte";
diff --git a/frontend/src/lib/components/neuron-detail/StakeItemAction.svelte b/frontend/src/lib/components/neuron-detail/StakeItemAction.svelte
index d621eb43093..277e80232b7 100644
--- a/frontend/src/lib/components/neuron-detail/StakeItemAction.svelte
+++ b/frontend/src/lib/components/neuron-detail/StakeItemAction.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import IncreaseStakeButton from "$lib/components/neuron-detail/actions/IncreaseStakeButton.svelte";
+  import UniverseLogo from "$lib/components/universe/UniverseLogo.svelte";
   import { i18n } from "$lib/stores/i18n";
   import type { Universe } from "$lib/types/universe";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import { formatTokenE8s } from "$lib/utils/token.utils";
-  import UniverseLogo from "../universe/UniverseLogo.svelte";
   import { ItemAction } from "@dfinity/gix-components";
   import type { Token } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/neuron-detail/actions/NnsAutoStakeMaturity.svelte b/frontend/src/lib/components/neuron-detail/actions/NnsAutoStakeMaturity.svelte
index 45456f18cb9..1c8885004c9 100644
--- a/frontend/src/lib/components/neuron-detail/actions/NnsAutoStakeMaturity.svelte
+++ b/frontend/src/lib/components/neuron-detail/actions/NnsAutoStakeMaturity.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import AutoStakeMaturity from "$lib/components/neuron-detail/actions/AutoStakeMaturity.svelte";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
   import { authStore } from "$lib/stores/auth.store";
   import {
@@ -10,7 +11,6 @@
     hasAutoStakeMaturityOn,
     isNeuronControllable,
   } from "$lib/utils/neuron.utils";
-  import AutoStakeMaturity from "./AutoStakeMaturity.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
   import { getContext } from "svelte";
 
diff --git a/frontend/src/lib/components/neurons/ConfirmNeuronsMerge.svelte b/frontend/src/lib/components/neurons/ConfirmNeuronsMerge.svelte
index 600d0a04360..11cd54a7aec 100644
--- a/frontend/src/lib/components/neurons/ConfirmNeuronsMerge.svelte
+++ b/frontend/src/lib/components/neurons/ConfirmNeuronsMerge.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import NnsNeuronDetailCard from "$lib/components/neurons/NnsNeuronDetailCard.svelte";
   import SkeletonCard from "$lib/components/ui/SkeletonCard.svelte";
   import { MAX_NEURONS_MERGED } from "$lib/constants/neurons.constants";
   import { startBusyNeuron } from "$lib/services/busy.services";
@@ -10,7 +11,6 @@
   import { i18n } from "$lib/stores/i18n";
   import { toastsError, toastsSuccess } from "$lib/stores/toasts.store";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
-  import NnsNeuronDetailCard from "./NnsNeuronDetailCard.svelte";
   import { Html, busy } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
   import { isNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/neurons/EditFollowNeurons.svelte b/frontend/src/lib/components/neurons/EditFollowNeurons.svelte
index 306d0725e56..441362fe1e6 100644
--- a/frontend/src/lib/components/neurons/EditFollowNeurons.svelte
+++ b/frontend/src/lib/components/neurons/EditFollowNeurons.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import FollowNnsTopicSection from "$lib/components/neurons/FollowNnsTopicSection.svelte";
   import Separator from "$lib/components/ui/Separator.svelte";
   import { definedNeuronsStore } from "$lib/derived/neurons.derived";
   import { listKnownNeurons } from "$lib/services/known-neurons.services";
@@ -6,7 +7,6 @@
   import { topicsToFollow } from "$lib/utils/neuron.utils";
   import type { NeuronId, NeuronInfo, Topic } from "@dfinity/nns";
   import { onMount } from "svelte";
-  import FollowNnsTopicSection from "./FollowNnsTopicSection.svelte";
 
   export let neuronId: NeuronId;
 
diff --git a/frontend/src/lib/components/neurons/FollowNnsTopicSection.svelte b/frontend/src/lib/components/neurons/FollowNnsTopicSection.svelte
index b644024bc14..712b57afe10 100644
--- a/frontend/src/lib/components/neurons/FollowNnsTopicSection.svelte
+++ b/frontend/src/lib/components/neurons/FollowNnsTopicSection.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   // Tested in EditFollowNeurons.spec.ts
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import FollowTopicSection from "$lib/components/neurons/FollowTopicSection.svelte";
   import NewFolloweeModal from "$lib/modals/neurons/NewFolloweeModal.svelte";
   import { removeFollowee } from "$lib/services/neurons.services";
   import { startBusy, stopBusy } from "$lib/stores/busy.store";
@@ -11,7 +12,6 @@
     getTopicSubtitle,
     getTopicTitle,
   } from "$lib/utils/neuron.utils";
-  import FollowTopicSection from "./FollowTopicSection.svelte";
   import { IconClose, Value } from "@dfinity/gix-components";
   import type { NeuronId, NeuronInfo, Topic } from "@dfinity/nns";
 
diff --git a/frontend/src/lib/components/neurons/NnsLosingRewardsNeuronCard.svelte b/frontend/src/lib/components/neurons/NnsLosingRewardsNeuronCard.svelte
index 88c38ca16ea..0a7d0899b92 100644
--- a/frontend/src/lib/components/neurons/NnsLosingRewardsNeuronCard.svelte
+++ b/frontend/src/lib/components/neurons/NnsLosingRewardsNeuronCard.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
-  import { Card, IconRight } from "@dfinity/gix-components";
+  import Followee from "$lib/components/neuron-detail/NeuronFollowingCard/Followee.svelte";
+  import NeuronTag from "$lib/components/ui/NeuronTag.svelte";
+  import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
+  import { authStore } from "$lib/stores/auth.store";
+  import { i18n } from "$lib/stores/i18n";
   import {
     followeesNeurons,
     getNeuronTags,
     type FolloweesNeuron,
     type NeuronTagData,
   } from "$lib/utils/neuron.utils";
-  import Followee from "../neuron-detail/NeuronFollowingCard/Followee.svelte";
+  import { Card, IconRight } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
-  import { authStore } from "$lib/stores/auth.store";
-  import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
-  import { i18n } from "$lib/stores/i18n";
-  import NeuronTag from "$lib/components/ui/NeuronTag.svelte";
   import { nonNullish } from "@dfinity/utils";
 
   export let neuron: NeuronInfo;
diff --git a/frontend/src/lib/components/neurons/NnsNeuronAge.svelte b/frontend/src/lib/components/neurons/NnsNeuronAge.svelte
index 95dcd927cbc..2356c7a88e2 100644
--- a/frontend/src/lib/components/neurons/NnsNeuronAge.svelte
+++ b/frontend/src/lib/components/neurons/NnsNeuronAge.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { neuronAge } from "$lib/utils/neuron.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
   import { KeyValuePair } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
   import { secondsToDuration } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/neurons/NnsNeuronCard.svelte b/frontend/src/lib/components/neurons/NnsNeuronCard.svelte
index 7e09007454e..5c3c3c4820b 100644
--- a/frontend/src/lib/components/neurons/NnsNeuronCard.svelte
+++ b/frontend/src/lib/components/neurons/NnsNeuronCard.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import NeuronCardContainer from "$lib/components/neurons/NeuronCardContainer.svelte";
+  import NeuronStateInfo from "$lib/components/neurons/NeuronStateInfo.svelte";
+  import NnsNeuronAmount from "$lib/components/neurons/NnsNeuronAmount.svelte";
+  import NnsNeuronCardTitle from "$lib/components/neurons/NnsNeuronCardTitle.svelte";
+  import NnsNeuronRemainingTime from "$lib/components/neurons/NnsNeuronRemainingTime.svelte";
   import type { CardType } from "$lib/types/card";
-  import NeuronCardContainer from "./NeuronCardContainer.svelte";
-  import NeuronStateInfo from "./NeuronStateInfo.svelte";
-  import NnsNeuronAmount from "./NnsNeuronAmount.svelte";
-  import NnsNeuronCardTitle from "./NnsNeuronCardTitle.svelte";
-  import NnsNeuronRemainingTime from "./NnsNeuronRemainingTime.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
 
   export let neuron: NeuronInfo;
diff --git a/frontend/src/lib/components/neurons/NnsNeuronRemainingTime.svelte b/frontend/src/lib/components/neurons/NnsNeuronRemainingTime.svelte
index b26c4528e73..5b358f1790a 100644
--- a/frontend/src/lib/components/neurons/NnsNeuronRemainingTime.svelte
+++ b/frontend/src/lib/components/neurons/NnsNeuronRemainingTime.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import NeuronStateRemainingTime from "$lib/components/neurons/NeuronStateRemainingTime.svelte";
   import {
     getDissolvingTimeInSeconds,
     getSpawningTimeInSeconds,
   } from "$lib/utils/neuron.utils";
-  import NeuronStateRemainingTime from "./NeuronStateRemainingTime.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
 
   export let neuron: NeuronInfo;
diff --git a/frontend/src/lib/components/neurons/RangeDissolveDelay.svelte b/frontend/src/lib/components/neurons/RangeDissolveDelay.svelte
index c91cf21ff89..d95b817c800 100644
--- a/frontend/src/lib/components/neurons/RangeDissolveDelay.svelte
+++ b/frontend/src/lib/components/neurons/RangeDissolveDelay.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { daysToDuration, secondsToDays } from "$lib/utils/date.utils";
   import { formatVotingPower } from "$lib/utils/neuron.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
   import { ProgressBar } from "@dfinity/gix-components";
 
   export let delayInSeconds: number;
diff --git a/frontend/src/lib/components/neurons/SelectNeuronsToMerge.svelte b/frontend/src/lib/components/neurons/SelectNeuronsToMerge.svelte
index ed4c3d17da6..d1708be86f8 100644
--- a/frontend/src/lib/components/neurons/SelectNeuronsToMerge.svelte
+++ b/frontend/src/lib/components/neurons/SelectNeuronsToMerge.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
+  import NnsNeuronCard from "$lib/components/neurons/NnsNeuronCard.svelte";
   import { MAX_NEURONS_MERGED } from "$lib/constants/neurons.constants";
   import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
-  import { i18n } from "$lib/stores/i18n";
   import { definedNeuronsStore } from "$lib/derived/neurons.derived";
+  import { i18n } from "$lib/stores/i18n";
   import { translate } from "$lib/utils/i18n.utils";
   import {
     mapMergeableNeurons,
     mapNeuronIds,
     type MergeableNeuron,
   } from "$lib/utils/neuron.utils";
-  import NnsNeuronCard from "./NnsNeuronCard.svelte";
   import { Tooltip } from "@dfinity/gix-components";
   import type { NeuronId } from "@dfinity/nns";
   import { createEventDispatcher } from "svelte";
diff --git a/frontend/src/lib/components/neurons/SetDissolveDelay.svelte b/frontend/src/lib/components/neurons/SetDissolveDelay.svelte
index 1c3b8a2b48d..7927eb7ece9 100644
--- a/frontend/src/lib/components/neurons/SetDissolveDelay.svelte
+++ b/frontend/src/lib/components/neurons/SetDissolveDelay.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import NeuronStateRemainingTime from "$lib/components/neurons/NeuronStateRemainingTime.svelte";
+  import RangeDissolveDelay from "$lib/components/neurons/RangeDissolveDelay.svelte";
   import DayInput from "$lib/components/ui/DayInput.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import { formatTokenV2 } from "$lib/utils/token.utils";
   import { valueSpan } from "$lib/utils/utils";
-  import RangeDissolveDelay from "./RangeDissolveDelay.svelte";
   import { Html } from "@dfinity/gix-components";
   import type { NeuronState } from "@dfinity/nns";
   import { nonNullish, type TokenAmountV2 } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/project-detail/CommitmentProgressBar.svelte b/frontend/src/lib/components/project-detail/CommitmentProgressBar.svelte
index 51f1c853f1e..272ff629ebc 100644
--- a/frontend/src/lib/components/project-detail/CommitmentProgressBar.svelte
+++ b/frontend/src/lib/components/project-detail/CommitmentProgressBar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import { i18n } from "$lib/stores/i18n";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
   import { ProgressBar } from "@dfinity/gix-components";
   import { ICPToken, TokenAmountV2, nonNullish } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/project-detail/NfCommitmentProgressBar.svelte b/frontend/src/lib/components/project-detail/NfCommitmentProgressBar.svelte
index cff8a564679..42efc98fab4 100644
--- a/frontend/src/lib/components/project-detail/NfCommitmentProgressBar.svelte
+++ b/frontend/src/lib/components/project-detail/NfCommitmentProgressBar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import { i18n } from "$lib/stores/i18n";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
   import { ProgressBar } from "@dfinity/gix-components";
   import { ICPToken, TokenAmountV2 } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/project-detail/ProjectCommitment.svelte b/frontend/src/lib/components/project-detail/ProjectCommitment.svelte
index 69a9398a564..54146fd2d60 100644
--- a/frontend/src/lib/components/project-detail/ProjectCommitment.svelte
+++ b/frontend/src/lib/components/project-detail/ProjectCommitment.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
+  import CommitmentProgressBar from "$lib/components/project-detail/CommitmentProgressBar.svelte";
   import NfCommitmentProgressBar from "$lib/components/project-detail/NfCommitmentProgressBar.svelte";
   import { getMaxNeuronsFundParticipation } from "$lib/getters/sns-summary";
   import { i18n } from "$lib/stores/i18n";
@@ -19,11 +22,8 @@
     KeyValuePair,
     KeyValuePairInfo,
   } from "@dfinity/gix-components";
-  import { ICPToken, nonNullish, TokenAmountV2 } from "@dfinity/utils";
+  import { ICPToken, TokenAmountV2, nonNullish } from "@dfinity/utils";
   import { getContext } from "svelte";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
-  import CommitmentProgressBar from "./CommitmentProgressBar.svelte";
 
   const { store: projectDetailStore } = getContext<ProjectDetailContext>(
     PROJECT_DETAIL_CONTEXT_KEY
diff --git a/frontend/src/lib/components/project-detail/ProjectInfoSection.svelte b/frontend/src/lib/components/project-detail/ProjectInfoSection.svelte
index fe385d9cc50..d97922caed1 100644
--- a/frontend/src/lib/components/project-detail/ProjectInfoSection.svelte
+++ b/frontend/src/lib/components/project-detail/ProjectInfoSection.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import ProjectSwapDetails from "$lib/components/project-detail/ProjectSwapDetails.svelte";
   import { i18n } from "$lib/stores/i18n";
   import type { IcrcTokenMetadata } from "$lib/types/icrc";
   import {
@@ -6,7 +7,6 @@
     type ProjectDetailContext,
   } from "$lib/types/project-detail.context";
   import type { SnsSummary, SnsSummaryMetadata } from "$lib/types/sns";
-  import ProjectSwapDetails from "./ProjectSwapDetails.svelte";
   import { KeyValuePair } from "@dfinity/gix-components";
   import { isNullish } from "@dfinity/utils";
   import { getContext } from "svelte";
diff --git a/frontend/src/lib/components/project-detail/ProjectProposal.svelte b/frontend/src/lib/components/project-detail/ProjectProposal.svelte
index d316e049b4a..b2a93591055 100644
--- a/frontend/src/lib/components/project-detail/ProjectProposal.svelte
+++ b/frontend/src/lib/components/project-detail/ProjectProposal.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
+  import NnsProposalCard from "$lib/components/proposals/NnsProposalCard.svelte";
   import { getProjectProposal } from "$lib/getters/sns-summary";
   import { loadProposal } from "$lib/services/public/proposals.services";
   import { i18n } from "$lib/stores/i18n";
   import type { SnsSummary } from "$lib/types/sns";
   import type { ProposalId, ProposalInfo } from "@dfinity/nns";
   import { nonNullish } from "@dfinity/utils";
-  import NnsProposalCard from "../proposals/NnsProposalCard.svelte";
 
   export let summary: SnsSummary;
 
diff --git a/frontend/src/lib/components/project-detail/ProjectStatusSection.svelte b/frontend/src/lib/components/project-detail/ProjectStatusSection.svelte
index 308cfd8273a..d59db462a1a 100644
--- a/frontend/src/lib/components/project-detail/ProjectStatusSection.svelte
+++ b/frontend/src/lib/components/project-detail/ProjectStatusSection.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+  import ParticipateButton from "$lib/components/project-detail/ParticipateButton.svelte";
+  import ProjectCommitment from "$lib/components/project-detail/ProjectCommitment.svelte";
+  import ProjectStatus from "$lib/components/project-detail/ProjectStatus.svelte";
+  import ProjectTimelineUserCommitment from "$lib/components/project-detail/ProjectTimelineUserCommitment.svelte";
   import {
     PROJECT_DETAIL_CONTEXT_KEY,
     type ProjectDetailContext,
@@ -8,10 +12,6 @@
   import { SnsSwapLifecycle } from "@dfinity/sns";
   import { ICPToken, TokenAmount, isNullish, nonNullish } from "@dfinity/utils";
   import { getContext } from "svelte";
-  import ParticipateButton from "./ParticipateButton.svelte";
-  import ProjectCommitment from "./ProjectCommitment.svelte";
-  import ProjectStatus from "./ProjectStatus.svelte";
-  import ProjectTimelineUserCommitment from "./ProjectTimelineUserCommitment.svelte";
 
   const { store: projectDetailStore } = getContext<ProjectDetailContext>(
     PROJECT_DETAIL_CONTEXT_KEY
diff --git a/frontend/src/lib/components/project-detail/ProjectSwapDetails.svelte b/frontend/src/lib/components/project-detail/ProjectSwapDetails.svelte
index 7661c9ac5e0..5e506078909 100644
--- a/frontend/src/lib/components/project-detail/ProjectSwapDetails.svelte
+++ b/frontend/src/lib/components/project-detail/ProjectSwapDetails.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import DateSeconds from "$lib/components/ui/DateSeconds.svelte";
   import {
     getDeniedCountries,
@@ -14,10 +16,8 @@
   import type { SnsSummaryWrapper } from "$lib/types/sns-summary-wrapper";
   import { formatNumber } from "$lib/utils/format.utils";
   import { KeyValuePair } from "@dfinity/gix-components";
-  import { ICPToken, nonNullish, TokenAmountV2 } from "@dfinity/utils";
+  import { ICPToken, TokenAmountV2, nonNullish } from "@dfinity/utils";
   import { getContext } from "svelte";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
 
   const { store: projectDetailStore } = getContext<ProjectDetailContext>(
     PROJECT_DETAIL_CONTEXT_KEY
diff --git a/frontend/src/lib/components/project-detail/ProjectTimelineUserCommitment.svelte b/frontend/src/lib/components/project-detail/ProjectTimelineUserCommitment.svelte
index ac432124dcb..defd04df8bc 100644
--- a/frontend/src/lib/components/project-detail/ProjectTimelineUserCommitment.svelte
+++ b/frontend/src/lib/components/project-detail/ProjectTimelineUserCommitment.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
+  import ProjectUserCommitmentLabel from "$lib/components/project-detail/ProjectUserCommitmentLabel.svelte";
+  import Separator from "$lib/components/ui/Separator.svelte";
   import { i18n } from "$lib/stores/i18n";
   import type { SnsSummarySwap, SnsSwapCommitment } from "$lib/types/sns";
   import type { SnsSummaryWrapper } from "$lib/types/sns-summary-wrapper";
@@ -8,10 +11,7 @@
   } from "$lib/utils/projects.utils";
   import { KeyValuePair, Value } from "@dfinity/gix-components";
   import { SnsSwapLifecycle } from "@dfinity/sns";
-  import { nonNullish, secondsToDuration, TokenAmount } from "@dfinity/utils";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
-  import Separator from "../ui/Separator.svelte";
-  import ProjectUserCommitmentLabel from "./ProjectUserCommitmentLabel.svelte";
+  import { TokenAmount, nonNullish, secondsToDuration } from "@dfinity/utils";
 
   export let myCommitment: TokenAmount | undefined;
   export let summary: SnsSummaryWrapper;
diff --git a/frontend/src/lib/components/proposal-detail/NnsProposal.svelte b/frontend/src/lib/components/proposal-detail/NnsProposal.svelte
index ec73eb6f0e1..0d470072baa 100644
--- a/frontend/src/lib/components/proposal-detail/NnsProposal.svelte
+++ b/frontend/src/lib/components/proposal-detail/NnsProposal.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import NnsProposalProposerActionsEntry from "$lib/components/proposal-detail/NnsProposalProposerActionsEntry.svelte";
+  import NnsProposalProposerPayloadEntry from "$lib/components/proposal-detail/NnsProposalProposerPayloadEntry.svelte";
+  import NnsProposalSummarySection from "$lib/components/proposal-detail/NnsProposalSummarySection.svelte";
+  import ProposalNavigation from "$lib/components/proposal-detail/ProposalNavigation.svelte";
+  import ProposalSystemInfoSection from "$lib/components/proposal-detail/ProposalSystemInfoSection.svelte";
+  import ProposalVotingSection from "$lib/components/proposal-detail/ProposalVotingSection.svelte";
   import SkeletonDetails from "$lib/components/ui/SkeletonDetails.svelte";
   import { OWN_CANISTER_ID_TEXT } from "$lib/constants/canister-ids.constants";
   import { AppPath } from "$lib/constants/routes.constants";
@@ -20,12 +26,6 @@
     mapProposalInfo,
     navigateToProposal,
   } from "$lib/utils/proposals.utils";
-  import NnsProposalProposerActionsEntry from "./NnsProposalProposerActionsEntry.svelte";
-  import NnsProposalProposerPayloadEntry from "./NnsProposalProposerPayloadEntry.svelte";
-  import NnsProposalSummarySection from "./NnsProposalSummarySection.svelte";
-  import ProposalNavigation from "./ProposalNavigation.svelte";
-  import ProposalSystemInfoSection from "./ProposalSystemInfoSection.svelte";
-  import ProposalVotingSection from "./ProposalVotingSection.svelte";
   import { SplitBlock } from "@dfinity/gix-components";
   import { nonNullish } from "@dfinity/utils";
   import { getContext } from "svelte";
diff --git a/frontend/src/lib/components/proposal-detail/NnsProposalProposerActionsEntry.svelte b/frontend/src/lib/components/proposal-detail/NnsProposalProposerActionsEntry.svelte
index 3e5cb909e69..f6a88edc669 100644
--- a/frontend/src/lib/components/proposal-detail/NnsProposalProposerActionsEntry.svelte
+++ b/frontend/src/lib/components/proposal-detail/NnsProposalProposerActionsEntry.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import ProposalProposerActionsEntry from "$lib/components/proposal-detail/ProposalProposerActionsEntry.svelte";
   import {
     proposalActionData,
     proposalFirstActionKey,
   } from "$lib/utils/proposals.utils";
-  import ProposalProposerActionsEntry from "./ProposalProposerActionsEntry.svelte";
   import type { Proposal } from "@dfinity/nns";
 
   export let proposal: Proposal | undefined;
diff --git a/frontend/src/lib/components/proposal-detail/NnsProposalProposerPayloadEntry.svelte b/frontend/src/lib/components/proposal-detail/NnsProposalProposerPayloadEntry.svelte
index 39958a17ae5..b8fb2227787 100644
--- a/frontend/src/lib/components/proposal-detail/NnsProposalProposerPayloadEntry.svelte
+++ b/frontend/src/lib/components/proposal-detail/NnsProposalProposerPayloadEntry.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import ProposalProposerPayloadEntry from "$lib/components/proposal-detail/ProposalProposerPayloadEntry.svelte";
   import { loadProposalPayload } from "$lib/services/public/proposals.services";
   import { proposalPayloadsStore } from "$lib/stores/proposals.store";
   import { getNnsFunctionKey } from "$lib/utils/proposals.utils";
   import type { Proposal, ProposalId } from "@dfinity/nns";
-  import ProposalProposerPayloadEntry from "./ProposalProposerPayloadEntry.svelte";
 
   export let proposalId: ProposalId | undefined;
   export let proposal: Proposal | undefined;
diff --git a/frontend/src/lib/components/proposal-detail/NnsProposalSummarySection.svelte b/frontend/src/lib/components/proposal-detail/NnsProposalSummarySection.svelte
index d1d6e1ac2cb..599e5c7cad2 100644
--- a/frontend/src/lib/components/proposal-detail/NnsProposalSummarySection.svelte
+++ b/frontend/src/lib/components/proposal-detail/NnsProposalSummarySection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import ProposalSummarySection from "$lib/components/proposal-detail/ProposalSummarySection.svelte";
   import { mapProposalInfo } from "$lib/utils/proposals.utils";
   import type { Proposal, ProposalInfo } from "@dfinity/nns";
-  import ProposalSummarySection from "./ProposalSummarySection.svelte";
 
   export let proposalInfo: ProposalInfo;
 
diff --git a/frontend/src/lib/components/proposal-detail/ProposalSummarySection.svelte b/frontend/src/lib/components/proposal-detail/ProposalSummarySection.svelte
index d2f6fb666ca..72d54dcbd6c 100644
--- a/frontend/src/lib/components/proposal-detail/ProposalSummarySection.svelte
+++ b/frontend/src/lib/components/proposal-detail/ProposalSummarySection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import ProposalSummary from "$lib/components/proposal-detail/ProposalSummary.svelte";
   import { i18n } from "$lib/stores/i18n";
-  import ProposalSummary from "./ProposalSummary.svelte";
 
   export let title: string | undefined;
   export let summary: string | undefined;
diff --git a/frontend/src/lib/components/proposal-detail/ProposalSystemInfoSection.svelte b/frontend/src/lib/components/proposal-detail/ProposalSystemInfoSection.svelte
index 6c98f02cb6c..a0fcb75e710 100644
--- a/frontend/src/lib/components/proposal-detail/ProposalSystemInfoSection.svelte
+++ b/frontend/src/lib/components/proposal-detail/ProposalSystemInfoSection.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
+  import ProposalSystemInfoEntry from "$lib/components/proposal-detail/ProposalSystemInfoEntry.svelte";
+  import ProposalSystemInfoProposerEntry from "$lib/components/proposal-detail/ProposalSystemInfoProposerEntry.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { secondsToDateTime } from "$lib/utils/date.utils";
   import { mapProposalInfo } from "$lib/utils/proposals.utils";
   import type { NeuronId, ProposalId, ProposalInfo } from "@dfinity/nns";
-  import ProposalSystemInfoEntry from "./ProposalSystemInfoEntry.svelte";
-  import ProposalSystemInfoProposerEntry from "./ProposalSystemInfoProposerEntry.svelte";
 
   export let proposalInfo: ProposalInfo;
 
diff --git a/frontend/src/lib/components/proposal-detail/ProposalVotingSection.svelte b/frontend/src/lib/components/proposal-detail/ProposalVotingSection.svelte
index d7e938700a8..05d56efc4bd 100644
--- a/frontend/src/lib/components/proposal-detail/ProposalVotingSection.svelte
+++ b/frontend/src/lib/components/proposal-detail/ProposalVotingSection.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import VotesResults from "$lib/components/proposal-detail/VotesResults.svelte";
   import NnsVotingCard from "$lib/components/proposal-detail/VotingCard/NnsVotingCard.svelte";
   import { E8S_PER_ICP } from "$lib/constants/icp.constants";
   import {
@@ -7,7 +8,6 @@
   } from "$lib/constants/proposals.constants";
   import { basisPointsToPercent } from "$lib/utils/utils";
   import { ProposalRewardStatus, type ProposalInfo } from "@dfinity/nns";
-  import VotesResults from "./VotesResults.svelte";
 
   export let proposalInfo: ProposalInfo;
 
diff --git a/frontend/src/lib/components/proposal-detail/VotesResults.svelte b/frontend/src/lib/components/proposal-detail/VotesResults.svelte
index c904ad458fa..5ddbde4389e 100644
--- a/frontend/src/lib/components/proposal-detail/VotesResults.svelte
+++ b/frontend/src/lib/components/proposal-detail/VotesResults.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import ProposalContentCell from "$lib/components/proposal-detail/ProposalContentCell.svelte";
   import VotesResultsMajorityDescription from "$lib/components/proposal-detail/VotesResultsMajorityDescription.svelte";
   import Countdown from "$lib/components/proposals/Countdown.svelte";
   import { i18n } from "$lib/stores/i18n";
@@ -6,7 +7,6 @@
   import { formatNumber, formatPercentage } from "$lib/utils/format.utils";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import { isCriticalProposal } from "$lib/utils/sns-proposals.utils";
-  import ProposalContentCell from "./ProposalContentCell.svelte";
   import { Html } from "@dfinity/gix-components";
   import { nonNullish } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/proposal-detail/VotingCard/VotingCard.svelte b/frontend/src/lib/components/proposal-detail/VotingCard/VotingCard.svelte
index 5ead65ea4a0..c2550a72a51 100644
--- a/frontend/src/lib/components/proposal-detail/VotingCard/VotingCard.svelte
+++ b/frontend/src/lib/components/proposal-detail/VotingCard/VotingCard.svelte
@@ -4,6 +4,7 @@
   import StakeNeuronToVote from "$lib/components/proposal-detail/VotingCard/StakeNeuronToVote.svelte";
   import VotableNeuronList from "$lib/components/proposal-detail/VotingCard/VotableNeuronList.svelte";
   import VotedNeuronList from "$lib/components/proposal-detail/VotingCard/VotedNeuronList.svelte";
+  import VotingConfirmationToolbar from "$lib/components/proposal-detail/VotingCard/VotingConfirmationToolbar.svelte";
   import SpinnerText from "$lib/components/ui/SpinnerText.svelte";
   import { authSignedInStore } from "$lib/derived/auth.derived";
   import { i18n } from "$lib/stores/i18n";
@@ -12,7 +13,6 @@
     CompactNeuronInfo,
     IneligibleNeuronData,
   } from "$lib/utils/neuron.utils";
-  import VotingConfirmationToolbar from "./VotingConfirmationToolbar.svelte";
   import { BottomSheet } from "@dfinity/gix-components";
 
   export let hasNeurons: boolean;
diff --git a/frontend/src/lib/components/proposals/ActionableNnsProposals.svelte b/frontend/src/lib/components/proposals/ActionableNnsProposals.svelte
index 5217b22445c..1d5785a5ccd 100644
--- a/frontend/src/lib/components/proposals/ActionableNnsProposals.svelte
+++ b/frontend/src/lib/components/proposals/ActionableNnsProposals.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import NnsProposalCard from "$lib/components/proposals/NnsProposalCard.svelte";
   import UniverseWithActionableProposals from "$lib/components/proposals/UniverseWithActionableProposals.svelte";
   import { nnsUniverseStore } from "$lib/derived/nns-universe.derived";
   import { actionableNnsProposalsStore } from "$lib/stores/actionable-nns-proposals.store";
-  import NnsProposalCard from "./NnsProposalCard.svelte";
 </script>
 
 <TestIdWrapper testId="actionable-nns-proposals-component">
diff --git a/frontend/src/lib/components/proposals/LoadingActionableProposals.svelte b/frontend/src/lib/components/proposals/LoadingActionableProposals.svelte
index 4bf8ad171fe..d6dd34aef79 100644
--- a/frontend/src/lib/components/proposals/LoadingActionableProposals.svelte
+++ b/frontend/src/lib/components/proposals/LoadingActionableProposals.svelte
@@ -1,5 +1,5 @@
 <script>
-  import SkeletonCard from "../ui/SkeletonCard.svelte";
+  import SkeletonCard from "$lib/components/ui/SkeletonCard.svelte";
   import { SkeletonText } from "@dfinity/gix-components";
 </script>
 
diff --git a/frontend/src/lib/components/proposals/LoadingProposals.svelte b/frontend/src/lib/components/proposals/LoadingProposals.svelte
index 0cb7f08fbdb..1a36b177eea 100644
--- a/frontend/src/lib/components/proposals/LoadingProposals.svelte
+++ b/frontend/src/lib/components/proposals/LoadingProposals.svelte
@@ -1,5 +1,5 @@
 <script>
-  import SkeletonCard from "../ui/SkeletonCard.svelte";
+  import SkeletonCard from "$lib/components/ui/SkeletonCard.svelte";
 </script>
 
 <div class="card-grid" data-tid="proposals-loading">
diff --git a/frontend/src/lib/components/proposals/NnsProposalCard.svelte b/frontend/src/lib/components/proposals/NnsProposalCard.svelte
index feb1dbf2f1d..99a261301e5 100644
--- a/frontend/src/lib/components/proposals/NnsProposalCard.svelte
+++ b/frontend/src/lib/components/proposals/NnsProposalCard.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import ProposalCard from "$lib/components/proposals/ProposalCard.svelte";
   import { pageStore } from "$lib/derived/page.derived";
   import type { UniversalProposalStatus } from "$lib/types/proposals";
   import { buildProposalUrl } from "$lib/utils/navigation.utils";
@@ -6,7 +7,6 @@
     getUniversalProposalStatus,
     mapProposalInfo,
   } from "$lib/utils/proposals.utils";
-  import ProposalCard from "./ProposalCard.svelte";
   import type { NeuronId, ProposalId, ProposalInfo } from "@dfinity/nns";
 
   export let proposalInfo: ProposalInfo;
diff --git a/frontend/src/lib/components/proposals/NnsProposalsFilters.svelte b/frontend/src/lib/components/proposals/NnsProposalsFilters.svelte
index b6e143260dc..277ea81003e 100644
--- a/frontend/src/lib/components/proposals/NnsProposalsFilters.svelte
+++ b/frontend/src/lib/components/proposals/NnsProposalsFilters.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import ActionableProposalsSegment from "$lib/components/proposals/ActionableProposalsSegment.svelte";
+  import FiltersWrapper from "$lib/components/proposals/FiltersWrapper.svelte";
   import FiltersButton from "$lib/components/ui/FiltersButton.svelte";
   import { DEPRECATED_TOPICS } from "$lib/constants/proposals.constants";
   import { actionableProposalsActiveStore } from "$lib/derived/actionable-proposals.derived";
@@ -10,7 +11,6 @@
   import { proposalsFiltersStore } from "$lib/stores/proposals.store";
   import type { ProposalsFilterModalProps } from "$lib/types/proposals";
   import { enumsExclude } from "$lib/utils/enum.utils";
-  import FiltersWrapper from "./FiltersWrapper.svelte";
   import { ProposalStatus, Topic } from "@dfinity/nns";
 
   let modalFilters: ProposalsFilterModalProps | undefined = undefined;
diff --git a/frontend/src/lib/components/proposals/NnsProposalsList.svelte b/frontend/src/lib/components/proposals/NnsProposalsList.svelte
index b31d93e0a8a..008fefd64fb 100644
--- a/frontend/src/lib/components/proposals/NnsProposalsList.svelte
+++ b/frontend/src/lib/components/proposals/NnsProposalsList.svelte
@@ -3,15 +3,15 @@
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import ActionableProposalsEmpty from "$lib/components/proposals/ActionableProposalsEmpty.svelte";
   import ActionableProposalsSignIn from "$lib/components/proposals/ActionableProposalsSignIn.svelte";
+  import ListLoader from "$lib/components/proposals/ListLoader.svelte";
+  import LoadingProposals from "$lib/components/proposals/LoadingProposals.svelte";
+  import NnsProposalCard from "$lib/components/proposals/NnsProposalCard.svelte";
+  import NnsProposalsFilters from "$lib/components/proposals/NnsProposalsFilters.svelte";
+  import NoProposals from "$lib/components/proposals/NoProposals.svelte";
   import { actionableProposalsActiveStore } from "$lib/derived/actionable-proposals.derived";
   import { authSignedInStore } from "$lib/derived/auth.derived";
   import { filteredActionableProposals } from "$lib/derived/proposals.derived";
   import { actionableNnsProposalsStore } from "$lib/stores/actionable-nns-proposals.store";
-  import ListLoader from "./ListLoader.svelte";
-  import LoadingProposals from "./LoadingProposals.svelte";
-  import NnsProposalCard from "./NnsProposalCard.svelte";
-  import NnsProposalsFilters from "./NnsProposalsFilters.svelte";
-  import NoProposals from "./NoProposals.svelte";
   import { InfiniteScroll } from "@dfinity/gix-components";
   import type { ProposalInfo } from "@dfinity/nns";
   import { isNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/proposals/ProposalCard.svelte b/frontend/src/lib/components/proposals/ProposalCard.svelte
index fa63b6cc5a7..15a7767584d 100644
--- a/frontend/src/lib/components/proposals/ProposalCard.svelte
+++ b/frontend/src/lib/components/proposals/ProposalCard.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
+  import Countdown from "$lib/components/proposals/Countdown.svelte";
   import ProposalStatusTag from "$lib/components/ui/ProposalStatusTag.svelte";
   import { PROPOSER_ID_DISPLAY_SPLIT_LENGTH } from "$lib/constants/proposals.constants";
   import { i18n } from "$lib/stores/i18n";
   import type { UniversalProposalStatus } from "$lib/types/proposals";
   import { nowInSeconds } from "$lib/utils/date.utils";
   import { shortenWithMiddleEllipsis } from "$lib/utils/format.utils";
-  import Countdown from "./Countdown.svelte";
   import {
     Card,
     IconChat,
diff --git a/frontend/src/lib/components/reporting/ReportingNeurons.svelte b/frontend/src/lib/components/reporting/ReportingNeurons.svelte
index ac96a44debc..31a7534240b 100644
--- a/frontend/src/lib/components/reporting/ReportingNeurons.svelte
+++ b/frontend/src/lib/components/reporting/ReportingNeurons.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import ReportingNeuronsButton from "$lib/components/reporting/ReportingNeuronsButton.svelte";
   import { i18n } from "$lib/stores/i18n";
-  import ReportingNeuronsButton from "./ReportingNeuronsButton.svelte";
 </script>
 
 <div class="wrapper">
diff --git a/frontend/src/lib/components/reporting/ReportingTransactions.svelte b/frontend/src/lib/components/reporting/ReportingTransactions.svelte
index 166494daf91..94e913f33f3 100644
--- a/frontend/src/lib/components/reporting/ReportingTransactions.svelte
+++ b/frontend/src/lib/components/reporting/ReportingTransactions.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import ReportingDateRangeSelector from "$lib/components/reporting/ReportingDateRangeSelector.svelte";
+  import ReportingTransactionsButton from "$lib/components/reporting/ReportingTransactionsButton.svelte";
   import { i18n } from "$lib/stores/i18n";
   import type { ReportingPeriod } from "$lib/types/reporting";
-  import ReportingDateRangeSelector from "./ReportingDateRangeSelector.svelte";
-  import ReportingTransactionsButton from "./ReportingTransactionsButton.svelte";
 
   let period: ReportingPeriod = "all";
 </script>
diff --git a/frontend/src/lib/components/sns-neuron-detail/FollowSnsTopicSection.svelte b/frontend/src/lib/components/sns-neuron-detail/FollowSnsTopicSection.svelte
index 59814a99c58..b8a11703c2c 100644
--- a/frontend/src/lib/components/sns-neuron-detail/FollowSnsTopicSection.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/FollowSnsTopicSection.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import FollowTopicSection from "$lib/components/neurons/FollowTopicSection.svelte";
+  import Hash from "$lib/components/ui/Hash.svelte";
   import NewSnsFolloweeModal from "$lib/modals/sns/neurons/NewSnsFolloweeModal.svelte";
   import { removeFollowee } from "$lib/services/sns-neurons.services";
   import { startBusy, stopBusy } from "$lib/stores/busy.store";
@@ -21,7 +22,6 @@
   } from "@dfinity/sns";
   import { fromNullable } from "@dfinity/utils";
   import { getContext } from "svelte";
-  import Hash from "../ui/Hash.svelte";
 
   export let neuron: SnsNeuron;
   export let rootCanisterId: Principal;
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsAvailableMaturityItemAction.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsAvailableMaturityItemAction.svelte
index fb5a5bb0f5c..8aee13df006 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsAvailableMaturityItemAction.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsAvailableMaturityItemAction.svelte
@@ -1,5 +1,8 @@
 <script lang="ts">
+  import SnsDisburseMaturityButton from "$lib/components/sns-neuron-detail/actions/SnsDisburseMaturityButton.svelte";
+  import SnsStakeMaturityButton from "$lib/components/sns-neuron-detail/actions/SnsStakeMaturityButton.svelte";
   import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
+  import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
@@ -8,9 +11,6 @@
     hasPermissionToDisburseMaturity,
     hasPermissionToStakeMaturity,
   } from "$lib/utils/sns-neuron.utils";
-  import TooltipIcon from "../ui/TooltipIcon.svelte";
-  import SnsDisburseMaturityButton from "./actions/SnsDisburseMaturityButton.svelte";
-  import SnsStakeMaturityButton from "./actions/SnsStakeMaturityButton.svelte";
   import { IconExpandCircleDown } from "@dfinity/gix-components";
   import type { SnsNeuron } from "@dfinity/sns";
   import type { Token, TokenAmountV2 } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsFollowee.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsFollowee.svelte
index 5b845965948..9bd673d4bb5 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsFollowee.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsFollowee.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import Hash from "$lib/components/ui/Hash.svelte";
+  import TagsList from "$lib/components/ui/TagsList.svelte";
   import type { SnsFolloweesByNeuron } from "$lib/utils/sns-neuron.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
-  import Hash from "../ui/Hash.svelte";
-  import TagsList from "../ui/TagsList.svelte";
   import { Tag } from "@dfinity/gix-components";
 
   export let followee: SnsFolloweesByNeuron;
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronAdvancedSection.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronAdvancedSection.svelte
index a3ddbd1d8fc..ce9a790fe32 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronAdvancedSection.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronAdvancedSection.svelte
@@ -1,4 +1,9 @@
 <script lang="ts">
+  import SnsNeuronVestingPeriodRemaining from "$lib/components/sns-neuron-detail/SnsNeuronVestingPeriodRemaining.svelte";
+  import SnsAutoStakeMaturity from "$lib/components/sns-neuron-detail/actions/SnsAutoStakeMaturity.svelte";
+  import SplitSnsNeuronButton from "$lib/components/sns-neuron-detail/actions/SplitSnsNeuronButton.svelte";
+  import SnsNeuronAge from "$lib/components/sns-neurons/SnsNeuronAge.svelte";
+  import Hash from "$lib/components/ui/Hash.svelte";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
   import { secondsToDateTime } from "$lib/utils/date.utils";
@@ -7,11 +12,6 @@
     getSnsNeuronIdAsHexString,
     hasPermissionToSplit,
   } from "$lib/utils/sns-neuron.utils";
-  import SnsNeuronAge from "../sns-neurons/SnsNeuronAge.svelte";
-  import Hash from "../ui/Hash.svelte";
-  import SnsNeuronVestingPeriodRemaining from "./SnsNeuronVestingPeriodRemaining.svelte";
-  import SnsAutoStakeMaturity from "./actions/SnsAutoStakeMaturity.svelte";
-  import SplitSnsNeuronButton from "./actions/SplitSnsNeuronButton.svelte";
   import { KeyValuePair, Section } from "@dfinity/gix-components";
   import { encodeIcrcAccount, type IcrcAccount } from "@dfinity/ledger-icrc";
   import type { Principal } from "@dfinity/principal";
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronDissolveDelayItemAction.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronDissolveDelayItemAction.svelte
index 96266b1c451..8ef488b54ad 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronDissolveDelayItemAction.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronDissolveDelayItemAction.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import DissolveDelayBonusText from "$lib/components/neuron-detail/DissolveDelayBonusText.svelte";
+  import IncreaseSnsDissolveDelayButton from "$lib/components/sns-neuron-detail/actions/IncreaseSnsDissolveDelayButton.svelte";
+  import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
@@ -12,9 +15,6 @@
   import { NeuronState } from "@dfinity/nns";
   import type { SnsNervousSystemParameters, SnsNeuron } from "@dfinity/sns";
   import { fromNullable, secondsToDuration, type Token } from "@dfinity/utils";
-  import DissolveDelayBonusText from "../neuron-detail/DissolveDelayBonusText.svelte";
-  import CommonItemAction from "../ui/CommonItemAction.svelte";
-  import IncreaseSnsDissolveDelayButton from "./actions/IncreaseSnsDissolveDelayButton.svelte";
 
   export let neuron: SnsNeuron;
   export let parameters: SnsNervousSystemParameters;
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronFollowingCard.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronFollowingCard.svelte
index 87def020910..9bbf4b05150 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronFollowingCard.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronFollowingCard.svelte
@@ -1,5 +1,8 @@
 <script lang="ts">
+  import SnsFollowee from "$lib/components/sns-neuron-detail/SnsFollowee.svelte";
+  import FollowSnsNeuronsButton from "$lib/components/sns-neuron-detail/actions/FollowSnsNeuronsButton.svelte";
   import CardInfo from "$lib/components/ui/CardInfo.svelte";
+  import SkeletonFollowees from "$lib/components/ui/SkeletonFollowees.svelte";
   import {
     createSnsNsFunctionsProjectStore,
     type SnsNervousSystemFunctionsProjectStore,
@@ -15,9 +18,6 @@
     hasPermissionToVote,
     type SnsFolloweesByNeuron,
   } from "$lib/utils/sns-neuron.utils";
-  import SkeletonFollowees from "../ui/SkeletonFollowees.svelte";
-  import SnsFollowee from "./SnsFollowee.svelte";
-  import FollowSnsNeuronsButton from "./actions/FollowSnsNeuronsButton.svelte";
   import { KeyValuePairInfo } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import type { SnsNeuron } from "@dfinity/sns";
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronHotkeysCard.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronHotkeysCard.svelte
index 6db9e562ad7..0d2a4d87ff0 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronHotkeysCard.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronHotkeysCard.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
   import { goto } from "$app/navigation";
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import AddSnsHotkeyButton from "$lib/components/sns-neuron-detail/actions/AddSnsHotkeyButton.svelte";
   import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { ICON_SIZE_LARGE } from "$lib/constants/layout.constants";
@@ -27,8 +29,6 @@
   } from "@dfinity/sns";
   import { fromDefinedNullable } from "@dfinity/utils";
   import { getContext } from "svelte";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
-  import AddSnsHotkeyButton from "./actions/AddSnsHotkeyButton.svelte";
 
   export let parameters: SnsNervousSystemParameters;
 
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronMaturitySection.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronMaturitySection.svelte
index f47368cda7c..d54308838e0 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronMaturitySection.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronMaturitySection.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import SnsAvailableMaturityItemAction from "$lib/components/sns-neuron-detail/SnsAvailableMaturityItemAction.svelte";
+  import SnsStakedMaturityItemAction from "$lib/components/sns-neuron-detail/SnsStakedMaturityItemAction.svelte";
   import SnsViewActiveDisbursementsItemAction from "$lib/components/sns-neuron-detail/SnsViewActiveDisbursementsItemAction.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { formattedTotalMaturity } from "$lib/utils/sns-neuron.utils";
-  import SnsAvailableMaturityItemAction from "./SnsAvailableMaturityItemAction.svelte";
-  import SnsStakedMaturityItemAction from "./SnsStakedMaturityItemAction.svelte";
   import { Section } from "@dfinity/gix-components";
   import type { SnsNeuron } from "@dfinity/sns";
   import type { Token, TokenAmountV2 } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeader.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeader.svelte
index d83cceb02cd..ef5506eda3f 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeader.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeader.svelte
@@ -1,8 +1,13 @@
 <script lang="ts">
+  import PageHeader from "$lib/components/common/PageHeader.svelte";
+  import NeuronNavigation from "$lib/components/neuron-detail/NeuronNavigation.svelte";
+  import IdentifierHash from "$lib/components/ui/IdentifierHash.svelte";
+  import UniverseSummary from "$lib/components/universe/UniverseSummary.svelte";
   import { selectedUniverseStore } from "$lib/derived/selected-universe.derived";
   import { onIntersection } from "$lib/directives/intersection.directives";
   import { i18n } from "$lib/stores/i18n";
   import { layoutTitleStore } from "$lib/stores/layout.store";
+  import { snsNeuronsTableOrderSortedNeuronIdsStore } from "$lib/stores/sns-neurons-table-order-sorted-neuron-ids-store";
   import type { IntersectingDetail } from "$lib/types/intersection.types";
   import {
     SELECTED_SNS_NEURON_CONTEXT_KEY,
@@ -10,14 +15,9 @@
   } from "$lib/types/sns-neuron-detail.context";
   import { shortenWithMiddleEllipsis } from "$lib/utils/format.utils";
   import { getSnsNeuronIdAsHexString } from "$lib/utils/sns-neuron.utils";
-  import PageHeader from "../common/PageHeader.svelte";
-  import IdentifierHash from "../ui/IdentifierHash.svelte";
-  import UniverseSummary from "../universe/UniverseSummary.svelte";
   import type { SnsNeuron } from "@dfinity/sns";
   import { isNullish, nonNullish, type Token } from "@dfinity/utils";
   import { getContext } from "svelte";
-  import NeuronNavigation from "../neuron-detail/NeuronNavigation.svelte";
-  import { snsNeuronsTableOrderSortedNeuronIdsStore } from "$lib/stores/sns-neurons-table-order-sorted-neuron-ids-store";
 
   export let token: Token;
 
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeading.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeading.svelte
index 1c19cf74185..bf139a6d101 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeading.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronPageHeading.svelte
@@ -1,4 +1,8 @@
 <script lang="ts">
+  import HeadingSubtitle from "$lib/components/common/HeadingSubtitle.svelte";
+  import HeadingSubtitleWithUsdValue from "$lib/components/common/HeadingSubtitleWithUsdValue.svelte";
+  import PageHeading from "$lib/components/common/PageHeading.svelte";
+  import AmountDisplay from "$lib/components/ic/AmountDisplay.svelte";
   import { selectedTokenStore } from "$lib/derived/selected-token.derived";
   import { authStore } from "$lib/stores/auth.store";
   import { ENABLE_USD_VALUES_FOR_NEURONS } from "$lib/stores/feature-flags.store";
@@ -10,10 +14,6 @@
     isUserHotkey,
     snsNeuronVotingPower,
   } from "$lib/utils/sns-neuron.utils";
-  import HeadingSubtitle from "../common/HeadingSubtitle.svelte";
-  import HeadingSubtitleWithUsdValue from "../common/HeadingSubtitleWithUsdValue.svelte";
-  import PageHeading from "../common/PageHeading.svelte";
-  import AmountDisplay from "../ic/AmountDisplay.svelte";
   import { Tag } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import type { SnsNervousSystemParameters, SnsNeuron } from "@dfinity/sns";
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronStateItemAction.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronStateItemAction.svelte
index 314ee9d4520..728b4ce562e 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronStateItemAction.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronStateItemAction.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import AgeBonusText from "$lib/components/neuron-detail/AgeBonusText.svelte";
+  import DisburseSnsButton from "$lib/components/sns-neuron-detail/actions/DisburseSnsButton.svelte";
+  import DissolveSnsNeuronButton from "$lib/components/sns-neuron-detail/actions/DissolveSnsNeuronButton.svelte";
   import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
   import { authStore } from "$lib/stores/auth.store";
   import { i18n } from "$lib/stores/i18n";
@@ -11,9 +14,6 @@
     hasPermissionToDissolve,
   } from "$lib/utils/sns-neuron.utils";
   import { keyOf } from "$lib/utils/utils";
-  import AgeBonusText from "../neuron-detail/AgeBonusText.svelte";
-  import DisburseSnsButton from "./actions/DisburseSnsButton.svelte";
-  import DissolveSnsNeuronButton from "./actions/DissolveSnsNeuronButton.svelte";
   import { NeuronState } from "@dfinity/nns";
   import type { SnsNervousSystemParameters, SnsNeuron } from "@dfinity/sns";
   import type { Token } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVestingPeriodRemaining.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVestingPeriodRemaining.svelte
index c761f110f4a..60499fd5ee0 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVestingPeriodRemaining.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVestingPeriodRemaining.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { isVesting, vestingInSeconds } from "$lib/utils/sns-neuron.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
   import { KeyValuePair } from "@dfinity/gix-components";
   import type { SnsNeuron } from "@dfinity/sns";
   import { secondsToDuration } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVotingPowerSection.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVotingPowerSection.svelte
index 32251a044e9..f12d18bc455 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVotingPowerSection.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsNeuronVotingPowerSection.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import SnsNeuronDissolveDelayItemAction from "$lib/components/sns-neuron-detail/SnsNeuronDissolveDelayItemAction.svelte";
+  import SnsNeuronStateItemAction from "$lib/components/sns-neuron-detail/SnsNeuronStateItemAction.svelte";
+  import SnsStakeItemAction from "$lib/components/sns-neuron-detail/SnsStakeItemAction.svelte";
   import { selectedUniverseStore } from "$lib/derived/selected-universe.derived";
   import { i18n } from "$lib/stores/i18n";
   import type { Universe } from "$lib/types/universe";
@@ -21,9 +24,6 @@
     secondsToDuration,
     type Token,
   } from "@dfinity/utils";
-  import SnsNeuronDissolveDelayItemAction from "./SnsNeuronDissolveDelayItemAction.svelte";
-  import SnsNeuronStateItemAction from "./SnsNeuronStateItemAction.svelte";
-  import SnsStakeItemAction from "./SnsStakeItemAction.svelte";
 
   export let parameters: SnsNervousSystemParameters;
   export let neuron: SnsNeuron;
diff --git a/frontend/src/lib/components/sns-neuron-detail/SnsStakedMaturityItemAction.svelte b/frontend/src/lib/components/sns-neuron-detail/SnsStakedMaturityItemAction.svelte
index cb8d905bf2d..66e17346a4a 100644
--- a/frontend/src/lib/components/sns-neuron-detail/SnsStakedMaturityItemAction.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/SnsStakedMaturityItemAction.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import CommonItemAction from "$lib/components/ui/CommonItemAction.svelte";
+  import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { formattedStakedMaturity } from "$lib/utils/sns-neuron.utils";
-  import TooltipIcon from "../ui/TooltipIcon.svelte";
   import { IconStakedMaturity } from "@dfinity/gix-components";
   import type { SnsNeuron } from "@dfinity/sns";
 
diff --git a/frontend/src/lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte b/frontend/src/lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte
index 25a45d07543..bb5c7c2306e 100644
--- a/frontend/src/lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import { isVesting, vestingInSeconds } from "$lib/utils/sns-neuron.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
   import { Tooltip } from "@dfinity/gix-components";
   import type { SnsNeuron } from "@dfinity/sns";
   import { secondsToDuration } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/sns-neuron-detail/actions/DisburseSnsButton.svelte b/frontend/src/lib/components/sns-neuron-detail/actions/DisburseSnsButton.svelte
index 5dec58772d4..a357c45e783 100644
--- a/frontend/src/lib/components/sns-neuron-detail/actions/DisburseSnsButton.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/actions/DisburseSnsButton.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import VestingTooltipWrapper from "$lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { openSnsNeuronModal } from "$lib/utils/modals.utils";
   import { isVesting } from "$lib/utils/sns-neuron.utils";
-  import VestingTooltipWrapper from "../VestingTooltipWrapper.svelte";
   import type { SnsNeuron } from "@dfinity/sns";
 
   export let neuron: SnsNeuron;
diff --git a/frontend/src/lib/components/sns-neuron-detail/actions/DissolveSnsNeuronButton.svelte b/frontend/src/lib/components/sns-neuron-detail/actions/DissolveSnsNeuronButton.svelte
index 46eebfa1f09..7d5bbea5fd0 100644
--- a/frontend/src/lib/components/sns-neuron-detail/actions/DissolveSnsNeuronButton.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/actions/DissolveSnsNeuronButton.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import VestingTooltipWrapper from "$lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { openSnsNeuronModal } from "$lib/utils/modals.utils";
   import { getSnsNeuronState, isVesting } from "$lib/utils/sns-neuron.utils";
   import { keyOf } from "$lib/utils/utils";
-  import VestingTooltipWrapper from "../VestingTooltipWrapper.svelte";
   import { NeuronState } from "@dfinity/nns";
   import type { SnsNeuron } from "@dfinity/sns";
 
diff --git a/frontend/src/lib/components/sns-neuron-detail/actions/IncreaseSnsDissolveDelayButton.svelte b/frontend/src/lib/components/sns-neuron-detail/actions/IncreaseSnsDissolveDelayButton.svelte
index 50fc3a88114..2503491d945 100644
--- a/frontend/src/lib/components/sns-neuron-detail/actions/IncreaseSnsDissolveDelayButton.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/actions/IncreaseSnsDissolveDelayButton.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import VestingTooltipWrapper from "$lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { openSnsNeuronModal } from "$lib/utils/modals.utils";
   import { getSnsNeuronState, isVesting } from "$lib/utils/sns-neuron.utils";
-  import VestingTooltipWrapper from "../VestingTooltipWrapper.svelte";
   import { NeuronState } from "@dfinity/nns";
   import type { SnsNeuron } from "@dfinity/sns";
 
diff --git a/frontend/src/lib/components/sns-neuron-detail/actions/SplitSnsNeuronButton.svelte b/frontend/src/lib/components/sns-neuron-detail/actions/SplitSnsNeuronButton.svelte
index 39d144eccf6..8abc0982e48 100644
--- a/frontend/src/lib/components/sns-neuron-detail/actions/SplitSnsNeuronButton.svelte
+++ b/frontend/src/lib/components/sns-neuron-detail/actions/SplitSnsNeuronButton.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import VestingTooltipWrapper from "$lib/components/sns-neuron-detail/VestingTooltipWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { replacePlaceholders } from "$lib/utils/i18n.utils";
   import { openSnsNeuronModal } from "$lib/utils/modals.utils";
@@ -15,7 +16,6 @@
     type Token,
     type TokenAmountV2,
   } from "@dfinity/utils";
-  import VestingTooltipWrapper from "../VestingTooltipWrapper.svelte";
 
   export let neuron: SnsNeuron;
   export let parameters: SnsNervousSystemParameters;
diff --git a/frontend/src/lib/components/sns-neurons/SnsNeuronAge.svelte b/frontend/src/lib/components/sns-neurons/SnsNeuronAge.svelte
index ee1798c6096..a931e8967bf 100644
--- a/frontend/src/lib/components/sns-neurons/SnsNeuronAge.svelte
+++ b/frontend/src/lib/components/sns-neurons/SnsNeuronAge.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { neuronAge } from "$lib/utils/sns-neuron.utils";
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
   import { KeyValuePair } from "@dfinity/gix-components";
   import type { SnsNeuron } from "@dfinity/sns";
   import { secondsToDuration } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/sns-proposals/SnsProposalPayloadSection.svelte b/frontend/src/lib/components/sns-proposals/SnsProposalPayloadSection.svelte
index bfdf4f2ccba..df2266e4cf1 100644
--- a/frontend/src/lib/components/sns-proposals/SnsProposalPayloadSection.svelte
+++ b/frontend/src/lib/components/sns-proposals/SnsProposalPayloadSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import ProposalSummary from "$lib/components/proposal-detail/ProposalSummary.svelte";
   import { i18n } from "$lib/stores/i18n";
-  import ProposalSummary from "../proposal-detail/ProposalSummary.svelte";
   import type { SnsProposalData } from "@dfinity/sns";
   import { fromNullable, nonNullish } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/sns-proposals/SnsProposalSummarySection.svelte b/frontend/src/lib/components/sns-proposals/SnsProposalSummarySection.svelte
index 9d39db5336f..37c80e39a75 100644
--- a/frontend/src/lib/components/sns-proposals/SnsProposalSummarySection.svelte
+++ b/frontend/src/lib/components/sns-proposals/SnsProposalSummarySection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ProposalSummarySection from "../proposal-detail/ProposalSummarySection.svelte";
+  import ProposalSummarySection from "$lib/components/proposal-detail/ProposalSummarySection.svelte";
   import type { SnsProposalData } from "@dfinity/sns";
   import { fromNullable, nonNullish } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/sns-proposals/SnsProposalSystemInfoSection.svelte b/frontend/src/lib/components/sns-proposals/SnsProposalSystemInfoSection.svelte
index ec41fd19d58..6be02c8b961 100644
--- a/frontend/src/lib/components/sns-proposals/SnsProposalSystemInfoSection.svelte
+++ b/frontend/src/lib/components/sns-proposals/SnsProposalSystemInfoSection.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
+  import ProposalSystemInfoEntry from "$lib/components/proposal-detail/ProposalSystemInfoEntry.svelte";
+  import SnsProposerEntry from "$lib/components/sns-proposals/SnsProposerEntry.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { secondsToDateTime } from "$lib/utils/date.utils";
   import type { SnsProposalDataMap } from "$lib/utils/sns-proposals.utils";
-  import ProposalSystemInfoEntry from "../proposal-detail/ProposalSystemInfoEntry.svelte";
-  import SnsProposerEntry from "./SnsProposerEntry.svelte";
   import type { SnsNeuronId } from "@dfinity/sns";
   import { nonNullish } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/sns-proposals/SnsProposalsFilters.svelte b/frontend/src/lib/components/sns-proposals/SnsProposalsFilters.svelte
index faa306d9d62..240441893ed 100644
--- a/frontend/src/lib/components/sns-proposals/SnsProposalsFilters.svelte
+++ b/frontend/src/lib/components/sns-proposals/SnsProposalsFilters.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import ActionableProposalsSegment from "$lib/components/proposals/ActionableProposalsSegment.svelte";
+  import FiltersWrapper from "$lib/components/proposals/FiltersWrapper.svelte";
+  import FiltersButton from "$lib/components/ui/FiltersButton.svelte";
   import { actionableProposalsActiveStore } from "$lib/derived/actionable-proposals.derived";
   import { authSignedInStore } from "$lib/derived/auth.derived";
   import { selectedUniverseIdStore } from "$lib/derived/selected-universe.derived";
@@ -11,8 +13,6 @@
     snsFiltersStore,
     type ProjectFiltersStoreData,
   } from "$lib/stores/sns-filters.store";
-  import FiltersWrapper from "../proposals/FiltersWrapper.svelte";
-  import FiltersButton from "../ui/FiltersButton.svelte";
   import type { Principal } from "@dfinity/principal";
 
   let modal: "types" | "status" | undefined = undefined;
diff --git a/frontend/src/lib/components/sns-proposals/SnsProposalsList.svelte b/frontend/src/lib/components/sns-proposals/SnsProposalsList.svelte
index 4121e6ac151..5209888fa94 100644
--- a/frontend/src/lib/components/sns-proposals/SnsProposalsList.svelte
+++ b/frontend/src/lib/components/sns-proposals/SnsProposalsList.svelte
@@ -2,14 +2,14 @@
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import ActionableProposalsEmpty from "$lib/components/proposals/ActionableProposalsEmpty.svelte";
   import ActionableProposalsSignIn from "$lib/components/proposals/ActionableProposalsSignIn.svelte";
+  import ListLoader from "$lib/components/proposals/ListLoader.svelte";
+  import LoadingProposals from "$lib/components/proposals/LoadingProposals.svelte";
+  import NoProposals from "$lib/components/proposals/NoProposals.svelte";
   import SnsProposalCard from "$lib/components/sns-proposals/SnsProposalCard.svelte";
+  import SnsProposalsFilters from "$lib/components/sns-proposals/SnsProposalsFilters.svelte";
   import { authSignedInStore } from "$lib/derived/auth.derived";
   import { pageStore } from "$lib/derived/page.derived";
   import type { SnsProposalActionableData } from "$lib/derived/sns/sns-filtered-actionable-proposals.derived";
-  import ListLoader from "../proposals/ListLoader.svelte";
-  import LoadingProposals from "../proposals/LoadingProposals.svelte";
-  import NoProposals from "../proposals/NoProposals.svelte";
-  import SnsProposalsFilters from "./SnsProposalsFilters.svelte";
   import { InfiniteScroll } from "@dfinity/gix-components";
   import type { SnsNervousSystemFunction } from "@dfinity/sns";
   import { fromNullable, isNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/components/sns-proposals/SnsProposerEntry.svelte b/frontend/src/lib/components/sns-proposals/SnsProposerEntry.svelte
index 3078b1238c6..d7660b83886 100644
--- a/frontend/src/lib/components/sns-proposals/SnsProposerEntry.svelte
+++ b/frontend/src/lib/components/sns-proposals/SnsProposerEntry.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import Hash from "$lib/components/ui/Hash.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { subaccountToHexString } from "$lib/utils/sns-neuron.utils";
-  import Hash from "../ui/Hash.svelte";
   import { Html, KeyValuePairInfo } from "@dfinity/gix-components";
   import type { SnsNeuronId } from "@dfinity/sns";
 
diff --git a/frontend/src/lib/components/tokens/TokensTable/TokenActionsCell.svelte b/frontend/src/lib/components/tokens/TokensTable/TokenActionsCell.svelte
index b33ff42e771..ab5420a7468 100644
--- a/frontend/src/lib/components/tokens/TokensTable/TokenActionsCell.svelte
+++ b/frontend/src/lib/components/tokens/TokensTable/TokenActionsCell.svelte
@@ -1,4 +1,9 @@
 <script lang="ts">
+  import GoToDashboardButton from "$lib/components/tokens/TokensTable/actions/GoToDashboardButton.svelte";
+  import GoToDetailIcon from "$lib/components/tokens/TokensTable/actions/GoToDetailIcon.svelte";
+  import ReceiveButton from "$lib/components/tokens/TokensTable/actions/ReceiveButton.svelte";
+  import RemoveButton from "$lib/components/tokens/TokensTable/actions/RemoveButton.svelte";
+  import SendButton from "$lib/components/tokens/TokensTable/actions/SendButton.svelte";
   import {
     UserTokenAction,
     type UserTokenData,
@@ -6,11 +11,6 @@
     type UserTokenLoading,
   } from "$lib/types/tokens-page";
   import { isUserTokenLoading } from "$lib/utils/user-token.utils";
-  import GoToDashboardButton from "./actions/GoToDashboardButton.svelte";
-  import GoToDetailIcon from "./actions/GoToDetailIcon.svelte";
-  import ReceiveButton from "./actions/ReceiveButton.svelte";
-  import RemoveButton from "./actions/RemoveButton.svelte";
-  import SendButton from "./actions/SendButton.svelte";
   import { nonNullish } from "@dfinity/utils";
   import type { ComponentType, SvelteComponent } from "svelte";
 
diff --git a/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte b/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte
index 5c01800d7d3..0715d712b18 100644
--- a/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte
+++ b/frontend/src/lib/components/tokens/TokensTable/TokensTable.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
+  import TokenActionsCell from "$lib/components/tokens/TokensTable/TokenActionsCell.svelte";
+  import TokenBalanceCell from "$lib/components/tokens/TokensTable/TokenBalanceCell.svelte";
+  import TokenTitleCell from "$lib/components/tokens/TokensTable/TokenTitleCell.svelte";
   import ResponsiveTable from "$lib/components/ui/ResponsiveTable.svelte";
   import { i18n } from "$lib/stores/i18n";
   import type { TokensTableColumn, UserToken } from "$lib/types/tokens-page";
-  import TokenActionsCell from "./TokenActionsCell.svelte";
-  import TokenBalanceCell from "./TokenBalanceCell.svelte";
-  import TokenTitleCell from "./TokenTitleCell.svelte";
 
   export let userTokensData: Array<UserToken>;
   export let firstColumnHeader: string;
diff --git a/frontend/src/lib/components/ui/AmountInput.svelte b/frontend/src/lib/components/ui/AmountInput.svelte
index 1dfdf6cd17f..454958810fb 100644
--- a/frontend/src/lib/components/ui/AmountInput.svelte
+++ b/frontend/src/lib/components/ui/AmountInput.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import MaxButton from "$lib/components/common/MaxButton.svelte";
+  import InputWithError from "$lib/components/ui/InputWithError.svelte";
   import { ICP_DISPLAYED_DECIMALS_DETAILED } from "$lib/constants/icp.constants";
   import { i18n } from "$lib/stores/i18n";
-  import InputWithError from "./InputWithError.svelte";
   import { isNullish, type Token } from "@dfinity/utils";
   import { createEventDispatcher } from "svelte";
 
diff --git a/frontend/src/lib/components/ui/CardInfo.svelte b/frontend/src/lib/components/ui/CardInfo.svelte
index 142f79e2cbb..d274fc81394 100644
--- a/frontend/src/lib/components/ui/CardInfo.svelte
+++ b/frontend/src/lib/components/ui/CardInfo.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ColumnRow from "./ColumnRow.svelte";
+  import ColumnRow from "$lib/components/ui/ColumnRow.svelte";
 
   // Same data-tid as <Card /> for backwards compatibility with existing jest test
   export let testId = "card";
diff --git a/frontend/src/lib/components/ui/CommonItemAction.svelte b/frontend/src/lib/components/ui/CommonItemAction.svelte
index 8dd69c4be4e..cb118ee694a 100644
--- a/frontend/src/lib/components/ui/CommonItemAction.svelte
+++ b/frontend/src/lib/components/ui/CommonItemAction.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import TooltipIcon from "./TooltipIcon.svelte";
+  import TooltipIcon from "$lib/components/ui/TooltipIcon.svelte";
   import { ItemAction } from "@dfinity/gix-components";
   import { nonNullish } from "@dfinity/utils";
 
diff --git a/frontend/src/lib/components/ui/DayInput.svelte b/frontend/src/lib/components/ui/DayInput.svelte
index 649b5f429e6..199289fde79 100644
--- a/frontend/src/lib/components/ui/DayInput.svelte
+++ b/frontend/src/lib/components/ui/DayInput.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import MaxButton from "$lib/components/common/MaxButton.svelte";
   import MinButton from "$lib/components/common/MinButton.svelte";
+  import InputWithError from "$lib/components/ui/InputWithError.svelte";
   import { daysToSeconds, secondsToDays } from "$lib/utils/date.utils";
-  import InputWithError from "./InputWithError.svelte";
 
   export let seconds: number;
   export let disabled: boolean = false;
diff --git a/frontend/src/lib/components/ui/InputWithError.svelte b/frontend/src/lib/components/ui/InputWithError.svelte
index 82f5707eede..a691be00fbb 100644
--- a/frontend/src/lib/components/ui/InputWithError.svelte
+++ b/frontend/src/lib/components/ui/InputWithError.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Input from "./Input.svelte";
+  import Input from "$lib/components/ui/Input.svelte";
   import { IconInfo } from "@dfinity/gix-components";
 
   // Same props as Input
diff --git a/frontend/src/lib/components/ui/PrincipalInput.svelte b/frontend/src/lib/components/ui/PrincipalInput.svelte
index 8501b53818e..4fd951397d5 100644
--- a/frontend/src/lib/components/ui/PrincipalInput.svelte
+++ b/frontend/src/lib/components/ui/PrincipalInput.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+  import InputWithError from "$lib/components/ui/InputWithError.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { getPrincipalFromString } from "$lib/utils/accounts.utils";
-  import InputWithError from "./InputWithError.svelte";
   import type { Principal } from "@dfinity/principal";
 
   export let placeholderLabelKey: string;
diff --git a/frontend/src/lib/components/ui/SkeletonCard.svelte b/frontend/src/lib/components/ui/SkeletonCard.svelte
index 879a68c21f8..ef107ebba55 100644
--- a/frontend/src/lib/components/ui/SkeletonCard.svelte
+++ b/frontend/src/lib/components/ui/SkeletonCard.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import CardInfo from "$lib/components/ui/CardInfo.svelte";
   import Separator from "$lib/components/ui/Separator.svelte";
+  import SkeletonCardContent from "$lib/components/ui/SkeletonCardContent.svelte";
   import type { CardType } from "$lib/types/card";
   import { Card, SkeletonText } from "@dfinity/gix-components";
-  import CardInfo from "./CardInfo.svelte";
-  import SkeletonCardContent from "./SkeletonCardContent.svelte";
 
   export let size: "small" | "medium" | "large" = "small";
   export let cardType: CardType = "card";
diff --git a/frontend/src/lib/components/ui/SkeletonDetails.svelte b/frontend/src/lib/components/ui/SkeletonDetails.svelte
index 2183207a180..77c404be2f0 100644
--- a/frontend/src/lib/components/ui/SkeletonDetails.svelte
+++ b/frontend/src/lib/components/ui/SkeletonDetails.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import TestIdWrapper from "../common/TestIdWrapper.svelte";
+  import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { SkeletonText } from "@dfinity/gix-components";
 </script>
 
diff --git a/frontend/src/lib/components/ui/SkeletonHeader.svelte b/frontend/src/lib/components/ui/SkeletonHeader.svelte
index a3921194d5e..26603d9ced2 100644
--- a/frontend/src/lib/components/ui/SkeletonHeader.svelte
+++ b/frontend/src/lib/components/ui/SkeletonHeader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import PageHeader from "../common/PageHeader.svelte";
+  import PageHeader from "$lib/components/common/PageHeader.svelte";
   import { SkeletonText } from "@dfinity/gix-components";
 </script>
 
diff --git a/frontend/src/lib/components/ui/SkeletonHeading.svelte b/frontend/src/lib/components/ui/SkeletonHeading.svelte
index 85d389474dc..ca99a6c81d5 100644
--- a/frontend/src/lib/components/ui/SkeletonHeading.svelte
+++ b/frontend/src/lib/components/ui/SkeletonHeading.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import PageHeading from "../common/PageHeading.svelte";
+  import PageHeading from "$lib/components/common/PageHeading.svelte";
   import { SkeletonText } from "@dfinity/gix-components";
 </script>
 
diff --git a/frontend/src/lib/components/ui/SkeletonProjectCard.svelte b/frontend/src/lib/components/ui/SkeletonProjectCard.svelte
index f1d64a13160..256f5cb0155 100644
--- a/frontend/src/lib/components/ui/SkeletonProjectCard.svelte
+++ b/frontend/src/lib/components/ui/SkeletonProjectCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import SkeletonLogo from "$lib/components/ui/SkeletonLogo.svelte";
   import { Card, SkeletonText } from "@dfinity/gix-components";
-  import SkeletonLogo from "./SkeletonLogo.svelte";
 </script>
 
 <Card testId="skeleton-card">
diff --git a/frontend/src/lib/components/universe/UniverseSummary.svelte b/frontend/src/lib/components/universe/UniverseSummary.svelte
index bcdc5192a5e..2cc172db0f9 100644
--- a/frontend/src/lib/components/universe/UniverseSummary.svelte
+++ b/frontend/src/lib/components/universe/UniverseSummary.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import UniverseLogo from "$lib/components/universe/UniverseLogo.svelte";
   import type { Universe } from "$lib/types/universe";
-  import UniverseLogo from "./UniverseLogo.svelte";
 
   export let universe: Universe;
 </script>
diff --git a/frontend/src/lib/derived/accounts-title.derived.ts b/frontend/src/lib/derived/accounts-title.derived.ts
index 9aa1d5d3d16..857b26db392 100644
--- a/frontend/src/lib/derived/accounts-title.derived.ts
+++ b/frontend/src/lib/derived/accounts-title.derived.ts
@@ -1,10 +1,10 @@
+import { pageStore, type Page } from "$lib/derived/page.derived";
 import { tokensByUniverseIdStore } from "$lib/derived/tokens.derived";
 import { i18n } from "$lib/stores/i18n";
 import type { IcrcTokenMetadata } from "$lib/types/icrc";
 import { replacePlaceholders } from "$lib/utils/i18n.utils";
 import { isNullish } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { pageStore, type Page } from "./page.derived";
 
 export const accountsTitleStore = derived<
   [Readable<Page>, Readable<Record<string, IcrcTokenMetadata>>, Readable<I18n>],
diff --git a/frontend/src/lib/derived/ckbtc-universes.derived.ts b/frontend/src/lib/derived/ckbtc-universes.derived.ts
index 655b523bb1a..7b5c236fa54 100644
--- a/frontend/src/lib/derived/ckbtc-universes.derived.ts
+++ b/frontend/src/lib/derived/ckbtc-universes.derived.ts
@@ -1,8 +1,8 @@
+import { ckBTCUniverseStore } from "$lib/derived/ckbtc-universe.derived";
+import { ckTESTBTCUniverseStore } from "$lib/derived/cktestbtc-universe.derived";
 import { ENABLE_CKTESTBTC } from "$lib/stores/feature-flags.store";
 import type { Universe } from "$lib/types/universe";
 import { derived, type Readable } from "svelte/store";
-import { ckBTCUniverseStore } from "./ckbtc-universe.derived";
-import { ckTESTBTCUniverseStore } from "./cktestbtc-universe.derived";
 
 export const ckBTCUniversesStore = derived<
   [Readable<Universe>, Readable<Universe>, Readable<boolean>],
diff --git a/frontend/src/lib/derived/icp-tokens-list-user.derived.ts b/frontend/src/lib/derived/icp-tokens-list-user.derived.ts
index e9111fe98e0..44c67d2aaf7 100644
--- a/frontend/src/lib/derived/icp-tokens-list-user.derived.ts
+++ b/frontend/src/lib/derived/icp-tokens-list-user.derived.ts
@@ -8,6 +8,7 @@ import {
   icpSwapUsdPricesStore,
   type IcpSwapUsdPricesStore,
 } from "$lib/derived/icp-swap.derived";
+import { nnsUniverseStore } from "$lib/derived/nns-universe.derived";
 import { i18n } from "$lib/stores/i18n";
 import type { Account, AccountType } from "$lib/types/account";
 import { UserTokenAction, type UserToken } from "$lib/types/tokens-page";
@@ -17,7 +18,6 @@ import { getUsdValue, sortUserTokens } from "$lib/utils/token.utils";
 import { Principal } from "@dfinity/principal";
 import { isNullish, TokenAmountV2 } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { nnsUniverseStore } from "./nns-universe.derived";
 
 const convertAccountToUserTokenData = ({
   nnsUniverse,
diff --git a/frontend/src/lib/derived/icp-tokens-list-visitors.derived.ts b/frontend/src/lib/derived/icp-tokens-list-visitors.derived.ts
index b957bc66e39..d37f8957b28 100644
--- a/frontend/src/lib/derived/icp-tokens-list-visitors.derived.ts
+++ b/frontend/src/lib/derived/icp-tokens-list-visitors.derived.ts
@@ -3,6 +3,7 @@ import {
   OWN_CANISTER_ID_TEXT,
 } from "$lib/constants/canister-ids.constants";
 import { NNS_TOKEN_DATA } from "$lib/constants/tokens.constants";
+import { nnsUniverseStore } from "$lib/derived/nns-universe.derived";
 import { UserTokenAction, type UserTokenData } from "$lib/types/tokens-page";
 import type { Universe } from "$lib/types/universe";
 import { buildWalletUrl } from "$lib/utils/navigation.utils";
@@ -10,7 +11,6 @@ import { UnavailableTokenAmount } from "$lib/utils/token.utils";
 import { Principal } from "@dfinity/principal";
 import { TokenAmountV2 } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { nnsUniverseStore } from "./nns-universe.derived";
 
 export const icpTokensListVisitors = derived<
   Readable<Universe>,
diff --git a/frontend/src/lib/derived/neurons.derived.ts b/frontend/src/lib/derived/neurons.derived.ts
index d8148bd09ad..d047c9f0dde 100644
--- a/frontend/src/lib/derived/neurons.derived.ts
+++ b/frontend/src/lib/derived/neurons.derived.ts
@@ -1,7 +1,7 @@
+import { neuronsStore } from "$lib/stores/neurons.store";
 import type { NeuronInfo } from "@dfinity/nns";
 import { nonNullish } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { neuronsStore } from "../stores/neurons.store";
 import {
   hasValidStake,
   shouldDisplayRewardLossNotification,
diff --git a/frontend/src/lib/derived/selectable-universes.derived.ts b/frontend/src/lib/derived/selectable-universes.derived.ts
index 7b889338aac..d4e98eb554f 100644
--- a/frontend/src/lib/derived/selectable-universes.derived.ts
+++ b/frontend/src/lib/derived/selectable-universes.derived.ts
@@ -9,6 +9,7 @@ import {
   type IcrcCanistersStoreData,
 } from "$lib/derived/icrc-canisters.derived";
 import { pageStore, type Page } from "$lib/derived/page.derived";
+import { universesStore } from "$lib/derived/universes.derived";
 import type { Universe } from "$lib/types/universe";
 import {
   createAscendingComparator,
@@ -18,7 +19,6 @@ import {
 import { isAllTokensPath, isUniverseCkBTC } from "$lib/utils/universe.utils";
 import { isNullish } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { universesStore } from "./universes.derived";
 
 type UniverseWithActionableProposalCount = {
   universe: Universe;
diff --git a/frontend/src/lib/derived/selected-universe.derived.ts b/frontend/src/lib/derived/selected-universe.derived.ts
index 3ec7a00b487..392537f5828 100644
--- a/frontend/src/lib/derived/selected-universe.derived.ts
+++ b/frontend/src/lib/derived/selected-universe.derived.ts
@@ -7,6 +7,7 @@ import {
   type IcrcCanistersStore,
   type IcrcCanistersStoreData,
 } from "$lib/derived/icrc-canisters.derived";
+import { nnsUniverseStore } from "$lib/derived/nns-universe.derived";
 import { pageStore, type Page } from "$lib/derived/page.derived";
 import { selectableUniversesStore } from "$lib/derived/selectable-universes.derived";
 import { ENABLE_CKTESTBTC } from "$lib/stores/feature-flags.store";
@@ -20,7 +21,6 @@ import {
 import { Principal } from "@dfinity/principal";
 import { nonNullish } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { nnsUniverseStore } from "./nns-universe.derived";
 
 /**
  * In Neurons or ultimately in Voting screen, user can select the "universe" - e.g. display Neurons of Nns or a particular Sns
diff --git a/frontend/src/lib/derived/sns-functions.derived.ts b/frontend/src/lib/derived/sns-functions.derived.ts
index c7f2452c407..467cbbb5bdf 100644
--- a/frontend/src/lib/derived/sns-functions.derived.ts
+++ b/frontend/src/lib/derived/sns-functions.derived.ts
@@ -1,7 +1,7 @@
+import { snsAggregatorDerived } from "$lib/derived/sns-aggregator.derived";
 import { convertNervousFunction } from "$lib/utils/sns-aggregator-converters.utils";
 import type { SnsNervousSystemFunction } from "@dfinity/sns";
 import { type Readable } from "svelte/store";
-import { snsAggregatorDerived } from "./sns-aggregator.derived";
 
 interface SnsNervousSystemFunctions {
   nsFunctions: SnsNervousSystemFunction[];
diff --git a/frontend/src/lib/derived/sns-total-token-supply.derived.ts b/frontend/src/lib/derived/sns-total-token-supply.derived.ts
index 3a2fb0e804d..483f143a7b0 100644
--- a/frontend/src/lib/derived/sns-total-token-supply.derived.ts
+++ b/frontend/src/lib/derived/sns-total-token-supply.derived.ts
@@ -1,6 +1,6 @@
+import { snsAggregatorDerived } from "$lib/derived/sns-aggregator.derived";
 import type { RootCanisterIdText } from "$lib/types/sns";
 import { type Readable } from "svelte/store";
-import { snsAggregatorDerived } from "./sns-aggregator.derived";
 
 interface ProjectTotalSupplyData {
   totalSupply: bigint;
diff --git a/frontend/src/lib/derived/sns/sns-selected-project-new-tx-data.derived.ts b/frontend/src/lib/derived/sns/sns-selected-project-new-tx-data.derived.ts
index fe30f9a74a3..5b6755adb61 100644
--- a/frontend/src/lib/derived/sns/sns-selected-project-new-tx-data.derived.ts
+++ b/frontend/src/lib/derived/sns/sns-selected-project-new-tx-data.derived.ts
@@ -1,9 +1,9 @@
+import { selectedUniverseIdStore } from "$lib/derived/selected-universe.derived";
+import { snsSelectedTransactionFeeStore } from "$lib/derived/sns/sns-selected-transaction-fee.store";
+import { snsTokenSymbolSelectedStore } from "$lib/derived/sns/sns-token-symbol-selected.store";
 import type { Principal } from "@dfinity/principal";
 import type { Token, TokenAmount } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { selectedUniverseIdStore } from "../selected-universe.derived";
-import { snsSelectedTransactionFeeStore } from "./sns-selected-transaction-fee.store";
-import { snsTokenSymbolSelectedStore } from "./sns-token-symbol-selected.store";
 
 interface SnsNewTxData {
   token: Token;
diff --git a/frontend/src/lib/derived/sns/sns-selected-transaction-fee.store.ts b/frontend/src/lib/derived/sns/sns-selected-transaction-fee.store.ts
index 6690c1a9ded..b6b2bb72999 100644
--- a/frontend/src/lib/derived/sns/sns-selected-transaction-fee.store.ts
+++ b/frontend/src/lib/derived/sns/sns-selected-transaction-fee.store.ts
@@ -1,7 +1,7 @@
+import { snsOnlyProjectStore } from "$lib/derived/sns/sns-selected-project.derived";
 import { snsTokensByRootCanisterIdStore } from "$lib/derived/sns/sns-tokens.derived";
 import { TokenAmount, nonNullish } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { snsOnlyProjectStore } from "./sns-selected-project.derived";
 
 export const snsSelectedTransactionFeeStore: Readable<TokenAmount | undefined> =
   derived(
diff --git a/frontend/src/lib/derived/sns/sns-sorted-neurons.derived.ts b/frontend/src/lib/derived/sns/sns-sorted-neurons.derived.ts
index ce67501fadd..1432bf63d57 100644
--- a/frontend/src/lib/derived/sns/sns-sorted-neurons.derived.ts
+++ b/frontend/src/lib/derived/sns/sns-sorted-neurons.derived.ts
@@ -1,3 +1,4 @@
+import { selectedUniverseIdStore } from "$lib/derived/selected-universe.derived";
 import { snsNeuronsStore } from "$lib/stores/sns-neurons.store";
 import {
   hasValidStake,
@@ -6,7 +7,6 @@ import {
 } from "$lib/utils/sns-neuron.utils";
 import type { SnsNeuron } from "@dfinity/sns";
 import { derived, type Readable } from "svelte/store";
-import { selectedUniverseIdStore } from "../selected-universe.derived";
 
 export const definedSnsNeuronStore: Readable<SnsNeuron[]> = derived(
   [snsNeuronsStore, selectedUniverseIdStore],
diff --git a/frontend/src/lib/derived/title-token-selector.derived.ts b/frontend/src/lib/derived/title-token-selector.derived.ts
index 7c9f4a61d2c..a4ed8904d9e 100644
--- a/frontend/src/lib/derived/title-token-selector.derived.ts
+++ b/frontend/src/lib/derived/title-token-selector.derived.ts
@@ -1,8 +1,8 @@
 import { AppPath } from "$lib/constants/routes.constants";
+import { pageStore } from "$lib/derived/page.derived";
 import { i18n } from "$lib/stores/i18n";
 import { isSelectedPath } from "$lib/utils/navigation.utils";
 import { derived } from "svelte/store";
-import { pageStore } from "./page.derived";
 
 export const titleTokenSelectorStore = derived(
   [i18n, pageStore],
diff --git a/frontend/src/lib/derived/tokens-list-base.derived.ts b/frontend/src/lib/derived/tokens-list-base.derived.ts
index b179eb5c9b7..7d1e4b8a863 100644
--- a/frontend/src/lib/derived/tokens-list-base.derived.ts
+++ b/frontend/src/lib/derived/tokens-list-base.derived.ts
@@ -1,9 +1,9 @@
+import { universesStore } from "$lib/derived/universes.derived";
 import type { UserTokenBase } from "$lib/types/tokens-page";
 import type { Universe } from "$lib/types/universe";
 import { getLedgerCanisterIdFromUniverse } from "$lib/utils/universe.utils";
 import { Principal } from "@dfinity/principal";
 import { derived, type Readable } from "svelte/store";
-import { universesStore } from "./universes.derived";
 
 const convertUniverseToBaseTokenData = (universe: Universe): UserTokenBase => ({
   universeId: Principal.fromText(universe.canisterId),
diff --git a/frontend/src/lib/derived/tokens-list-user.derived.ts b/frontend/src/lib/derived/tokens-list-user.derived.ts
index 1c8c476d9b4..5ddc22e956e 100644
--- a/frontend/src/lib/derived/tokens-list-user.derived.ts
+++ b/frontend/src/lib/derived/tokens-list-user.derived.ts
@@ -1,10 +1,14 @@
 import { OWN_CANISTER_ID_TEXT } from "$lib/constants/canister-ids.constants";
+import type { UniversesAccounts } from "$lib/derived/accounts-list.derived";
 import {
   icpSwapUsdPricesStore,
   type IcpSwapUsdPricesStore,
   type IcpSwapUsdPricesStoreData,
 } from "$lib/derived/icp-swap.derived";
 import { failedExistentImportedTokenLedgerIdsStore } from "$lib/derived/imported-tokens.derived";
+import { tokensListBaseStore } from "$lib/derived/tokens-list-base.derived";
+import { tokensByUniverseIdStore } from "$lib/derived/tokens.derived";
+import { universesAccountsStore } from "$lib/derived/universes-accounts.derived";
 import type { IcrcTokenMetadata } from "$lib/types/icrc";
 import {
   UserTokenAction,
@@ -17,10 +21,6 @@ import { isUniverseNns } from "$lib/utils/universe.utils";
 import { toUserTokenFailed } from "$lib/utils/user-token.utils";
 import { isNullish, TokenAmountV2 } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import type { UniversesAccounts } from "./accounts-list.derived";
-import { tokensListBaseStore } from "./tokens-list-base.derived";
-import { tokensByUniverseIdStore } from "./tokens.derived";
-import { universesAccountsStore } from "./universes-accounts.derived";
 
 const getUsdValue = ({
   balance,
diff --git a/frontend/src/lib/derived/tokens-list-visitors.derived.ts b/frontend/src/lib/derived/tokens-list-visitors.derived.ts
index 557c23fcef2..6754e4f9db4 100644
--- a/frontend/src/lib/derived/tokens-list-visitors.derived.ts
+++ b/frontend/src/lib/derived/tokens-list-visitors.derived.ts
@@ -1,3 +1,5 @@
+import { tokensListBaseStore } from "$lib/derived/tokens-list-base.derived";
+import { tokensByUniverseIdStore } from "$lib/derived/tokens.derived";
 import type { IcrcTokenMetadata } from "$lib/types/icrc";
 import {
   UserTokenAction,
@@ -9,8 +11,6 @@ import { UnavailableTokenAmount } from "$lib/utils/token.utils";
 import { isUniverseNns } from "$lib/utils/universe.utils";
 import { TokenAmountV2, isNullish } from "@dfinity/utils";
 import { derived, type Readable } from "svelte/store";
-import { tokensListBaseStore } from "./tokens-list-base.derived";
-import { tokensByUniverseIdStore } from "./tokens.derived";
 
 const convertToUserToken = ({
   tokenBaseData,
diff --git a/frontend/src/lib/derived/universes.derived.ts b/frontend/src/lib/derived/universes.derived.ts
index 9d55f35a609..0f245a2d2f5 100644
--- a/frontend/src/lib/derived/universes.derived.ts
+++ b/frontend/src/lib/derived/universes.derived.ts
@@ -1,4 +1,6 @@
 import { ckBTCUniversesStore } from "$lib/derived/ckbtc-universes.derived";
+import { icrcTokensUniversesStore } from "$lib/derived/icrc-universes.derived";
+import { nnsUniverseStore } from "$lib/derived/nns-universe.derived";
 import {
   snsProjectsCommittedStore,
   type SnsFullProject,
@@ -6,8 +8,6 @@ import {
 import type { Universe } from "$lib/types/universe";
 import { createUniverse } from "$lib/utils/universe.utils";
 import { derived, type Readable } from "svelte/store";
-import { icrcTokensUniversesStore } from "./icrc-universes.derived";
-import { nnsUniverseStore } from "./nns-universe.derived";
 
 export const universesStore = derived<
   [
diff --git a/frontend/src/lib/directives/debug.directives.ts b/frontend/src/lib/directives/debug.directives.ts
index cbea4ea9cc4..930943be633 100644
--- a/frontend/src/lib/directives/debug.directives.ts
+++ b/frontend/src/lib/directives/debug.directives.ts
@@ -1,7 +1,9 @@
 import { addHotkey } from "$lib/api/governance.api";
 import type { FeatureKey } from "$lib/constants/environment.constants";
 import { initDebugStore } from "$lib/derived/debug.derived";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
 import { listNeurons, removeFollowee } from "$lib/services/neurons.services";
+import { claimSeedNeurons } from "$lib/services/seed-neurons.services";
 import {
   EDITABLE_FEATURE_FLAGS,
   overrideFeatureFlagsStore,
@@ -14,8 +16,6 @@ import { enumKeys } from "$lib/utils/enum.utils";
 import { followeesByTopic } from "$lib/utils/neuron.utils";
 import { Topic, type NeuronId } from "@dfinity/nns";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "../services/auth.services";
-import { claimSeedNeurons } from "../services/seed-neurons.services";
 
 /**
  * coo - original as object -> console
diff --git a/frontend/src/lib/modals/accounts/AccountsModals.svelte b/frontend/src/lib/modals/accounts/AccountsModals.svelte
index 1a529cdcd67..6e7fe48aa51 100644
--- a/frontend/src/lib/modals/accounts/AccountsModals.svelte
+++ b/frontend/src/lib/modals/accounts/AccountsModals.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import AddAccountModal from "$lib/modals/accounts/AddAccountModal.svelte";
+  import BuyIcpModal from "$lib/modals/accounts/BuyIcpModal.svelte";
+  import IcpTransactionModal from "$lib/modals/accounts/IcpTransactionModal.svelte";
   import IcrcReceiveModal from "$lib/modals/accounts/IcrcReceiveModal.svelte";
   import NnsReceiveModal from "$lib/modals/accounts/NnsReceiveModal.svelte";
   import type { Account } from "$lib/types/account";
@@ -8,9 +11,6 @@
     AccountsModalType,
     AccountsReceiveModalData,
   } from "$lib/types/accounts.modal";
-  import AddAccountModal from "./AddAccountModal.svelte";
-  import BuyIcpModal from "./BuyIcpModal.svelte";
-  import IcpTransactionModal from "./IcpTransactionModal.svelte";
   import { nonNullish } from "@dfinity/utils";
 
   let modal:
diff --git a/frontend/src/lib/modals/accounts/AddIndexCanisterModal.svelte b/frontend/src/lib/modals/accounts/AddIndexCanisterModal.svelte
index aa2515701e4..20bd6f816cd 100644
--- a/frontend/src/lib/modals/accounts/AddIndexCanisterModal.svelte
+++ b/frontend/src/lib/modals/accounts/AddIndexCanisterModal.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import ImportTokenForm from "$lib/components/accounts/ImportTokenForm.svelte";
   import { matchLedgerIndexPair } from "$lib/services/icrc-index.services";
+  import { addIndexCanister } from "$lib/services/imported-tokens.services";
   import { startBusy, stopBusy } from "$lib/stores/busy.store";
   import { i18n } from "$lib/stores/i18n";
   import { importedTokensStore } from "$lib/stores/imported-tokens.store";
-  import { addIndexCanister } from "../../services/imported-tokens.services";
   import { Modal } from "@dfinity/gix-components";
   import type { Principal } from "@dfinity/principal";
   import { isNullish } from "@dfinity/utils";
diff --git a/frontend/src/lib/modals/accounts/IcrcTokenAccountsModals.svelte b/frontend/src/lib/modals/accounts/IcrcTokenAccountsModals.svelte
index 519330ddcf6..5b2ec353901 100644
--- a/frontend/src/lib/modals/accounts/IcrcTokenAccountsModals.svelte
+++ b/frontend/src/lib/modals/accounts/IcrcTokenAccountsModals.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import IcrcTokenTransactionModal from "$lib/modals/accounts/IcrcTokenTransactionModal.svelte";
   import type { IcrcTokenModalProps } from "$lib/types/icrc-accounts.modal";
-  import IcrcTokenTransactionModal from "./IcrcTokenTransactionModal.svelte";
   import { TokenAmountV2 } from "@dfinity/utils";
 
   let modal: IcrcTokenModalProps | undefined = undefined;
diff --git a/frontend/src/lib/modals/accounts/ImportTokenModal.svelte b/frontend/src/lib/modals/accounts/ImportTokenModal.svelte
index d0fd2e30db9..64bc1e490d0 100644
--- a/frontend/src/lib/modals/accounts/ImportTokenModal.svelte
+++ b/frontend/src/lib/modals/accounts/ImportTokenModal.svelte
@@ -2,6 +2,7 @@
   import { goto } from "$app/navigation";
   import ImportTokenForm from "$lib/components/accounts/ImportTokenForm.svelte";
   import ImportTokenReview from "$lib/components/accounts/ImportTokenReview.svelte";
+  import { LEDGER_CANISTER_ID } from "$lib/constants/canister-ids.constants";
   import { snsProjectsCommittedStore } from "$lib/derived/sns/sns-projects.derived";
   import { getIcrcTokenMetaData } from "$lib/services/icrc-accounts.services";
   import { matchLedgerIndexPair } from "$lib/services/icrc-index.services";
@@ -16,7 +17,6 @@
   import { isImportedToken } from "$lib/utils/imported-tokens.utils";
   import { buildWalletUrl } from "$lib/utils/navigation.utils";
   import { isSnsLedgerCanisterId } from "$lib/utils/sns.utils";
-  import { LEDGER_CANISTER_ID } from "../../constants/canister-ids.constants";
   import {
     WizardModal,
     type WizardStep,
diff --git a/frontend/src/lib/modals/canisters/CanisterDetailModals.svelte b/frontend/src/lib/modals/canisters/CanisterDetailModals.svelte
index c9a341e6650..0e8141fb388 100644
--- a/frontend/src/lib/modals/canisters/CanisterDetailModals.svelte
+++ b/frontend/src/lib/modals/canisters/CanisterDetailModals.svelte
@@ -2,6 +2,7 @@
   import AddCanisterControllerModal from "$lib/modals/canisters/AddCanisterControllerModal.svelte";
   import AddCyclesModal from "$lib/modals/canisters/AddCyclesModal.svelte";
   import RemoveCanisterControllerModal from "$lib/modals/canisters/RemoveCanisterControllerModal.svelte";
+  import RenameCanisterModal from "$lib/modals/canisters/RenameCanisterModal.svelte";
   import UnlinkCanisterModal from "$lib/modals/canisters/UnlinkCanisterModal.svelte";
   import type {
     CanisterDetailModal,
@@ -9,7 +10,6 @@
     CanisterDetailModalRemoveController,
     CanisterDetailModalType,
   } from "$lib/types/canister-detail.modal";
-  import RenameCanisterModal from "./RenameCanisterModal.svelte";
   import type { Principal } from "@dfinity/principal";
 
   let modal: CanisterDetailModal | undefined = undefined;
diff --git a/frontend/src/lib/modals/neurons/ChangeNeuronVisibilityModal.svelte b/frontend/src/lib/modals/neurons/ChangeNeuronVisibilityModal.svelte
index fe78083f265..847023c9bfe 100644
--- a/frontend/src/lib/modals/neurons/ChangeNeuronVisibilityModal.svelte
+++ b/frontend/src/lib/modals/neurons/ChangeNeuronVisibilityModal.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import Separator from "$lib/components/ui/Separator.svelte";
+  import ChangeBulkNeuronVisibilityForm from "$lib/modals/neurons/ChangeBulkNeuronVisibilityForm.svelte";
   import { changeNeuronVisibility } from "$lib/services/neurons.services";
   import { startBusy, stopBusy } from "$lib/stores/busy.store";
   import { i18n } from "$lib/stores/i18n";
   import { toastsSuccess } from "$lib/stores/toasts.store";
-  import ChangeBulkNeuronVisibilityForm from "./ChangeBulkNeuronVisibilityForm.svelte";
   import { Modal } from "@dfinity/gix-components";
   import type { NeuronInfo } from "@dfinity/nns";
   import { createEventDispatcher } from "svelte";
diff --git a/frontend/src/lib/modals/neurons/NnsNeuronModals.svelte b/frontend/src/lib/modals/neurons/NnsNeuronModals.svelte
index 4ea4cfbfb15..1a91751d497 100644
--- a/frontend/src/lib/modals/neurons/NnsNeuronModals.svelte
+++ b/frontend/src/lib/modals/neurons/NnsNeuronModals.svelte
@@ -2,17 +2,21 @@
   import TestIdWrapper from "$lib/components/common/TestIdWrapper.svelte";
   import { IS_TESTNET } from "$lib/constants/environment.constants";
   import AddHotkeyModal from "$lib/modals/neurons/AddHotkeyModal.svelte";
+  import ChangeNeuronVisibilityModal from "$lib/modals/neurons/ChangeNeuronVisibilityModal.svelte";
   import DisburseNnsNeuronModal from "$lib/modals/neurons/DisburseNnsNeuronModal.svelte";
   import DissolveActionButtonModal from "$lib/modals/neurons/DissolveActionButtonModal.svelte";
   import FollowNeuronsModal from "$lib/modals/neurons/FollowNeuronsModal.svelte";
   import IncreaseDissolveDelayModal from "$lib/modals/neurons/IncreaseDissolveDelayModal.svelte";
   import IncreaseNeuronStakeModal from "$lib/modals/neurons/IncreaseNeuronStakeModal.svelte";
   import JoinCommunityFundModal from "$lib/modals/neurons/JoinCommunityFundModal.svelte";
+  import LosingRewardNeuronsModal from "$lib/modals/neurons/LosingRewardNeuronsModal.svelte";
   import NnsAutoStakeMaturityModal from "$lib/modals/neurons/NnsAutoStakeMaturityModal.svelte";
   import NnsStakeMaturityModal from "$lib/modals/neurons/NnsStakeMaturityModal.svelte";
   import SpawnNeuronModal from "$lib/modals/neurons/SpawnNeuronModal.svelte";
   import SplitNeuronModal from "$lib/modals/neurons/SplitNnsNeuronModal.svelte";
+  import UpdateVotingPowerRefreshedModal from "$lib/modals/neurons/UpdateVotingPowerRefreshedModal.svelte";
   import VotingHistoryModal from "$lib/modals/neurons/VotingHistoryModal.svelte";
+  import NnsAddMaturityModal from "$lib/modals/sns/neurons/NnsAddMaturityModal.svelte";
   import type {
     NnsNeuronModal,
     NnsNeuronModalData,
@@ -23,12 +27,8 @@
     isPublicNeuron,
     type FolloweesNeuron,
   } from "$lib/utils/neuron.utils";
-  import NnsAddMaturityModal from "../sns/neurons/NnsAddMaturityModal.svelte";
-  import UpdateVotingPowerRefreshedModal from "$lib/modals/neurons/UpdateVotingPowerRefreshedModal.svelte";
-  import ChangeNeuronVisibilityModal from "./ChangeNeuronVisibilityModal.svelte";
   import type { NeuronInfo } from "@dfinity/nns";
   import { nonNullish } from "@dfinity/utils";
-  import LosingRewardNeuronsModal from "./LosingRewardNeuronsModal.svelte";
 
   let modal: NnsNeuronModal<NnsNeuronModalData> | undefined;
   const close = () => (modal = undefined);
diff --git a/frontend/src/lib/modals/proposals/NnsProposalsFilterModal.svelte b/frontend/src/lib/modals/proposals/NnsProposalsFilterModal.svelte
index 4e9e6f66425..d636ed61718 100644
--- a/frontend/src/lib/modals/proposals/NnsProposalsFilterModal.svelte
+++ b/frontend/src/lib/modals/proposals/NnsProposalsFilterModal.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import { DEPRECATED_TOPICS } from "$lib/constants/proposals.constants";
+  import FilterModal from "$lib/modals/common/FilterModal.svelte";
   import { i18n } from "$lib/stores/i18n";
   import { proposalsFiltersStore } from "$lib/stores/proposals.store";
   import type { Filter } from "$lib/types/filters";
@@ -10,7 +11,6 @@
   import { PROPOSAL_FILTER_UNSPECIFIED_VALUE } from "$lib/types/proposals";
   import { enumValues } from "$lib/utils/enum.utils";
   import { keyOf, keyOfOptional } from "$lib/utils/utils";
-  import FilterModal from "../common/FilterModal.svelte";
   import type { ProposalStatus, Topic } from "@dfinity/nns";
   import { createEventDispatcher } from "svelte";
 
diff --git a/frontend/src/lib/modals/sns/neurons/SnsNeuronModals.svelte b/frontend/src/lib/modals/sns/neurons/SnsNeuronModals.svelte
index 2d7beaa15b8..9e258003371 100644
--- a/frontend/src/lib/modals/sns/neurons/SnsNeuronModals.svelte
+++ b/frontend/src/lib/modals/sns/neurons/SnsNeuronModals.svelte
@@ -5,6 +5,7 @@
   import { snsTokenSymbolSelectedStore } from "$lib/derived/sns/sns-token-symbol-selected.store";
   import DisburseSnsNeuronModal from "$lib/modals/neurons/DisburseSnsNeuronModal.svelte";
   import AddMaturityModal from "$lib/modals/sns/neurons/AddMaturityModal.svelte";
+  import AddPermissionsModal from "$lib/modals/sns/neurons/AddPermissionsModal.svelte";
   import AddSnsHotkeyModal from "$lib/modals/sns/neurons/AddSnsHotkeyModal.svelte";
   import DissolveSnsNeuronModal from "$lib/modals/sns/neurons/DissolveSnsNeuronModal.svelte";
   import FollowSnsNeuronsModal from "$lib/modals/sns/neurons/FollowSnsNeuronsModal.svelte";
@@ -38,7 +39,6 @@
     type Token,
   } from "@dfinity/utils";
   import { getContext } from "svelte";
-  import AddPermissionsModal from "./AddPermissionsModal.svelte";
 
   // Modal events
 
diff --git a/frontend/src/lib/modals/transaction/TransactionModal.svelte b/frontend/src/lib/modals/transaction/TransactionModal.svelte
index 1dd1cbed9e4..f45a54895b4 100644
--- a/frontend/src/lib/modals/transaction/TransactionModal.svelte
+++ b/frontend/src/lib/modals/transaction/TransactionModal.svelte
@@ -4,15 +4,15 @@
   import TransactionForm from "$lib/components/transaction/TransactionForm.svelte";
   import TransactionReceivedAmount from "$lib/components/transaction/TransactionReceivedAmount.svelte";
   import TransactionReview from "$lib/components/transaction/TransactionReview.svelte";
+  import QrWizardModal from "$lib/modals/transaction/QrWizardModal.svelte";
   import type { Account } from "$lib/types/account";
   import type { QrResponse } from "$lib/types/qr-wizard-modal";
   import type {
     TransactionInit,
     TransactionNetwork,
+    TransactionSelectDestinationMethods,
     ValidateAmountFn,
   } from "$lib/types/transaction";
-  import type { TransactionSelectDestinationMethods } from "$lib/types/transaction";
-  import QrWizardModal from "./QrWizardModal.svelte";
   import type {
     WizardModal,
     WizardStep,
@@ -23,9 +23,10 @@
     ICPToken,
     TokenAmount,
     TokenAmountV2,
+    isNullish,
+    nonNullish,
     type Token,
   } from "@dfinity/utils";
-  import { isNullish, nonNullish } from "@dfinity/utils";
 
   export let testId = "transaction-modal-component";
   export let transactionInit: TransactionInit = {};
diff --git a/frontend/src/lib/pages/SnsProposalDetail.svelte b/frontend/src/lib/pages/SnsProposalDetail.svelte
index 56a3a43a59e..1f4fa7cdf09 100644
--- a/frontend/src/lib/pages/SnsProposalDetail.svelte
+++ b/frontend/src/lib/pages/SnsProposalDetail.svelte
@@ -10,6 +10,7 @@
   import { actionableProposalsActiveStore } from "$lib/derived/actionable-proposals.derived";
   import { actionableProposalsNavigationIdsStore } from "$lib/derived/actionable-universes.derived";
   import { authSignedInStore } from "$lib/derived/auth.derived";
+  import { debugSnsProposalStore } from "$lib/derived/debug.derived";
   import { pageStore } from "$lib/derived/page.derived";
   import { selectableUniversesStore } from "$lib/derived/selectable-universes.derived";
   import { createSnsNsFunctionsProjectStore } from "$lib/derived/sns-ns-functions-project.derived";
@@ -45,7 +46,6 @@
   import { isNullish, nonNullish } from "@dfinity/utils";
   import { tick } from "svelte";
   import type { Readable } from "svelte/store";
-  import { debugSnsProposalStore } from "../derived/debug.derived";
 
   export let proposalIdText: string | undefined | null = undefined;
 
diff --git a/frontend/src/lib/services/app.services.ts b/frontend/src/lib/services/app.services.ts
index 0b4922b095b..bb1e5d54e55 100644
--- a/frontend/src/lib/services/app.services.ts
+++ b/frontend/src/lib/services/app.services.ts
@@ -1,8 +1,8 @@
 import { loadActionableProposals } from "$lib/services/actionable-proposals.services";
 import { loadActionableSnsProposals } from "$lib/services/actionable-sns-proposals.services";
+import { initAccounts } from "$lib/services/icp-accounts.services";
 import { loadImportedTokens } from "$lib/services/imported-tokens.services";
-import { initAccounts } from "./icp-accounts.services";
-import { loadSnsProjects } from "./public/sns.services";
+import { loadSnsProjects } from "$lib/services/public/sns.services";
 
 export const initAppPrivateData = async (): Promise<void> => {
   const initNns: Promise<void>[] = [initAccounts()];
diff --git a/frontend/src/lib/services/busy.services.ts b/frontend/src/lib/services/busy.services.ts
index 56d5d35c5d5..ed0ef37128b 100644
--- a/frontend/src/lib/services/busy.services.ts
+++ b/frontend/src/lib/services/busy.services.ts
@@ -1,9 +1,9 @@
 import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
+import { getNeuronFromStore } from "$lib/services/neurons.services";
 import { startBusy, type BusyStateInitiatorType } from "$lib/stores/busy.store";
 import { isNeuronControlledByHardwareWallet } from "$lib/utils/neuron.utils";
 import type { NeuronId } from "@dfinity/nns";
 import { get } from "svelte/store";
-import { getNeuronFromStore } from "./neurons.services";
 
 export const startBusyNeuron = ({
   neuronId,
diff --git a/frontend/src/lib/services/canisters.services.ts b/frontend/src/lib/services/canisters.services.ts
index cb24d294841..9c891b90af8 100644
--- a/frontend/src/lib/services/canisters.services.ts
+++ b/frontend/src/lib/services/canisters.services.ts
@@ -24,6 +24,12 @@ import {
 import { CYCLES_MINTING_CANISTER_ID } from "$lib/constants/canister-ids.constants";
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
 import { mainTransactionFeeE8sStore } from "$lib/derived/main-transaction-fee.derived";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import {
+  getAccountIdentity,
+  loadBalance,
+} from "$lib/services/icp-accounts.services";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import { canistersStore } from "$lib/stores/canisters.store";
 import { toastsError, toastsShow } from "$lib/stores/toasts.store";
 import type { Account } from "$lib/types/account";
@@ -54,9 +60,6 @@ import {
   principalToSubAccount,
 } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "./auth.services";
-import { getAccountIdentity, loadBalance } from "./icp-accounts.services";
-import { queryAndUpdate } from "./utils.services";
 
 export const listCanisters = async ({
   clearBeforeQuery,
diff --git a/frontend/src/lib/services/ckbtc-convert.services.ts b/frontend/src/lib/services/ckbtc-convert.services.ts
index 8f6c7d1b560..c34cc704ac3 100644
--- a/frontend/src/lib/services/ckbtc-convert.services.ts
+++ b/frontend/src/lib/services/ckbtc-convert.services.ts
@@ -1,11 +1,18 @@
+import { retrieveBtcWithApproval } from "$lib/api/ckbtc-minter.api";
+import { approveTransfer } from "$lib/api/icrc-ledger.api";
 import { NANO_SECONDS_IN_MINUTE } from "$lib/constants/constants";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import type { IcrcTransferTokensUserParams } from "$lib/services/icrc-accounts.services";
 import { loadAccounts as loadWalletAccounts } from "$lib/services/icrc-accounts.services";
+import { loadIcrcAccountTransactions } from "$lib/services/icrc-transactions.services";
+import { toastsError } from "$lib/stores/toasts.store";
 import type { Account } from "$lib/types/account";
 import type { CanisterId } from "$lib/types/canister";
 import type { CkBTCAdditionalCanisters } from "$lib/types/ckbtc-canisters";
 import { ConvertBtcStep } from "$lib/types/ckbtc-convert";
 import type { UniverseCanisterId } from "$lib/types/universe";
 import { nowInBigIntNanoSeconds } from "$lib/utils/date.utils";
+import { numberToE8s } from "$lib/utils/token.utils";
 import {
   MinterAlreadyProcessingError,
   MinterAmountTooLowError,
@@ -15,13 +22,6 @@ import {
   MinterTemporaryUnavailableError,
 } from "@dfinity/ckbtc";
 import { nonNullish } from "@dfinity/utils";
-import { retrieveBtcWithApproval } from "../api/ckbtc-minter.api";
-import { approveTransfer } from "../api/icrc-ledger.api";
-import { toastsError } from "../stores/toasts.store";
-import { numberToE8s } from "../utils/token.utils";
-import { getAuthenticatedIdentity } from "./auth.services";
-import type { IcrcTransferTokensUserParams } from "./icrc-accounts.services";
-import { loadIcrcAccountTransactions } from "./icrc-transactions.services";
 
 export type ConvertCkBTCToBtcParams = {
   destinationAddress: string;
diff --git a/frontend/src/lib/services/ckbtc-minter.services.ts b/frontend/src/lib/services/ckbtc-minter.services.ts
index a710bcc66df..0d86e217656 100644
--- a/frontend/src/lib/services/ckbtc-minter.services.ts
+++ b/frontend/src/lib/services/ckbtc-minter.services.ts
@@ -1,6 +1,7 @@
 import {
   estimateFee as estimateFeeAPI,
   getBTCAddress as getBTCAddressAPI,
+  retrieveBtcStatusV2ByAccount,
   updateBalance as updateBalanceAPI,
 } from "$lib/api/ckbtc-minter.api";
 import { WALLET_TRANSACTIONS_RELOAD_DELAY } from "$lib/constants/wallet.constants";
@@ -30,7 +31,6 @@ import {
 } from "@dfinity/ckbtc";
 import { nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { retrieveBtcStatusV2ByAccount } from "../api/ckbtc-minter.api";
 
 const getBTCAddress = async (minterCanisterId: CanisterId): Promise<string> => {
   const identity = await getAuthenticatedIdentity();
diff --git a/frontend/src/lib/services/ckbtc-tokens.services.ts b/frontend/src/lib/services/ckbtc-tokens.services.ts
index f0eb46d18b7..4e4eee42470 100644
--- a/frontend/src/lib/services/ckbtc-tokens.services.ts
+++ b/frontend/src/lib/services/ckbtc-tokens.services.ts
@@ -2,9 +2,9 @@ import {
   CKBTC_LEDGER_CANISTER_ID,
   CKTESTBTC_LEDGER_CANISTER_ID,
 } from "$lib/constants/ckbtc-canister-ids.constants";
+import { loadIcrcToken } from "$lib/services/icrc-accounts.services";
 import { ENABLE_CKTESTBTC } from "$lib/stores/feature-flags.store";
 import { get } from "svelte/store";
-import { loadIcrcToken } from "./icrc-accounts.services";
 
 export const loadCkBTCTokens = async () => {
   const enableCkBTCTest = get(ENABLE_CKTESTBTC);
diff --git a/frontend/src/lib/services/dev.services.ts b/frontend/src/lib/services/dev.services.ts
index 010981ba749..08a7cad8b91 100644
--- a/frontend/src/lib/services/dev.services.ts
+++ b/frontend/src/lib/services/dev.services.ts
@@ -8,14 +8,14 @@ import { CKBTC_MINTER_CANISTER_ID } from "$lib/constants/ckbtc-canister-ids.cons
 import type { IcpAccountsStoreData } from "$lib/derived/icp-accounts.derived";
 import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
 import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { syncAccounts } from "$lib/services/icp-accounts.services";
+import { loadAccounts } from "$lib/services/icrc-accounts.services";
 import { icrcAccountsStore } from "$lib/stores/icrc-accounts.store";
 import type { Account } from "$lib/types/account";
 import { numberToUlps } from "$lib/utils/token.utils";
 import type { Principal } from "@dfinity/principal";
 import { ICPToken, nonNullish, type Token } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { syncAccounts } from "./icp-accounts.services";
-import { loadAccounts } from "./icrc-accounts.services";
 
 const getMainAccount = async (): Promise<Account> => {
   const { main }: IcpAccountsStoreData = get(icpAccountsStore);
diff --git a/frontend/src/lib/services/icp-accounts.services.ts b/frontend/src/lib/services/icp-accounts.services.ts
index c5bf64503fc..60537967848 100644
--- a/frontend/src/lib/services/icp-accounts.services.ts
+++ b/frontend/src/lib/services/icp-accounts.services.ts
@@ -23,6 +23,8 @@ import { icpAccountsStore } from "$lib/derived/icp-accounts.derived";
 import { mainTransactionFeeE8sStore } from "$lib/derived/main-transaction-fee.derived";
 import type { LedgerIdentity } from "$lib/identities/ledger.identity";
 import { getLedgerIdentityProxy } from "$lib/proxy/icp-ledger.services.proxy";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import {
   icpAccountBalancesStore,
   type IcpAccountBalancesStoreData,
@@ -55,8 +57,6 @@ import { TxCreatedInFutureError, TxTooOldError } from "@dfinity/ledger-icp";
 import { decodeIcrcAccount } from "@dfinity/ledger-icrc";
 import { ICPToken, TokenAmount, isNullish, nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "./auth.services";
-import { queryAndUpdate } from "./utils.services";
 
 type AccountStoresData = {
   accountDetailsData: IcpAccountDetailsStoreData;
diff --git a/frontend/src/lib/services/icp-ledger.services.ts b/frontend/src/lib/services/icp-ledger.services.ts
index bddfdceb112..fa2141f15d1 100644
--- a/frontend/src/lib/services/icp-ledger.services.ts
+++ b/frontend/src/lib/services/icp-ledger.services.ts
@@ -2,6 +2,8 @@ import { queryNeurons } from "$lib/api/governance.api";
 import { nnsDappCanister } from "$lib/api/nns-dapp.api";
 import { LedgerConnectionState } from "$lib/constants/ledger.constants";
 import { LedgerIdentity } from "$lib/identities/ledger.identity";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { syncAccounts } from "$lib/services/icp-accounts.services";
 import { i18n } from "$lib/stores/i18n";
 import { toastsError } from "$lib/stores/toasts.store";
 import { LedgerErrorKey, LedgerErrorMessage } from "$lib/types/ledger.errors";
@@ -13,8 +15,6 @@ import type { Identity } from "@dfinity/agent";
 import { principalToAccountIdentifier } from "@dfinity/ledger-icp";
 import type { NeuronInfo } from "@dfinity/nns";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "./auth.services";
-import { syncAccounts } from "./icp-accounts.services";
 
 export interface ConnectToHardwareWalletParams {
   connectionState: LedgerConnectionState;
diff --git a/frontend/src/lib/services/icp-transactions.services.ts b/frontend/src/lib/services/icp-transactions.services.ts
index 781b18e37b3..3ee1321da6b 100644
--- a/frontend/src/lib/services/icp-transactions.services.ts
+++ b/frontend/src/lib/services/icp-transactions.services.ts
@@ -1,12 +1,12 @@
 import { getTransactions } from "$lib/api/icp-index.api";
 import { DEFAULT_INDEX_TRANSACTION_PAGE_LIMIT } from "$lib/constants/constants";
+import { getCurrentIdentity } from "$lib/services/auth.services";
 import { icpTransactionsStore } from "$lib/stores/icp-transactions.store";
 import { toastsError } from "$lib/stores/toasts.store";
 import { toToastError } from "$lib/utils/error.utils";
 import { sortTransactionsByIdDescendingOrder } from "$lib/utils/icp-transactions.utils";
 import { isNullish, nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getCurrentIdentity } from "./auth.services";
 
 export interface LoadIcrcAccountTransactionsParams {
   accountIdentifier: string;
diff --git a/frontend/src/lib/services/icrc-accounts.services.ts b/frontend/src/lib/services/icrc-accounts.services.ts
index cfe76d379c3..2d71cb8b1cf 100644
--- a/frontend/src/lib/services/icrc-accounts.services.ts
+++ b/frontend/src/lib/services/icrc-accounts.services.ts
@@ -10,6 +10,10 @@ import {
   getAuthenticatedIdentity,
   getCurrentIdentity,
 } from "$lib/services/auth.services";
+import {
+  queryAndUpdate,
+  type QueryAndUpdateStrategy,
+} from "$lib/services/utils.services";
 import { icrcAccountsStore } from "$lib/stores/icrc-accounts.store";
 import { icrcTransactionsStore } from "$lib/stores/icrc-transactions.store";
 import {
@@ -33,7 +37,6 @@ import {
 import type { Principal } from "@dfinity/principal";
 import { isNullish, nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { queryAndUpdate, type QueryAndUpdateStrategy } from "./utils.services";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const getIcrcAccountIdentity = (_: Account): Promise<Identity> => {
diff --git a/frontend/src/lib/services/icrc-tokens.services.ts b/frontend/src/lib/services/icrc-tokens.services.ts
index 42ce0265cdb..9cc1a74c4d1 100644
--- a/frontend/src/lib/services/icrc-tokens.services.ts
+++ b/frontend/src/lib/services/icrc-tokens.services.ts
@@ -1,6 +1,6 @@
 import { icrcCanistersStore } from "$lib/derived/icrc-canisters.derived";
+import { loadIcrcToken } from "$lib/services/icrc-accounts.services";
 import type { Unsubscriber } from "svelte/store";
-import { loadIcrcToken } from "./icrc-accounts.services";
 
 export const watchIcrcTokensLoadTokenData = (): Unsubscriber => {
   return icrcCanistersStore.subscribe((canistersData) => {
diff --git a/frontend/src/lib/services/imported-tokens.services.ts b/frontend/src/lib/services/imported-tokens.services.ts
index 8b10a7e5ce6..1f81707bdc5 100644
--- a/frontend/src/lib/services/imported-tokens.services.ts
+++ b/frontend/src/lib/services/imported-tokens.services.ts
@@ -10,6 +10,7 @@ import type { ImportedTokens } from "$lib/canisters/nns-dapp/nns-dapp.types";
 import { MAX_IMPORTED_TOKENS } from "$lib/constants/imported-tokens.constants";
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
 import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import { startBusy, stopBusy } from "$lib/stores/busy.store";
 import {
   failedImportedTokenLedgerIdsStore,
@@ -25,7 +26,6 @@ import {
 import type { Principal } from "@dfinity/principal";
 import { isNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { queryAndUpdate } from "./utils.services";
 
 /** Load imported tokens from the `nns-dapp` backend and update the `importedTokensStore` store.
  * - Displays an error toast if the operation fails.
diff --git a/frontend/src/lib/services/known-neurons.services.ts b/frontend/src/lib/services/known-neurons.services.ts
index 01bbdc8c626..0cf2c1cd86f 100644
--- a/frontend/src/lib/services/known-neurons.services.ts
+++ b/frontend/src/lib/services/known-neurons.services.ts
@@ -1,9 +1,9 @@
 import { governanceApiService } from "$lib/api-services/governance.api-service";
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import { knownNeuronsStore } from "$lib/stores/known-neurons.store";
 import { toastsError } from "$lib/stores/toasts.store";
 import type { KnownNeuron } from "@dfinity/nns";
-import { queryAndUpdate } from "./utils.services";
 
 export const listKnownNeurons = (): Promise<void> => {
   return queryAndUpdate<KnownNeuron[], unknown>({
diff --git a/frontend/src/lib/services/neurons.services.ts b/frontend/src/lib/services/neurons.services.ts
index 4e947a0bd3d..c9c926bc24a 100644
--- a/frontend/src/lib/services/neurons.services.ts
+++ b/frontend/src/lib/services/neurons.services.ts
@@ -18,6 +18,12 @@ import { definedNeuronsStore } from "$lib/derived/neurons.derived";
 import type { LedgerIdentity } from "$lib/identities/ledger.identity";
 import { getLedgerIdentityProxy } from "$lib/proxy/icp-ledger.services.proxy";
 import { loadActionableProposals } from "$lib/services/actionable-proposals.services";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { assertLedgerVersion } from "$lib/services/icp-ledger.services";
+import {
+  queryAndUpdate,
+  type QueryAndUpdateStrategy,
+} from "$lib/services/utils.services";
 import { startBusy, stopBusy } from "$lib/stores/busy.store";
 import { checkedNeuronSubaccountsStore } from "$lib/stores/checked-neurons.store";
 import { neuronsStore } from "$lib/stores/neurons.store";
@@ -69,15 +75,12 @@ import {
 import { Principal } from "@dfinity/principal";
 import { isNullish, nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "./auth.services";
 import {
   getAccountIdentity,
   getAccountIdentityByPrincipal,
   loadBalance,
   transferICP,
 } from "./icp-accounts.services";
-import { assertLedgerVersion } from "./icp-ledger.services";
-import { queryAndUpdate, type QueryAndUpdateStrategy } from "./utils.services";
 
 const getIdentityAndNeuronHelper = async (
   neuronId: NeuronId
diff --git a/frontend/src/lib/services/nns-neurons-dev.services.ts b/frontend/src/lib/services/nns-neurons-dev.services.ts
index 2f351a7031a..c9ae86be9c7 100644
--- a/frontend/src/lib/services/nns-neurons-dev.services.ts
+++ b/frontend/src/lib/services/nns-neurons-dev.services.ts
@@ -1,9 +1,9 @@
 import { updateNeuron } from "$lib/api/governace-test.api";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { getAndLoadNeuron, listNeurons } from "$lib/services/neurons.services";
 import { toastsError, toastsSuccess } from "$lib/stores/toasts.store";
 import type { E8s, Neuron, NeuronInfo } from "@dfinity/nns";
 import { isNullish } from "@dfinity/utils";
-import { getAuthenticatedIdentity } from "./auth.services";
-import { getAndLoadNeuron, listNeurons } from "./neurons.services";
 
 const u64Max = 2n ** 64n - 1n;
 
diff --git a/frontend/src/lib/services/nns-reward-event.services.ts b/frontend/src/lib/services/nns-reward-event.services.ts
index 2e8b58bbec1..1a2e4f4b2c9 100644
--- a/frontend/src/lib/services/nns-reward-event.services.ts
+++ b/frontend/src/lib/services/nns-reward-event.services.ts
@@ -1,8 +1,8 @@
 import { governanceApiService } from "$lib/api-services/governance.api-service";
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import { nnsLatestRewardEventStore } from "$lib/stores/nns-latest-reward-event.store";
 import type { RewardEvent } from "@dfinity/nns";
-import { queryAndUpdate } from "./utils.services";
 
 export const loadLatestRewardEvent = (): Promise<void> => {
   return queryAndUpdate<RewardEvent, unknown>({
diff --git a/frontend/src/lib/services/nns-vote-registration.services.ts b/frontend/src/lib/services/nns-vote-registration.services.ts
index 294387750b2..36222cbd7fc 100644
--- a/frontend/src/lib/services/nns-vote-registration.services.ts
+++ b/frontend/src/lib/services/nns-vote-registration.services.ts
@@ -1,6 +1,9 @@
 import { governanceApiService } from "$lib/api-services/governance.api-service";
 import { OWN_CANISTER_ID } from "$lib/constants/canister-ids.constants";
 import { loadActionableProposals } from "$lib/services/actionable-proposals.services";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { listNeurons } from "$lib/services/neurons.services";
+import { loadProposal } from "$lib/services/public/proposals.services";
 import {
   manageVotesRegistration,
   processRegisterVoteErrors,
@@ -16,9 +19,6 @@ import type { Identity } from "@dfinity/agent";
 import type { NeuronId, ProposalId, ProposalInfo, Vote } from "@dfinity/nns";
 import { nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "./auth.services";
-import { listNeurons } from "./neurons.services";
-import { loadProposal } from "./public/proposals.services";
 
 /**
  * Makes multiple registerVote calls (1 per neuronId).
diff --git a/frontend/src/lib/services/public/app.services.ts b/frontend/src/lib/services/public/app.services.ts
index d8a41dbdd4b..e87f4194690 100644
--- a/frontend/src/lib/services/public/app.services.ts
+++ b/frontend/src/lib/services/public/app.services.ts
@@ -1,11 +1,11 @@
 import { browser } from "$app/environment";
 import { displayAndCleanLogoutMsg } from "$lib/services/auth.services";
+import { loadIcrcCanisters } from "$lib/services/icrc-canisters.services";
+import { watchIcrcTokensLoadTokenData } from "$lib/services/icrc-tokens.services";
 import { loadSnsProjects } from "$lib/services/public/sns.services";
 import { authStore } from "$lib/stores/auth.store";
 import { layoutAuthReady } from "$lib/stores/layout.store";
 import { toastsError } from "$lib/stores/toasts.store";
-import { loadIcrcCanisters } from "../icrc-canisters.services";
-import { watchIcrcTokensLoadTokenData } from "../icrc-tokens.services";
 
 /**
  * Load the application public data that are available globally ("global stores").
diff --git a/frontend/src/lib/services/public/proposals.services.ts b/frontend/src/lib/services/public/proposals.services.ts
index fffc4b7e7c3..659d1d310be 100644
--- a/frontend/src/lib/services/public/proposals.services.ts
+++ b/frontend/src/lib/services/public/proposals.services.ts
@@ -9,6 +9,7 @@ import {
 } from "$lib/canisters/nns-dapp/nns-dapp.errors";
 import { DEFAULT_LIST_PAGINATION_LIMIT } from "$lib/constants/constants";
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
+import { getCurrentIdentity } from "$lib/services/auth.services";
 import {
   proposalPayloadsStore,
   proposalsFiltersStore,
@@ -27,7 +28,6 @@ import {
 import type { ProposalId, ProposalInfo } from "@dfinity/nns";
 import { nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getCurrentIdentity } from "../auth.services";
 import {
   queryAndUpdate,
   type QueryAndUpdateOnError,
diff --git a/frontend/src/lib/services/public/sns-proposals.services.ts b/frontend/src/lib/services/public/sns-proposals.services.ts
index 7d59f129c02..20fc45e2ba1 100644
--- a/frontend/src/lib/services/public/sns-proposals.services.ts
+++ b/frontend/src/lib/services/public/sns-proposals.services.ts
@@ -10,6 +10,7 @@ import {
   getSnsNeuronIdentity,
   syncSnsNeurons,
 } from "$lib/services/sns-neurons.services";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import { authStore } from "$lib/stores/auth.store";
 import { snsSelectedFiltersStore } from "$lib/stores/sns-filters.store";
 import { snsProposalsStore } from "$lib/stores/sns-proposals.store";
@@ -33,7 +34,6 @@ import type {
 } from "@dfinity/sns";
 import { fromDefinedNullable, isNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { queryAndUpdate } from "../utils.services";
 
 export const registerVote = async ({
   rootCanisterId,
diff --git a/frontend/src/lib/services/sns-accounts-balance.services.ts b/frontend/src/lib/services/sns-accounts-balance.services.ts
index 6549b28159c..39cecd20a23 100644
--- a/frontend/src/lib/services/sns-accounts-balance.services.ts
+++ b/frontend/src/lib/services/sns-accounts-balance.services.ts
@@ -1,6 +1,6 @@
+import { loadSnsAccounts } from "$lib/services/sns-accounts.services";
 import { toastsError } from "$lib/stores/toasts.store";
 import type { RootCanisterId } from "$lib/types/sns";
-import { loadSnsAccounts } from "./sns-accounts.services";
 
 /**
  * Load Sns projects accounts balances.
diff --git a/frontend/src/lib/services/sns-accounts.services.ts b/frontend/src/lib/services/sns-accounts.services.ts
index d3665a7fde9..3e134b7a32c 100644
--- a/frontend/src/lib/services/sns-accounts.services.ts
+++ b/frontend/src/lib/services/sns-accounts.services.ts
@@ -1,9 +1,9 @@
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
 import { snsLedgerCanisterIdsStore } from "$lib/derived/sns/sns-canisters.derived";
+import { loadAccounts } from "$lib/services/icrc-accounts.services";
+import type { QueryAndUpdateStrategy } from "$lib/services/utils.services";
 import type { Principal } from "@dfinity/principal";
 import { get } from "svelte/store";
-import { loadAccounts } from "./icrc-accounts.services";
-import type { QueryAndUpdateStrategy } from "./utils.services";
 
 export const loadSnsAccounts = async ({
   rootCanisterId,
diff --git a/frontend/src/lib/services/sns-finalization.services.ts b/frontend/src/lib/services/sns-finalization.services.ts
index 873ce74eeba..e3e52c55d51 100644
--- a/frontend/src/lib/services/sns-finalization.services.ts
+++ b/frontend/src/lib/services/sns-finalization.services.ts
@@ -1,5 +1,6 @@
 import { queryFinalizationStatus } from "$lib/api/sns-sale.api";
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import { getOrCreateSnsFinalizationStatusStore } from "$lib/stores/sns-finalization-status.store";
 import { snsSummariesStore } from "$lib/stores/sns.store";
 import { nowInSeconds } from "$lib/utils/date.utils";
@@ -11,7 +12,6 @@ import {
 } from "@dfinity/sns";
 import { isNullish, nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { queryAndUpdate } from "./utils.services";
 
 export const loadSnsFinalizationStatus = async ({
   rootCanisterId,
diff --git a/frontend/src/lib/services/sns-neurons.services.ts b/frontend/src/lib/services/sns-neurons.services.ts
index 87a4566a2fd..8c3a455b734 100644
--- a/frontend/src/lib/services/sns-neurons.services.ts
+++ b/frontend/src/lib/services/sns-neurons.services.ts
@@ -25,6 +25,9 @@ import { snsParametersStore } from "$lib/derived/sns-parameters.derived";
 import { snsTokenSymbolSelectedStore } from "$lib/derived/sns/sns-token-symbol-selected.store";
 import { snsTokensByRootCanisterIdStore } from "$lib/derived/sns/sns-tokens.derived";
 import { loadActionableProposalsForSns } from "$lib/services/actionable-sns-proposals.services";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
+import { loadSnsAccounts } from "$lib/services/sns-accounts.services";
+import { queryAndUpdate } from "$lib/services/utils.services";
 import {
   snsNeuronsStore,
   type ProjectNeuronStore,
@@ -60,9 +63,6 @@ import {
   nonNullish,
 } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "./auth.services";
-import { loadSnsAccounts } from "./sns-accounts.services";
-import { queryAndUpdate } from "./utils.services";
 
 /**
  * Loads sns neurons in store.
diff --git a/frontend/src/lib/services/sns-sale.services.ts b/frontend/src/lib/services/sns-sale.services.ts
index d58606d46b1..bd6292959c2 100644
--- a/frontend/src/lib/services/sns-sale.services.ts
+++ b/frontend/src/lib/services/sns-sale.services.ts
@@ -6,6 +6,8 @@ import {
   notifyPaymentFailure as notifyPaymentFailureApi,
 } from "$lib/api/sns-sale.api";
 import type { SubAccountArray } from "$lib/canisters/nns-dapp/nns-dapp.types";
+import { DEFAULT_TOAST_DURATION_MILLIS } from "$lib/constants/constants";
+import { SALE_PARTICIPATION_RETRY_SECONDS } from "$lib/constants/sns.constants";
 import { nnsAccountsListStore } from "$lib/derived/accounts-list.derived";
 import { mainTransactionFeeE8sStore } from "$lib/derived/main-transaction-fee.derived";
 import {
@@ -15,6 +17,7 @@ import {
 import { getConditionsToAccept } from "$lib/getters/sns-summary";
 import { getCurrentIdentity } from "$lib/services/auth.services";
 import { loadBalance } from "$lib/services/icp-accounts.services";
+import { snsTicketsStore } from "$lib/stores/sns-tickets.store";
 import {
   toastsError,
   toastsHide,
@@ -26,6 +29,8 @@ import { ApiErrorKey } from "$lib/types/api.errors";
 import { LedgerErrorKey } from "$lib/types/ledger.errors";
 import { SaleStep } from "$lib/types/sale";
 import { assertEnoughAccountFunds } from "$lib/utils/accounts.utils";
+import { nanoSecondsToDateTime } from "$lib/utils/date.utils";
+import { logWithTimestamp } from "$lib/utils/dev.utils";
 import { toToastError } from "$lib/utils/error.utils";
 import { validParticipation } from "$lib/utils/projects.utils";
 import { subaccountToHexString } from "$lib/utils/sns-neuron.utils";
@@ -33,6 +38,7 @@ import {
   getSwapCanisterAccount,
   isInternalRefreshBuyerTokensError,
 } from "$lib/utils/sns.utils";
+import { formatTokenE8s } from "$lib/utils/token.utils";
 import {
   cancelPoll,
   poll,
@@ -70,12 +76,6 @@ import {
   nonNullish,
 } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { DEFAULT_TOAST_DURATION_MILLIS } from "../constants/constants";
-import { SALE_PARTICIPATION_RETRY_SECONDS } from "../constants/sns.constants";
-import { snsTicketsStore } from "../stores/sns-tickets.store";
-import { nanoSecondsToDateTime } from "../utils/date.utils";
-import { logWithTimestamp } from "../utils/dev.utils";
-import { formatTokenE8s } from "../utils/token.utils";
 
 let toastId: symbol | undefined;
 export const hidePollingToast = (): void => {
diff --git a/frontend/src/lib/services/sns.services.ts b/frontend/src/lib/services/sns.services.ts
index b729211ae1e..e179fb1fa07 100644
--- a/frontend/src/lib/services/sns.services.ts
+++ b/frontend/src/lib/services/sns.services.ts
@@ -5,7 +5,12 @@ import {
 } from "$lib/api/sns.api";
 import { FORCE_CALL_STRATEGY } from "$lib/constants/mockable.constants";
 import { WATCH_SALE_STATE_EVERY_MILLISECONDS } from "$lib/constants/sns.constants";
+import { getAuthenticatedIdentity } from "$lib/services/auth.services";
 import { getLoadedSnsAggregatorData } from "$lib/services/public/sns.services";
+import {
+  queryAndUpdate,
+  type QueryAndUpdateStrategy,
+} from "$lib/services/utils.services";
 import { snsDerivedStateStore } from "$lib/stores/sns-derived-state.store";
 import { snsLifecycleStore } from "$lib/stores/sns-lifecycle.store";
 import { snsSwapCommitmentsStore } from "$lib/stores/sns.store";
@@ -22,8 +27,6 @@ import type {
 } from "@dfinity/sns";
 import { nonNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { getAuthenticatedIdentity } from "./auth.services";
-import { queryAndUpdate, type QueryAndUpdateStrategy } from "./utils.services";
 
 /**
  * Loads the user commitments for all projects.
diff --git a/frontend/src/lib/services/wallet-uncertified-accounts.services.ts b/frontend/src/lib/services/wallet-uncertified-accounts.services.ts
index 10be4cfd574..a273a14b2e5 100644
--- a/frontend/src/lib/services/wallet-uncertified-accounts.services.ts
+++ b/frontend/src/lib/services/wallet-uncertified-accounts.services.ts
@@ -1,7 +1,10 @@
+import {
+  loadAccounts,
+  loadIcrcToken,
+} from "$lib/services/icrc-accounts.services";
 import { toastsError } from "$lib/stores/toasts.store";
 import type { UniverseCanisterIdText } from "$lib/types/universe";
 import { Principal } from "@dfinity/principal";
-import { loadAccounts, loadIcrcToken } from "./icrc-accounts.services";
 
 /**
  * Load Icrc accounts balances and token
diff --git a/frontend/src/lib/services/worker-auth.services.ts b/frontend/src/lib/services/worker-auth.services.ts
index 7c9abfad9fb..8ddd3ab2433 100644
--- a/frontend/src/lib/services/worker-auth.services.ts
+++ b/frontend/src/lib/services/worker-auth.services.ts
@@ -1,8 +1,8 @@
+import { logout } from "$lib/services/auth.services";
 import type { AuthStoreData } from "$lib/stores/auth.store";
 import { authRemainingTimeStore } from "$lib/stores/auth.store";
 import type { PostMessage } from "$lib/types/post-messages";
 import type { PostMessageDataResponseAuth } from "$lib/types/post-messsage.auth";
-import { logout } from "./auth.services";
 
 export interface AuthWorker {
   syncAuthIdle: (auth: AuthStoreData) => void;
diff --git a/frontend/src/lib/stores/feature-flags.store.ts b/frontend/src/lib/stores/feature-flags.store.ts
index e3168996597..ab10869889a 100644
--- a/frontend/src/lib/stores/feature-flags.store.ts
+++ b/frontend/src/lib/stores/feature-flags.store.ts
@@ -5,8 +5,8 @@ import {
   type FeatureKey,
 } from "$lib/constants/environment.constants";
 import { StoreLocalStorageKey } from "$lib/constants/stores.constants";
+import { writableStored } from "$lib/stores/writable-stored";
 import { derived, get, type Readable } from "svelte/store";
-import { writableStored } from "./writable-stored";
 
 type OverrideFeatureFlagsData = Partial<FeatureFlags<boolean>>;
 export interface OverrideFeatureFlagsStore
diff --git a/frontend/src/lib/stores/hide-zero-balances.store.ts b/frontend/src/lib/stores/hide-zero-balances.store.ts
index 3c892add288..407a4e0e60e 100644
--- a/frontend/src/lib/stores/hide-zero-balances.store.ts
+++ b/frontend/src/lib/stores/hide-zero-balances.store.ts
@@ -1,6 +1,6 @@
 import { StoreLocalStorageKey } from "$lib/constants/stores.constants";
+import { writableStored } from "$lib/stores/writable-stored";
 import type { Writable } from "svelte/store";
-import { writableStored } from "./writable-stored";
 
 export type HideZeroBalancesMode = "show" | "hide";
 
diff --git a/frontend/src/lib/stores/icp-account-balances.store.ts b/frontend/src/lib/stores/icp-account-balances.store.ts
index 8a636090554..a05d0d9fed9 100644
--- a/frontend/src/lib/stores/icp-account-balances.store.ts
+++ b/frontend/src/lib/stores/icp-account-balances.store.ts
@@ -1,7 +1,7 @@
 import type { AccountIdentifierString } from "$lib/canisters/nns-dapp/nns-dapp.types";
 import type { QueryAndUpdateStrategy } from "$lib/services/utils.services";
+import { queuedStore } from "$lib/stores/queued-store";
 import type { Readable } from "svelte/store";
-import { queuedStore } from "./queued-store";
 
 export interface IcpAccountBalanceStoreData {
   balanceE8s: bigint;
diff --git a/frontend/src/lib/stores/json-representation.store.ts b/frontend/src/lib/stores/json-representation.store.ts
index d084f506658..5c6364ccd10 100644
--- a/frontend/src/lib/stores/json-representation.store.ts
+++ b/frontend/src/lib/stores/json-representation.store.ts
@@ -1,6 +1,6 @@
 import { StoreLocalStorageKey } from "$lib/constants/stores.constants";
+import { writableStored } from "$lib/stores/writable-stored";
 import type { Readable } from "svelte/store";
-import { writableStored } from "./writable-stored";
 
 type JsonRepresentationMode = "tree" | "raw";
 
diff --git a/frontend/src/lib/stores/proposals.store.ts b/frontend/src/lib/stores/proposals.store.ts
index 939b15caeb8..92e0e6d31c1 100644
--- a/frontend/src/lib/stores/proposals.store.ts
+++ b/frontend/src/lib/stores/proposals.store.ts
@@ -1,6 +1,8 @@
 import { DEFAULT_PROPOSALS_FILTERS } from "$lib/constants/proposals.constants";
 import { StoreLocalStorageKey } from "$lib/constants/stores.constants";
 import type { QueryAndUpdateStrategy } from "$lib/services/utils.services";
+import { queuedStore } from "$lib/stores/queued-store";
+import { writableStored } from "$lib/stores/writable-stored";
 import {
   concatenateUniqueProposals,
   excludeProposals,
@@ -14,8 +16,6 @@ import type {
   Topic,
 } from "@dfinity/nns";
 import { writable } from "svelte/store";
-import { queuedStore } from "./queued-store";
-import { writableStored } from "./writable-stored";
 
 export interface ProposalsFiltersStore {
   topics: Topic[];
diff --git a/frontend/src/lib/stores/sns-filters.store.ts b/frontend/src/lib/stores/sns-filters.store.ts
index c3f8afa7d3e..fda3d428045 100644
--- a/frontend/src/lib/stores/sns-filters.store.ts
+++ b/frontend/src/lib/stores/sns-filters.store.ts
@@ -1,10 +1,10 @@
 import { StoreLocalStorageKey } from "$lib/constants/stores.constants";
+import { writableStored } from "$lib/stores/writable-stored";
 import type { Filter, SnsProposalTypeFilterId } from "$lib/types/filters";
 import { mapEntries } from "$lib/utils/utils";
 import type { Principal } from "@dfinity/principal";
 import type { SnsProposalDecisionStatus } from "@dfinity/sns";
 import { derived, type Readable } from "svelte/store";
-import { writableStored } from "./writable-stored";
 
 export interface ProjectFiltersStoreData {
   types: Filter<SnsProposalTypeFilterId>[];
diff --git a/frontend/src/lib/stores/sns-neurons-table-order-sorted-neuron-ids-store.ts b/frontend/src/lib/stores/sns-neurons-table-order-sorted-neuron-ids-store.ts
index 6fbd05cabbf..92b6f85c5ed 100644
--- a/frontend/src/lib/stores/sns-neurons-table-order-sorted-neuron-ids-store.ts
+++ b/frontend/src/lib/stores/sns-neurons-table-order-sorted-neuron-ids-store.ts
@@ -4,6 +4,7 @@ import { snsProjectSelectedStore } from "$lib/derived/sns/sns-selected-project.d
 import { definedSnsNeuronStore } from "$lib/derived/sns/sns-sorted-neurons.derived";
 import { authStore } from "$lib/stores/auth.store";
 import { i18n } from "$lib/stores/i18n";
+import { neuronsTableOrderStore } from "$lib/stores/neurons-table.store";
 import { getSortedNeuronIds } from "$lib/utils/neurons-table-order-sorted-neuron-ids-store.utils";
 import {
   compareById,
@@ -11,7 +12,6 @@ import {
 } from "$lib/utils/neurons-table.utils";
 import { nonNullish } from "@dfinity/utils";
 import { derived } from "svelte/store";
-import { neuronsTableOrderStore } from "./neurons-table.store";
 
 const snsTableNeuronsToSortStore = derived(
   [
diff --git a/frontend/src/lib/types/actions.ts b/frontend/src/lib/types/actions.ts
index 9019185dc8f..f0bf102e1b9 100644
--- a/frontend/src/lib/types/actions.ts
+++ b/frontend/src/lib/types/actions.ts
@@ -1,4 +1,4 @@
-import type { UserTokenData } from "./tokens-page";
+import type { UserTokenData } from "$lib/types/tokens-page";
 
 export enum ActionType {
   Send = "send",
diff --git a/frontend/src/lib/types/icrc-accounts.modal.ts b/frontend/src/lib/types/icrc-accounts.modal.ts
index 2b39abc14e0..59b8a70364d 100644
--- a/frontend/src/lib/types/icrc-accounts.modal.ts
+++ b/frontend/src/lib/types/icrc-accounts.modal.ts
@@ -1,6 +1,6 @@
+import type { Account } from "$lib/types/account";
+import type { IcrcTokenMetadata } from "$lib/types/icrc";
 import type { Principal } from "@dfinity/principal";
-import type { Account } from "./account";
-import type { IcrcTokenMetadata } from "./icrc";
 
 // TODO: https://dfinity.atlassian.net/browse/GIX-2150 to be refactored:
 // 1. Integrate those types in accounts.modal.ts
diff --git a/frontend/src/lib/types/neuron-visibility-row.ts b/frontend/src/lib/types/neuron-visibility-row.ts
index 926e481039e..857afc40123 100644
--- a/frontend/src/lib/types/neuron-visibility-row.ts
+++ b/frontend/src/lib/types/neuron-visibility-row.ts
@@ -1,5 +1,5 @@
+import type { NeuronTagData } from "$lib/utils/neuron.utils";
 import type { TokenAmountV2 } from "@dfinity/utils";
-import type { NeuronTagData } from "../utils/neuron.utils";
 
 export type NeuronVisibilityRowData = {
   neuronId: string;
diff --git a/frontend/src/lib/types/project-detail.context.ts b/frontend/src/lib/types/project-detail.context.ts
index 0f27b1effbc..dd794859456 100644
--- a/frontend/src/lib/types/project-detail.context.ts
+++ b/frontend/src/lib/types/project-detail.context.ts
@@ -1,7 +1,7 @@
+import type { SnsSwapCommitment } from "$lib/types/sns";
 import type { SnsSummaryWrapper } from "$lib/types/sns-summary-wrapper";
 import type { TokenAmountV2 } from "@dfinity/utils";
 import type { Writable } from "svelte/store";
-import type { SnsSwapCommitment } from "./sns";
 
 /**
  * SnsSummary or SnsSwapCommitment is a valid project
diff --git a/frontend/src/lib/types/sns.ts b/frontend/src/lib/types/sns.ts
index 64d178c814d..e833bac0ac6 100644
--- a/frontend/src/lib/types/sns.ts
+++ b/frontend/src/lib/types/sns.ts
@@ -1,3 +1,4 @@
+import type { PngDataUrl } from "$lib/types/assets";
 import type { IcrcTokenMetadata } from "$lib/types/icrc";
 import type { Principal } from "@dfinity/principal";
 import type {
@@ -11,7 +12,6 @@ import type {
   SnsSwapTicket,
 } from "@dfinity/sns";
 import type { FinalizeSwapResponse } from "@dfinity/sns/dist/candid/sns_swap";
-import type { PngDataUrl } from "./assets";
 
 export type RootCanisterId = Principal;
 export type RootCanisterIdText = string;
diff --git a/frontend/src/lib/types/transaction.ts b/frontend/src/lib/types/transaction.ts
index 1fd0a3a9dc9..54ee27e8c7a 100644
--- a/frontend/src/lib/types/transaction.ts
+++ b/frontend/src/lib/types/transaction.ts
@@ -1,6 +1,6 @@
+import type { Account } from "$lib/types/account";
 import type { IcrcTransactionWithId } from "@dfinity/ledger-icrc";
 import type { TokenAmount, TokenAmountV2 } from "@dfinity/utils";
-import type { Account } from "./account";
 
 export type NewTransaction = {
   sourceAccount: Account;
diff --git a/frontend/src/lib/types/wallet.context.ts b/frontend/src/lib/types/wallet.context.ts
index ac2d3293f30..03cf278e7cb 100644
--- a/frontend/src/lib/types/wallet.context.ts
+++ b/frontend/src/lib/types/wallet.context.ts
@@ -1,6 +1,6 @@
+import type { Account } from "$lib/types/account";
 import type { NeuronInfo } from "@dfinity/nns";
 import type { Writable } from "svelte/store";
-import type { Account } from "./account";
 
 export interface HardwareWalletNeuronInfo extends NeuronInfo {
   controlledByNNSDapp: boolean;
diff --git a/frontend/src/lib/utils/accounts.utils.ts b/frontend/src/lib/utils/accounts.utils.ts
index 9d6908aaf8d..c50b3e03962 100644
--- a/frontend/src/lib/utils/accounts.utils.ts
+++ b/frontend/src/lib/utils/accounts.utils.ts
@@ -9,6 +9,7 @@ import { NotEnoughAmountError } from "$lib/types/common.errors";
 import { TransactionNetwork } from "$lib/types/transaction";
 import { sumAmounts } from "$lib/utils/token.utils";
 import { isTransactionNetworkBtc } from "$lib/utils/transactions.utils";
+import { isUniverseNns } from "$lib/utils/universe.utils";
 import { BtcNetwork, parseBtcAddress, type BtcAddress } from "@dfinity/ckbtc";
 import {
   AccountIdentifier,
@@ -18,7 +19,6 @@ import {
 import { decodeIcrcAccount } from "@dfinity/ledger-icrc";
 import { Principal } from "@dfinity/principal";
 import { isNullish, nonNullish } from "@dfinity/utils";
-import { isUniverseNns } from "./universe.utils";
 
 /*
  * Returns the principal's main or hardware account
diff --git a/frontend/src/lib/utils/canisters.utils.ts b/frontend/src/lib/utils/canisters.utils.ts
index 502b6e52e9e..6cb69b51b56 100644
--- a/frontend/src/lib/utils/canisters.utils.ts
+++ b/frontend/src/lib/utils/canisters.utils.ts
@@ -8,12 +8,12 @@ import type { AuthStoreData } from "$lib/stores/auth.store";
 import type { CanistersStore } from "$lib/stores/canisters.store";
 import { i18n } from "$lib/stores/i18n";
 import type { CanisterId } from "$lib/types/canister";
+import { formatNumber } from "$lib/utils/format.utils";
+import { replacePlaceholders } from "$lib/utils/i18n.utils";
 import { AccountIdentifier, SubAccount } from "@dfinity/ledger-icp";
 import { Principal } from "@dfinity/principal";
 import { nonNullish, principalToSubAccount } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { formatNumber } from "./format.utils";
-import { replacePlaceholders } from "./i18n.utils";
 
 export const getCanisterFromStore = ({
   canisterId,
diff --git a/frontend/src/lib/utils/error.utils.ts b/frontend/src/lib/utils/error.utils.ts
index 170544cd11f..a538bc0c5a0 100644
--- a/frontend/src/lib/utils/error.utils.ts
+++ b/frontend/src/lib/utils/error.utils.ts
@@ -9,6 +9,7 @@ import {
   NotFoundError,
 } from "$lib/types/neurons.errors";
 import type { ToastMsg } from "$lib/types/toast";
+import { translate, type I18nSubstitutions } from "$lib/utils/i18n.utils";
 import { InvalidaTransactionError, RefundedError } from "@dfinity/cmc";
 import {
   InsufficientFundsError,
@@ -23,7 +24,6 @@ import {
 } from "@dfinity/nns";
 import { SnsGovernanceError, UnsupportedMethodError } from "@dfinity/sns";
 import { InvalidPercentageError, nonNullish } from "@dfinity/utils";
-import { translate, type I18nSubstitutions } from "./i18n.utils";
 
 export const errorToString = (err?: unknown): string | undefined => {
   const text =
diff --git a/frontend/src/lib/utils/hardware-wallet-neurons.utils.ts b/frontend/src/lib/utils/hardware-wallet-neurons.utils.ts
index 7742e74d8a0..1313d8e8335 100644
--- a/frontend/src/lib/utils/hardware-wallet-neurons.utils.ts
+++ b/frontend/src/lib/utils/hardware-wallet-neurons.utils.ts
@@ -1,7 +1,7 @@
 import type { HardwareWalletNeuronInfo } from "$lib/types/wallet.context";
+import { isHotKeyControllable } from "$lib/utils/neuron.utils";
 import type { Identity } from "@dfinity/agent";
 import type { NeuronInfo } from "@dfinity/nns";
-import { isHotKeyControllable } from "./neuron.utils";
 
 export const mapHardwareWalletNeuronInfo = ({
   identity,
diff --git a/frontend/src/lib/utils/icp-transactions.utils.ts b/frontend/src/lib/utils/icp-transactions.utils.ts
index 2ce7798ec16..8ad24a78a7f 100644
--- a/frontend/src/lib/utils/icp-transactions.utils.ts
+++ b/frontend/src/lib/utils/icp-transactions.utils.ts
@@ -8,6 +8,7 @@ import {
   AccountTransactionType,
   type UiTransaction,
 } from "$lib/types/transaction";
+import { transactionName } from "$lib/utils/transactions.utils";
 import type {
   Operation,
   Transaction,
@@ -20,7 +21,6 @@ import {
   isNullish,
   nonNullish,
 } from "@dfinity/utils";
-import { transactionName } from "./transactions.utils";
 
 const isToSelf = (transaction: Transaction): boolean => {
   if ("Transfer" in transaction.operation) {
diff --git a/frontend/src/lib/utils/ledger.utils.ts b/frontend/src/lib/utils/ledger.utils.ts
index c7eb5fa870a..370b0524878 100644
--- a/frontend/src/lib/utils/ledger.utils.ts
+++ b/frontend/src/lib/utils/ledger.utils.ts
@@ -6,6 +6,7 @@ import {
 import { Secp256k1PublicKey } from "$lib/keys/secp256k1";
 import { i18n } from "$lib/stores/i18n";
 import { LedgerErrorKey, LedgerErrorMessage } from "$lib/types/ledger.errors";
+import { replacePlaceholders } from "$lib/utils/i18n.utils";
 import type { ReadRequest, RequestId, Signature } from "@dfinity/agent";
 import { Principal } from "@dfinity/principal";
 import { isNullish } from "@dfinity/utils";
@@ -16,7 +17,6 @@ import type {
   ResponseSignUpdateCall,
 } from "@zondax/ledger-icp";
 import { get } from "svelte/store";
-import { replacePlaceholders } from "./i18n.utils";
 
 export const decodePublicKey = async ({
   principalText,
diff --git a/frontend/src/lib/utils/navigation.utils.ts b/frontend/src/lib/utils/navigation.utils.ts
index d50c0c95479..e0b6e75c527 100644
--- a/frontend/src/lib/utils/navigation.utils.ts
+++ b/frontend/src/lib/utils/navigation.utils.ts
@@ -7,9 +7,9 @@ import {
   PROPOSAL_PARAM,
   UNIVERSE_PARAM,
 } from "$lib/constants/routes.constants";
+import { isArrayEmpty } from "$lib/utils/utils";
 import type { NeuronId, ProposalId } from "@dfinity/nns";
 import { nonNullish } from "@dfinity/utils";
-import { isArrayEmpty } from "./utils";
 
 // If the previous page is a particular detail page and if we have data in store, we don't reset and query the data in store after the route is mounted.
 // We do this to smoothness the back and forth navigation between the page and the detail page that have store that are not loaded at boot time.
diff --git a/frontend/src/lib/utils/neuron.utils.ts b/frontend/src/lib/utils/neuron.utils.ts
index 2b176419cae..3dac41a1fbb 100644
--- a/frontend/src/lib/utils/neuron.utils.ts
+++ b/frontend/src/lib/utils/neuron.utils.ts
@@ -30,7 +30,19 @@ import type {
   NeuronVisibilityRowData,
   UncontrolledNeuronDetailsData,
 } from "$lib/types/neuron-visibility-row";
+import { daysToSeconds, nowInSeconds } from "$lib/utils/date.utils";
+import {
+  formatNumber,
+  shortenWithMiddleEllipsis,
+} from "$lib/utils/format.utils";
 import { replacePlaceholders } from "$lib/utils/i18n.utils";
+import { getVotingBallot, getVotingPower } from "$lib/utils/proposals.utils";
+import {
+  createAscendingComparator,
+  mergeComparators,
+} from "$lib/utils/sort.utils";
+import { formatTokenE8s, numberToUlps } from "$lib/utils/token.utils";
+import { isDefined } from "$lib/utils/utils";
 import type { Identity } from "@dfinity/agent";
 import type { WizardStep } from "@dfinity/gix-components";
 import {
@@ -69,12 +81,6 @@ import {
   getAccountByPrincipal,
   isAccountHardwareWallet,
 } from "./accounts.utils";
-import { daysToSeconds, nowInSeconds } from "./date.utils";
-import { formatNumber, shortenWithMiddleEllipsis } from "./format.utils";
-import { getVotingBallot, getVotingPower } from "./proposals.utils";
-import { createAscendingComparator, mergeComparators } from "./sort.utils";
-import { formatTokenE8s, numberToUlps } from "./token.utils";
-import { isDefined } from "./utils";
 
 export type StateInfo = {
   Icon?: ComponentType;
diff --git a/frontend/src/lib/utils/projects.utils.ts b/frontend/src/lib/utils/projects.utils.ts
index 168d47bd125..80c5361a02f 100644
--- a/frontend/src/lib/utils/projects.utils.ts
+++ b/frontend/src/lib/utils/projects.utils.ts
@@ -14,7 +14,12 @@ import type {
 } from "$lib/types/sns";
 import type { SnsSummaryWrapper } from "$lib/types/sns-summary-wrapper";
 import type { StoreData } from "$lib/types/store";
+import { nowInSeconds } from "$lib/utils/date.utils";
+import type { I18nSubstitutions } from "$lib/utils/i18n.utils";
+import { getCommitmentE8s } from "$lib/utils/sns.utils";
 import { createDescendingComparator } from "$lib/utils/sort.utils";
+import { formatTokenE8s } from "$lib/utils/token.utils";
+import { stringifyJson } from "$lib/utils/utils";
 import type { Principal } from "@dfinity/principal";
 import { SnsSwapLifecycle, type SnsSwapTicket } from "@dfinity/sns";
 import {
@@ -23,11 +28,6 @@ import {
   nonNullish,
   type TokenAmount,
 } from "@dfinity/utils";
-import { nowInSeconds } from "./date.utils";
-import type { I18nSubstitutions } from "./i18n.utils";
-import { getCommitmentE8s } from "./sns.utils";
-import { formatTokenE8s } from "./token.utils";
-import { stringifyJson } from "./utils";
 
 export const filterProjectsStatus = ({
   swapLifecycle,
diff --git a/frontend/src/lib/utils/proposals.utils.ts b/frontend/src/lib/utils/proposals.utils.ts
index 4b884ff6ef4..ac76c9121d0 100644
--- a/frontend/src/lib/utils/proposals.utils.ts
+++ b/frontend/src/lib/utils/proposals.utils.ts
@@ -8,7 +8,12 @@ import type {
   VotingNeuron,
 } from "$lib/types/proposals";
 import type { UniverseCanisterIdText } from "$lib/types/universe";
+import { nowInSeconds } from "$lib/utils/date.utils";
+import { errorToString } from "$lib/utils/error.utils";
+import { replacePlaceholders } from "$lib/utils/i18n.utils";
 import { buildProposalUrl } from "$lib/utils/navigation.utils";
+import { toNnsVote } from "$lib/utils/sns-proposals.utils";
+import { isDefined, keyOf, keyOfOptional } from "$lib/utils/utils";
 import type {
   Ballot,
   ExecuteNnsFunction,
@@ -29,11 +34,6 @@ import {
 import type { SnsVote } from "@dfinity/sns";
 import { isNullish } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { nowInSeconds } from "./date.utils";
-import { errorToString } from "./error.utils";
-import { replacePlaceholders } from "./i18n.utils";
-import { toNnsVote } from "./sns-proposals.utils";
-import { isDefined, keyOf, keyOfOptional } from "./utils";
 
 export const lastProposalId = (
   proposalInfos: ProposalInfo[]
diff --git a/frontend/src/lib/utils/sns-aggregator-converters.utils.ts b/frontend/src/lib/utils/sns-aggregator-converters.utils.ts
index 6bbbd931669..433dd08f660 100644
--- a/frontend/src/lib/utils/sns-aggregator-converters.utils.ts
+++ b/frontend/src/lib/utils/sns-aggregator-converters.utils.ts
@@ -24,6 +24,8 @@ import type {
   CachedVotingRewardsParametersDto,
 } from "$lib/types/sns-aggregator";
 import { SnsSummaryWrapper } from "$lib/types/sns-summary-wrapper";
+import { mapOptionalToken } from "$lib/utils/icrc-tokens.utils";
+import { isPngAsset } from "$lib/utils/utils";
 import type { IcrcTokenMetadataResponse } from "@dfinity/ledger-icrc";
 import { Principal } from "@dfinity/principal";
 import type {
@@ -44,8 +46,6 @@ import {
   nonNullish,
   toNullable,
 } from "@dfinity/utils";
-import { mapOptionalToken } from "./icrc-tokens.utils";
-import { isPngAsset } from "./utils";
 
 export const aggregatorCanisterLogoPath = (rootCanisterId: string) =>
   `${SNS_AGGREGATOR_CANISTER_URL}/${AGGREGATOR_CANISTER_VERSION}/sns/root/${rootCanisterId}/logo.png`;
diff --git a/frontend/src/lib/utils/sns-ledger.utils.ts b/frontend/src/lib/utils/sns-ledger.utils.ts
index 1a811bf4d58..25816f7ac08 100644
--- a/frontend/src/lib/utils/sns-ledger.utils.ts
+++ b/frontend/src/lib/utils/sns-ledger.utils.ts
@@ -1,6 +1,6 @@
+import { toToastError } from "$lib/utils/error.utils";
+import type { I18nSubstitutions } from "$lib/utils/i18n.utils";
 import { IcrcTransferError } from "@dfinity/ledger-icrc";
-import { toToastError } from "./error.utils";
-import type { I18nSubstitutions } from "./i18n.utils";
 
 export const ledgerErrorToToastError = ({
   err,
diff --git a/frontend/src/lib/utils/sns-neuron.utils.ts b/frontend/src/lib/utils/sns-neuron.utils.ts
index 92cfab5023d..37ce6a69c2d 100644
--- a/frontend/src/lib/utils/sns-neuron.utils.ts
+++ b/frontend/src/lib/utils/sns-neuron.utils.ts
@@ -5,6 +5,7 @@ import {
   MAX_NEURONS_SUBACCOUNTS,
 } from "$lib/constants/sns-neurons.constants";
 import { NextMemoNotFoundError } from "$lib/types/sns-neurons.errors";
+import { nowInSeconds } from "$lib/utils/date.utils";
 import {
   bonusMultiplier,
   votingPower,
@@ -13,7 +14,9 @@ import {
   type NeuronIneligibilityReason,
   type NeuronTagData,
 } from "$lib/utils/neuron.utils";
+import { ballotVotingPower } from "$lib/utils/sns-proposals.utils";
 import { formatTokenE8s } from "$lib/utils/token.utils";
+import { bytesToHexString } from "$lib/utils/utils";
 import type { Identity } from "@dfinity/agent";
 import { NeuronState, Vote, type E8s, type NeuronInfo } from "@dfinity/nns";
 import type { Principal } from "@dfinity/principal";
@@ -33,9 +36,6 @@ import {
   isNullish,
   nonNullish,
 } from "@dfinity/utils";
-import { nowInSeconds } from "./date.utils";
-import { ballotVotingPower } from "./sns-proposals.utils";
-import { bytesToHexString } from "./utils";
 
 export const sortSnsNeuronsByStake = (neurons: SnsNeuron[]): SnsNeuron[] =>
   [...neurons].sort((a, b) =>
diff --git a/frontend/src/lib/utils/sns-proposals.utils.ts b/frontend/src/lib/utils/sns-proposals.utils.ts
index 18825661edb..0d83eb2325b 100644
--- a/frontend/src/lib/utils/sns-proposals.utils.ts
+++ b/frontend/src/lib/utils/sns-proposals.utils.ts
@@ -11,13 +11,14 @@ import type {
   UniversalProposalStatus,
   VotingNeuron,
 } from "$lib/types/proposals";
+import { nowInSeconds } from "$lib/utils/date.utils";
 import { replacePlaceholders } from "$lib/utils/i18n.utils";
 import { getSnsNeuronIdAsHexString } from "$lib/utils/sns-neuron.utils";
 import {
   isSnsGenericNervousSystemFunction,
   isSnsNativeNervousSystemFunction,
 } from "$lib/utils/sns.utils";
-import { basisPointsToPercent } from "$lib/utils/utils";
+import { basisPointsToPercent, keyOfOptional } from "$lib/utils/utils";
 import { Vote } from "@dfinity/nns";
 import type {
   SnsAction,
@@ -42,8 +43,6 @@ import {
   nonNullish,
 } from "@dfinity/utils";
 import { get } from "svelte/store";
-import { nowInSeconds } from "./date.utils";
-import { keyOfOptional } from "./utils";
 
 export type SnsProposalDataMap = {
   // Mapped directly from SnsProposalData directly
diff --git a/frontend/src/lib/utils/utils.ts b/frontend/src/lib/utils/utils.ts
index 2aba6c5d733..18a02df9074 100644
--- a/frontend/src/lib/utils/utils.ts
+++ b/frontend/src/lib/utils/utils.ts
@@ -1,9 +1,9 @@
 import { toastsError, toastsHide } from "$lib/stores/toasts.store";
 import type { PngDataUrl } from "$lib/types/assets";
 import type { BasisPoints } from "$lib/types/proposals";
+import { errorToString } from "$lib/utils/error.utils";
 import { JSON_KEY_PRINCIPAL, type Principal } from "@dfinity/principal";
 import { nonNullish } from "@dfinity/utils";
-import { errorToString } from "./error.utils";
 
 export const isPrincipal = (value: unknown): value is Principal =>
   typeof value === "object" && (value as Principal)?._isPrincipal === true;