From 753cbc1e96b2758d32d7277527caa336be7fd6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 28 Nov 2023 12:15:08 +0100
Subject: [PATCH] refactor(editor): Delete some barrel files and reduce
 circular dependencies (no-changelog) (#7838)

---
 .../src/components/N8nDatatable/Datatable.vue |  2 +-
 .../N8nKeyboardShortcut.vue                   |  2 +-
 .../N8nNodeCreatorNode/NodeCreatorNode.vue    |  2 +-
 .../design-system/src/composables/index.ts    |  2 -
 packages/design-system/src/main.ts            |  2 +-
 packages/design-system/vite.config.mts        |  1 +
 packages/editor-ui/src/App.vue                | 26 ++++----
 packages/editor-ui/src/Interface.ts           |  2 +-
 .../editor-ui/src/__tests__/router.test.ts    |  2 +-
 packages/editor-ui/src/api/cloudPlans.ts      |  2 +-
 packages/editor-ui/src/api/communityNodes.ts  |  2 +-
 packages/editor-ui/src/api/environments.ee.ts |  2 +-
 packages/editor-ui/src/api/eventbus.ee.ts     |  2 +-
 .../editor-ui/src/api/externalSecrets.ee.ts   |  2 +-
 packages/editor-ui/src/api/orchestration.ts   |  2 +-
 packages/editor-ui/src/api/sourceControl.ts   |  4 +-
 packages/editor-ui/src/api/sso.ts             |  2 +-
 packages/editor-ui/src/api/tags.ts            |  2 +-
 packages/editor-ui/src/api/workflowHistory.ts |  2 +-
 .../src/components/ActivationModal.vue        |  2 +-
 .../src/components/BinaryDataDisplayEmbed.vue |  2 +-
 .../src/components/BreakpointsObserver.vue    |  4 +-
 .../src/components/ChangePasswordModal.vue    |  2 +-
 .../src/components/ChatEmbedModal.vue         |  4 +-
 .../components/CodeNodeEditor/AskAI/AskAI.vue | 13 +++-
 .../CodeNodeEditor/CodeNodeEditor.vue         |  5 +-
 .../completions/secrets.completions.ts        |  2 +-
 .../completions/variables.completions.ts      |  2 +-
 .../CommunityPackageInstallModal.vue          |  2 +-
 .../CommunityPackageManageConfirmModal.vue    |  2 +-
 .../src/components/ContactPromptModal.vue     |  2 +-
 .../components/ContextMenu/ContextMenu.vue    |  2 +-
 .../editor-ui/src/components/CopyInput.vue    |  2 +-
 .../src/components/CredentialCard.vue         |  2 +-
 .../CredentialEdit/AuthTypeSelector.vue       |  2 +-
 .../CredentialEdit/CredentialConfig.vue       |  2 +-
 .../CredentialEdit/CredentialEdit.vue         | 11 ++--
 .../CredentialEdit/CredentialSharing.ee.vue   |  2 +-
 .../CredentialEdit/GoogleAuthButton.vue       |  2 +-
 .../CredentialPicker/CredentialPicker.vue     |  2 +-
 .../CredentialPicker/CredentialsDropdown.vue  |  2 +-
 .../src/components/DebugPaywallModal.vue      |  2 +-
 .../src/components/DeleteUserModal.vue        |  2 +-
 .../components/DuplicateWorkflowDialog.vue    |  4 +-
 .../src/components/Error/NodeErrorView.vue    |  4 +-
 .../src/components/ExecutionFilter.vue        |  4 +-
 .../src/components/ExecutionsList.vue         |  8 ++-
 .../src/components/ExecutionsUsage.vue        |  2 +-
 .../ExecutionsView/ExecutionPreview.vue       |  3 +-
 .../ExecutionsView/ExecutionsList.vue         |  6 +-
 .../__tests__/ExecutionPreview.test.ts        |  3 +-
 .../ExternalSecretsProviderCard.ee.vue        |  7 ++-
 ...rnalSecretsProviderConnectionSwitch.ee.vue |  6 +-
 .../ExternalSecretsProviderModal.ee.vue       |  7 ++-
 .../src/components/ImportCurlModal.vue        |  2 +-
 .../InlineExpressionEditorOutput.vue          |  2 +-
 .../src/components/InlineNameEdit.vue         |  2 +-
 .../src/components/InviteUsersModal.vue       |  4 +-
 packages/editor-ui/src/components/Logo.vue    |  3 +-
 .../src/components/MainHeader/MainHeader.vue  |  4 +-
 .../components/MainHeader/WorkflowDetails.vue | 22 +++----
 .../editor-ui/src/components/MainSidebar.vue  | 22 +++----
 .../components/MainSidebarSourceControl.vue   |  5 +-
 .../src/components/MfaSetupModal.vue          |  2 +-
 packages/editor-ui/src/components/Node.vue    |  4 +-
 .../Node/NodeCreator/ItemTypes/NodeItem.vue   |  5 +-
 .../NodeCreator/ItemTypes/SubcategoryItem.vue |  2 +-
 .../Node/NodeCreator/Modes/ActionsMode.vue    |  2 +-
 .../Node/NodeCreator/Modes/NodesMode.vue      |  3 +-
 .../Node/NodeCreator/NodeCreator.vue          |  3 +-
 .../Node/NodeCreator/Panel/NodesListPanel.vue |  2 +-
 .../Node/NodeCreator/Panel/SearchBar.vue      |  2 +-
 .../NodeCreator/composables/useActions.ts     |  2 +-
 .../NodeCreator/composables/useViewStacks.ts  |  4 +-
 .../src/components/Node/NodeCreator/utils.ts  |  2 +-
 .../components/Node/NodeCreator/viewsData.ts  |  4 +-
 .../src/components/NodeCredentials.vue        |  4 +-
 .../src/components/NodeDetailsView.vue        |  4 +-
 .../src/components/NodeExecuteButton.vue      |  3 +-
 .../editor-ui/src/components/NodeList.vue     |  2 +-
 .../editor-ui/src/components/NodeSettings.vue |  2 +-
 .../src/components/NodeSettingsTabs.vue       |  2 +-
 .../editor-ui/src/components/NodeWebhooks.vue |  2 +-
 .../components/OnboardingCallSignupModal.vue  |  2 +-
 .../editor-ui/src/components/PageAlert.vue    |  4 +-
 .../src/components/ParameterInput.vue         |  5 +-
 .../src/components/ParameterInputExpanded.vue |  2 +-
 .../src/components/ParameterInputFull.vue     | 11 ++--
 .../src/components/ParameterInputHint.vue     |  2 +-
 .../src/components/ParameterInputList.vue     |  6 +-
 .../src/components/ParameterInputWrapper.vue  |  5 +-
 .../src/components/ParameterOptions.vue       |  3 +-
 .../src/components/PersonalizationModal.vue   |  6 +-
 .../ResourceLocator/ResourceLocator.vue       |  8 +--
 .../ResourceMapper/MappingFields.vue          | 10 ++-
 .../ResourceMapper/MappingModeSelect.vue      |  2 +-
 .../ResourceMapper/MatchingColumnsSelect.vue  |  2 +-
 .../ResourceMapper/ResourceMapper.vue         |  3 +-
 packages/editor-ui/src/components/RunData.vue |  6 +-
 .../RunDataAi/AiRunContentBlock.vue           |  4 +-
 .../src/components/RunDataAi/RunDataAi.vue    |  3 +-
 .../components/RunDataAi/RunDataAiContent.vue |  3 +-
 .../editor-ui/src/components/RunDataJson.vue  |  5 +-
 .../src/components/RunDataJsonActions.vue     |  6 +-
 .../src/components/RunDataSchema.vue          |  5 +-
 .../src/components/RunDataSchemaItem.vue      |  4 +-
 .../src/components/RunDataSearch.vue          |  2 +-
 .../editor-ui/src/components/RunDataTable.vue |  4 +-
 .../editor-ui/src/components/SSOLogin.vue     |  3 +-
 .../EventDestinationCard.ee.vue               |  2 +-
 .../EventDestinationSettingsModal.ee.vue      |  2 +-
 .../editor-ui/src/components/ShortenName.vue  |  2 +-
 .../components/SourceControlPullModal.ee.vue  |  6 +-
 .../components/SourceControlPushModal.ee.vue  |  6 +-
 packages/editor-ui/src/components/Sticky.vue  |  4 +-
 .../editor-ui/src/components/TagsDropdown.vue |  3 +-
 .../components/TagsManager/TagsManager.vue    |  2 +-
 .../editor-ui/src/components/TemplateCard.vue |  3 +-
 .../src/components/TemplateDetails.vue        |  4 +-
 packages/editor-ui/src/components/TimeAgo.vue |  2 +-
 .../editor-ui/src/components/TriggerPanel.vue |  2 +-
 .../editor-ui/src/components/ValueSurvey.vue  |  2 +-
 .../editor-ui/src/components/VariablesRow.vue |  4 +-
 .../src/components/WorkerList.ee.vue          |  9 +--
 .../Workers/WorkerChartsAccordion.ee.vue      |  2 +-
 .../Workers/WorkerNetAccordion.ee.vue         |  4 +-
 .../src/components/WorkflowActivator.vue      |  4 +-
 .../editor-ui/src/components/WorkflowCard.vue |  3 +-
 .../WorkflowHistoryContent.vue                |  2 +-
 .../WorkflowHistory/WorkflowHistoryList.vue   |  2 +-
 .../WorkflowHistoryListItem.vue               |  2 +-
 .../WorkflowHistoryVersionRestoreModal.vue    |  4 +-
 .../src/components/WorkflowLMChat.vue         |  5 +-
 .../src/components/WorkflowPreview.vue        |  3 +-
 .../src/components/WorkflowSettings.vue       |  2 +-
 .../src/components/WorkflowShareModal.ee.vue  |  3 +-
 .../__tests__/RunDataSearch.test.ts           |  3 +-
 .../src/components/banners/BannerStack.vue    |  2 +-
 .../banners/EmailConfirmationBanner.vue       |  2 +-
 .../layouts/ResourcesListLayout.vue           |  2 +-
 .../__tests__/useContextMenu.test.ts          |  3 +-
 .../__tests__/useDataSchema.test.ts           |  2 +-
 packages/editor-ui/src/composables/index.ts   | 17 -----
 .../src/composables/useCanvasMouseSelect.ts   |  2 +-
 .../src/composables/useContextMenu.ts         |  5 +-
 .../src/composables/useDataSchema.ts          |  2 +-
 .../src/composables/useExecutionDebugging.ts  |  8 ++-
 .../src/composables/useExternalHooks.ts       |  2 +-
 .../src/composables/useHistoryHelper.ts       |  4 +-
 .../src/composables/useTitleChange.ts         |  2 +-
 .../editor-ui/src/composables/useToast.ts     |  2 +-
 packages/editor-ui/src/hooks/index.ts         |  4 --
 .../mixins/__tests__/workflowHelpers.spec.ts  |  3 +-
 .../editor-ui/src/mixins/externalHooks.ts     |  2 +-
 .../editor-ui/src/mixins/genericHelpers.ts    |  4 +-
 packages/editor-ui/src/mixins/newVersions.ts  |  2 +-
 packages/editor-ui/src/mixins/nodeHelpers.ts  |  4 +-
 packages/editor-ui/src/mixins/pinData.ts      |  4 +-
 .../editor-ui/src/mixins/pushConnection.ts    |  5 +-
 .../editor-ui/src/mixins/workflowActivate.ts  |  2 +-
 .../editor-ui/src/mixins/workflowHelpers.ts   |  7 ++-
 packages/editor-ui/src/mixins/workflowRun.ts  |  2 +-
 .../completions/datatype.completions.ts       |  5 +-
 .../completions/dollar.completions.ts         |  2 +-
 packages/editor-ui/src/plugins/i18n/index.ts  | 14 ++---
 .../editor-ui/src/plugins/telemetry/index.ts  |  9 +--
 .../src/rbac/checks/__tests__/hasRole.test.ts |  2 +-
 packages/editor-ui/src/rbac/checks/hasRole.ts |  2 +-
 .../src/rbac/checks/isAuthenticated.ts        |  2 +-
 .../rbac/checks/isEnterpriseFeatureEnabled.ts |  2 +-
 packages/editor-ui/src/rbac/checks/isGuest.ts |  2 +-
 .../rbac/middleware/__tests__/role.test.ts    |  2 +-
 packages/editor-ui/src/router.ts              | 11 ++--
 .../src/stores/__tests__/environments.spec.ts |  2 +-
 .../editor-ui/src/stores/__tests__/ui.test.ts |  3 +-
 .../src/stores/__tests__/workflows.spec.ts    |  4 +-
 .../src/stores/__tests__/workflows.test.ts    |  2 +-
 .../editor-ui/src/stores/auditLogs.store.ts   |  2 +-
 packages/editor-ui/src/stores/canvas.store.ts | 16 ++---
 .../editor-ui/src/stores/credentials.store.ts |  2 +-
 packages/editor-ui/src/stores/index.ts        | 31 ----------
 .../editor-ui/src/stores/nodeTypes.store.ts   |  2 +-
 .../editor-ui/src/stores/settings.store.ts    |  9 ++-
 packages/editor-ui/src/stores/ui.store.ts     |  5 +-
 packages/editor-ui/src/stores/users.store.ts  |  2 +-
 .../editor-ui/src/stores/workflows.store.ts   | 13 ++--
 packages/editor-ui/src/types/externalHooks.ts |  4 +-
 .../src/utils/__tests__/htmlUtils.test.ts     |  2 +-
 .../src/utils/__tests__/objectUtils.test.ts   |  2 +-
 .../__tests__/sourceControlUtils.test.ts      |  2 +-
 .../src/utils/__tests__/typesUtils.test.ts    |  2 +-
 packages/editor-ui/src/utils/canvasUtils.ts   | 21 +------
 packages/editor-ui/src/utils/index.ts         | 13 ----
 .../editor-ui/src/utils/nodeTypesUtils.ts     |  3 +-
 packages/editor-ui/src/utils/nodeViewUtils.ts | 23 ++++++-
 .../editor-ui/src/utils/pairedItemUtils.ts    |  4 +-
 .../editor-ui/src/utils/telemetryUtils.ts     |  2 +-
 .../src/views/ChangePasswordView.vue          |  2 +-
 .../editor-ui/src/views/CredentialsView.vue   |  2 +-
 .../src/views/ForgotMyPasswordView.vue        |  2 +-
 packages/editor-ui/src/views/NodeView.vue     | 62 +++++++++----------
 .../editor-ui/src/views/SettingsApiView.vue   |  3 +-
 .../editor-ui/src/views/SettingsAuditLogs.vue |  5 +-
 .../src/views/SettingsCommunityNodesView.vue  |  2 +-
 .../src/views/SettingsExternalSecrets.vue     |  6 +-
 .../editor-ui/src/views/SettingsLdapView.vue  |  8 ++-
 .../src/views/SettingsLogStreamingView.vue    | 14 ++---
 .../src/views/SettingsPersonalView.vue        |  3 +-
 .../src/views/SettingsSourceControl.vue       |  8 ++-
 packages/editor-ui/src/views/SettingsSso.vue  |  4 +-
 .../src/views/SettingsUsageAndPlan.vue        |  6 +-
 .../editor-ui/src/views/SettingsUsersView.vue |  4 +-
 packages/editor-ui/src/views/SetupView.vue    |  2 +-
 .../AppsRequiringCredsNotice.vue              |  2 +-
 .../SetupWorkflowFromTemplateView.vue         |  4 +-
 .../setupTemplate.store.ts                    | 12 ++--
 packages/editor-ui/src/views/SigninView.vue   |  5 +-
 packages/editor-ui/src/views/SignoutView.vue  |  2 +-
 packages/editor-ui/src/views/SignupView.vue   |  2 +-
 .../src/views/TemplatesCollectionView.vue     |  2 +-
 .../src/views/TemplatesSearchView.vue         |  4 +-
 .../src/views/TemplatesWorkflowView.vue       |  2 +-
 .../editor-ui/src/views/VariablesView.vue     | 17 ++---
 .../editor-ui/src/views/WorkflowHistory.vue   |  3 +-
 .../src/views/WorkflowOnboardingView.vue      |  6 +-
 .../editor-ui/src/views/WorkflowsView.vue     |  2 +-
 .../views/__tests__/SettingsAuditLogs.test.ts |  3 +-
 .../__tests__/SettingsSourceControl.test.ts   |  3 +-
 .../src/views/__tests__/VariablesView.spec.ts |  4 +-
 229 files changed, 539 insertions(+), 507 deletions(-)
 delete mode 100644 packages/design-system/src/composables/index.ts
 delete mode 100644 packages/editor-ui/src/composables/index.ts
 delete mode 100644 packages/editor-ui/src/hooks/index.ts
 delete mode 100644 packages/editor-ui/src/stores/index.ts
 delete mode 100644 packages/editor-ui/src/utils/index.ts

diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.vue b/packages/design-system/src/components/N8nDatatable/Datatable.vue
index b776cc759e9af..14d1b216555b0 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.vue
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.vue
@@ -3,7 +3,7 @@ import type { PropType } from 'vue';
 import { computed, defineComponent, ref, useCssModule } from 'vue';
 import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../types';
 import { getValueByPath } from '../../utils';
-import { useI18n } from '../../composables';
+import { useI18n } from '../../composables/useI18n';
 import N8nSelect from '../N8nSelect';
 import N8nOption from '../N8nOption';
 import N8nPagination from '../N8nPagination';
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
index 333299b1fbd50..8dc809755a1bf 100644
--- a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
+++ b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import { useDeviceSupport } from '../../composables';
+import { useDeviceSupport } from '../../composables/useDeviceSupport';
 import type { KeyboardShortcut } from '../../types/keyboardshortcut';
 
 const props = defineProps<KeyboardShortcut>();
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
index d186a23bc60ca..38dced8c0c513 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import N8nTooltip from '../N8nTooltip';
 
diff --git a/packages/design-system/src/composables/index.ts b/packages/design-system/src/composables/index.ts
deleted file mode 100644
index e0fff3b53afa8..0000000000000
--- a/packages/design-system/src/composables/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './useI18n';
-export { useDeviceSupport } from './useDeviceSupport';
diff --git a/packages/design-system/src/main.ts b/packages/design-system/src/main.ts
index 6e630702e518a..54934d6f1c4d6 100644
--- a/packages/design-system/src/main.ts
+++ b/packages/design-system/src/main.ts
@@ -1,6 +1,6 @@
 import * as locale from './locale';
 
-export { useDeviceSupport } from './composables';
+export { useDeviceSupport } from './composables/useDeviceSupport';
 export * from './components';
 export * from './plugin';
 export * from './types';
diff --git a/packages/design-system/vite.config.mts b/packages/design-system/vite.config.mts
index eca2b41aacbbb..d026973f443e2 100644
--- a/packages/design-system/vite.config.mts
+++ b/packages/design-system/vite.config.mts
@@ -6,6 +6,7 @@ import { defineConfig as defineVitestConfig } from 'vitest/config';
 
 export const vitestConfig = defineVitestConfig({
 	test: {
+		silent: true,
 		globals: true,
 		environment: 'jsdom',
 		setupFiles: ['./src/__tests__/setup.ts'],
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index 1ee26df2d74d4..3eb816067532c 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -45,21 +45,21 @@ import { HIRING_BANNER, VIEWS } from '@/constants';
 
 import { userHelpers } from '@/mixins/userHelpers';
 import { loadLanguage } from '@/plugins/i18n';
-import { useGlobalLinkActions, useToast, useExternalHooks } from '@/composables';
-import {
-	useUIStore,
-	useSettingsStore,
-	useUsersStore,
-	useRootStore,
-	useTemplatesStore,
-	useNodeTypesStore,
-	useCloudPlanStore,
-	useSourceControlStore,
-	useUsageStore,
-} from '@/stores';
+import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useToast } from '@/composables/useToast';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsageStore } from '@/stores/usage.store';
+import { useUsersStore } from '@/stores/users.store';
 import { useHistoryHelper } from '@/composables/useHistoryHelper';
 import { useRoute } from 'vue-router';
-import { runExternalHook } from '@/utils';
+import { runExternalHook } from '@/utils/externalHooks';
 import { initializeAuthenticatedFeatures } from '@/init';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 028f7b8af56e0..bd1d6a273d605 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -51,7 +51,7 @@ import type { BulkCommand, Undoable } from '@/models/history';
 import type { PartialBy, TupleToUnion } from '@/utils/typeHelpers';
 import type { Component } from 'vue';
 import type { Scope } from '@n8n/permissions';
-import type { runExternalHook } from '@/utils';
+import type { runExternalHook } from '@/utils/externalHooks';
 
 export * from 'n8n-design-system/types';
 
diff --git a/packages/editor-ui/src/__tests__/router.test.ts b/packages/editor-ui/src/__tests__/router.test.ts
index 566447fa221d7..beb38e8b17438 100644
--- a/packages/editor-ui/src/__tests__/router.test.ts
+++ b/packages/editor-ui/src/__tests__/router.test.ts
@@ -3,7 +3,7 @@ import { createComponentRenderer } from '@/__tests__/render';
 import router from '@/router';
 import { VIEWS } from '@/constants';
 import { setupServer } from '@/__tests__/server';
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 
 const App = {
 	template: '<div />',
diff --git a/packages/editor-ui/src/api/cloudPlans.ts b/packages/editor-ui/src/api/cloudPlans.ts
index fed694fb91919..920563c0d3423 100644
--- a/packages/editor-ui/src/api/cloudPlans.ts
+++ b/packages/editor-ui/src/api/cloudPlans.ts
@@ -1,5 +1,5 @@
 import type { Cloud, IRestApiContext, InstanceUsage } from '@/Interface';
-import { get, post } from '@/utils';
+import { get, post } from '@/utils/apiUtils';
 
 export async function getCurrentPlan(context: IRestApiContext): Promise<Cloud.PlanData> {
 	return get(context.baseUrl, '/admin/cloud-plan');
diff --git a/packages/editor-ui/src/api/communityNodes.ts b/packages/editor-ui/src/api/communityNodes.ts
index 12089e36fc8bd..d72b9f8d6ffdb 100644
--- a/packages/editor-ui/src/api/communityNodes.ts
+++ b/packages/editor-ui/src/api/communityNodes.ts
@@ -1,6 +1,6 @@
 import type { IRestApiContext } from '@/Interface';
 import type { PublicInstalledPackage } from 'n8n-workflow';
-import { get, post, makeRestApiRequest } from '@/utils';
+import { get, post, makeRestApiRequest } from '@/utils/apiUtils';
 
 export async function getInstalledCommunityNodes(
 	context: IRestApiContext,
diff --git a/packages/editor-ui/src/api/environments.ee.ts b/packages/editor-ui/src/api/environments.ee.ts
index 09d91d2a5b76c..b98f2c96a9d09 100644
--- a/packages/editor-ui/src/api/environments.ee.ts
+++ b/packages/editor-ui/src/api/environments.ee.ts
@@ -1,5 +1,5 @@
 import type { EnvironmentVariable, IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IDataObject } from 'n8n-workflow';
 
 export async function getVariables(context: IRestApiContext): Promise<EnvironmentVariable[]> {
diff --git a/packages/editor-ui/src/api/eventbus.ee.ts b/packages/editor-ui/src/api/eventbus.ee.ts
index a979a63fe92c2..468febc6e8261 100644
--- a/packages/editor-ui/src/api/eventbus.ee.ts
+++ b/packages/editor-ui/src/api/eventbus.ee.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { IDataObject, MessageEventBusDestinationOptions } from 'n8n-workflow';
 
 export async function saveDestinationToDb(
diff --git a/packages/editor-ui/src/api/externalSecrets.ee.ts b/packages/editor-ui/src/api/externalSecrets.ee.ts
index 76a1e189f9016..f2531e8fb69b7 100644
--- a/packages/editor-ui/src/api/externalSecrets.ee.ts
+++ b/packages/editor-ui/src/api/externalSecrets.ee.ts
@@ -3,7 +3,7 @@ import type {
 	ExternalSecretsProvider,
 	ExternalSecretsProviderWithProperties,
 } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
 export const getExternalSecrets = async (
 	context: IRestApiContext,
diff --git a/packages/editor-ui/src/api/orchestration.ts b/packages/editor-ui/src/api/orchestration.ts
index 147c9aa2e3772..4c8e1cd1e0d33 100644
--- a/packages/editor-ui/src/api/orchestration.ts
+++ b/packages/editor-ui/src/api/orchestration.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
 const GET_STATUS_ENDPOINT = '/orchestration/worker/status';
 
diff --git a/packages/editor-ui/src/api/sourceControl.ts b/packages/editor-ui/src/api/sourceControl.ts
index 13c61ef590b98..90777439f30af 100644
--- a/packages/editor-ui/src/api/sourceControl.ts
+++ b/packages/editor-ui/src/api/sourceControl.ts
@@ -1,3 +1,4 @@
+import type { IDataObject } from 'n8n-workflow';
 import type {
 	IRestApiContext,
 	SourceControlAggregatedFile,
@@ -5,8 +6,7 @@ import type {
 	SourceControlStatus,
 	SshKeyTypes,
 } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
-import type { IDataObject } from 'n8n-workflow';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { TupleToUnion } from '@/utils/typeHelpers';
 
 const sourceControlApiRoot = '/source-control';
diff --git a/packages/editor-ui/src/api/sso.ts b/packages/editor-ui/src/api/sso.ts
index fc169f82076b5..8fc6518868f25 100644
--- a/packages/editor-ui/src/api/sso.ts
+++ b/packages/editor-ui/src/api/sso.ts
@@ -1,4 +1,4 @@
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import type {
 	IRestApiContext,
 	SamlPreferencesLoginEnabled,
diff --git a/packages/editor-ui/src/api/tags.ts b/packages/editor-ui/src/api/tags.ts
index 8ae405518bee6..a8a77b42eaa29 100644
--- a/packages/editor-ui/src/api/tags.ts
+++ b/packages/editor-ui/src/api/tags.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext, ITag } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
 export async function getTags(context: IRestApiContext, withUsageCount = false): Promise<ITag[]> {
 	return makeRestApiRequest(context, 'GET', '/tags', { withUsageCount });
diff --git a/packages/editor-ui/src/api/workflowHistory.ts b/packages/editor-ui/src/api/workflowHistory.ts
index 3083dbeb6bdbe..29ce2655447f2 100644
--- a/packages/editor-ui/src/api/workflowHistory.ts
+++ b/packages/editor-ui/src/api/workflowHistory.ts
@@ -1,5 +1,5 @@
 import type { IRestApiContext } from '@/Interface';
-import { get } from '@/utils';
+import { get } from '@/utils/apiUtils';
 import type {
 	WorkflowHistory,
 	WorkflowVersion,
diff --git a/packages/editor-ui/src/components/ActivationModal.vue b/packages/editor-ui/src/components/ActivationModal.vue
index a8c119c2e2bee..7bd7d56db4032 100644
--- a/packages/editor-ui/src/components/ActivationModal.vue
+++ b/packages/editor-ui/src/components/ActivationModal.vue
@@ -46,7 +46,7 @@ import {
 	LOCAL_STORAGE_ACTIVATION_FLAG,
 	VIEWS,
 } from '../constants';
-import { getActivatableTriggerNodes, getTriggerNodeServiceName } from '@/utils';
+import { getActivatableTriggerNodes, getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
diff --git a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
index 2a36ca185a958..c364622e4600e 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
@@ -30,7 +30,7 @@ import type { IBinaryData } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 import type { PropType } from 'vue';
 import VueJsonPretty from 'vue-json-pretty';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import RunDataHtml from '@/components/RunDataHtml.vue';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/BreakpointsObserver.vue b/packages/editor-ui/src/components/BreakpointsObserver.vue
index 669531616c026..3850f38a6496e 100644
--- a/packages/editor-ui/src/components/BreakpointsObserver.vue
+++ b/packages/editor-ui/src/components/BreakpointsObserver.vue
@@ -19,8 +19,8 @@ import { BREAKPOINT_SM, BREAKPOINT_MD, BREAKPOINT_LG, BREAKPOINT_XL } from '@/co
 
 import { genericHelpers } from '@/mixins/genericHelpers';
 import { debounceHelper } from '@/mixins/debounce';
-import { useUIStore } from '@/stores';
-import { getBannerRowHeight } from '@/utils';
+import { useUIStore } from '@/stores/ui.store';
+import { getBannerRowHeight } from '@/utils/htmlUtils';
 
 export default defineComponent({
 	name: 'BreakpointsObserver',
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index 601c7aa5e3265..6a58d92b3bb2e 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -32,7 +32,7 @@
 import { defineComponent } from 'vue';
 
 import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import type { IFormInputs } from '@/Interface';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/ChatEmbedModal.vue b/packages/editor-ui/src/components/ChatEmbedModal.vue
index 6bc28ad6e03a2..fe979122c773d 100644
--- a/packages/editor-ui/src/components/ChatEmbedModal.vue
+++ b/packages/editor-ui/src/components/ChatEmbedModal.vue
@@ -7,10 +7,10 @@ import Modal from './Modal.vue';
 import { CHAT_EMBED_MODAL_KEY, WEBHOOK_NODE_TYPE } from '../constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
 import CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps({
 	modalBus: {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index d2ac3e1410d52..c7dc07de92cf0 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -9,9 +9,16 @@ import type { CodeExecutionMode, INodeExecutionData } from 'n8n-workflow';
 import type { BaseTextKey } from '@/plugins/i18n';
 import type { INodeUi, Schema } from '@/Interface';
 import { generateCodeForPrompt } from '@/api/ai';
-import { useDataSchema, useI18n, useMessage, useTelemetry, useToast } from '@/composables';
-import { useNDVStore, usePostHog, useRootStore, useWorkflowsStore } from '@/stores';
-import { executionDataToJson } from '@/utils';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useDataSchema } from '@/composables/useDataSchema';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useNDVStore } from '@/stores/ndv.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import {
 	ASK_AI_EXPERIMENT,
 	ASK_AI_MAX_PROMPT_LENGTH,
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index e5aa887a8a5a2..559e6478d9393 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -60,7 +60,8 @@ import { CODE_EXECUTION_MODES, CODE_LANGUAGES } from 'n8n-workflow';
 import { workflowHelpers } from '@/mixins/workflowHelpers'; // for json field completions
 import { ASK_AI_EXPERIMENT, CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
-import { useRootStore, usePostHog } from '@/stores';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { usePostHog } from '@/stores/posthog.store';
 
 import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
 import { CODE_PLACEHOLDERS } from './constants';
@@ -68,7 +69,7 @@ import { linterExtension } from './linter';
 import { completerExtension } from './completer';
 import { codeNodeEditorTheme } from './theme';
 import AskAI from './AskAI/AskAI.vue';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 
 export default defineComponent({
 	name: 'code-node-editor',
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
index d3eec85bc0f66..79bbe2b211700 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { CodeNodeEditorMixin } from '../types';
-import { useExternalSecretsStore } from '@/stores';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
index 278d401545bb7..c6f7283f91be7 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
@@ -1,6 +1,6 @@
 import { addVarType } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { useEnvironmentsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import { defineComponent } from 'vue';
 
 const escape = (str: string) => str.replace('$', '\\$');
diff --git a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
index 3a0b4d75745cd..420919e6a6f8c 100644
--- a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
@@ -101,7 +101,7 @@ import {
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
 	COMMUNITY_NODES_RISKS_DOCS_URL,
 } from '@/constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { useCommunityNodesStore } from '@/stores/communityNodes.store';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
index f6d11065d728b..19b10eadfb9ba 100644
--- a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
@@ -36,7 +36,7 @@
 import { defineComponent } from 'vue';
 import Modal from '@/components/Modal.vue';
 import { COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS } from '@/constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { mapStores } from 'pinia';
 import { useCommunityNodesStore } from '@/stores/communityNodes.store';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/editor-ui/src/components/ContactPromptModal.vue
index 7a8dcc6338b64..b27a9478a554f 100644
--- a/packages/editor-ui/src/components/ContactPromptModal.vue
+++ b/packages/editor-ui/src/components/ContactPromptModal.vue
@@ -42,7 +42,7 @@ import Modal from '@/components/Modal.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'ContactPromptModal',
diff --git a/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue b/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
index 1113468ffe7ac..8d5f7ffb95c56 100644
--- a/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
+++ b/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { type ContextMenuAction, useContextMenu } from '@/composables';
+import { type ContextMenuAction, useContextMenu } from '@/composables/useContextMenu';
 import { N8nActionDropdown } from 'n8n-design-system';
 import type { INode } from 'n8n-workflow';
 import { watch, ref } from 'vue';
diff --git a/packages/editor-ui/src/components/CopyInput.vue b/packages/editor-ui/src/components/CopyInput.vue
index 88b8d71474039..4e0f1f9bd447b 100644
--- a/packages/editor-ui/src/components/CopyInput.vue
+++ b/packages/editor-ui/src/components/CopyInput.vue
@@ -24,7 +24,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { copyPaste } from '@/mixins/copyPaste';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { i18n } from '@/plugins/i18n';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index a6671b82c4499..31189d5afa92f 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -37,7 +37,7 @@ import { defineComponent } from 'vue';
 import type { ICredentialsResponse, IUser } from '@/Interface';
 import type { ICredentialType } from 'n8n-workflow';
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import CredentialIcon from '@/components/CredentialIcon.vue';
 import type { IPermissions } from '@/permissions';
 import { getCredentialPermissions } from '@/permissions';
diff --git a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
index f78ac5ac28874..d766897415890 100644
--- a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
@@ -8,7 +8,7 @@ import {
 	getNodeAuthFields,
 	getNodeAuthOptions,
 	isAuthRelatedParameter,
-} from '@/utils';
+} from '@/utils/nodeTypesUtils';
 import type { INodeProperties, INodeTypeDescription, NodeParameterValue } from 'n8n-workflow';
 import { computed, onMounted, ref } from 'vue';
 
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index 85f405f44a2c2..3c7a7063d2d08 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -145,7 +145,7 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 
 import type { ICredentialType, INodeTypeDescription } from 'n8n-workflow';
-import { getAppNameFromCredType, isCommunityPackageName } from '@/utils';
+import { getAppNameFromCredType, isCommunityPackageName } from '@/utils/nodeTypesUtils';
 
 import Banner from '../Banner.vue';
 import CopyInput from '../CopyInput.vue';
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 99d40c4b28b8c..36d2cd095918d 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -136,7 +136,8 @@ import { NodeHelpers } from 'n8n-workflow';
 import CredentialIcon from '@/components/CredentialIcon.vue';
 
 import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { useToast, useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 
 import CredentialConfig from '@/components/CredentialEdit/CredentialConfig.vue';
 import CredentialInfo from '@/components/CredentialEdit/CredentialInfo.vue';
@@ -157,14 +158,12 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import {
-	isValidCredentialResponse,
 	getNodeAuthOptions,
 	getNodeCredentialForSelectedAuthType,
 	updateNodeAuthType,
-	isCredentialModalState,
-	isExpression,
-	isTestableExpression,
-} from '@/utils';
+} from '@/utils/nodeTypesUtils';
+import { isValidCredentialResponse, isCredentialModalState } from '@/utils/typeGuards';
+import { isExpression, isTestableExpression } from '@/utils/expressions';
 import { externalHooks } from '@/mixins/externalHooks';
 
 interface NodeAccessMap {
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 062358cab1b32..acdbcd6ec8e00 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -72,7 +72,7 @@
 <script lang="ts">
 import type { IUser, IUserListAction } from '@/Interface';
 import { defineComponent } from 'vue';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
diff --git a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
index b633369efb21c..f2eb2ca9de27e 100644
--- a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
 
 const { baseUrl } = useRootStore();
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
index b0c9223c919e6..eb945a7ab11d9 100644
--- a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { listenForCredentialChanges, useCredentialsStore } from '@/stores/credentials.store';
 import { assert } from '@/utils/assert';
 import CredentialsDropdown from './CredentialsDropdown.vue';
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue b/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
index 026dcc43c6e27..8b0e03534c25b 100644
--- a/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { PropType } from 'vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 export type CredentialOption = {
 	id: string;
diff --git a/packages/editor-ui/src/components/DebugPaywallModal.vue b/packages/editor-ui/src/components/DebugPaywallModal.vue
index 87c733b7e1b5a..854fb399691b3 100644
--- a/packages/editor-ui/src/components/DebugPaywallModal.vue
+++ b/packages/editor-ui/src/components/DebugPaywallModal.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import Modal from '@/components/Modal.vue';
 
 const props = defineProps<{
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index 8412e61f86c44..4249884752d88 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -79,7 +79,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import type { IUser } from '@/Interface';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
index ef21f5f6be17f..d260567ea4604 100644
--- a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -52,7 +52,7 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import { MAX_WORKFLOW_NAME_LENGTH, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import TagsDropdown from '@/components/TagsDropdown.vue';
 import Modal from '@/components/Modal.vue';
 import { useSettingsStore } from '@/stores/settings.store';
@@ -62,7 +62,7 @@ import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import { useUsersStore } from '@/stores/users.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useCredentialsStore } from '@/stores';
+import { useCredentialsStore } from '@/stores/credentials.store';
 
 export default defineComponent({
 	name: 'DuplicateWorkflow',
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index 1fa91205239c6..9f2d2858d6b47 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -122,11 +122,11 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import VueJsonPretty from 'vue-json-pretty';
 import { copyPaste } from '@/mixins/copyPaste';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { MAX_DISPLAY_DATA_SIZE } from '@/constants';
 
 import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
-import { sanitizeHtml } from '@/utils';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 
diff --git a/packages/editor-ui/src/components/ExecutionFilter.vue b/packages/editor-ui/src/components/ExecutionFilter.vue
index 0a60cff53a76e..bb1ef35d1a249 100644
--- a/packages/editor-ui/src/components/ExecutionFilter.vue
+++ b/packages/editor-ui/src/components/ExecutionFilter.vue
@@ -8,12 +8,12 @@ import type {
 } from '@/Interface';
 import { i18n as locale } from '@/plugins/i18n';
 import TagsDropdown from '@/components/TagsDropdown.vue';
-import { getObjectKeys, isEmpty } from '@/utils';
+import { getObjectKeys, isEmpty } from '@/utils/typesUtils';
 import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useTelemetry } from '@/composables';
+import { useTelemetry } from '@/composables/useTelemetry';
 import type { Placement } from '@floating-ui/core';
 
 export type ExecutionFilterProps = {
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index 2a1956481d284..d694a5908ae6d 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -291,7 +291,10 @@ import { externalHooks } from '@/mixins/externalHooks';
 import { MODAL_CONFIRM, VIEWS, WAIT_TIME_UNLIMITED } from '@/constants';
 import { genericHelpers } from '@/mixins/genericHelpers';
 import { executionHelpers } from '@/mixins/executionsHelpers';
-import { useToast, useMessage, useI18n, useTelemetry } from '@/composables';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 import type {
 	IExecutionsCurrentSummaryExtended,
 	IExecutionDeleteFilter,
@@ -304,7 +307,8 @@ import type { IExecutionsSummary, ExecutionStatus } from 'n8n-workflow';
 import { range as _range } from 'lodash-es';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { isEmpty, setPageTitle } from '@/utils';
+import { isEmpty } from '@/utils/typesUtils';
+import { setPageTitle } from '@/utils/htmlUtils';
 import { executionFilterToQueryFilter } from '@/utils/executionUtils';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/ExecutionsUsage.vue b/packages/editor-ui/src/components/ExecutionsUsage.vue
index 8539e0c03a58f..3f9490f51d3e5 100644
--- a/packages/editor-ui/src/components/ExecutionsUsage.vue
+++ b/packages/editor-ui/src/components/ExecutionsUsage.vue
@@ -67,7 +67,7 @@ import { i18n as locale } from '@/plugins/i18n';
 import { DateTime } from 'luxon';
 import type { CloudPlanAndUsageData } from '@/Interface';
 import { computed } from 'vue';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 
 const PROGRESS_BAR_MINIMUM_THRESHOLD = 8;
 
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
index be5c9c78d5900..4a2e4a68a8229 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
@@ -152,7 +152,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { ElDropdown } from 'element-plus';
-import { useExecutionDebugging, useMessage } from '@/composables';
+import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
+import { useMessage } from '@/composables/useMessage';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
 import type { IExecutionUIData } from '@/mixins/executionsHelpers';
 import { executionHelpers } from '@/mixins/executionsHelpers';
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index a75f74fe7e8b0..c4b66f343da71 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -52,13 +52,15 @@ import type {
 	INodeTypeNameVersion,
 } from 'n8n-workflow';
 import { NodeHelpers } from 'n8n-workflow';
-import { useToast, useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import { v4 as uuid } from 'uuid';
 import type { Route } from 'vue-router';
 import { executionHelpers } from '@/mixins/executionsHelpers';
 import { range as _range } from 'lodash-es';
 import { debounceHelper } from '@/mixins/debounce';
-import { getNodeViewTab, NO_NETWORK_ERROR_CODE } from '@/utils';
+import { NO_NETWORK_ERROR_CODE } from '@/utils/apiUtils';
+import { getNodeViewTab } from '@/utils/canvasUtils';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts b/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts
index fb13c06a34958..a1715e7a24da8 100644
--- a/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts
+++ b/packages/editor-ui/src/components/ExecutionsView/__tests__/ExecutionPreview.test.ts
@@ -5,7 +5,8 @@ import { faker } from '@faker-js/faker';
 import { createRouter, createWebHistory } from 'vue-router';
 import { createPinia, PiniaVuePlugin, setActivePinia } from 'pinia';
 import type { IExecutionsSummary } from 'n8n-workflow';
-import { useSettingsStore, useWorkflowsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import ExecutionPreview from '@/components/ExecutionsView/ExecutionPreview.vue';
 import { VIEWS } from '@/constants';
 import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
index 437613d3e4f7c..7f1dfa3fc7a38 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
@@ -3,8 +3,11 @@ import type { PropType, Ref } from 'vue';
 import type { ExternalSecretsProvider } from '@/Interface';
 import ExternalSecretsProviderImage from '@/components/ExternalSecretsProviderImage.ee.vue';
 import ExternalSecretsProviderConnectionSwitch from '@/components/ExternalSecretsProviderConnectionSwitch.ee.vue';
-import { useExternalSecretsStore, useUIStore } from '@/stores';
-import { useExternalSecretsProvider, useI18n, useToast } from '@/composables';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import { useExternalSecretsProvider } from '@/composables/useExternalSecretsProvider';
 import { EXTERNAL_SECRETS_PROVIDER_MODAL_KEY } from '@/constants';
 import { DateTime } from 'luxon';
 import { computed, nextTick, onMounted, toRefs } from 'vue';
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
index 091219aedf318..9913afee4ecd8 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
@@ -1,8 +1,10 @@
 <script lang="ts" setup>
 import type { PropType } from 'vue';
 import type { ExternalSecretsProvider } from '@/Interface';
-import { useExternalSecretsStore } from '@/stores';
-import { useI18n, useLoadingService, useToast } from '@/composables';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
+import { useLoadingService } from '@/composables/useLoadingService';
 import { computed, onMounted, ref } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
 
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
index fd292a3ad81c4..9ad526c1c60da 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
@@ -4,9 +4,12 @@ import { EXTERNAL_SECRETS_PROVIDER_MODAL_KEY, MODAL_CONFIRM } from '@/constants'
 import { computed, onMounted, ref } from 'vue';
 import type { PropType, Ref } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
-import { useExternalSecretsProvider, useI18n, useMessage, useToast } from '@/composables';
+import { useExternalSecretsProvider } from '@/composables/useExternalSecretsProvider';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { useRoute } from 'vue-router';
 import ParameterInputExpanded from '@/components/ParameterInputExpanded.vue';
 import type {
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index 8fd8c32197cb1..4807fedfe477f 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -46,7 +46,7 @@ import {
 	CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS,
 	CURL_IMPORT_NODES_PROTOCOLS,
 } from '@/constants';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { defineComponent } from 'vue';
 import type { INodeUi } from '@/Interface';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
index 2af419542462c..8eae15da76f01 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
@@ -40,7 +40,7 @@ import { outputTheme } from './theme';
 
 import type { Plaintext, Resolved, Segment } from '@/types/expressions';
 import { EXPRESSIONS_DOCS_URL } from '@/constants';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 export default defineComponent({
 	name: 'InlineExpressionEditorOutput',
diff --git a/packages/editor-ui/src/components/InlineNameEdit.vue b/packages/editor-ui/src/components/InlineNameEdit.vue
index 59ba4292e50a8..f48ad64b6edb8 100644
--- a/packages/editor-ui/src/components/InlineNameEdit.vue
+++ b/packages/editor-ui/src/components/InlineNameEdit.vue
@@ -33,7 +33,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'InlineNameEdit',
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index befa66f8b50c5..5082def42796f 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -54,12 +54,12 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { copyPaste } from '@/mixins/copyPaste';
 import Modal from './Modal.vue';
 import type { IFormInputs, IInviteResponse, IUser } from '@/Interface';
 import { VALID_EMAIL_REGEX, INVITE_USER_MODAL_KEY } from '@/constants';
-import { ROLE } from '@/utils';
+import { ROLE } from '@/utils/userUtils';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/Logo.vue b/packages/editor-ui/src/components/Logo.vue
index 8504ae28ca94b..e8947b5d99388 100644
--- a/packages/editor-ui/src/components/Logo.vue
+++ b/packages/editor-ui/src/components/Logo.vue
@@ -5,7 +5,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import { useRootStore, useUIStore } from '@/stores';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	computed: {
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index cf65031fc1830..fb3d0530441c0 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -30,7 +30,9 @@ import {
 } from '@/constants';
 import type { INodeUi, ITabBarItem } from '@/Interface';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useUIStore, useNDVStore, useSourceControlStore } from '@/stores';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export default defineComponent({
 	name: 'MainHeader',
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 6c74525fac67f..b8507b5e8461f 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -167,18 +167,18 @@ import CollaborationPane from '@/components/MainHeader/CollaborationPane.vue';
 import type { IUser, IWorkflowDataUpdate, IWorkflowDb, IWorkflowToShare } from '@/Interface';
 
 import { saveAs } from 'file-saver';
-import { useTitleChange, useToast, useMessage } from '@/composables';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import type { MessageBoxInputData } from 'element-plus';
-import {
-	useUIStore,
-	useSettingsStore,
-	useWorkflowsStore,
-	useRootStore,
-	useTagsStore,
-	useUsersStore,
-	useUsageStore,
-	useSourceControlStore,
-} from '@/stores';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useTagsStore } from '@/stores/tags.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsageStore } from '@/stores/usage.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 7726b94059c80..9da524a48e2d8 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -100,7 +100,7 @@ import type { CloudPlanAndUsageData, IExecutionResponse, IMenuItem, IVersion } f
 import GiftNotificationIcon from './GiftNotificationIcon.vue';
 
 import { genericHelpers } from '@/mixins/genericHelpers';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { workflowRun } from '@/mixins/workflowRun';
 
@@ -109,20 +109,18 @@ import { userHelpers } from '@/mixins/userHelpers';
 import { debounceHelper } from '@/mixins/debounce';
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
-import {
-	useUIStore,
-	useSettingsStore,
-	useUsersStore,
-	useWorkflowsStore,
-	useRootStore,
-	useVersionsStore,
-	useCloudPlanStore,
-	useSourceControlStore,
-} from '@/stores/';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useVersionsStore } from '@/stores/versions.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isNavigationFailure } from 'vue-router';
 import ExecutionsUsage from '@/components/ExecutionsUsage.vue';
 import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
-import { ROLE } from '@/utils';
+import { ROLE } from '@/utils/userUtils';
 import { hasPermission } from '@/rbac/permissions';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index f35a29e5549df..bbab868a337b3 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -2,7 +2,10 @@
 import { computed, nextTick, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useI18n, useLoadingService, useMessage, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useLoadingService } from '@/composables/useLoadingService';
 import { useUIStore } from '@/stores/ui.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUsersStore } from '@/stores/users.store';
diff --git a/packages/editor-ui/src/components/MfaSetupModal.vue b/packages/editor-ui/src/components/MfaSetupModal.vue
index ddb507ee953fe..9029be00523c2 100644
--- a/packages/editor-ui/src/components/MfaSetupModal.vue
+++ b/packages/editor-ui/src/components/MfaSetupModal.vue
@@ -142,7 +142,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useUsersStore } from '@/stores/users.store';
 import { copyPaste } from '@/mixins/copyPaste';
 import { mfaEventBus } from '@/event-bus';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 //@ts-ignore
 import QrcodeVue from 'qrcode.vue';
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 60e14277c6f0d..63a6c88eb61f3 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -176,7 +176,7 @@ import NodeIcon from '@/components/NodeIcon.vue';
 import TitledList from '@/components/TitledList.vue';
 
 import { get } from 'lodash-es';
-import { getTriggerNodeServiceName } from '@/utils';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import type { INodeUi, XYPosition } from '@/Interface';
 import { debounceHelper } from '@/mixins/debounce';
 import { useUIStore } from '@/stores/ui.store';
@@ -185,7 +185,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { EnableNodeToggleCommand } from '@/models/history';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-import { type ContextMenuTarget, useContextMenu } from '@/composables';
+import { type ContextMenuTarget, useContextMenu } from '@/composables/useContextMenu';
 
 export default defineComponent({
 	name: 'Node',
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index f933e524d780d..ddef6f1262c27 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -49,13 +49,14 @@ import {
 	DRAG_EVENT_DATA_KEY,
 } from '@/constants';
 
-import { isCommunityPackageName } from '@/utils';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
 import { getNewNodePosition, NODE_SIZE } from '@/utils/nodeViewUtils';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 
 import { useActions } from '../composables/useActions';
-import { useI18n, useTelemetry } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
 
 export interface Props {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
index a1279e5bbb830..d5764978e6092 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
@@ -22,7 +22,7 @@
 import type { SubcategoryItemProps } from '@/Interface';
 import { camelCase } from 'lodash-es';
 import { computed } from 'vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 export interface Props {
 	item: SubcategoryItemProps;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
index 280244e7fb406..11a7676ef6bbc 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
@@ -16,7 +16,7 @@ import {
 } from '@/constants';
 
 import { useUsersStore } from '@/stores/users.store';
-import { runExternalHook } from '@/utils';
+import { runExternalHook } from '@/utils/externalHooks';
 
 import { useActions } from '../composables/useActions';
 import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
index 164253bd592c7..995909129dbdf 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
@@ -22,7 +22,8 @@ import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
 import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
 import CategorizedItemsRenderer from '../Renderers/CategorizedItemsRenderer.vue';
 import NoResults from '../Panel/NoResults.vue';
-import { useI18n, useTelemetry } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 export interface Props {
 	rootView: 'trigger' | 'action';
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index b9752fe133110..d33f550d22a34 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -30,7 +30,8 @@ import { useViewStacks } from './composables/useViewStacks';
 import { useKeyboardNavigation } from './composables/useKeyboardNavigation';
 import { useActionsGenerator } from './composables/useActionsGeneration';
 import NodesListPanel from './Panel/NodesListPanel.vue';
-import { useCredentialsStore, useUIStore } from '@/stores';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useUIStore } from '@/stores/ui.store';
 import { DRAG_EVENT_DATA_KEY } from '@/constants';
 
 export interface Props {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
index ce9c5edab5ea6..d485c3a214a62 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
@@ -16,7 +16,7 @@ import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
 import SearchBar from './SearchBar.vue';
 import ActionsRenderer from '../Modes/ActionsMode.vue';
 import NodesRenderer from '../Modes/NodesMode.vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const i18n = useI18n();
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
index 66984a3c429a5..dee59742e92b0 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
@@ -25,7 +25,7 @@
 
 <script setup lang="ts">
 import { onMounted, reactive, toRefs, onBeforeUnmount } from 'vue';
-import { useExternalHooks } from '@/composables';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 
 export interface Props {
 	placeholder: string;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
index 4bed5651c4d91..231d89ff023a8 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
@@ -26,7 +26,7 @@ import type { Telemetry } from '@/plugins/telemetry';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { runExternalHook } from '@/utils';
+import { runExternalHook } from '@/utils/externalHooks';
 
 import { sortNodeCreateElements, transformNodeType } from '../utils';
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
index e584bd4760ba2..bbd30c25ac1fe 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
@@ -22,10 +22,10 @@ import {
 	sortNodeCreateElements,
 	searchNodes,
 } from '../utils';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 import type { INodeInputFilter } from 'n8n-workflow';
-import { useNodeTypesStore } from '@/stores';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { AINodesView, type NodeViewItem } from '@/components/Node/NodeCreator/viewsData';
 
 interface ViewStack {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index 617dcc81922c7..73ebd5cf7b94c 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -7,7 +7,7 @@ import type {
 } from '@/Interface';
 import { AI_SUBCATEGORY, CORE_NODES_CATEGORY, DEFAULT_SUBCATEGORY } from '@/constants';
 import { v4 as uuidv4 } from 'uuid';
-import { sublimeSearch } from '@/utils';
+import { sublimeSearch } from '@/utils/sortUtils';
 
 export function transformNodeType(
 	node: SimplifiedNodeType,
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index e767ccdd48dc8..8b55a869e6552 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -30,8 +30,8 @@ import {
 	AI_OTHERS_NODE_CREATOR_VIEW,
 	AI_UNCATEGORIZED_CATEGORY,
 } from '@/constants';
-import { useI18n } from '@/composables';
-import { useNodeTypesStore } from '@/stores';
+import { useI18n } from '@/composables/useI18n';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type { SimplifiedNodeType } from '@/Interface';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 4c7bbf9f98ee5..73119bee65489 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -119,7 +119,7 @@ import type {
 
 import { genericHelpers } from '@/mixins/genericHelpers';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import TitledList from '@/components/TitledList.vue';
 import { useUIStore } from '@/stores/ui.store';
@@ -136,7 +136,7 @@ import {
 	getAllNodeCredentialForAuthType,
 	updateNodeAuthType,
 	isRequiredCredential,
-} from '@/utils';
+} from '@/utils/nodeTypesUtils';
 
 interface CredentialDropdownOption extends ICredentialsResponse {
 	typeDisplayName: string;
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index d84cf1ce122d9..edfe58d41c27a 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -170,8 +170,8 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useDeviceSupport } from 'n8n-design-system';
-import { useMessage } from '@/composables';
+import { useDeviceSupport } from 'n8n-design-system/composables/useDeviceSupport';
+import { useMessage } from '@/composables/useMessage';
 
 export default defineComponent({
 	name: 'NodeDetailsView',
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index 982dc9489c67d..175d610c32eb0 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -37,7 +37,8 @@ import { pinData } from '@/mixins/pinData';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useToast, useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/packages/editor-ui/src/components/NodeList.vue b/packages/editor-ui/src/components/NodeList.vue
index dcaf54b0228b3..b80242ac25a93 100644
--- a/packages/editor-ui/src/components/NodeList.vue
+++ b/packages/editor-ui/src/components/NodeList.vue
@@ -17,7 +17,7 @@ import { defineComponent } from 'vue';
 import NodeIcon from '@/components/NodeIcon.vue';
 import { genericHelpers } from '@/mixins/genericHelpers';
 import type { ITemplatesNode } from '@/Interface';
-import { filterTemplateNodes } from '@/utils';
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
 
 export default defineComponent({
 	name: 'NodeList',
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index bbe44b562e538..7a17e9b3c760c 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -205,7 +205,7 @@ import { externalHooks } from '@/mixins/externalHooks';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
 
 import NodeExecuteButton from './NodeExecuteButton.vue';
-import { isCommunityPackageName } from '@/utils';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
diff --git a/packages/editor-ui/src/components/NodeSettingsTabs.vue b/packages/editor-ui/src/components/NodeSettingsTabs.vue
index 2abbaf0f2b19e..17a7ec8e4da1f 100644
--- a/packages/editor-ui/src/components/NodeSettingsTabs.vue
+++ b/packages/editor-ui/src/components/NodeSettingsTabs.vue
@@ -22,7 +22,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { isCommunityPackageName } from '@/utils';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
 
 export default defineComponent({
 	name: 'NodeSettingsTabs',
diff --git a/packages/editor-ui/src/components/NodeWebhooks.vue b/packages/editor-ui/src/components/NodeWebhooks.vue
index 2e7e31bfe6a6e..653dad73b966b 100644
--- a/packages/editor-ui/src/components/NodeWebhooks.vue
+++ b/packages/editor-ui/src/components/NodeWebhooks.vue
@@ -64,7 +64,7 @@
 import type { INodeTypeDescription, IWebhookDescription } from 'n8n-workflow';
 import { defineComponent } from 'vue';
 
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { FORM_TRIGGER_NODE_TYPE, OPEN_URL_PANEL_TRIGGER_NODE_TYPES } from '@/constants';
 import { copyPaste } from '@/mixins/copyPaste';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
diff --git a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
index e2bb8aa60e9e1..53da59855a93d 100644
--- a/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
+++ b/packages/editor-ui/src/components/OnboardingCallSignupModal.vue
@@ -50,7 +50,7 @@ import { ONBOARDING_CALL_SIGNUP_MODAL_KEY, VALID_EMAIL_REGEX } from '@/constants
 import Modal from './Modal.vue';
 
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/PageAlert.vue b/packages/editor-ui/src/components/PageAlert.vue
index d2c4fdc35b2ed..5c3b463a69c42 100644
--- a/packages/editor-ui/src/components/PageAlert.vue
+++ b/packages/editor-ui/src/components/PageAlert.vue
@@ -5,8 +5,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { NotificationInstance } from 'element-plus';
-import { sanitizeHtml } from '@/utils';
-import { useToast } from '@/composables';
+import { sanitizeHtml } from '@/utils/htmlUtils';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'PageAlert',
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 0fc67812d3fb3..21b18ef8697c5 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -398,7 +398,8 @@ import SqlEditor from '@/components/SqlEditor/SqlEditor.vue';
 import { externalHooks } from '@/mixins/externalHooks';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { hasExpressionMapping, isValueExpression, isResourceLocatorValue } from '@/utils';
+import { hasExpressionMapping, isValueExpression } from '@/utils/nodeTypesUtils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
 
 import {
 	CUSTOM_API_CALL_KEY,
@@ -417,7 +418,7 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { htmlEditorEventBus } from '@/event-bus';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import type { N8nInput } from 'n8n-design-system';
 import { isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
 
diff --git a/packages/editor-ui/src/components/ParameterInputExpanded.vue b/packages/editor-ui/src/components/ParameterInputExpanded.vue
index 20a0984eaa019..12f9dc2f5ff1a 100644
--- a/packages/editor-ui/src/components/ParameterInputExpanded.vue
+++ b/packages/editor-ui/src/components/ParameterInputExpanded.vue
@@ -60,7 +60,7 @@ import ParameterOptions from './ParameterOptions.vue';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import ParameterInputWrapper from './ParameterInputWrapper.vue';
-import { isValueExpression } from '@/utils';
+import { isValueExpression } from '@/utils/nodeTypesUtils';
 import type { INodeParameterResourceLocator, INodeProperties, IParameterLabel } from 'n8n-workflow';
 import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 85ad5b9408a2e..219c9add2b573 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -77,13 +77,10 @@ import type { IN8nButton, INodeUi, IRunDataDisplayMode, IUpdateInformation } fro
 
 import ParameterOptions from '@/components/ParameterOptions.vue';
 import DraggableTarget from '@/components/DraggableTarget.vue';
-import { useI18n, useToast } from '@/composables';
-import {
-	hasExpressionMapping,
-	isResourceLocatorValue,
-	hasOnlyListMode,
-	isValueExpression,
-} from '@/utils';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { hasExpressionMapping, hasOnlyListMode, isValueExpression } from '@/utils/nodeTypesUtils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
 import ParameterInputWrapper from '@/components/ParameterInputWrapper.vue';
 import type {
 	INodeParameters,
diff --git a/packages/editor-ui/src/components/ParameterInputHint.vue b/packages/editor-ui/src/components/ParameterInputHint.vue
index 21b840693a5c0..cad4052c2ec5e 100644
--- a/packages/editor-ui/src/components/ParameterInputHint.vue
+++ b/packages/editor-ui/src/components/ParameterInputHint.vue
@@ -12,7 +12,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { sanitizeHtml } from '@/utils';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 
 export default defineComponent({
 	name: 'InputHint',
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 5d3c7b240f86a..81415e58cabdd 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -157,7 +157,11 @@ import { KEEP_AUTH_IN_NDV_FOR_NODES } from '@/constants';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { getMainAuthField, getNodeAuthFields, isAuthRelatedParameter } from '@/utils';
+import {
+	getMainAuthField,
+	getNodeAuthFields,
+	isAuthRelatedParameter,
+} from '@/utils/nodeTypesUtils';
 import { get, set } from 'lodash-es';
 import { nodeViewEventBus } from '@/event-bus';
 
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index e8a4299b26537..06270f371fcfb 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -61,9 +61,10 @@ import type {
 import { isResourceLocatorValue } from 'n8n-workflow';
 import type { INodeUi, IUpdateInformation, TargetItem } from '@/Interface';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { isValueExpression, parseResourceMapperFieldName } from '@/utils';
+import { isValueExpression, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useEnvironmentsStore, useExternalSecretsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/editor-ui/src/components/ParameterOptions.vue
index 6027c472ce575..7e162f9c215b8 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -43,7 +43,8 @@
 import type { NodeParameterValueType } from 'n8n-workflow';
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
-import { isValueExpression, isResourceLocatorValue } from '@/utils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
+import { isValueExpression } from '@/utils/nodeTypesUtils';
 import { i18n } from '@/plugins/i18n';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 89ce1a71ceb98..98d1fe40fe566 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -128,17 +128,17 @@ import {
 	VIEWS,
 } from '@/constants';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import type { IFormInputs, IPersonalizationLatestVersion, IUser } from '@/Interface';
-import { getAccountAge } from '@/utils';
+import { getAccountAge } from '@/utils/userUtils';
 import type { GenericValue } from 'n8n-workflow';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { useUsersStore } from '@/stores/users.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import { usePostHog } from '@/stores';
+import { usePostHog } from '@/stores/posthog.store';
 
 export default defineComponent({
 	name: 'PersonalizationModal',
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 6f6dec09bef36..104a3286b9eff 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -156,12 +156,8 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import {
-	getAppNameFromNodeName,
-	getMainAuthField,
-	hasOnlyListMode,
-	isResourceLocatorValue,
-} from '@/utils';
+import { getAppNameFromNodeName, getMainAuthField, hasOnlyListMode } from '@/utils/nodeTypesUtils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
 import stringify from 'fast-json-stable-stringify';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
index 9bc63f0797cf2..0dcbe1afb7cc6 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -14,9 +14,13 @@ import ParameterIssues from '@/components//ParameterIssues.vue';
 import ParameterOptions from '@/components//ParameterOptions.vue';
 import { computed } from 'vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useNDVStore } from '@/stores';
-import { fieldCannotBeDeleted, isMatchingField, parseResourceMapperFieldName } from '@/utils';
-import { useNodeSpecificationValues } from '@/composables';
+import { useNDVStore } from '@/stores/ndv.store';
+import {
+	fieldCannotBeDeleted,
+	isMatchingField,
+	parseResourceMapperFieldName,
+} from '@/utils/nodeTypesUtils';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
 
 interface Props {
 	parameter: INodeProperties;
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
index b37cdb5c1cbd9..2a46e46ff792e 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
@@ -2,7 +2,7 @@
 import type { INodePropertyTypeOptions, ResourceMapperFields } from 'n8n-workflow';
 import { computed, ref, watch } from 'vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useNodeSpecificationValues } from '@/composables';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
 
 interface Props {
 	initialValue: string;
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
index 19b82d7200f1f..2ba727af074d3 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -7,7 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { computed, reactive, watch } from 'vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { useNodeSpecificationValues } from '@/composables';
+import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
 import ParameterOptions from '@/components/ParameterOptions.vue';
 
 interface Props {
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 638993dc7b839..07e81ff974816 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -15,7 +15,8 @@ import { computed, onMounted, reactive, watch } from 'vue';
 import MappingModeSelect from './MappingModeSelect.vue';
 import MatchingColumnsSelect from './MatchingColumnsSelect.vue';
 import MappingFields from './MappingFields.vue';
-import { fieldCannotBeDeleted, isResourceMapperValue, parseResourceMapperFieldName } from '@/utils';
+import { fieldCannotBeDeleted, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
+import { isResourceMapperValue } from '@/utils/typeGuards';
 import { i18n as locale } from '@/plugins/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 43ed2b71432db..f95a4a00a7dac 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -612,11 +612,13 @@ import { pinData } from '@/mixins/pinData';
 import type { PinDataSource } from '@/mixins/pinData';
 import CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
 import { dataPinningEventBus } from '@/event-bus';
-import { clearJsonKey, executionDataToJson, isEmpty, searchInObject } from '@/utils';
+import { clearJsonKey, isEmpty } from '@/utils/typesUtils';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { searchInObject } from '@/utils/objectUtils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { isObject } from 'lodash-es';
 
 const RunDataTable = defineAsyncComponent(async () => import('@/components/RunDataTable.vue'));
diff --git a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
index 6e180bc90031e..a516ecc35c42f 100644
--- a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
+++ b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
@@ -68,7 +68,9 @@ import { ref, onMounted } from 'vue';
 import type { ParsedAiContent } from './useAiContentParsers';
 import { useAiContentParsers } from './useAiContentParsers';
 import VueMarkdown from 'vue-markdown-render';
-import { useCopyToClipboard, useI18n, useToast } from '@/composables';
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import { NodeConnectionType, type IDataObject } from 'n8n-workflow';
 
 const props = defineProps<{
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
index 9fbf107b9fcf8..3ee11d306762a 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
@@ -63,7 +63,8 @@ import { computed, ref, watch } from 'vue';
 import type { ITaskSubRunMetadata, ITaskDataConnections } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 import type { IAiData, IAiDataContent, INodeUi } from '@/Interface';
-import { useNodeTypesStore, useWorkflowsStore } from '@/stores';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 import RunDataAiContent from './RunDataAiContent.vue';
 import { ElTree } from 'element-plus';
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
index e8954882a4cad..17503260c6ece 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
@@ -73,7 +73,8 @@
 
 <script lang="ts" setup>
 import type { IAiData, IAiDataContent } from '@/Interface';
-import { useNodeTypesStore, useWorkflowsStore } from '@/stores';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type {
 	IDataObject,
 	INodeExecutionData,
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 712d847ad3248..c8495ae612808 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -74,7 +74,10 @@ import type { PropType } from 'vue';
 import VueJsonPretty from 'vue-json-pretty';
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from '@/components/Draggable.vue';
-import { executionDataToJson, highlightText, isString, sanitizeHtml, shorten } from '@/utils';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { isString } from '@/utils/typeGuards';
+import { highlightText, sanitizeHtml } from '@/utils/htmlUtils';
+import { shorten } from '@/utils/typesUtils';
 import type { INodeUi } from '@/Interface';
 import { externalHooks } from '@/mixins/externalHooks';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/RunDataJsonActions.vue b/packages/editor-ui/src/components/RunDataJsonActions.vue
index 4bdf715f498a8..88d24719bed94 100644
--- a/packages/editor-ui/src/components/RunDataJsonActions.vue
+++ b/packages/editor-ui/src/components/RunDataJsonActions.vue
@@ -45,10 +45,12 @@ import { copyPaste } from '@/mixins/copyPaste';
 import { pinData } from '@/mixins/pinData';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
 import { genericHelpers } from '@/mixins/genericHelpers';
-import { clearJsonKey, convertPath, executionDataToJson } from '@/utils';
+import { clearJsonKey, convertPath } from '@/utils/typesUtils';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import { nonExistingJsonPath } from '@/constants';
 
 type JsonPathData = {
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
index 158e57ac7429e..2a7e3de72b861 100644
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ b/packages/editor-ui/src/components/RunDataSchema.vue
@@ -6,10 +6,11 @@ import Draggable from '@/components/Draggable.vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { telemetry } from '@/plugins/telemetry';
 import type { IDataObject } from 'n8n-workflow';
-import { isEmpty, runExternalHook } from '@/utils';
+import { isEmpty } from '@/utils/typesUtils';
+import { runExternalHook } from '@/utils/externalHooks';
 import { i18n } from '@/plugins/i18n';
 import MappingPill from './MappingPill.vue';
-import { useDataSchema } from '@/composables';
+import { useDataSchema } from '@/composables/useDataSchema';
 type Props = {
 	data: IDataObject[];
 	mappingEnabled: boolean;
diff --git a/packages/editor-ui/src/components/RunDataSchemaItem.vue b/packages/editor-ui/src/components/RunDataSchemaItem.vue
index eafba5a0a9cea..a4a496bd07299 100644
--- a/packages/editor-ui/src/components/RunDataSchemaItem.vue
+++ b/packages/editor-ui/src/components/RunDataSchemaItem.vue
@@ -1,7 +1,9 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import type { INodeUi, Schema } from '@/Interface';
-import { checkExhaustive, highlightText, sanitizeHtml, shorten } from '@/utils';
+import { highlightText, sanitizeHtml } from '@/utils/htmlUtils';
+import { checkExhaustive } from '@/utils/typeGuards';
+import { shorten } from '@/utils/typesUtils';
 import { getMappedExpression } from '@/utils/mappingUtils';
 
 type Props = {
diff --git a/packages/editor-ui/src/components/RunDataSearch.vue b/packages/editor-ui/src/components/RunDataSearch.vue
index deb9cdbcf888a..648d956a1deea 100644
--- a/packages/editor-ui/src/components/RunDataSearch.vue
+++ b/packages/editor-ui/src/components/RunDataSearch.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, onMounted, onUnmounted } from 'vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import type { NodePanelType } from '@/Interface';
 
 type Props = {
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index a5f03639bbb94..a3476ce305453 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -161,7 +161,9 @@ import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
 import type { INodeUi, ITableData, NDVState } from '@/Interface';
-import { getPairedItemId, highlightText, sanitizeHtml, shorten } from '@/utils';
+import { shorten } from '@/utils/typesUtils';
+import { highlightText, sanitizeHtml } from '@/utils/htmlUtils';
+import { getPairedItemId } from '@/utils/pairedItemUtils';
 import type { GenericValue, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from './Draggable.vue';
 import { externalHooks } from '@/mixins/externalHooks';
diff --git a/packages/editor-ui/src/components/SSOLogin.vue b/packages/editor-ui/src/components/SSOLogin.vue
index aecacdc3b7cfa..c37221aae8464 100644
--- a/packages/editor-ui/src/components/SSOLogin.vue
+++ b/packages/editor-ui/src/components/SSOLogin.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { useSSOStore } from '@/stores/sso.store';
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 
 const i18n = useI18n();
 const ssoStore = useSSOStore();
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index d146829eecd56..03b3a6d0489c9 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -48,7 +48,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import { useLogStreamingStore } from '@/stores/logStreaming.store';
 import type { PropType } from 'vue';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 83d6fa9a9af8d..db9b1d6e61505 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -192,7 +192,7 @@ import type { PropType } from 'vue';
 import { defineComponent } from 'vue';
 import { LOG_STREAM_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import Modal from '@/components/Modal.vue';
-import { useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
 import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { destinationToFakeINodeUi } from '@/components/SettingsLogStreaming/Helpers.ee';
diff --git a/packages/editor-ui/src/components/ShortenName.vue b/packages/editor-ui/src/components/ShortenName.vue
index a40b6a7ccfd5f..1287b78bcca52 100644
--- a/packages/editor-ui/src/components/ShortenName.vue
+++ b/packages/editor-ui/src/components/ShortenName.vue
@@ -6,7 +6,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { shorten } from '@/utils';
+import { shorten } from '@/utils/typesUtils';
 
 const DEFAULT_WORKFLOW_NAME_LIMIT = 25;
 const WORKFLOW_NAME_END_COUNT_TO_KEEP = 4;
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
index c869ef78c6b1f..780a19add9e0a 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -4,9 +4,11 @@ import { SOURCE_CONTROL_PULL_MODAL_KEY } from '@/constants';
 import type { PropType } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
 import type { SourceControlAggregatedFile } from '@/Interface';
-import { useI18n, useLoadingService, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useToast } from '@/composables/useToast';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { useRoute, useRouter } from 'vue-router';
 import { computed, nextTick, ref } from 'vue';
 import { sourceControlEventBus } from '@/event-bus/source-control';
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index 136f5c4b2ac80..581eb3487b902 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -5,9 +5,11 @@ import { computed, onMounted, ref } from 'vue';
 import type { PropType } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
 import type { SourceControlAggregatedFile } from '@/Interface';
-import { useI18n, useLoadingService, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useToast } from '@/composables/useToast';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { useRoute } from 'vue-router';
 import dateformat from 'dateformat';
 
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index 0a538dcc71839..1592c69ef371b 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -108,7 +108,7 @@ import { externalHooks } from '@/mixins/externalHooks';
 import { nodeBase } from '@/mixins/nodeBase';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { isNumber, isString } from '@/utils';
+import { isNumber, isString } from '@/utils/typeGuards';
 import type {
 	INodeUi,
 	INodeUpdatePropertiesInformation,
@@ -122,7 +122,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useContextMenu } from '@/composables';
+import { useContextMenu } from '@/composables/useContextMenu';
 
 export default defineComponent({
 	name: 'Sticky',
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 95b2fa313c890..0b1980411ee98 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -67,7 +67,8 @@ import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, ref, w
 import type { ITag } from '@/Interface';
 import { MAX_TAG_NAME_LENGTH, TAGS_MANAGER_MODAL_KEY } from '@/constants';
 
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import { useUIStore } from '@/stores/ui.store';
 import { useTagsStore } from '@/stores/tags.store';
 import type { EventBus, N8nOption, N8nSelect } from 'n8n-design-system';
diff --git a/packages/editor-ui/src/components/TagsManager/TagsManager.vue b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
index 69a9471b408f9..fb34b38b91c99 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsManager.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
@@ -33,7 +33,7 @@ import { defineComponent } from 'vue';
 
 import type { ITag } from '@/Interface';
 
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import TagsView from '@/components/TagsManager/TagsView/TagsView.vue';
 import NoTagsView from '@/components/TagsManager/NoTagsView.vue';
 import Modal from '@/components/Modal.vue';
diff --git a/packages/editor-ui/src/components/TemplateCard.vue b/packages/editor-ui/src/components/TemplateCard.vue
index f1f87ba74236f..2f95e474c29ca 100644
--- a/packages/editor-ui/src/components/TemplateCard.vue
+++ b/packages/editor-ui/src/components/TemplateCard.vue
@@ -47,7 +47,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { genericHelpers } from '@/mixins/genericHelpers';
-import { filterTemplateNodes, abbreviateNumber } from '@/utils';
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
+import { abbreviateNumber } from '@/utils/typesUtils';
 import NodeList from './NodeList.vue';
 import TimeAgo from '@/components/TimeAgo.vue';
 
diff --git a/packages/editor-ui/src/components/TemplateDetails.vue b/packages/editor-ui/src/components/TemplateDetails.vue
index d40e33213a578..0a4b6c746502f 100644
--- a/packages/editor-ui/src/components/TemplateDetails.vue
+++ b/packages/editor-ui/src/components/TemplateDetails.vue
@@ -45,12 +45,14 @@
 		</template-details-block>
 	</div>
 </template>
+
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { PropType } from 'vue';
 import TemplateDetailsBlock from '@/components/TemplateDetailsBlock.vue';
 import NodeIcon from '@/components/NodeIcon.vue';
-import { abbreviateNumber, filterTemplateNodes } from '@/utils';
+import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
+import { abbreviateNumber } from '@/utils/typesUtils';
 import type { ITemplatesNode, ITemplatesWorkflow, ITemplatesWorkflowFull } from '@/Interface';
 import { mapStores } from 'pinia';
 import { useTemplatesStore } from '@/stores/templates.store';
diff --git a/packages/editor-ui/src/components/TimeAgo.vue b/packages/editor-ui/src/components/TimeAgo.vue
index 2d5cf3d21054e..333375ad57ba2 100644
--- a/packages/editor-ui/src/components/TimeAgo.vue
+++ b/packages/editor-ui/src/components/TimeAgo.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
 import type { LocaleFunc } from 'timeago.js';
 import { format, register } from 'timeago.js';
-import { convertToHumanReadableDate } from '@/utils';
+import { convertToHumanReadableDate } from '@/utils/typesUtils';
 import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import { useRootStore } from '@/stores/n8nRoot.store';
diff --git a/packages/editor-ui/src/components/TriggerPanel.vue b/packages/editor-ui/src/components/TriggerPanel.vue
index d6ac15a21276c..9abd15cb3ae8e 100644
--- a/packages/editor-ui/src/components/TriggerPanel.vue
+++ b/packages/editor-ui/src/components/TriggerPanel.vue
@@ -112,7 +112,7 @@ import {
 } from '@/constants';
 import type { INodeUi } from '@/Interface';
 import type { INodeTypeDescription } from 'n8n-workflow';
-import { getTriggerNodeServiceName } from '@/utils';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import NodeExecuteButton from '@/components/NodeExecuteButton.vue';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import CopyInput from '@/components/CopyInput.vue';
diff --git a/packages/editor-ui/src/components/ValueSurvey.vue b/packages/editor-ui/src/components/ValueSurvey.vue
index 5344275d2d77e..0033943805534 100644
--- a/packages/editor-ui/src/components/ValueSurvey.vue
+++ b/packages/editor-ui/src/components/ValueSurvey.vue
@@ -66,7 +66,7 @@ import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 const DEFAULT_TITLE = 'How likely are you to recommend n8n to a friend or colleague?';
 const GREAT_FEEDBACK_TITLE =
diff --git a/packages/editor-ui/src/components/VariablesRow.vue b/packages/editor-ui/src/components/VariablesRow.vue
index e699418a4f5de..df3520e57dec0 100644
--- a/packages/editor-ui/src/components/VariablesRow.vue
+++ b/packages/editor-ui/src/components/VariablesRow.vue
@@ -2,7 +2,9 @@
 import type { ComponentPublicInstance, PropType } from 'vue';
 import { computed, nextTick, onMounted, ref, watch } from 'vue';
 import type { EnvironmentVariable, Rule, RuleGroup } from '@/Interface';
-import { useI18n, useToast, useCopyToClipboard } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard';
 import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
diff --git a/packages/editor-ui/src/components/WorkerList.ee.vue b/packages/editor-ui/src/components/WorkerList.ee.vue
index d96ff2b104941..a14e1fe9a58be 100644
--- a/packages/editor-ui/src/components/WorkerList.ee.vue
+++ b/packages/editor-ui/src/components/WorkerList.ee.vue
@@ -25,13 +25,14 @@ import { externalHooks } from '@/mixins/externalHooks';
 import PushConnectionTracker from '@/components/PushConnectionTracker.vue';
 import { genericHelpers } from '@/mixins/genericHelpers';
 import { executionHelpers } from '@/mixins/executionsHelpers';
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import type { IPushDataWorkerStatusPayload } from '@/Interface';
 import type { ExecutionStatus } from 'n8n-workflow';
 import { useUIStore } from '@/stores/ui.store';
-import { useOrchestrationStore } from '../stores/orchestration.store';
-import { setPageTitle } from '@/utils';
-import { pushConnection } from '../mixins/pushConnection';
+import { useOrchestrationStore } from '@/stores/orchestration.store';
+import { setPageTitle } from '@/utils/htmlUtils';
+import { pushConnection } from '@/mixins/pushConnection';
 import WorkerCard from './Workers/WorkerCard.ee.vue';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
index f82db2cdc0c5f..7d930acd21b5d 100644
--- a/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
@@ -38,7 +38,7 @@ import { ref } from 'vue';
 import type { ChartData, ChartOptions } from 'chart.js';
 import type { ChartComponentRef } from 'vue-chartjs';
 import { Chart } from 'vue-chartjs';
-import { averageWorkerLoadFromLoads, memAsGb } from '../../utils/workerUtils';
+import { averageWorkerLoadFromLoads, memAsGb } from '@/utils/workerUtils';
 
 const props = defineProps<{
 	workerId: string;
diff --git a/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
index c9ed50961d060..7bee271e1120a 100644
--- a/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
@@ -22,7 +22,9 @@
 <script setup lang="ts">
 import type { IPushDataWorkerStatusPayload } from '@/Interface';
 import WorkerAccordion from './WorkerAccordion.ee.vue';
-import { useCopyToClipboard, useToast, useI18n } from '@/composables';
+import { useCopyToClipboard } from '@/composables/useCopyToClipboard';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 
 const props = defineProps<{
 	items: IPushDataWorkerStatusPayload['interfaces'];
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
index 40ac23f3ea7ee..e77e2bc854bb5 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -51,13 +51,13 @@
 </template>
 
 <script lang="ts">
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { workflowActivate } from '@/mixins/workflowActivate';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { mapStores } from 'pinia';
 import { defineComponent } from 'vue';
-import { getActivatableTriggerNodes } from '@/utils';
+import { getActivatableTriggerNodes } from '@/utils/nodeTypesUtils';
 
 export default defineComponent({
 	name: 'WorkflowActivator',
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index 165b869040609..527c337967bed 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -65,7 +65,8 @@ import {
 	VIEWS,
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
-import { useToast, useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import dateformat from 'dateformat';
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
index a3932642883ce..b7fe5fe19322a 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
@@ -8,7 +8,7 @@ import type {
 } from '@/types/workflowHistory';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
 import WorkflowHistoryListItem from '@/components/WorkflowHistory/WorkflowHistoryListItem.vue';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const i18n = useI18n();
 
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
index 3f5c0394174aa..94c44c8440746 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import type { UserAction } from 'n8n-design-system';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import type {
 	WorkflowHistory,
 	WorkflowVersionId,
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
index 282ff421e5a10..8df6234ad5e5d 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
@@ -7,7 +7,7 @@ import type {
 	WorkflowVersionId,
 	WorkflowHistoryActionTypes,
 } from '@/types/workflowHistory';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps<{
 	item: WorkflowHistory;
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
index c459f59770962..1dbc346f70833 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
+++ b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 import Modal from '@/components/Modal.vue';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 
 const props = defineProps<{
 	modalName: string;
diff --git a/packages/editor-ui/src/components/WorkflowLMChat.vue b/packages/editor-ui/src/components/WorkflowLMChat.vue
index 749112d20ab03..ec371174f91b9 100644
--- a/packages/editor-ui/src/components/WorkflowLMChat.vue
+++ b/packages/editor-ui/src/components/WorkflowLMChat.vue
@@ -115,7 +115,7 @@
 import { defineAsyncComponent, defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import {
 	AI_CATEGORY_AGENTS,
@@ -131,7 +131,8 @@ import {
 import { workflowRun } from '@/mixins/workflowRun';
 import { get, last } from 'lodash-es';
 
-import { useUIStore, useWorkflowsStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createEventBus } from 'n8n-design-system/utils';
 import type { IDataObject, INodeType, INode, ITaskData } from 'n8n-workflow';
 import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
diff --git a/packages/editor-ui/src/components/WorkflowPreview.vue b/packages/editor-ui/src/components/WorkflowPreview.vue
index 1fd3948b6e1a4..1df08f6800e34 100644
--- a/packages/editor-ui/src/components/WorkflowPreview.vue
+++ b/packages/editor-ui/src/components/WorkflowPreview.vue
@@ -23,7 +23,8 @@
 
 <script setup lang="ts">
 import { onMounted, onBeforeUnmount, ref, computed, watch } from 'vue';
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import type { IWorkflowDb } from '@/Interface';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index 4a1ee8fe46735..e6d8cd19e72b2 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -357,7 +357,7 @@ import { mapStores } from 'pinia';
 
 import { externalHooks } from '@/mixins/externalHooks';
 import { genericHelpers } from '@/mixins/genericHelpers';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import type {
 	ITimeoutHMS,
 	IUser,
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index bd9ebc0f08f8d..1ba14077fc2c2 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -137,7 +137,8 @@ import {
 import type { IUser, IWorkflowDb } from '@/Interface';
 import type { IPermissions } from '@/permissions';
 import { getWorkflowPermissions } from '@/permissions';
-import { useToast, useMessage } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import { nodeViewEventBus } from '@/event-bus';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts b/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts
index 794dc6416f0d4..25cadd2c3b32d 100644
--- a/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts
+++ b/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts
@@ -2,7 +2,8 @@ import userEvent from '@testing-library/user-event';
 import { createPinia, setActivePinia } from 'pinia';
 import { createComponentRenderer } from '@/__tests__/render';
 import RunDataSearch from '@/components/RunDataSearch.vue';
-import { useSettingsStore, useUIStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
 
 const renderComponent = createComponentRenderer(RunDataSearch);
 let pinia: ReturnType<typeof createPinia>;
diff --git a/packages/editor-ui/src/components/banners/BannerStack.vue b/packages/editor-ui/src/components/banners/BannerStack.vue
index a52b7e696f559..f78aa0d851dea 100644
--- a/packages/editor-ui/src/components/banners/BannerStack.vue
+++ b/packages/editor-ui/src/components/banners/BannerStack.vue
@@ -23,7 +23,7 @@ export const N8N_BANNERS: N8nBanners = {
 <script setup lang="ts">
 import { useUIStore } from '@/stores/ui.store';
 import { computed, onMounted } from 'vue';
-import { getBannerRowHeight } from '@/utils';
+import { getBannerRowHeight } from '@/utils/htmlUtils';
 
 const uiStore = useUIStore();
 
diff --git a/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue b/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
index 12936e10c3bf6..a2266737a0ca0 100644
--- a/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
+++ b/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import BaseBanner from '@/components/banners/BaseBanner.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { i18n as locale } from '@/plugins/i18n';
 import { useUsersStore } from '@/stores/users.store';
 import { computed } from 'vue';
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 26ed49bd379d2..e39e214bab6d4 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -194,7 +194,7 @@ import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import type { N8nInput, DatatableColumn } from 'n8n-design-system';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 export interface IResource {
 	id: string;
diff --git a/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts b/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
index 3709e4810a008..6e3374be64b57 100644
--- a/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
@@ -4,7 +4,8 @@ import { NO_OP_NODE_TYPE, STICKY_NODE_TYPE, STORES } from '@/constants';
 import { faker } from '@faker-js/faker';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
-import { useSourceControlStore, useUIStore } from '@/stores';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
 
 const nodeFactory = (data: Partial<INodeUi> = {}): INodeUi => ({
 	id: faker.string.uuid(),
diff --git a/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts b/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
index 62b3e7e229fc6..8ec6ce8283559 100644
--- a/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
@@ -1,5 +1,5 @@
 import jp from 'jsonpath';
-import { useDataSchema } from '@/composables';
+import { useDataSchema } from '@/composables/useDataSchema';
 import type { Schema } from '@/Interface';
 
 describe('useDataSchema', () => {
diff --git a/packages/editor-ui/src/composables/index.ts b/packages/editor-ui/src/composables/index.ts
deleted file mode 100644
index 748875a7c3b4c..0000000000000
--- a/packages/editor-ui/src/composables/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export { default as useCanvasMouseSelect } from './useCanvasMouseSelect';
-export * from './useCopyToClipboard';
-export * from './useDebounce';
-export * from './useExternalHooks';
-export * from './useExternalSecretsProvider';
-export { default as useGlobalLinkActions } from './useGlobalLinkActions';
-export * from './useHistoryHelper';
-export * from './useI18n';
-export * from './useLoadingService';
-export * from './useMessage';
-export * from './useTelemetry';
-export * from './useTitleChange';
-export * from './useToast';
-export * from './useNodeSpecificationValues';
-export * from './useDataSchema';
-export * from './useExecutionDebugging';
-export * from './useContextMenu';
diff --git a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
index a04342db2319b..c7d015c01b2f3 100644
--- a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
+++ b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
@@ -1,6 +1,6 @@
 import type { INodeUi, XYPosition } from '@/Interface';
 
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from 'n8n-design-system/composables/useDeviceSupport';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getMousePosition, getRelativePosition } from '@/utils/nodeViewUtils';
diff --git a/packages/editor-ui/src/composables/useContextMenu.ts b/packages/editor-ui/src/composables/useContextMenu.ts
index d140e63210043..f6e31053ee8fe 100644
--- a/packages/editor-ui/src/composables/useContextMenu.ts
+++ b/packages/editor-ui/src/composables/useContextMenu.ts
@@ -4,7 +4,10 @@ import {
 	PIN_DATA_NODE_TYPES_DENYLIST,
 	STICKY_NODE_TYPE,
 } from '@/constants';
-import { useNodeTypesStore, useSourceControlStore, useUIStore, useWorkflowsStore } from '@/stores';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IActionDropdownItem } from 'n8n-design-system/src/components/N8nActionDropdown/ActionDropdown.vue';
 import type { INode, INodeTypeDescription } from 'n8n-workflow';
 import { computed, ref, watch } from 'vue';
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
index 1ed4c5bdb9925..d6c446421891f 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -8,7 +8,7 @@ import {
 import { merge } from 'lodash-es';
 import { generatePath } from '@/utils/mappingUtils';
 import { isObj } from '@/utils/typeGuards';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 
 export function useDataSchema() {
 	function getSchema(
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.ts b/packages/editor-ui/src/composables/useExecutionDebugging.ts
index 2e422b6d4efee..b62b9c69b7eb2 100644
--- a/packages/editor-ui/src/composables/useExecutionDebugging.ts
+++ b/packages/editor-ui/src/composables/useExecutionDebugging.ts
@@ -1,14 +1,18 @@
 import { h, computed } from 'vue';
 import { useRouter } from 'vue-router';
-import { useI18n, useMessage, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import {
 	DEBUG_PAYWALL_MODAL_KEY,
 	EnterpriseEditionFeature,
 	MODAL_CONFIRM,
 	VIEWS,
 } from '@/constants';
-import { useSettingsStore, useUIStore, useWorkflowsStore } from '@/stores';
 import type { INodeUi } from '@/Interface';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export const useExecutionDebugging = () => {
 	const router = useRouter();
diff --git a/packages/editor-ui/src/composables/useExternalHooks.ts b/packages/editor-ui/src/composables/useExternalHooks.ts
index d97f88cd23028..cf1de1c624740 100644
--- a/packages/editor-ui/src/composables/useExternalHooks.ts
+++ b/packages/editor-ui/src/composables/useExternalHooks.ts
@@ -1,5 +1,5 @@
 import type { IExternalHooks } from '@/Interface';
-import { runExternalHook } from '@/utils';
+import { runExternalHook } from '@/utils/externalHooks';
 
 export function useExternalHooks(): IExternalHooks {
 	return {
diff --git a/packages/editor-ui/src/composables/useHistoryHelper.ts b/packages/editor-ui/src/composables/useHistoryHelper.ts
index f349bddfd6d8d..a221586654339 100644
--- a/packages/editor-ui/src/composables/useHistoryHelper.ts
+++ b/packages/editor-ui/src/composables/useHistoryHelper.ts
@@ -7,8 +7,8 @@ import { useUIStore } from '@/stores/ui.store';
 
 import { ref, onMounted, onUnmounted, nextTick, getCurrentInstance } from 'vue';
 import { useDebounceHelper } from './useDebounce';
-import { useDeviceSupport } from 'n8n-design-system';
-import { getNodeViewTab } from '@/utils';
+import { useDeviceSupport } from 'n8n-design-system/composables/useDeviceSupport';
+import { getNodeViewTab } from '@/utils/canvasUtils';
 import type { Route } from 'vue-router';
 
 const UNDO_REDO_DEBOUNCE_INTERVAL = 100;
diff --git a/packages/editor-ui/src/composables/useTitleChange.ts b/packages/editor-ui/src/composables/useTitleChange.ts
index 17f5cfcc27d51..7f22cf9e4fcc4 100644
--- a/packages/editor-ui/src/composables/useTitleChange.ts
+++ b/packages/editor-ui/src/composables/useTitleChange.ts
@@ -1,5 +1,5 @@
 import type { WorkflowTitleStatus } from '@/Interface';
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export function useTitleChange() {
 	const prependBeta = (title: string) => {
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index 3b5256ba5cec0..756d063f58a06 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -1,6 +1,6 @@
 import { ElNotification as Notification } from 'element-plus';
 import type { NotificationInstance, NotificationOptions, MessageBoxState } from 'element-plus';
-import { sanitizeHtml } from '@/utils';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useI18n } from './useI18n';
diff --git a/packages/editor-ui/src/hooks/index.ts b/packages/editor-ui/src/hooks/index.ts
deleted file mode 100644
index 55fe7f5ed0f7a..0000000000000
--- a/packages/editor-ui/src/hooks/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './cloud';
-export * from './segment';
-export * from './types';
-export * from './utils';
diff --git a/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts b/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
index 4142097d4e723..8870976fb54bd 100644
--- a/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
+++ b/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
@@ -1,5 +1,6 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useSettingsStore, useWorkflowsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { setupServer } from '@/__tests__/server';
 import { executeData } from '@/mixins/workflowHelpers';
 import type { IExecutionResponse } from '@/Interface';
diff --git a/packages/editor-ui/src/mixins/externalHooks.ts b/packages/editor-ui/src/mixins/externalHooks.ts
index d13fa069fd61b..4d191c60e60ec 100644
--- a/packages/editor-ui/src/mixins/externalHooks.ts
+++ b/packages/editor-ui/src/mixins/externalHooks.ts
@@ -2,7 +2,7 @@ import type { IExternalHooks } from '@/Interface';
 import type { PartialDeep } from 'type-fest';
 import type { ExternalHooks, ExternalHooksGenericContext } from '@/types';
 import { defineComponent } from 'vue';
-import { runExternalHook } from '@/utils';
+import { runExternalHook } from '@/utils/externalHooks';
 
 export function extendExternalHooks(hooksExtension: PartialDeep<ExternalHooks>) {
 	if (typeof window.n8nExternalHooks === 'undefined') {
diff --git a/packages/editor-ui/src/mixins/genericHelpers.ts b/packages/editor-ui/src/mixins/genericHelpers.ts
index b48ccc3081d75..826814c8378e4 100644
--- a/packages/editor-ui/src/mixins/genericHelpers.ts
+++ b/packages/editor-ui/src/mixins/genericHelpers.ts
@@ -2,8 +2,8 @@ import { defineComponent } from 'vue';
 import { mapStores } from 'pinia';
 import dateformat from 'dateformat';
 import { VIEWS } from '@/constants';
-import { useToast } from '@/composables';
-import { useSourceControlStore } from '@/stores';
+import { useToast } from '@/composables/useToast';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
 
 export const genericHelpers = defineComponent({
 	setup() {
diff --git a/packages/editor-ui/src/mixins/newVersions.ts b/packages/editor-ui/src/mixins/newVersions.ts
index 0b865263f5b6f..bd634a2f4b803 100644
--- a/packages/editor-ui/src/mixins/newVersions.ts
+++ b/packages/editor-ui/src/mixins/newVersions.ts
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { VERSIONS_MODAL_KEY } from '@/constants';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/editor-ui/src/mixins/nodeHelpers.ts b/packages/editor-ui/src/mixins/nodeHelpers.ts
index 413cdd1ab0f8f..1b2d1700ceba3 100644
--- a/packages/editor-ui/src/mixins/nodeHelpers.ts
+++ b/packages/editor-ui/src/mixins/nodeHelpers.ts
@@ -34,13 +34,13 @@ import type {
 
 import { get } from 'lodash-es';
 
-import { isObject } from '@/utils';
+import { isObject } from '@/utils/objectUtils';
 import { getCredentialPermissions } from '@/permissions';
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useRootStore } from '@/stores';
+import { useRootStore } from '@/stores/n8nRoot.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { defineComponent } from 'vue';
diff --git a/packages/editor-ui/src/mixins/pinData.ts b/packages/editor-ui/src/mixins/pinData.ts
index fa491ff9da9d0..2e967627c8bec 100644
--- a/packages/editor-ui/src/mixins/pinData.ts
+++ b/packages/editor-ui/src/mixins/pinData.ts
@@ -1,7 +1,7 @@
 import { defineComponent } from 'vue';
 import type { INodeUi } from '@/Interface';
 import type { IPinData, INodeExecutionData } from 'n8n-workflow';
-import { stringSizeInBytes } from '@/utils';
+import { stringSizeInBytes } from '@/utils/typesUtils';
 import {
 	MAX_EXPECTED_REQUEST_SIZE,
 	MAX_PINNED_DATA_SIZE,
@@ -11,7 +11,7 @@ import {
 import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { jsonParse, jsonStringify } from 'n8n-workflow';
 
 export type PinDataSource =
diff --git a/packages/editor-ui/src/mixins/pushConnection.ts b/packages/editor-ui/src/mixins/pushConnection.ts
index 294068589443d..7224e6f1af854 100644
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/mixins/pushConnection.ts
@@ -7,7 +7,8 @@ import type {
 
 import { externalHooks } from '@/mixins/externalHooks';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
-import { useTitleChange, useToast } from '@/composables';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useToast } from '@/composables/useToast';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 
 import type {
@@ -23,7 +24,7 @@ import type {
 import { TelemetryHelpers } from 'n8n-workflow';
 
 import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
-import { getTriggerNodeServiceName } from '@/utils';
+import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import { codeNodeEditorEventBus, globalLinkActionsEventBus } from '@/event-bus';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/editor-ui/src/mixins/workflowActivate.ts b/packages/editor-ui/src/mixins/workflowActivate.ts
index 18183cd1e5090..dc096d8f25d94 100644
--- a/packages/editor-ui/src/mixins/workflowActivate.ts
+++ b/packages/editor-ui/src/mixins/workflowActivate.ts
@@ -4,7 +4,7 @@ import { useStorage } from '@/composables/useStorage';
 
 import { externalHooks } from '@/mixins/externalHooks';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import {
 	LOCAL_STORAGE_ACTIVATION_FLAG,
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.ts b/packages/editor-ui/src/mixins/workflowHelpers.ts
index f92f7fd234fe3..71b7cad786792 100644
--- a/packages/editor-ui/src/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/mixins/workflowHelpers.ts
@@ -43,9 +43,10 @@ import type {
 	IWorkflowDb,
 	TargetItem,
 	XYPosition,
-} from '../Interface';
+} from '@/Interface';
 
-import { useMessage, useToast } from '@/composables';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import { externalHooks } from '@/mixins/externalHooks';
 import { genericHelpers } from '@/mixins/genericHelpers';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
@@ -63,7 +64,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { getSourceItems } from '@/utils';
+import { getSourceItems } from '@/utils/pairedItemUtils';
 import { v4 as uuid } from 'uuid';
 import { useSettingsStore } from '@/stores/settings.store';
 import { getCredentialTypeName, isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
diff --git a/packages/editor-ui/src/mixins/workflowRun.ts b/packages/editor-ui/src/mixins/workflowRun.ts
index 8ba41453adc7f..d757df20dc49d 100644
--- a/packages/editor-ui/src/mixins/workflowRun.ts
+++ b/packages/editor-ui/src/mixins/workflowRun.ts
@@ -10,7 +10,7 @@ import {
 	FORM_TRIGGER_PATH_IDENTIFIER,
 } from 'n8n-workflow';
 
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { externalHooks } from '@/mixins/externalHooks';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
index eb57bea7e7561..2a1728a97fa5d 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -17,11 +17,12 @@ import {
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { AutocompleteOptionType, ExtensionTypeName, FnToDoc, Resolved } from './types';
-import { sanitizeHtml } from '@/utils';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 import { isFunctionOption } from './typeGuards';
 import { luxonInstanceDocs } from './nativesAutocompleteDocs/luxon.instance.docs';
 import { luxonStaticDocs } from './nativesAutocompleteDocs/luxon.static.docs';
-import { useEnvironmentsStore, useExternalSecretsStore } from '@/stores';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 
 /**
  * Resolution-based completions offered according to datatype.
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
index 2ff7c97468781..4f5c101d2f8d0 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
@@ -10,7 +10,7 @@ import {
 	isCredentialsModalOpen,
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { useExternalSecretsStore } from '@/stores';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 
 /**
  * Completions offered at the dollar position: `$|`
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index faa86c72c8d99..acab1e427c8cb 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -1,20 +1,20 @@
 import type { Plugin } from 'vue';
 import axios from 'axios';
 import { createI18n } from 'vue-i18n';
+import { locale } from 'n8n-design-system';
+import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
+
 import type { INodeTranslationHeaders } from '@/Interface';
+import { useUIStore } from '@/stores/ui.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import englishBaseText from './locales/en.json';
 import {
 	deriveMiddleKey,
 	isNestedInCollectionLike,
 	normalize,
 	insertOptionsAndValues,
 } from './utils';
-import { locale } from 'n8n-design-system';
-
-import englishBaseText from './locales/en.json';
-import { useUIStore } from '@/stores/ui.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
-import { useRootStore } from '@/stores';
 
 export const i18nInstance = createI18n({
 	locale: 'en',
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index fb445298ed781..ad33ab9cd288d 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -4,17 +4,18 @@ import type { RouteLocation } from 'vue-router';
 
 import type { INodeCreateElement, IUpdateInformation } from '@/Interface';
 import type { IUserNodesPanelSession } from './telemetry.types';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useRootStore } from '@/stores/n8nRoot.store';
-import { useTelemetryStore } from '@/stores/telemetry.store';
 import {
 	APPEND_ATTRIBUTION_DEFAULT_PATH,
 	MICROSOFT_TEAMS_NODE_TYPE,
 	SLACK_NODE_TYPE,
 	TELEGRAM_NODE_TYPE,
 } from '@/constants';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useNDVStore } from '@/stores/ndv.store';
 import { usePostHog } from '@/stores/posthog.store';
-import { useNDVStore, useUIStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useTelemetryStore } from '@/stores/telemetry.store';
+import { useUIStore } from '@/stores/ui.store';
 
 export class Telemetry {
 	private pageEventQueue: Array<{ route: RouteLocation }>;
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts b/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts
index 9261fae27053d..5bc0538047b39 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts
+++ b/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts
@@ -1,6 +1,6 @@
 import { useUsersStore } from '@/stores/users.store';
 import { hasRole } from '@/rbac/checks';
-import { ROLE } from '@/utils';
+import { ROLE } from '@/utils/userUtils';
 
 vi.mock('@/stores/users.store', () => ({
 	useUsersStore: vi.fn(),
diff --git a/packages/editor-ui/src/rbac/checks/hasRole.ts b/packages/editor-ui/src/rbac/checks/hasRole.ts
index e396b9edbf0c3..f9938e72665bd 100644
--- a/packages/editor-ui/src/rbac/checks/hasRole.ts
+++ b/packages/editor-ui/src/rbac/checks/hasRole.ts
@@ -1,6 +1,6 @@
 import { useUsersStore } from '@/stores/users.store';
 import type { RBACPermissionCheck, RolePermissionOptions } from '@/types/rbac';
-import { ROLE } from '@/utils';
+import { ROLE } from '@/utils/userUtils';
 import type { IRole } from '@/Interface';
 
 export const hasRole: RBACPermissionCheck<RolePermissionOptions> = (checkRoles) => {
diff --git a/packages/editor-ui/src/rbac/checks/isAuthenticated.ts b/packages/editor-ui/src/rbac/checks/isAuthenticated.ts
index a4d0c994361e4..ed8654410fdfe 100644
--- a/packages/editor-ui/src/rbac/checks/isAuthenticated.ts
+++ b/packages/editor-ui/src/rbac/checks/isAuthenticated.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/stores';
+import { useUsersStore } from '@/stores/users.store';
 import type { RBACPermissionCheck, AuthenticatedPermissionOptions } from '@/types/rbac';
 
 export const isAuthenticated: RBACPermissionCheck<AuthenticatedPermissionOptions> = () => {
diff --git a/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts b/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts
index ee73c9cc4ffd6..652e7ec0beab8 100644
--- a/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts
+++ b/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts
@@ -1,4 +1,4 @@
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 import type { RBACPermissionCheck, EnterprisePermissionOptions } from '@/types/rbac';
 
 export const isEnterpriseFeatureEnabled: RBACPermissionCheck<EnterprisePermissionOptions> = (
diff --git a/packages/editor-ui/src/rbac/checks/isGuest.ts b/packages/editor-ui/src/rbac/checks/isGuest.ts
index c6a6cfadb1e5c..d3de02a37d174 100644
--- a/packages/editor-ui/src/rbac/checks/isGuest.ts
+++ b/packages/editor-ui/src/rbac/checks/isGuest.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/stores';
+import { useUsersStore } from '@/stores/users.store';
 import type { RBACPermissionCheck, GuestPermissionOptions } from '@/types/rbac';
 
 export const isGuest: RBACPermissionCheck<GuestPermissionOptions> = () => {
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts b/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
index 5dc739eca5dbc..18cd46a6b33dd 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
+++ b/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
@@ -1,6 +1,6 @@
 import { roleMiddleware } from '@/rbac/middleware/role';
 import { useUsersStore } from '@/stores/users.store';
-import { ROLE } from '@/utils';
+import { ROLE } from '@/utils/userUtils';
 import type { IUser } from '@/Interface';
 import type { RouteLocationNormalized } from 'vue-router';
 import { VIEWS } from '@/constants';
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 6629f45e0dcfe..034a064afdca8 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -8,13 +8,14 @@ import type {
 	RouteLocationNormalized,
 } from 'vue-router';
 import { createRouter, createWebHistory } from 'vue-router';
-import { ROLE, runExternalHook } from '@/utils';
-import { useSettingsStore } from './stores/settings.store';
-import { useTemplatesStore } from './stores/templates.store';
+import { runExternalHook } from '@/utils/externalHooks';
+import { ROLE } from '@/utils/userUtils';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useTemplatesStore } from '@/stores/templates.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useSSOStore } from './stores/sso.store';
+import { useSSOStore } from '@/stores/sso.store';
 import { EnterpriseEditionFeature, VIEWS } from '@/constants';
-import { useTelemetry } from '@/composables';
+import { useTelemetry } from '@/composables/useTelemetry';
 import { middleware } from '@/rbac/middleware';
 import type { RouteConfig, RouterMiddleware } from '@/types/router';
 import { initializeCore } from '@/init';
diff --git a/packages/editor-ui/src/stores/__tests__/environments.spec.ts b/packages/editor-ui/src/stores/__tests__/environments.spec.ts
index 7b956cdf3dfd9..123254ff75680 100644
--- a/packages/editor-ui/src/stores/__tests__/environments.spec.ts
+++ b/packages/editor-ui/src/stores/__tests__/environments.spec.ts
@@ -4,7 +4,7 @@ import { setupServer } from '@/__tests__/server';
 import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import type { EnvironmentVariable } from '@/Interface';
 
-describe('store', () => {
+describe('environments.store', () => {
 	let server: ReturnType<typeof setupServer>;
 	const seedRecordsCount = 3;
 
diff --git a/packages/editor-ui/src/stores/__tests__/ui.test.ts b/packages/editor-ui/src/stores/__tests__/ui.test.ts
index 359b9baee0e86..996e67057c372 100644
--- a/packages/editor-ui/src/stores/__tests__/ui.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/ui.test.ts
@@ -1,6 +1,7 @@
 import { createPinia, setActivePinia } from 'pinia';
 import { useUIStore } from '@/stores/ui.store';
-import { useSettingsStore, useUsersStore } from '@/stores/settings.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
 import { merge } from 'lodash-es';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import { useRootStore } from '@/stores/n8nRoot.store';
diff --git a/packages/editor-ui/src/stores/__tests__/workflows.spec.ts b/packages/editor-ui/src/stores/__tests__/workflows.spec.ts
index 78396b75efa12..c2f6a54d549ee 100644
--- a/packages/editor-ui/src/stores/__tests__/workflows.spec.ts
+++ b/packages/editor-ui/src/stores/__tests__/workflows.spec.ts
@@ -1,10 +1,10 @@
 import { setActivePinia, createPinia } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IWorkflowDataUpdate } from '@/Interface';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 import { useRootStore } from '../n8nRoot.store';
 
-vi.mock('@/utils', () => ({
+vi.mock('@/utils/apiUtils', () => ({
 	makeRestApiRequest: vi.fn(),
 }));
 
diff --git a/packages/editor-ui/src/stores/__tests__/workflows.test.ts b/packages/editor-ui/src/stores/__tests__/workflows.test.ts
index 51d0a001bb881..0fd67f88bfa79 100644
--- a/packages/editor-ui/src/stores/__tests__/workflows.test.ts
+++ b/packages/editor-ui/src/stores/__tests__/workflows.test.ts
@@ -1,5 +1,5 @@
 import { createTestingPinia } from '@pinia/testing';
-import { useWorkflowsStore } from '@/stores';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 beforeAll(() => {
diff --git a/packages/editor-ui/src/stores/auditLogs.store.ts b/packages/editor-ui/src/stores/auditLogs.store.ts
index 7fec2b2db1f6b..12c42dcfd079b 100644
--- a/packages/editor-ui/src/stores/auditLogs.store.ts
+++ b/packages/editor-ui/src/stores/auditLogs.store.ts
@@ -1,7 +1,7 @@
 import { computed } from 'vue';
 import { defineStore } from 'pinia';
 import { EnterpriseEditionFeature } from '@/constants';
-import { useSettingsStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export const useAuditLogsStore = defineStore('auditLogs', () => {
 	const settingsStore = useSettingsStore();
diff --git a/packages/editor-ui/src/stores/canvas.store.ts b/packages/editor-ui/src/stores/canvas.store.ts
index 08fcbc1978bf1..a60dbaf689054 100644
--- a/packages/editor-ui/src/stores/canvas.store.ts
+++ b/packages/editor-ui/src/stores/canvas.store.ts
@@ -1,13 +1,7 @@
 import { computed, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
 import { v4 as uuid } from 'uuid';
-import {
-	useWorkflowsStore,
-	useNodeTypesStore,
-	useUIStore,
-	useHistoryStore,
-	useSourceControlStore,
-} from '@/stores';
+
 import type { INodeUi, XYPosition } from '@/Interface';
 import {
 	applyScale,
@@ -16,7 +10,7 @@ import {
 	scaleBigger,
 	scaleReset,
 	scaleSmaller,
-} from '@/utils';
+} from '@/utils/canvasUtils';
 import { START_NODE_TYPE } from '@/constants';
 import type {
 	BeforeStartEventParams,
@@ -43,6 +37,12 @@ import {
 } from '@/utils/nodeViewUtils';
 import type { PointXY } from '@jsplumb/util';
 
+import { useWorkflowsStore } from './workflows.store';
+import { useNodeTypesStore } from './nodeTypes.store';
+import { useUIStore } from './ui.store';
+import { useHistoryStore } from './history.store';
+import { useSourceControlStore } from './sourceControl.store';
+
 export const useCanvasStore = defineStore('canvas', () => {
 	const workflowStore = useWorkflowsStore();
 	const nodeTypesStore = useNodeTypesStore();
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
index 006823081dcb4..00f0dbfff10fb 100644
--- a/packages/editor-ui/src/stores/credentials.store.ts
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -6,7 +6,7 @@ import type {
 	ICredentialsResponse,
 	ICredentialsState,
 	ICredentialTypeMap,
-} from '../Interface';
+} from '@/Interface';
 import {
 	createNewCredential,
 	deleteCredential,
diff --git a/packages/editor-ui/src/stores/index.ts b/packages/editor-ui/src/stores/index.ts
deleted file mode 100644
index 82a04766f0e02..0000000000000
--- a/packages/editor-ui/src/stores/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-export * from './canvas.store';
-export * from './communityNodes.store';
-export * from './credentials.store';
-export * from './environments.ee.store';
-export * from './externalSecrets.ee.store';
-export * from './history.store';
-export * from './logStreaming.store';
-export * from './n8nRoot.store';
-export * from './ndv.store';
-export * from './nodeCreator.store';
-export * from './nodeTypes.store';
-export * from './posthog.store';
-export * from './segment.store';
-export * from './settings.store';
-export * from './tags.store';
-export * from './telemetry.store';
-export * from './templates.store';
-export * from './ui.store';
-export * from './usage.store';
-export * from './users.store';
-export * from './versions.store';
-export * from './webhooks.store';
-export * from './workflows.ee.store';
-export * from './workflows.store';
-export * from './cloudPlan.store';
-export * from './sourceControl.store';
-export * from './sso.store';
-export * from './auditLogs.store';
-export * from './rbac.store';
-export * from './collaboration.store';
-export * from './pushConnection.store';
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index 510fc45cee1e5..21ffb1a746805 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -14,7 +14,7 @@ import {
 } from '@/constants';
 import type { INodeTypesState, DynamicNodeParameters } from '@/Interface';
 import { addHeaders, addNodeTranslation } from '@/plugins/i18n';
-import { omit } from '@/utils';
+import { omit } from '@/utils/typesUtils';
 import type {
 	ConnectionTypes,
 	INode,
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 006d98b8a1eb7..f2b90ee8d3403 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -25,14 +25,15 @@ import type {
 	ITelemetrySettings,
 	WorkflowSettings,
 } from 'n8n-workflow';
+import { ExpressionEvaluatorProxy } from 'n8n-workflow';
 import { defineStore } from 'pinia';
 import { useRootStore } from './n8nRoot.store';
 import { useUIStore } from './ui.store';
 import { useUsersStore } from './users.store';
 import { useVersionsStore } from './versions.store';
-import { makeRestApiRequest } from '@/utils';
-import { useTitleChange, useToast } from '@/composables';
-import { ExpressionEvaluatorProxy } from 'n8n-workflow';
+import { makeRestApiRequest } from '@/utils/apiUtils';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useToast } from '@/composables/useToast';
 import { i18n } from '@/plugins/i18n';
 
 export const useSettingsStore = defineStore(STORES.SETTINGS, {
@@ -392,5 +393,3 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 		},
 	},
 });
-
-export { useUsersStore };
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index 90f54a27f0ad6..36812f0a2e41a 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -57,9 +57,10 @@ import type {
 import { defineStore } from 'pinia';
 import { useRootStore } from '@/stores/n8nRoot.store';
 import { getCurlToJson } from '@/api/curlHelper';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useSettingsStore, useUsersStore } from '@/stores/settings.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
 import { useTelemetryStore } from '@/stores/telemetry.store';
 import { dismissBannerPermanently } from '@/api/ui';
 import type { BannerName } from 'n8n-workflow';
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index a05c67379ae0e..bfc2e22c07f7a 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -30,7 +30,7 @@ import type {
 	CurrentUserResponse,
 } from '@/Interface';
 import { getCredentialPermissions } from '@/permissions';
-import { getPersonalizedNodeTypes, ROLE } from '@/utils';
+import { getPersonalizedNodeTypes, ROLE } from '@/utils/userUtils';
 import { defineStore } from 'pinia';
 import { useRootStore } from './n8nRoot.store';
 import { usePostHog } from './posthog.store';
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index b0b5315b60b99..ac1e45c7abd87 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -72,15 +72,10 @@ import {
 } from '@/api/workflows';
 import { useUIStore } from '@/stores/ui.store';
 import { dataPinningEventBus } from '@/event-bus';
-import {
-	isJsonKeyObject,
-	getPairedItemsMapping,
-	stringSizeInBytes,
-	isObject,
-	isEmpty,
-	makeRestApiRequest,
-	unflattenExecutionData,
-} from '@/utils';
+import { isObject } from '@/utils/objectUtils';
+import { getPairedItemsMapping } from '@/utils/pairedItemUtils';
+import { isJsonKeyObject, isEmpty, stringSizeInBytes } from '@/utils/typesUtils';
+import { makeRestApiRequest, unflattenExecutionData } from '@/utils/apiUtils';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUsersStore } from '@/stores/users.store';
diff --git a/packages/editor-ui/src/types/externalHooks.ts b/packages/editor-ui/src/types/externalHooks.ts
index 8d9ea2ed36479..653ab8cfcc0de 100644
--- a/packages/editor-ui/src/types/externalHooks.ts
+++ b/packages/editor-ui/src/types/externalHooks.ts
@@ -21,7 +21,7 @@ import type {
 	OutputModeChangedEventData,
 	UpdatedWorkflowSettingsEventData,
 	UserSavedCredentialsEventData,
-} from '@/hooks';
+} from '@/hooks/segment';
 import type {
 	INodeCreateElement,
 	INodeUi,
@@ -31,7 +31,7 @@ import type {
 	NodeFilterType,
 } from '@/Interface';
 import type { ComponentPublicInstance } from 'vue/dist/vue';
-import type { useWebhooksStore } from '@/stores';
+import type { useWebhooksStore } from '@/stores/webhooks.store';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export interface ExternalHooksMethod<T = any, R = void> {
diff --git a/packages/editor-ui/src/utils/__tests__/htmlUtils.test.ts b/packages/editor-ui/src/utils/__tests__/htmlUtils.test.ts
index c3b79e10d1434..096b421b95d56 100644
--- a/packages/editor-ui/src/utils/__tests__/htmlUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/htmlUtils.test.ts
@@ -1,4 +1,4 @@
-import { highlightText } from '@/utils';
+import { highlightText } from '@/utils/htmlUtils';
 
 describe('highlightText', () => {
 	it('should return original text if search parameter is an empty string', () => {
diff --git a/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts b/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts
index db1e45741d317..0dd51f5e80183 100644
--- a/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts
@@ -1,4 +1,4 @@
-import { isObjectOrArray, isObject, searchInObject } from '@/utils';
+import { isObjectOrArray, isObject, searchInObject } from '@/utils/objectUtils';
 
 const testData = [1, '', true, null, undefined, new Date(), () => {}].map((value) => [
 	value,
diff --git a/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts b/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts
index 6b79353fdb302..ef7141fcd9865 100644
--- a/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/sourceControlUtils.test.ts
@@ -1,6 +1,6 @@
 import type { SourceControlStatus } from '@/Interface';
 import { beforeEach } from 'vitest';
-import { aggregateSourceControlFiles } from '@/utils';
+import { aggregateSourceControlFiles } from '@/utils/sourceControlUtils';
 
 describe('sourceControlUtils', () => {
 	describe('aggregateSourceControlFiles()', () => {
diff --git a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
index ed6c429bd4e02..a9070dbe842da 100644
--- a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
@@ -1,4 +1,4 @@
-import { isEmpty, intersection, isValidDate } from '@/utils';
+import { isEmpty, intersection, isValidDate } from '@/utils/typesUtils';
 
 describe('Types Utils', () => {
 	describe('isEmpty', () => {
diff --git a/packages/editor-ui/src/utils/canvasUtils.ts b/packages/editor-ui/src/utils/canvasUtils.ts
index 34863fca661c3..3d619a17d7154 100644
--- a/packages/editor-ui/src/utils/canvasUtils.ts
+++ b/packages/editor-ui/src/utils/canvasUtils.ts
@@ -10,7 +10,7 @@ import type { Route } from 'vue-router';
 	and components used to display workflow in node view.
 	These are general-purpose functions that are exported
 	with this module and should be used by importing from
-	'@/utils'.
+	'@/utils/canvasUtils'.
 */
 
 const SCALE_CHANGE_FACTOR = 1.25;
@@ -52,25 +52,6 @@ export const scaleReset = (config: IZoomConfig): IZoomConfig => {
 	return applyScale(1 / config.scale)(config);
 };
 
-export const closestNumberDivisibleBy = (inputNumber: number, divisibleBy: number): number => {
-	const quotient = Math.ceil(inputNumber / divisibleBy);
-
-	// 1st possible closest number
-	const inputNumber1 = divisibleBy * quotient;
-
-	// 2nd possible closest number
-	const inputNumber2 =
-		inputNumber * divisibleBy > 0 ? divisibleBy * (quotient + 1) : divisibleBy * (quotient - 1);
-
-	// if true, then inputNumber1 is the required closest number
-	if (Math.abs(inputNumber - inputNumber1) < Math.abs(inputNumber - inputNumber2)) {
-		return inputNumber1;
-	}
-
-	// else inputNumber2 is the required closest number
-	return inputNumber2;
-};
-
 export const getNodeViewTab = (route: Route): string | null => {
 	if (route.meta?.nodeView) {
 		return MAIN_HEADER_TABS.WORKFLOW;
diff --git a/packages/editor-ui/src/utils/index.ts b/packages/editor-ui/src/utils/index.ts
deleted file mode 100644
index a1d66c0b239b0..0000000000000
--- a/packages/editor-ui/src/utils/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export * from './apiUtils';
-export * from './canvasUtils';
-export * from './externalHooks';
-export * from './htmlUtils';
-export * from './nodeTypesUtils';
-export * from './sortUtils';
-export * from './pairedItemUtils';
-export * from './typeGuards';
-export * from './typesUtils';
-export * from './userUtils';
-export * from './sourceControlUtils';
-export * from './expressions';
-export * from './objectUtils';
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/editor-ui/src/utils/nodeTypesUtils.ts
index cb68ee0d34f38..bad9b9c371699 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -24,7 +24,8 @@ import type {
 	NodeAuthenticationOption,
 	INodeUpdatePropertiesInformation,
 } from '@/Interface';
-import { isResourceLocatorValue, isJsonKeyObject } from '@/utils';
+import { isResourceLocatorValue } from '@/utils/typeGuards';
+import { isJsonKeyObject } from '@/utils/typesUtils';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { i18n as locale } from '@/plugins/i18n';
 
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/editor-ui/src/utils/nodeViewUtils.ts
index 6d9f97127dcc3..a1cc59306e880 100644
--- a/packages/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.ts
@@ -1,4 +1,4 @@
-import { isNumber, closestNumberDivisibleBy } from '@/utils';
+import { isNumber } from '@/utils/typeGuards';
 import { NODE_OUTPUT_DEFAULT_KEY, STICKY_NODE_TYPE } from '@/constants';
 import type { EndpointStyle, IBounds, INodeUi, XYPosition } from '@/Interface';
 import type { ArrayAnchorSpec, ConnectorSpec, OverlaySpec, PaintStyle } from '@jsplumb/common';
@@ -14,7 +14,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 import { EVENT_CONNECTION_MOUSEOUT, EVENT_CONNECTION_MOUSEOVER } from '@jsplumb/browser-ui';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 
 /*
 	Canvas constants and functions.
@@ -512,6 +512,25 @@ const canUsePosition = (position1: XYPosition, position2: XYPosition) => {
 	return true;
 };
 
+const closestNumberDivisibleBy = (inputNumber: number, divisibleBy: number): number => {
+	const quotient = Math.ceil(inputNumber / divisibleBy);
+
+	// 1st possible closest number
+	const inputNumber1 = divisibleBy * quotient;
+
+	// 2nd possible closest number
+	const inputNumber2 =
+		inputNumber * divisibleBy > 0 ? divisibleBy * (quotient + 1) : divisibleBy * (quotient - 1);
+
+	// if true, then inputNumber1 is the required closest number
+	if (Math.abs(inputNumber - inputNumber1) < Math.abs(inputNumber - inputNumber2)) {
+		return inputNumber1;
+	}
+
+	// else inputNumber2 is the required closest number
+	return inputNumber2;
+};
+
 export const getNewNodePosition = (
 	nodes: INodeUi[],
 	newPosition: XYPosition,
diff --git a/packages/editor-ui/src/utils/pairedItemUtils.ts b/packages/editor-ui/src/utils/pairedItemUtils.ts
index 05560279e3122..c1246d704083a 100644
--- a/packages/editor-ui/src/utils/pairedItemUtils.ts
+++ b/packages/editor-ui/src/utils/pairedItemUtils.ts
@@ -1,6 +1,6 @@
 import type { IPairedItemData, IRunData, ITaskData } from 'n8n-workflow';
-import type { IExecutionResponse, TargetItem } from '../Interface';
-import { isNotNull } from '@/utils';
+import type { IExecutionResponse, TargetItem } from '@/Interface';
+import { isNotNull } from '@/utils/typeGuards';
 
 /*
 	Utility functions that provide shared functionalities used to add paired item support to nodes
diff --git a/packages/editor-ui/src/utils/telemetryUtils.ts b/packages/editor-ui/src/utils/telemetryUtils.ts
index 9c0faaf4dbbc5..51063ab5b387a 100644
--- a/packages/editor-ui/src/utils/telemetryUtils.ts
+++ b/packages/editor-ui/src/utils/telemetryUtils.ts
@@ -1,4 +1,4 @@
-import { hasExpressionMapping } from '@/utils';
+import { hasExpressionMapping } from '@/utils/nodeTypesUtils';
 
 import type { Resolvable, Segment } from '@/types/expressions';
 
diff --git a/packages/editor-ui/src/views/ChangePasswordView.vue b/packages/editor-ui/src/views/ChangePasswordView.vue
index eafe3816b69ec..9c28492352f17 100644
--- a/packages/editor-ui/src/views/ChangePasswordView.vue
+++ b/packages/editor-ui/src/views/ChangePasswordView.vue
@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import AuthView from '@/views/AuthView.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index 00acb157da191..3a7fab586cd72 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -56,7 +56,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
-import { useExternalSecretsStore } from '@/stores';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 
 type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
diff --git a/packages/editor-ui/src/views/ForgotMyPasswordView.vue b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
index 80fc2ad365d80..eb8fe919f7e70 100644
--- a/packages/editor-ui/src/views/ForgotMyPasswordView.vue
+++ b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
@@ -4,7 +4,7 @@
 
 <script lang="ts">
 import AuthView from './AuthView.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 6c4236a170cf7..73a25be46011e 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -237,19 +237,16 @@ import { externalHooks } from '@/mixins/externalHooks';
 import { genericHelpers } from '@/mixins/genericHelpers';
 import { moveNodeWorkflow } from '@/mixins/moveNodeWorkflow';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
-import {
-	useGlobalLinkActions,
-	useCanvasMouseSelect,
-	useMessage,
-	useToast,
-	useTitleChange,
-	useExecutionDebugging,
-	useContextMenu,
-	type ContextMenuAction,
-	useDataSchema,
-} from '@/composables';
+import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
+import useCanvasMouseSelect from '@/composables/useCanvasMouseSelect';
+import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
+import { useTitleChange } from '@/composables/useTitleChange';
+import { useDataSchema } from '@/composables/useDataSchema';
+import { type ContextMenuAction, useContextMenu } from '@/composables/useContextMenu';
 import { useUniqueNodeName } from '@/composables/useUniqueNodeName';
 import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { workflowRun } from '@/mixins/workflowRun';
 import { type PinDataSource, pinData } from '@/mixins/pinData';
@@ -312,29 +309,28 @@ import type {
 import { debounceHelper } from '@/mixins/debounce';
 import type { Route, RawLocation } from 'vue-router';
 import { dataPinningEventBus, nodeViewEventBus } from '@/event-bus';
-import {
-	useEnvironmentsStore,
-	useWorkflowsEEStore,
-	useCanvasStore,
-	useNodeCreatorStore,
-	useTagsStore,
-	useCredentialsStore,
-	useNodeTypesStore,
-	useTemplatesStore,
-	useSegment,
-	useNDVStore,
-	useRootStore,
-	useWorkflowsStore,
-	useUsersStore,
-	useSettingsStore,
-	useUIStore,
-	useHistoryStore,
-	useExternalSecretsStore,
-	useCollaborationStore,
-	usePushConnectionStore,
-} from '@/stores';
+import { useCanvasStore } from '@/stores/canvas.store';
+import { useCollaborationStore } from '@/stores/collaboration.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
+import { useHistoryStore } from '@/stores/history.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useSegment } from '@/stores/segment.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useTagsStore } from '@/stores/tags.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
-import { getAccountAge, getConnectionInfo, getNodeViewTab } from '@/utils';
+import { getAccountAge } from '@/utils/userUtils';
+import { getConnectionInfo, getNodeViewTab } from '@/utils/canvasUtils';
 import {
 	AddConnectionCommand,
 	AddNodeCommand,
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index 5e71ab630b8c2..d09b1d4c4c046 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -86,7 +86,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import type { IUser } from '@/Interface';
-import { useToast, useMessage } from '@/composables';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 
 import CopyInput from '@/components/CopyInput.vue';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/views/SettingsAuditLogs.vue b/packages/editor-ui/src/views/SettingsAuditLogs.vue
index 926fc481ff926..5e0e469f5dcff 100644
--- a/packages/editor-ui/src/views/SettingsAuditLogs.vue
+++ b/packages/editor-ui/src/views/SettingsAuditLogs.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import { useI18n } from '@/composables';
-import { useUIStore, useAuditLogsStore } from '@/stores';
+import { useI18n } from '@/composables/useI18n';
+import { useAuditLogsStore } from '@/stores/auditLogs.store';
+import { useUIStore } from '@/stores/ui.store';
 
 const locale = useI18n();
 const uiStore = useUIStore();
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
index f90f30eba64b5..a3cf360bf7169 100644
--- a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
+++ b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
@@ -59,7 +59,7 @@ import {
 	COMMUNITY_NODES_NPM_INSTALLATION_URL,
 } from '@/constants';
 import CommunityPackageCard from '@/components/CommunityPackageCard.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { pushConnection } from '@/mixins/pushConnection';
 import type { PublicInstalledPackage } from 'n8n-workflow';
 
diff --git a/packages/editor-ui/src/views/SettingsExternalSecrets.vue b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
index c0237273d7182..02576fd0ce118 100644
--- a/packages/editor-ui/src/views/SettingsExternalSecrets.vue
+++ b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { useUIStore } from '@/stores/ui.store';
-import { useI18n, useMessage, useToast } from '@/composables';
-import { useExternalSecretsStore } from '@/stores';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { computed, onMounted } from 'vue';
 import ExternalSecretsProviderCard from '@/components/ExternalSecretsProviderCard.ee.vue';
 import type { ExternalSecretsProvider } from '@/Interface';
@@ -9,7 +10,6 @@ import type { ExternalSecretsProvider } from '@/Interface';
 const i18n = useI18n();
 const uiStore = useUIStore();
 const externalSecretsStore = useExternalSecretsStore();
-const message = useMessage();
 const toast = useToast();
 
 const sortedProviders = computed(() => {
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index 36029c073eb01..a2266b640a373 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -142,8 +142,10 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { convertToDisplayDate, capitalizeFirstLetter } from '@/utils';
-import { useToast, useMessage } from '@/composables';
+import { capitalizeFirstLetter } from '@/utils/htmlUtils';
+import { convertToDisplayDate } from '@/utils/typesUtils';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 import type {
 	ILdapConfig,
 	ILdapSyncData,
@@ -160,7 +162,7 @@ import InfiniteLoading from 'v3-infinite-loading';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { createEventBus } from 'n8n-design-system/utils';
 import type { N8nFormInputs } from 'n8n-design-system';
 import type { CellStyle } from 'element-plus';
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index 9d1b8c4097a1b..f2e3d975a646a 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -76,13 +76,13 @@
 import { defineComponent, nextTick } from 'vue';
 import { mapStores } from 'pinia';
 import { v4 as uuid } from 'uuid';
-import { useWorkflowsStore } from '../stores/workflows.store';
-import { useUsersStore } from '../stores/users.store';
-import { useCredentialsStore } from '../stores/credentials.store';
-import { useLogStreamingStore } from '../stores/logStreaming.store';
-import { useSettingsStore } from '../stores/settings.store';
-import { useUIStore } from '../stores/ui.store';
-import { LOG_STREAM_MODAL_KEY, EnterpriseEditionFeature } from '../constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useLogStreamingStore } from '@/stores/logStreaming.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { LOG_STREAM_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
 import EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 3fbaf4ab8c49d..2cdab448444cf 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -116,7 +116,8 @@
 </template>
 
 <script lang="ts">
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import type { IFormInputs, IUser, ThemeOption } from '@/Interface';
 import { CHANGE_PASSWORD_MODAL_KEY, MFA_DOCS_URL, MFA_SETUP_MODAL_KEY } from '@/constants';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/editor-ui/src/views/SettingsSourceControl.vue
index b4c73644bec7b..1307da7952515 100644
--- a/packages/editor-ui/src/views/SettingsSourceControl.vue
+++ b/packages/editor-ui/src/views/SettingsSourceControl.vue
@@ -2,8 +2,12 @@
 import { computed, reactive, ref, onMounted } from 'vue';
 import type { Rule, RuleGroup } from 'n8n-design-system/types';
 import { MODAL_CONFIRM } from '@/constants';
-import { useUIStore, useSourceControlStore } from '@/stores';
-import { useToast, useMessage, useLoadingService, useI18n } from '@/composables';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useToast } from '@/composables/useToast';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
 import CopyInput from '@/components/CopyInput.vue';
 import type { TupleToUnion } from '@/utils/typeHelpers';
 import type { SshKeyTypes } from '@/Interface';
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/editor-ui/src/views/SettingsSso.vue
index f4374968f5d38..2158bff036c30 100644
--- a/packages/editor-ui/src/views/SettingsSso.vue
+++ b/packages/editor-ui/src/views/SettingsSso.vue
@@ -3,7 +3,9 @@ import { computed, ref, onMounted } from 'vue';
 import { useSSOStore } from '@/stores/sso.store';
 import { useUIStore } from '@/stores/ui.store';
 import CopyInput from '@/components/CopyInput.vue';
-import { useI18n, useMessage, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
 
 const IdentityProviderSettingsType = {
 	URL: 'url',
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
index e113f8b60be31..83523fb35521d 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -5,10 +5,10 @@ import type { UsageTelemetry } from '@/stores/usage.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { telemetry } from '@/plugins/telemetry';
 import { i18n as locale } from '@/plugins/i18n';
-import { useUIStore } from '@/stores';
+import { useUIStore } from '@/stores/ui.store';
 import { N8N_PRICING_PAGE_URL } from '@/constants';
-import { useToast } from '@/composables';
-import { ROLE } from '@/utils';
+import { useToast } from '@/composables/useToast';
+import { ROLE } from '@/utils/userUtils';
 import { hasPermission } from '@/rbac/permissions';
 
 const usageStore = useUsageStore();
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index 8b72ad6a98fd2..9bff8d74dd487 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -79,7 +79,7 @@ import { mapStores } from 'pinia';
 import { EnterpriseEditionFeature, INVITE_USER_MODAL_KEY, VIEWS } from '@/constants';
 
 import type { IRole, IUser, IUserListAction } from '@/Interface';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { copyPaste } from '@/mixins/copyPaste';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
@@ -87,7 +87,7 @@ import { useUsersStore } from '@/stores/users.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { useSSOStore } from '@/stores/sso.store';
 import { hasPermission } from '@/rbac/permissions';
-import { ROLE } from '@/utils';
+import { ROLE } from '@/utils/userUtils';
 
 export default defineComponent({
 	name: 'SettingsUsersView',
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/editor-ui/src/views/SetupView.vue
index 536451b850cce..4a50f052bfa3f 100644
--- a/packages/editor-ui/src/views/SetupView.vue
+++ b/packages/editor-ui/src/views/SetupView.vue
@@ -11,7 +11,7 @@
 import AuthView from './AuthView.vue';
 import { defineComponent } from 'vue';
 
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import type { IFormBoxConfig } from '@/Interface';
 import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
index 7173805236c1d..45f7e439200a7 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
@@ -5,7 +5,7 @@ import type { AppCredentials } from '@/views/SetupWorkflowFromTemplateView/setup
 import { useSetupTemplateStore } from '@/views/SetupWorkflowFromTemplateView/setupTemplate.store';
 import { storeToRefs } from 'pinia';
 import { formatList } from '@/utils/formatters/listFormatter';
-import { useI18n } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
 
 const i18n = useI18n();
 const store = useSetupTemplateStore();
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
index 81bcc0d33b595..0324314004b71 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
@@ -8,7 +8,9 @@ import AppsRequiringCredsNotice from './AppsRequiringCredsNotice.vue';
 import SetupTemplateFormStep from './SetupTemplateFormStep.vue';
 import TemplatesView from '../TemplatesView.vue';
 import { VIEWS } from '@/constants';
-import { useExternalHooks, useI18n, useTelemetry } from '@/composables';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 // Store
 const setupTemplateStore = useSetupTemplateStore();
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
index ffbdff50a5cba..5ae601048c777 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
@@ -2,13 +2,11 @@ import sortBy from 'lodash-es/sortBy';
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
 import type { Router } from 'vue-router';
-import {
-	useCredentialsStore,
-	useNodeTypesStore,
-	useRootStore,
-	useTemplatesStore,
-	useWorkflowsStore,
-} from '@/stores';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useRootStore } from '@/stores/n8nRoot.store';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getAppNameFromNodeName } from '@/utils/nodeTypesUtils';
 import type { INodeCredentialsDetails, INodeTypeDescription } from 'n8n-workflow';
 import type {
diff --git a/packages/editor-ui/src/views/SigninView.vue b/packages/editor-ui/src/views/SigninView.vue
index ddff8144f29fe..c30f930088283 100644
--- a/packages/editor-ui/src/views/SigninView.vue
+++ b/packages/editor-ui/src/views/SigninView.vue
@@ -22,13 +22,14 @@
 import { defineComponent } from 'vue';
 import AuthView from './AuthView.vue';
 import MfaView, { FORM } from './MfaView.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import type { IFormBoxConfig } from '@/Interface';
 import { MFA_AUTHENTICATION_REQUIRED_ERROR_CODE, VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useCloudPlanStore, useUIStore } from '@/stores';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useUIStore } from '@/stores/ui.store';
 import { genericHelpers } from '@/mixins/genericHelpers';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/views/SignoutView.vue b/packages/editor-ui/src/views/SignoutView.vue
index 4a34341207e4c..a5d7576758781 100644
--- a/packages/editor-ui/src/views/SignoutView.vue
+++ b/packages/editor-ui/src/views/SignoutView.vue
@@ -3,7 +3,7 @@ import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { defineComponent } from 'vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 export default defineComponent({
 	name: 'SignoutView',
diff --git a/packages/editor-ui/src/views/SignupView.vue b/packages/editor-ui/src/views/SignupView.vue
index 3d2cd8885c8d3..42e8c8368c252 100644
--- a/packages/editor-ui/src/views/SignupView.vue
+++ b/packages/editor-ui/src/views/SignupView.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import AuthView from '@/views/AuthView.vue';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 
 import { defineComponent } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
diff --git a/packages/editor-ui/src/views/TemplatesCollectionView.vue b/packages/editor-ui/src/views/TemplatesCollectionView.vue
index 4c237356b7c30..2f84633fa3be3 100644
--- a/packages/editor-ui/src/views/TemplatesCollectionView.vue
+++ b/packages/editor-ui/src/views/TemplatesCollectionView.vue
@@ -65,7 +65,7 @@ import type {
 	ITemplatesWorkflowFull,
 } from '@/Interface';
 
-import { setPageTitle } from '@/utils';
+import { setPageTitle } from '@/utils/htmlUtils';
 import { VIEWS } from '@/constants';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { usePostHog } from '@/stores/posthog.store';
diff --git a/packages/editor-ui/src/views/TemplatesSearchView.vue b/packages/editor-ui/src/views/TemplatesSearchView.vue
index 08776b586d0c3..224cff932c360 100644
--- a/packages/editor-ui/src/views/TemplatesSearchView.vue
+++ b/packages/editor-ui/src/views/TemplatesSearchView.vue
@@ -92,14 +92,14 @@ import type {
 	ITemplatesCategory,
 } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
-import { setPageTitle } from '@/utils';
+import { setPageTitle } from '@/utils/htmlUtils';
 import { CREATOR_HUB_URL, VIEWS } from '@/constants';
 import { debounceHelper } from '@/mixins/debounce';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useToast } from '@/composables';
+import { useToast } from '@/composables/useToast';
 import { usePostHog } from '@/stores/posthog.store';
 
 interface ISearchEvent {
diff --git a/packages/editor-ui/src/views/TemplatesWorkflowView.vue b/packages/editor-ui/src/views/TemplatesWorkflowView.vue
index 6947a6bf15d19..a17f9f5ae5b65 100644
--- a/packages/editor-ui/src/views/TemplatesWorkflowView.vue
+++ b/packages/editor-ui/src/views/TemplatesWorkflowView.vue
@@ -65,7 +65,7 @@ import WorkflowPreview from '@/components/WorkflowPreview.vue';
 
 import type { ITemplatesWorkflow, ITemplatesWorkflowFull } from '@/Interface';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
-import { setPageTitle } from '@/utils';
+import { setPageTitle } from '@/utils/htmlUtils';
 import { VIEWS } from '@/constants';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { usePostHog } from '@/stores/posthog.store';
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index 6439c95f222ec..29339817512f4 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -1,13 +1,14 @@
 <script lang="ts" setup>
 import { computed, ref, onBeforeMount, onBeforeUnmount } from 'vue';
-import {
-	useEnvironmentsStore,
-	useUIStore,
-	useSettingsStore,
-	useUsersStore,
-	useSourceControlStore,
-} from '@/stores';
-import { useI18n, useTelemetry, useToast, useMessage } from '@/composables';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
 
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import VariablesRow from '@/components/VariablesRow.vue';
diff --git a/packages/editor-ui/src/views/WorkflowHistory.vue b/packages/editor-ui/src/views/WorkflowHistory.vue
index 842582e0ece52..7977bb760fa7c 100644
--- a/packages/editor-ui/src/views/WorkflowHistory.vue
+++ b/packages/editor-ui/src/views/WorkflowHistory.vue
@@ -3,7 +3,8 @@ import { onBeforeMount, ref, watchEffect, computed, h } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import type { IWorkflowDb, UserAction } from '@/Interface';
 import { VIEWS, WORKFLOW_HISTORY_VERSION_RESTORE } from '@/constants';
-import { useI18n, useToast } from '@/composables';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
 import type {
 	WorkflowHistoryActionTypes,
 	WorkflowVersionId,
diff --git a/packages/editor-ui/src/views/WorkflowOnboardingView.vue b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
index 19d4d01e3f9f3..813123e757b0a 100644
--- a/packages/editor-ui/src/views/WorkflowOnboardingView.vue
+++ b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
-import { useLoadingService, useI18n } from '@/composables';
+import { useLoadingService } from '@/composables/useLoadingService';
+import { useI18n } from '@/composables/useI18n';
 import { VIEWS } from '@/constants';
-import { useTemplatesStore, useWorkflowsStore } from '@/stores';
+import { useTemplatesStore } from '@/stores/templates.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import { onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 5aa62ef3c41ff..f600d85c9f155 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -135,7 +135,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { genericHelpers } from '@/mixins/genericHelpers';
-import { useTagsStore } from '@/stores';
+import { useTagsStore } from '@/stores/tags.store';
 
 type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
 
diff --git a/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts b/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
index c5006e8ddee17..2199fa79c58ed 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsAuditLogs.test.ts
@@ -1,6 +1,7 @@
 import { vi } from 'vitest';
 import { createPinia, setActivePinia } from 'pinia';
-import { useAuditLogsStore, useSettingsStore } from '@/stores';
+import { useAuditLogsStore } from '@/stores/auditLogs.store';
+import { useSettingsStore } from '@/stores/settings.store';
 import SettingsAuditLogs from '@/views/SettingsAuditLogs.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { EnterpriseEditionFeature } from '@/constants';
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
index 322f44c666f8f..9f3d0007c3b83 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSourceControl.test.ts
@@ -3,7 +3,8 @@ import { screen, waitFor, within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { createPinia, setActivePinia } from 'pinia';
 import { setupServer } from '@/__tests__/server';
-import { useSettingsStore, useSourceControlStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
 import SettingsSourceControl from '@/views/SettingsSourceControl.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { EnterpriseEditionFeature } from '@/constants';
diff --git a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
index d5428cdf20fb9..f9088cf68cb8c 100644
--- a/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
+++ b/packages/editor-ui/src/views/__tests__/VariablesView.spec.ts
@@ -3,7 +3,9 @@ import { setActivePinia, createPinia } from 'pinia';
 import { waitFor } from '@testing-library/vue';
 import { setupServer } from '@/__tests__/server';
 import VariablesView from '@/views/VariablesView.vue';
-import { useSettingsStore, useUsersStore, useRBACStore } from '@/stores';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useRBACStore } from '@/stores/rbac.store';
 import { createComponentRenderer } from '@/__tests__/render';
 import { EnterpriseEditionFeature } from '@/constants';