diff --git a/packages/frontend/editor-ui/src/App.vue b/packages/frontend/editor-ui/src/App.vue
index 54da2fd8e29..b1d133281e9 100644
--- a/packages/frontend/editor-ui/src/App.vue
+++ b/packages/frontend/editor-ui/src/App.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import '@/polyfills';
 
-import AssistantsHub from '@/features/assistant/components/AssistantsHub.vue';
-import AskAssistantFloatingButton from '@/features/assistant/components/Chat/AskAssistantFloatingButton.vue';
+import AssistantsHub from '@/features/ai/assistant/components/AssistantsHub.vue';
+import AskAssistantFloatingButton from '@/features/ai/assistant/components/Chat/AskAssistantFloatingButton.vue';
 import BannerStack from '@/components/banners/BannerStack.vue';
 import Modals from '@/components/Modals.vue';
 import Telemetry from '@/components/Telemetry.vue';
@@ -15,12 +15,12 @@ import {
 	HIRING_BANNER,
 	VIEWS,
 } from '@/constants';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import LoadingView from '@/views/LoadingView.vue';
 import { locale, N8nCommandBar } from '@n8n/design-system';
 import { setLanguage } from '@n8n/i18n';
@@ -32,7 +32,7 @@ import { useRoute } from 'vue-router';
 import { useStyles } from './composables/useStyles';
 import { useExposeCssVar } from '@/composables/useExposeCssVar';
 import { useFloatingUiOffsets } from '@/composables/useFloatingUiOffsets';
-import { useCommandBar } from '@/features/ui/commandBar/composables/useCommandBar';
+import { useCommandBar } from '@/features/shared/commandBar/composables/useCommandBar';
 import { hasPermission } from './utils/rbac/permissions';
 
 const route = useRoute();
diff --git a/packages/frontend/editor-ui/src/Interface.ts b/packages/frontend/editor-ui/src/Interface.ts
index 68e13451169..3721f46f367 100644
--- a/packages/frontend/editor-ui/src/Interface.ts
+++ b/packages/frontend/editor-ui/src/Interface.ts
@@ -7,7 +7,7 @@ import type {
 	IVersionNotificationSettings,
 	Role,
 } from '@n8n/api-types';
-import type { ILogInStatus } from '@/features/users/users.types';
+import type { ILogInStatus } from '@/features/settings/users/users.types';
 import type { IUsedCredential } from '@/features/credentials/credentials.types';
 import type { Scope } from '@n8n/permissions';
 import type { NodeCreatorTag } from '@n8n/design-system';
@@ -56,13 +56,13 @@ import type {
 import type { CREDENTIAL_EDIT_MODAL_KEY } from '@/features/credentials/credentials.constants';
 import type { BulkCommand, Undoable } from '@/models/history';
 
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import type { IconName } from '@n8n/design-system/src/components/N8nIcon/icons';
 import type {
 	BaseFolderItem,
 	FolderListItem,
 	ResourceParentFolder,
-} from '@/features/folders/folders.types';
+} from '@/features/core/folders/folders.types';
 
 export * from '@n8n/design-system/types';
 
diff --git a/packages/frontend/editor-ui/src/__tests__/mocks.ts b/packages/frontend/editor-ui/src/__tests__/mocks.ts
index 2fa58ecc775..8877bca9d00 100644
--- a/packages/frontend/editor-ui/src/__tests__/mocks.ts
+++ b/packages/frontend/editor-ui/src/__tests__/mocks.ts
@@ -29,8 +29,8 @@ import {
 	STICKY_NODE_TYPE,
 } from '@/constants';
 import type { INodeUi, IWorkflowDb } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
-import { CanvasNodeRenderType } from '@/features/canvas/canvas.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
+import { CanvasNodeRenderType } from '@/features/workflows/canvas/canvas.types';
 import type { FrontendSettings } from '@n8n/api-types';
 import type { ExpressionLocalResolveContext } from '@/types/expressions';
 
diff --git a/packages/frontend/editor-ui/src/__tests__/server/endpoints/sourceControl.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
index 8cf55256304..c7276e1547b 100644
--- a/packages/frontend/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
+++ b/packages/frontend/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
@@ -2,7 +2,7 @@ import type { Server, Request } from 'miragejs';
 import { Response } from 'miragejs';
 import { jsonParse } from 'n8n-workflow';
 import type { AppSchema } from '@/__tests__/server/types';
-import type { SourceControlPreferences } from '@/features/sourceControl.ee/sourceControl.types';
+import type { SourceControlPreferences } from '@/features/integrations/sourceControl.ee/sourceControl.types';
 
 export function routesForSourceControl(server: Server) {
 	const sourceControlApiRoot = '/rest/source-control';
diff --git a/packages/frontend/editor-ui/src/__tests__/server/endpoints/variable.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/variable.ts
index af19fac7b24..6f57d789c9d 100644
--- a/packages/frontend/editor-ui/src/__tests__/server/endpoints/variable.ts
+++ b/packages/frontend/editor-ui/src/__tests__/server/endpoints/variable.ts
@@ -2,7 +2,7 @@ import type { Request, Server } from 'miragejs';
 import { Response } from 'miragejs';
 import type { AppSchema } from '../types';
 import { jsonParse } from 'n8n-workflow';
-import type { EnvironmentVariable } from '@/features/environments.ee/environments.types';
+import type { EnvironmentVariable } from '@/features/settings/environments.ee/environments.types';
 
 export function routesForVariables(server: Server) {
 	server.get('/rest/variables', (schema: AppSchema) => {
diff --git a/packages/frontend/editor-ui/src/__tests__/server/factories/variable.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/variable.ts
index d45fb6d2735..fc6b9666b8a 100644
--- a/packages/frontend/editor-ui/src/__tests__/server/factories/variable.ts
+++ b/packages/frontend/editor-ui/src/__tests__/server/factories/variable.ts
@@ -1,6 +1,6 @@
 import { Factory } from 'miragejs';
 import { faker } from '@faker-js/faker';
-import type { EnvironmentVariable } from '@/features/environments.ee/environments.types';
+import type { EnvironmentVariable } from '@/features/settings/environments.ee/environments.types';
 
 export const variableFactory = Factory.extend<EnvironmentVariable>({
 	id(i: number) {
diff --git a/packages/frontend/editor-ui/src/__tests__/server/models/variable.ts b/packages/frontend/editor-ui/src/__tests__/server/models/variable.ts
index f123fa3f917..f6954678bdb 100644
--- a/packages/frontend/editor-ui/src/__tests__/server/models/variable.ts
+++ b/packages/frontend/editor-ui/src/__tests__/server/models/variable.ts
@@ -1,4 +1,4 @@
-import type { EnvironmentVariable } from '@/features/environments.ee/environments.types';
+import type { EnvironmentVariable } from '@/features/settings/environments.ee/environments.types';
 import { Model } from 'miragejs';
 import type { ModelDefinition } from 'miragejs/-types';
 
diff --git a/packages/frontend/editor-ui/src/api/ai.test.ts b/packages/frontend/editor-ui/src/api/ai.test.ts
index e28f32c9d73..9eabd757b8d 100644
--- a/packages/frontend/editor-ui/src/api/ai.test.ts
+++ b/packages/frontend/editor-ui/src/api/ai.test.ts
@@ -1,7 +1,7 @@
 import { chatWithBuilder, getBuilderCredits } from './ai';
 import * as apiUtils from '@n8n/rest-api-client';
 import type { IRestApiContext } from '@n8n/rest-api-client';
-import type { ChatRequest } from '@/features/assistant/assistant.types';
+import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
 import { vi, describe, it, beforeEach, afterEach, expect } from 'vitest';
 import type { MockInstance } from 'vitest';
 
diff --git a/packages/frontend/editor-ui/src/api/ai.ts b/packages/frontend/editor-ui/src/api/ai.ts
index 1c1f3eb0e14..cb93d4540cd 100644
--- a/packages/frontend/editor-ui/src/api/ai.ts
+++ b/packages/frontend/editor-ui/src/api/ai.ts
@@ -1,4 +1,4 @@
-import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
+import { useAIAssistantHelpers } from '@/features/ai/assistant/composables/useAIAssistantHelpers';
 import { AI_ASSISTANT_MAX_CONTENT_LENGTH } from '@/constants';
 import type { ICredentialsResponse } from '@/features/credentials/credentials.types';
 import type { IRestApiContext } from '@n8n/rest-api-client';
@@ -6,7 +6,7 @@ import type {
 	AskAiRequest,
 	ChatRequest,
 	ReplaceCodeRequest,
-} from '@/features/assistant/assistant.types';
+} from '@/features/ai/assistant/assistant.types';
 import { makeRestApiRequest, streamRequest } from '@n8n/rest-api-client';
 import { getObjectSizeInKB } from '@/utils/objectUtils';
 import type { IDataObject } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/api/workflows.ts b/packages/frontend/editor-ui/src/api/workflows.ts
index 4d5feabe616..c46ec843f44 100644
--- a/packages/frontend/editor-ui/src/api/workflows.ts
+++ b/packages/frontend/editor-ui/src/api/workflows.ts
@@ -7,7 +7,7 @@ import type {
 import type {
 	IExecutionResponse,
 	IExecutionsCurrentSummaryExtended,
-} from '@/features/executions/executions.types';
+} from '@/features/execution/executions/executions.types';
 import type { IRestApiContext } from '@n8n/rest-api-client';
 import type {
 	ExecutionFilters,
diff --git a/packages/frontend/editor-ui/src/components/ActivationModal.vue b/packages/frontend/editor-ui/src/components/ActivationModal.vue
index a32eadf1570..0a463a2b1d3 100644
--- a/packages/frontend/editor-ui/src/components/ActivationModal.vue
+++ b/packages/frontend/editor-ui/src/components/ActivationModal.vue
@@ -13,7 +13,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useStorage } from '@/composables/useStorage';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useRouter } from 'vue-router';
 import { useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.vue
index 945d4b70450..75b2deb271d 100644
--- a/packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.vue
+++ b/packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.vue
@@ -5,7 +5,7 @@ import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ParameterInputHint from '@/components/ParameterInputHint.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
 import { useResolvedExpression } from '@/composables/useResolvedExpression';
-import useEnvironmentsStore from '@/features/environments.ee/environments.store';
+import useEnvironmentsStore from '@/features/settings/environments.ee/environments.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import type { AssignmentValue, INodeProperties } from 'n8n-workflow';
 import { computed, ref } from 'vue';
diff --git a/packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue b/packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
index 47f3dfe5564..65d0429edfe 100644
--- a/packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
+++ b/packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
@@ -16,9 +16,9 @@ import Assignment from './Assignment.vue';
 import { inputDataToAssignments, typeFromExpression } from './utils';
 import { propertyNameFromExpression } from '@/utils/mappingUtils';
 import Draggable from 'vuedraggable';
-import ExperimentalEmbeddedNdvMapper from '@/features/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue';
+import ExperimentalEmbeddedNdvMapper from '@/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue';
 import { ExpressionLocalResolveContextSymbol } from '@/constants';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 
 import { N8nInputLabel } from '@n8n/design-system';
 interface Props {
diff --git a/packages/frontend/editor-ui/src/components/BannersStack.test.ts b/packages/frontend/editor-ui/src/components/BannersStack.test.ts
index 41ffb5d2618..fd6301f412a 100644
--- a/packages/frontend/editor-ui/src/components/BannersStack.test.ts
+++ b/packages/frontend/editor-ui/src/components/BannersStack.test.ts
@@ -11,7 +11,7 @@ import type { RenderOptions } from '@/__tests__/render';
 import { createComponentRenderer } from '@/__tests__/render';
 import { waitFor } from '@testing-library/vue';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 let uiStore: ReturnType<typeof useUIStore>;
 
diff --git a/packages/frontend/editor-ui/src/components/ButtonParameter/utils.test.ts b/packages/frontend/editor-ui/src/components/ButtonParameter/utils.test.ts
index d4a56ade5ad..921e00f5872 100644
--- a/packages/frontend/editor-ui/src/components/ButtonParameter/utils.test.ts
+++ b/packages/frontend/editor-ui/src/components/ButtonParameter/utils.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { generateCodeForAiTransform, reducePayloadSizeOrThrow } from './utils';
 import { createPinia, setActivePinia } from 'pinia';
 import { generateCodeForPrompt } from '@/api/ai';
-import type { AskAiRequest } from '@/features/assistant/assistant.types';
+import type { AskAiRequest } from '@/features/ai/assistant/assistant.types';
 import type { Schema } from '@/Interface';
 
 vi.mock('./utils', async () => {
diff --git a/packages/frontend/editor-ui/src/components/ButtonParameter/utils.ts b/packages/frontend/editor-ui/src/components/ButtonParameter/utils.ts
index bf4a6c19b53..197353c44ab 100644
--- a/packages/frontend/editor-ui/src/components/ButtonParameter/utils.ts
+++ b/packages/frontend/editor-ui/src/components/ButtonParameter/utils.ts
@@ -6,7 +6,7 @@ import { useDataSchema } from '@/composables/useDataSchema';
 import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import { generateCodeForPrompt } from '@/api/ai';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { type AskAiRequest } from '@/features/assistant/assistant.types';
+import { type AskAiRequest } from '@/features/ai/assistant/assistant.types';
 import { useSettingsStore } from '@/stores/settings.store';
 import { format } from 'prettier';
 import jsParser from 'prettier/plugins/babel';
diff --git a/packages/frontend/editor-ui/src/components/ChatEmbedModal.vue b/packages/frontend/editor-ui/src/components/ChatEmbedModal.vue
index 2fb6fc7a84d..7e6029b6e89 100644
--- a/packages/frontend/editor-ui/src/components/ChatEmbedModal.vue
+++ b/packages/frontend/editor-ui/src/components/ChatEmbedModal.vue
@@ -6,8 +6,8 @@ import Modal from './Modal.vue';
 import { CHAT_EMBED_MODAL_KEY, CHAT_TRIGGER_NODE_TYPE, WEBHOOK_NODE_TYPE } from '../constants';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import HtmlEditor from '@/features/editors/components/HtmlEditor/HtmlEditor.vue';
-import JsEditor from '@/features/editors/components/JsEditor/JsEditor.vue';
+import HtmlEditor from '@/features/shared/editors/components/HtmlEditor/HtmlEditor.vue';
+import JsEditor from '@/features/shared/editors/components/JsEditor/JsEditor.vue';
 import { useI18n } from '@n8n/i18n';
 import { I18nT } from 'vue-i18n';
 
diff --git a/packages/frontend/editor-ui/src/components/ContactPromptModal.vue b/packages/frontend/editor-ui/src/components/ContactPromptModal.vue
index 3d37c543358..4c3bc27251e 100644
--- a/packages/frontend/editor-ui/src/components/ContactPromptModal.vue
+++ b/packages/frontend/editor-ui/src/components/ContactPromptModal.vue
@@ -5,7 +5,7 @@ import type { ModalKey } from '@/Interface';
 import { VALID_EMAIL_REGEX } from '@/constants';
 import Modal from '@/components/Modal.vue';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { useToast } from '@/composables/useToast';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
diff --git a/packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts
index 5265748b683..6b6de0613f8 100644
--- a/packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts
+++ b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts
@@ -4,9 +4,9 @@ import userEvent from '@testing-library/user-event';
 import type { NodeError } from 'n8n-workflow';
 import { mockedStore } from '@/__tests__/utils';
 import { createComponentRenderer } from '@/__tests__/render';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import NodeErrorView from '@/components/Error/NodeErrorView.vue';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
index bd967d921d0..caccc132fa2 100644
--- a/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
@@ -21,11 +21,11 @@ import { isCommunityPackageName } from 'n8n-workflow';
 import { sanitizeHtml } from '@/utils/htmlUtils';
 import { MAX_DISPLAY_DATA_SIZE, NEW_ASSISTANT_SESSION_MODAL, VIEWS } from '@/constants';
 import type { BaseTextKey } from '@n8n/i18n';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
-import type { ChatRequest } from '@/features/assistant/assistant.types';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
+import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
 import { useUIStore } from '@/stores/ui.store';
-import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
+import { useAIAssistantHelpers } from '@/features/ai/assistant/composables/useAIAssistantHelpers';
 import {
 	N8nInlineAskAssistantButton,
 	N8nButton,
diff --git a/packages/frontend/editor-ui/src/components/ExpressionEditModal.vue b/packages/frontend/editor-ui/src/components/ExpressionEditModal.vue
index cb3c4bbae9b..c7c0e6179f6 100644
--- a/packages/frontend/editor-ui/src/components/ExpressionEditModal.vue
+++ b/packages/frontend/editor-ui/src/components/ExpressionEditModal.vue
@@ -13,13 +13,13 @@ import type { Segment } from '@/types/expressions';
 import type { INodeProperties } from 'n8n-workflow';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import { outputTheme } from './ExpressionEditorModal/theme';
-import ExpressionOutput from '@/features/editors/components/InlineExpressionEditor/ExpressionOutput.vue';
+import ExpressionOutput from '@/features/shared/editors/components/InlineExpressionEditor/ExpressionOutput.vue';
 import VirtualSchema from '@/components/VirtualSchema.vue';
-import OutputItemSelect from '@/features/editors/components/InlineExpressionEditor/OutputItemSelect.vue';
+import OutputItemSelect from '@/features/shared/editors/components/InlineExpressionEditor/OutputItemSelect.vue';
 import { useI18n } from '@n8n/i18n';
 import { useDebounce } from '@/composables/useDebounce';
 import DraggableTarget from './DraggableTarget.vue';
-import { dropInExpressionEditor } from '@/features/editors/plugins/codemirror/dragAndDrop';
+import { dropInExpressionEditor } from '@/features/shared/editors/plugins/codemirror/dragAndDrop';
 
 import { APP_MODALS_ELEMENT_ID } from '@/constants';
 import { useThrottleFn } from '@vueuse/core';
diff --git a/packages/frontend/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/frontend/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index 711f66a8be2..2a15d9e3c1f 100644
--- a/packages/frontend/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/frontend/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -4,17 +4,17 @@ import { Prec } from '@codemirror/state';
 import { dropCursor, EditorView, keymap } from '@codemirror/view';
 import { computed, onMounted, ref, watch } from 'vue';
 
-import { n8nAutocompletion, n8nLang } from '@/features/editors/plugins/codemirror/n8nLang';
+import { n8nAutocompletion, n8nLang } from '@/features/shared/editors/plugins/codemirror/n8nLang';
 import { forceParse } from '@/utils/forceParse';
 import { inputTheme } from './theme';
 
-import { useExpressionEditor } from '@/features/editors/composables/useExpressionEditor';
-import { infoBoxTooltips } from '@/features/editors/plugins/codemirror/tooltips/InfoBoxTooltip';
+import { useExpressionEditor } from '@/features/shared/editors/composables/useExpressionEditor';
+import { infoBoxTooltips } from '@/features/shared/editors/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Segment } from '@/types/expressions';
 import { removeExpressionPrefix } from '@/utils/expressions';
-import { mappingDropCursor } from '@/features/editors/plugins/codemirror/dragAndDrop';
-import { editorKeymap } from '@/features/editors/plugins/codemirror/keymap';
-import { expressionCloseBrackets } from '@/features/editors/plugins/codemirror/expressionCloseBrackets';
+import { mappingDropCursor } from '@/features/shared/editors/plugins/codemirror/dragAndDrop';
+import { editorKeymap } from '@/features/shared/editors/plugins/codemirror/keymap';
+import { expressionCloseBrackets } from '@/features/shared/editors/plugins/codemirror/expressionCloseBrackets';
 import type { TargetNodeParameterContext } from '@/Interface';
 
 type Props = {
diff --git a/packages/frontend/editor-ui/src/components/ExpressionEditorModal/theme.ts b/packages/frontend/editor-ui/src/components/ExpressionEditorModal/theme.ts
index c12cac67377..050c4e4738b 100644
--- a/packages/frontend/editor-ui/src/components/ExpressionEditorModal/theme.ts
+++ b/packages/frontend/editor-ui/src/components/ExpressionEditorModal/theme.ts
@@ -1,5 +1,5 @@
 import { EditorView } from '@codemirror/view';
-import { highlighter } from '@/features/editors/plugins/codemirror/resolvableHighlighter';
+import { highlighter } from '@/features/shared/editors/plugins/codemirror/resolvableHighlighter';
 
 const commonThemeProps = (isReadOnly = false) => ({
 	'&': {
diff --git a/packages/frontend/editor-ui/src/components/ExpressionParameterInput.vue b/packages/frontend/editor-ui/src/components/ExpressionParameterInput.vue
index 939fc390728..cb78f022dc5 100644
--- a/packages/frontend/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/frontend/editor-ui/src/components/ExpressionParameterInput.vue
@@ -4,21 +4,21 @@ import { onClickOutside } from '@vueuse/core';
 
 import DraggableTarget from '@/components/DraggableTarget.vue';
 import ExpressionFunctionIcon from '@/components/ExpressionFunctionIcon.vue';
-import InlineExpressionEditorInput from '@/features/editors/components/InlineExpressionEditor/InlineExpressionEditorInput.vue';
-import InlineExpressionEditorOutput from '@/features/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
+import InlineExpressionEditorInput from '@/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorInput.vue';
+import InlineExpressionEditorOutput from '@/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createExpressionTelemetryPayload } from '@/utils/telemetryUtils';
 
 import { useTelemetry } from '@/composables/useTelemetry';
-import { dropInExpressionEditor } from '@/features/editors/plugins/codemirror/dragAndDrop';
+import { dropInExpressionEditor } from '@/features/shared/editors/plugins/codemirror/dragAndDrop';
 import type { Segment } from '@/types/expressions';
 import { startCompletion } from '@codemirror/autocomplete';
 import type { EditorState, SelectionRange } from '@codemirror/state';
 import type { IDataObject } from 'n8n-workflow';
 import { createEventBus, type EventBus } from '@n8n/utils/event-bus';
 import { CanvasKey } from '@/constants';
-import { useIsInExperimentalNdv } from '@/features/canvas/experimental/composables/useIsInExperimentalNdv';
+import { useIsInExperimentalNdv } from '@/features/workflows/canvas/experimental/composables/useIsInExperimentalNdv';
 import { isEventTargetContainedBy } from '@/utils/htmlUtils';
 
 import { N8nButton } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/FocusPanel.test.ts b/packages/frontend/editor-ui/src/components/FocusPanel.test.ts
index 8ed4bb585ef..1e4d53e9917 100644
--- a/packages/frontend/editor-ui/src/components/FocusPanel.test.ts
+++ b/packages/frontend/editor-ui/src/components/FocusPanel.test.ts
@@ -1,4 +1,4 @@
-import { createCanvasGraphNode } from '@/features/canvas/__tests__/utils';
+import { createCanvasGraphNode } from '@/features/workflows/canvas/__tests__/utils';
 import { createTestNode, createTestWorkflow, mockNodeTypeDescription } from '@/__tests__/mocks';
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore } from '@/__tests__/utils';
@@ -11,7 +11,7 @@ import { useVueFlow } from '@vue-flow/core';
 import type { INodeProperties } from 'n8n-workflow';
 import { setActivePinia } from 'pinia';
 import { reactive } from 'vue';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 import FocusPanel from './FocusPanel.vue';
 
 vi.mock('vue-router', () => ({
diff --git a/packages/frontend/editor-ui/src/components/FocusPanel.vue b/packages/frontend/editor-ui/src/components/FocusPanel.vue
index 9c9f6e34e4c..37dade9b2d1 100644
--- a/packages/frontend/editor-ui/src/components/FocusPanel.vue
+++ b/packages/frontend/editor-ui/src/components/FocusPanel.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
-import CodeNodeEditor from '@/features/editors/components/CodeNodeEditor/CodeNodeEditor.vue';
-import CssEditor from '@/features/editors/components/CssEditor/CssEditor.vue';
+import CodeNodeEditor from '@/features/shared/editors/components/CodeNodeEditor/CodeNodeEditor.vue';
+import CssEditor from '@/features/shared/editors/components/CssEditor/CssEditor.vue';
 import ExpressionEditorModalInput from '@/components/ExpressionEditorModal/ExpressionEditorModalInput.vue';
-import HtmlEditor from '@/features/editors/components/HtmlEditor/HtmlEditor.vue';
-import JsEditor from '@/features/editors/components/JsEditor/JsEditor.vue';
-import JsonEditor from '@/features/editors/components/JsonEditor/JsonEditor.vue';
+import HtmlEditor from '@/features/shared/editors/components/HtmlEditor/HtmlEditor.vue';
+import JsEditor from '@/features/shared/editors/components/JsEditor/JsEditor.vue';
+import JsonEditor from '@/features/shared/editors/components/JsonEditor/JsonEditor.vue';
 import NodeExecuteButton from '@/components/NodeExecuteButton.vue';
 import ParameterOptions from '@/components/ParameterOptions.vue';
-import SqlEditor from '@/features/editors/components/SqlEditor/SqlEditor.vue';
+import SqlEditor from '@/features/shared/editors/components/SqlEditor/SqlEditor.vue';
 import { useFocusPanelStore } from '@/stores/focusPanel.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { computed, nextTick, ref, watch, toRef, useTemplateRef } from 'vue';
@@ -32,22 +32,22 @@ import {
 	type INodeProperties,
 	isResourceLocatorValue,
 } from 'n8n-workflow';
-import { useEnvironmentsStore } from '@/features/environments.ee/environments.store';
+import { useEnvironmentsStore } from '@/features/settings/environments.ee/environments.store';
 import { htmlEditorEventBus } from '@/event-bus';
 import { hasFocusOnInput, isFocusableEl } from '@/utils/typesUtils';
 import type { INodeUi, ResizeData, TargetNodeParameterContext } from '@/Interface';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useActiveElement, useThrottleFn } from '@vueuse/core';
-import { useExecutionData } from '@/features/executions/composables/useExecutionData';
+import { useExecutionData } from '@/features/execution/executions/composables/useExecutionData';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import ExperimentalNodeDetailsDrawer from '@/features/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
+import ExperimentalNodeDetailsDrawer from '@/features/workflows/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useVueFlow } from '@vue-flow/core';
-import ExperimentalFocusPanelHeader from '@/features/canvas/experimental/components/ExperimentalFocusPanelHeader.vue';
+import ExperimentalFocusPanelHeader from '@/features/workflows/canvas/experimental/components/ExperimentalFocusPanelHeader.vue';
 import { useTelemetryContext } from '@/composables/useTelemetryContext';
-import { type ContextMenuAction } from '@/features/ui/contextMenu/composables/useContextMenuItems';
-import { type CanvasNode, CanvasNodeRenderType } from '@/features/canvas/canvas.types';
+import { type ContextMenuAction } from '@/features/shared/contextMenu/composables/useContextMenuItems';
+import { type CanvasNode, CanvasNodeRenderType } from '@/features/workflows/canvas/canvas.types';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
 
 import {
diff --git a/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.test.ts b/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.test.ts
index 677468ee338..72d048e8a56 100644
--- a/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.test.ts
+++ b/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.test.ts
@@ -3,9 +3,9 @@ import { fireEvent, screen } from '@testing-library/vue';
 import FreeAiCreditsCallout from '@/components/FreeAiCreditsCallout.vue';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useToast } from '@/composables/useToast';
 import { renderComponent } from '@/__tests__/render';
@@ -28,7 +28,7 @@ vi.mock('@/features/credentials/credentials.store', () => ({
 	useCredentialsStore: vi.fn(),
 }));
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
@@ -36,7 +36,7 @@ vi.mock('@/stores/ndv.store', () => ({
 	useNDVStore: vi.fn(),
 }));
 
-vi.mock('@/features/projects/projects.store', () => ({
+vi.mock('@/features/collaboration/projects/projects.store', () => ({
 	useProjectsStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.vue b/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.vue
index 2ceb7da9b13..7586d1eb3c4 100644
--- a/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.vue
+++ b/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.vue
@@ -4,9 +4,9 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed, ref } from 'vue';
 import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 import { N8nButton, N8nCallout, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/FromAiParametersModal.test.ts b/packages/frontend/editor-ui/src/components/FromAiParametersModal.test.ts
index 3bf598deccc..bcf1b68ce7e 100644
--- a/packages/frontend/editor-ui/src/components/FromAiParametersModal.test.ts
+++ b/packages/frontend/editor-ui/src/components/FromAiParametersModal.test.ts
@@ -6,7 +6,7 @@ import { STORES } from '@n8n/stores';
 import userEvent from '@testing-library/user-event';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useAgentRequestStore } from '@n8n/stores/useAgentRequestStore';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useRouter } from 'vue-router';
 import type { Workflow } from 'n8n-workflow';
 import { NodeConnectionTypes } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/components/FromAiParametersModal.vue b/packages/frontend/editor-ui/src/components/FromAiParametersModal.vue
index 79dcc5ab6f1..516d674cca5 100644
--- a/packages/frontend/editor-ui/src/components/FromAiParametersModal.vue
+++ b/packages/frontend/editor-ui/src/components/FromAiParametersModal.vue
@@ -20,7 +20,7 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { type JSONSchema7 } from 'json-schema';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 import { ElCol, ElRow } from 'element-plus';
 import { N8nButton, N8nCallout, N8nFormInputs, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/InputPanel.vue b/packages/frontend/editor-ui/src/components/InputPanel.vue
index 27c3532af38..e3ddab1e16e 100644
--- a/packages/frontend/editor-ui/src/components/InputPanel.vue
+++ b/packages/frontend/editor-ui/src/components/InputPanel.vue
@@ -10,7 +10,7 @@ import {
 } from '@/constants';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { waitingNodeTooltip } from '@/features/executions/executions.utils';
+import { waitingNodeTooltip } from '@/features/execution/executions/executions.utils';
 import uniqBy from 'lodash/uniqBy';
 import {
 	type INodeInputConfiguration,
@@ -29,7 +29,7 @@ import WireMeUp from './WireMeUp.vue';
 import { usePostHog } from '@/stores/posthog.store';
 import { type IRunDataDisplayMode } from '@/Interface';
 import { I18nT } from 'vue-i18n';
-import { type SearchShortcut } from '@/features/canvas/canvas.types';
+import { type SearchShortcut } from '@/features/workflows/canvas/canvas.types';
 import { useRouter } from 'vue-router';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
 
diff --git a/packages/frontend/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/frontend/editor-ui/src/components/MainHeader/MainHeader.vue
index 3ac4164eb1e..8cec7b6c8d3 100644
--- a/packages/frontend/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/frontend/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -11,10 +11,10 @@ import {
 	VIEWS,
 	N8N_MAIN_GITHUB_REPO_URL,
 } from '@/constants';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { computed, onBeforeMount, onBeforeUnmount, onMounted, ref, watch } from 'vue';
@@ -23,7 +23,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { useLocalStorage } from '@vueuse/core';
 import GithubButton from 'vue-github-button';
-import type { FolderShortInfo } from '@/features/folders/folders.types';
+import type { FolderShortInfo } from '@/features/core/folders/folders.types';
 
 import { N8nIcon } from '@n8n/design-system';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
index 2081b11de0b..fb7d75c52ab 100644
--- a/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
+++ b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
@@ -7,7 +7,7 @@ import {
 	VIEWS,
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
-import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/projects/projects.constants';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
 import type { IWorkflowDb } from '@/Interface';
 import { STORES } from '@n8n/stores';
 import { createTestingPinia } from '@pinia/testing';
@@ -18,8 +18,8 @@ import { useRoute, useRouter } from 'vue-router';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { Project } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import type { Project } from '@/features/collaboration/projects/projects.types';
 
 vi.mock('vue-router', async (importOriginal) => ({
 	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
diff --git a/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 9879c5809af..635c5d0777d 100644
--- a/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import BreakpointsObserver from '@/components/BreakpointsObserver.vue';
 import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
-import FolderBreadcrumbs from '@/features/folders/components/FolderBreadcrumbs.vue';
-import CollaborationPane from '@/features/collaboration/components/CollaborationPane.vue';
-import WorkflowHistoryButton from '@/features/workflowHistory/components/WorkflowHistoryButton.vue';
+import FolderBreadcrumbs from '@/features/core/folders/components/FolderBreadcrumbs.vue';
+import CollaborationPane from '@/features/collaboration/collaboration/components/CollaborationPane.vue';
+import WorkflowHistoryButton from '@/features/workflows/workflowHistory/components/WorkflowHistoryButton.vue';
 import PushConnectionTracker from '@/components/PushConnectionTracker.vue';
 import SaveButton from '@/components/SaveButton.vue';
 import WorkflowActivator from '@/components/WorkflowActivator.vue';
@@ -22,15 +22,15 @@ import {
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
-import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/projects/projects.constants';
-import { ResourceType } from '@/features/projects/projects.utils';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
+import { ResourceType } from '@/features/collaboration/projects/projects.utils';
 
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useTagsStore } from '@/stores/tags.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
 
@@ -43,10 +43,10 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useWorkflowSaving } from '@/composables/useWorkflowSaving';
 import { nodeViewEventBus } from '@/event-bus';
 import type { ActionDropdownItem, IWorkflowDb, IWorkflowToShare } from '@/Interface';
-import type { FolderShortInfo } from '@/features/folders/folders.types';
-import { useFoldersStore } from '@/features/folders/folders.store';
+import type { FolderShortInfo } from '@/features/core/folders/folders.types';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import { sanitizeFilename } from '@/utils/fileUtils';
 import { hasPermission } from '@/utils/rbac/permissions';
 import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
diff --git a/packages/frontend/editor-ui/src/components/MainSidebar.test.ts b/packages/frontend/editor-ui/src/components/MainSidebar.test.ts
index 4ea569dd584..272f1e7fd6c 100644
--- a/packages/frontend/editor-ui/src/components/MainSidebar.test.ts
+++ b/packages/frontend/editor-ui/src/components/MainSidebar.test.ts
@@ -6,9 +6,9 @@ import { defaultSettings } from '@/__tests__/defaults';
 import MainSidebar from '@/components/MainSidebar.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useVersionsStore } from '@/stores/versions.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { Version } from '@n8n/rest-api-client/api/versions';
 
 vi.mock('vue-router', () => ({
diff --git a/packages/frontend/editor-ui/src/components/MainSidebar.vue b/packages/frontend/editor-ui/src/components/MainSidebar.vue
index 4f53fc1ad5e..0ba42a47c41 100644
--- a/packages/frontend/editor-ui/src/components/MainSidebar.vue
+++ b/packages/frontend/editor-ui/src/components/MainSidebar.vue
@@ -28,17 +28,17 @@ import {
 	WHATS_NEW_MODAL_KEY,
 } from '@/constants';
 import { EXTERNAL_LINKS } from '@/constants/externalLinks';
-import { CHAT_VIEW } from '@/features/chatHub/constants';
+import { CHAT_VIEW } from '@/features/ai/chatHub/constants';
 import { hasPermission } from '@/utils/rbac/permissions';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useVersionsStore } from '@/stores/versions.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useDebounce } from '@/composables/useDebounce';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useTelemetry } from '@/composables/useTelemetry';
@@ -55,7 +55,7 @@ import { usePersonalizedTemplatesV3Store } from '@/experiments/personalizedTempl
 import TemplateTooltip from '@/experiments/personalizedTemplatesV3/components/TemplateTooltip.vue';
 import { useKeybindings } from '@/composables/useKeybindings';
 import { useCalloutHelpers } from '@/composables/useCalloutHelpers';
-import ProjectNavigation from '@/features/projects/components/ProjectNavigation.vue';
+import ProjectNavigation from '@/features/collaboration/projects/components/ProjectNavigation.vue';
 import MainSidebarSourceControl from './MainSidebarSourceControl.vue';
 import MainSidebarUserArea from '@/components/MainSidebarUserArea.vue';
 import { usePostHog } from '@/stores/posthog.store';
diff --git a/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.test.ts b/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.test.ts
index 25f6b9a55d7..2e4416ce123 100644
--- a/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.test.ts
+++ b/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.test.ts
@@ -7,10 +7,10 @@ import { reactive } from 'vue';
 import { STORES } from '@n8n/stores';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useRBACStore } from '@/stores/rbac.store';
 import { createComponentRenderer } from '@/__tests__/render';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 let pinia: ReturnType<typeof createTestingPinia>;
 let sourceControlStore: ReturnType<typeof useSourceControlStore>;
diff --git a/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.vue
index a19a6648f5c..049db08c034 100644
--- a/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -3,8 +3,8 @@ import { computed, ref } from 'vue';
 import { useI18n } from '@n8n/i18n';
 import { hasPermission } from '@/utils/rbac/permissions';
 import { getResourcePermissions } from '@n8n/permissions';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useRoute, useRouter } from 'vue-router';
 
 import { N8nButton, N8nIcon, N8nTooltip } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/MainSidebarUserArea.vue b/packages/frontend/editor-ui/src/components/MainSidebarUserArea.vue
index 2535fe6b353..9abd36d0bf6 100644
--- a/packages/frontend/editor-ui/src/components/MainSidebarUserArea.vue
+++ b/packages/frontend/editor-ui/src/components/MainSidebarUserArea.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { VIEWS } from '@/constants';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import {
 	type IMenuItem,
 	N8nAvatar,
diff --git a/packages/frontend/editor-ui/src/components/Modals.vue b/packages/frontend/editor-ui/src/components/Modals.vue
index d0496eec8ee..99f642dbf01 100644
--- a/packages/frontend/editor-ui/src/components/Modals.vue
+++ b/packages/frontend/editor-ui/src/components/Modals.vue
@@ -31,8 +31,8 @@ import {
 	EXPERIMENT_TEMPLATE_RECO_V3_KEY,
 	CONFIRM_PASSWORD_MODAL_KEY,
 } from '@/constants';
-import { DEBUG_PAYWALL_MODAL_KEY } from '@/features/executions/executions.constants';
-import { VARIABLE_MODAL_KEY } from '@/features/environments.ee/environments.constants';
+import { DEBUG_PAYWALL_MODAL_KEY } from '@/features/execution/executions/executions.constants';
+import { VARIABLE_MODAL_KEY } from '@/features/settings/environments.ee/environments.constants';
 import {
 	CREDENTIAL_EDIT_MODAL_KEY,
 	CREDENTIAL_SELECT_MODAL_KEY,
@@ -41,71 +41,71 @@ import {
 	DELETE_USER_MODAL_KEY,
 	INVITE_USER_MODAL_KEY,
 	PERSONALIZATION_MODAL_KEY,
-} from '@/features/users/users.constants';
-import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/usage/usage.constants';
+} from '@/features/settings/users/users.constants';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/settings/usage/usage.constants';
 import {
 	DELETE_FOLDER_MODAL_KEY,
 	MOVE_FOLDER_MODAL_KEY,
-} from '@/features/folders/folders.constants';
+} from '@/features/core/folders/folders.constants';
 import {
 	SOURCE_CONTROL_PULL_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
-} from '@/features/sourceControl.ee/sourceControl.constants';
-import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/projects/projects.constants';
+} from '@/features/integrations/sourceControl.ee/sourceControl.constants';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
 import {
 	COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
-} from '@/features/communityNodes/communityNodes.constants';
-import { API_KEY_CREATE_OR_EDIT_MODAL_KEY } from '@/features/apiKeys/apiKeys.constants';
+} from '@/features/settings/communityNodes/communityNodes.constants';
+import { API_KEY_CREATE_OR_EDIT_MODAL_KEY } from '@/features/settings/apiKeys/apiKeys.constants';
 import AboutModal from '@/components/AboutModal.vue';
 import ActivationModal from '@/components/ActivationModal.vue';
-import ApiKeyCreateOrEditModal from '@/features/apiKeys/components/ApiKeyCreateOrEditModal.vue';
-import NewAssistantSessionModal from '@/features/assistant/components/Chat/NewAssistantSessionModal.vue';
-import ChangePasswordModal from '@/features/auth/components/ChangePasswordModal.vue';
-import ConfirmPasswordModal from '@/features/auth/components/ConfirmPasswordModal.vue';
+import ApiKeyCreateOrEditModal from '@/features/settings/apiKeys/components/ApiKeyCreateOrEditModal.vue';
+import NewAssistantSessionModal from '@/features/ai/assistant/components/Chat/NewAssistantSessionModal.vue';
+import ChangePasswordModal from '@/features/core/auth/components/ChangePasswordModal.vue';
+import ConfirmPasswordModal from '@/features/core/auth/components/ConfirmPasswordModal.vue';
 import ChatEmbedModal from '@/components/ChatEmbedModal.vue';
-import CommunityPackageInstallModal from '@/features/communityNodes/components/CommunityPackageInstallModal.vue';
-import CommunityPackageManageConfirmModal from '@/features/communityNodes/components/CommunityPackageManageConfirmModal.vue';
-import CommunityPlusEnrollmentModal from '@/features/usage/components/CommunityPlusEnrollmentModal.vue';
+import CommunityPackageInstallModal from '@/features/settings/communityNodes/components/CommunityPackageInstallModal.vue';
+import CommunityPackageManageConfirmModal from '@/features/settings/communityNodes/components/CommunityPackageManageConfirmModal.vue';
+import CommunityPlusEnrollmentModal from '@/features/settings/usage/components/CommunityPlusEnrollmentModal.vue';
 import ContactPromptModal from '@/components/ContactPromptModal.vue';
 import CredentialEdit from '@/features/credentials/components/CredentialEdit/CredentialEdit.vue';
 import CredentialsSelectModal from '@/features/credentials/components/CredentialsSelectModal.vue';
-import DebugPaywallModal from '@/features/executions/components/DebugPaywallModal.vue';
-import DeleteFolderModal from '@/features/folders/components/DeleteFolderModal.vue';
-import MoveToFolderModal from '@/features/folders/components/MoveToFolderModal.vue';
-import DeleteUserModal from '@/features/users/components/DeleteUserModal.vue';
+import DebugPaywallModal from '@/features/execution/executions/components/DebugPaywallModal.vue';
+import DeleteFolderModal from '@/features/core/folders/components/DeleteFolderModal.vue';
+import MoveToFolderModal from '@/features/core/folders/components/MoveToFolderModal.vue';
+import DeleteUserModal from '@/features/settings/users/components/DeleteUserModal.vue';
 import DuplicateWorkflowDialog from '@/components/DuplicateWorkflowDialog.vue';
-import ExternalSecretsProviderModal from '@/features/externalSecrets/components/ExternalSecretsProviderModal.ee.vue';
+import ExternalSecretsProviderModal from '@/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderModal.ee.vue';
 import FromAiParametersModal from '@/components/FromAiParametersModal.vue';
 import ImportCurlModal from '@/components/ImportCurlModal.vue';
 import ImportWorkflowUrlModal from '@/components/ImportWorkflowUrlModal.vue';
-import InviteUsersModal from '@/features/users/components/InviteUsersModal.vue';
-import MfaSetupModal from '@/features/auth/components/MfaSetupModal.vue';
+import InviteUsersModal from '@/features/settings/users/components/InviteUsersModal.vue';
+import MfaSetupModal from '@/features/core/auth/components/MfaSetupModal.vue';
 import ModalRoot from '@/components/ModalRoot.vue';
 import NpsSurvey from '@/components/NpsSurvey.vue';
-import PersonalizationModal from '@/features/users/components/PersonalizationModal.vue';
+import PersonalizationModal from '@/features/settings/users/components/PersonalizationModal.vue';
 import PreBuiltAgentsModal from '@/components/PreBuiltAgentsModal.vue';
-import ProjectMoveResourceModal from '@/features/projects/components/ProjectMoveResourceModal.vue';
-import EventDestinationSettingsModal from '@/features/logStreaming.ee/components/EventDestinationSettingsModal.vue';
-import SetupWorkflowCredentialsModal from '@/features/templates/components/SetupWorkflowCredentialsModal.vue';
-import SourceControlPullModal from '@/features/sourceControl.ee/components/SourceControlPullModal.vue';
-import SourceControlPushModal from '@/features/sourceControl.ee/components/SourceControlPushModal.vue';
+import ProjectMoveResourceModal from '@/features/collaboration/projects/components/ProjectMoveResourceModal.vue';
+import EventDestinationSettingsModal from '@/features/integrations/logStreaming.ee/components/EventDestinationSettingsModal.vue';
+import SetupWorkflowCredentialsModal from '@/features/workflows/templates/components/SetupWorkflowCredentialsModal.vue';
+import SourceControlPullModal from '@/features/integrations/sourceControl.ee/components/SourceControlPullModal.vue';
+import SourceControlPushModal from '@/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue';
 import AnnotationTagsManager from '@/components/TagsManager/AnnotationTagsManager.ee.vue';
 import WorkflowTagsManager from '@/components/TagsManager/WorkflowTagsManager.vue';
 import UpdatesPanel from '@/components/UpdatesPanel.vue';
 import WhatsNewModal from '@/components/WhatsNewModal.vue';
 import WorkflowActivationConflictingWebhookModal from '@/components/WorkflowActivationConflictingWebhookModal.vue';
 import WorkflowExtractionNameModal from '@/components/WorkflowExtractionNameModal.vue';
-import WorkflowHistoryVersionRestoreModal from '@/features/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue';
+import WorkflowHistoryVersionRestoreModal from '@/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue';
 import WorkflowSettings from '@/components/WorkflowSettings.vue';
 import WorkflowShareModal from '@/components/WorkflowShareModal.ee.vue';
-import WorkflowDiffModal from '@/features/workflow-diff/WorkflowDiffModal.vue';
+import WorkflowDiffModal from '@/features/workflows/workflowDiff/WorkflowDiffModal.vue';
 import type { EventBus } from '@n8n/utils/event-bus';
-import PromptMfaCodeModal from '@/features/auth/components/PromptMfaCodeModal.vue';
+import PromptMfaCodeModal from '@/features/core/auth/components/PromptMfaCodeModal.vue';
 import DynamicModalLoader from './DynamicModalLoader.vue';
 import NodeRecommendationModalV2 from '@/experiments/templateRecoV2/components/NodeRecommendationModal.vue';
 import NodeRecommendationModalV3 from '@/experiments/personalizedTemplatesV3/components/NodeRecommendationModal.vue';
-import VariableModal from '@/features/environments.ee/components/VariableModal.vue';
+import VariableModal from '@/features/settings/environments.ee/components/VariableModal.vue';
 </script>
 
 <template>
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
index cea169fb1d9..fe0f4e0c747 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
@@ -19,10 +19,10 @@ import { useActions } from './NodeCreator/composables/useActions';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 import { useI18n } from '@n8n/i18n';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
-import { useBuilderStore } from '@/features/assistant/builder.store';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
-import { useCommandBar } from '@/features/ui/commandBar/composables/useCommandBar';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
+import { useCommandBar } from '@/features/shared/commandBar/composables/useCommandBar';
 
 import { N8nAssistantIcon, N8nButton, N8nIconButton, N8nTooltip } from '@n8n/design-system';
 
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/CommunityNodeItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/CommunityNodeItem.vue
index ea92f4f6969..f552ab12064 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/CommunityNodeItem.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/CommunityNodeItem.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from '@n8n/i18n';
-import CommunityNodeInstallHint from '@/features/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue';
+import CommunityNodeInstallHint from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue';
 import { N8nButton } from '@n8n/design-system';
 export interface Props {
 	isPreview: boolean;
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index 96e8ca02993..d55ecf6a413 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -6,7 +6,7 @@ import {
 	DRAG_EVENT_DATA_KEY,
 	HITL_SUBCATEGORY,
 } from '@/constants';
-import { COMMUNITY_NODES_INSTALLATION_DOCS_URL } from '@/features/communityNodes/communityNodes.constants';
+import { COMMUNITY_NODES_INSTALLATION_DOCS_URL } from '@/features/settings/communityNodes/communityNodes.constants';
 import { computed, ref } from 'vue';
 
 import NodeIcon from '@/components/NodeIcon.vue';
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
index 350bacfab50..00b3f46f484 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
@@ -15,7 +15,7 @@ import {
 	OPEN_AI_NODE_TYPE,
 } from '@/constants';
 
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 
 import { useActions } from '../composables/useActions';
@@ -31,8 +31,8 @@ import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import OrderSwitcher from './../OrderSwitcher.vue';
 import { getActiveViewCallouts, isNodePreviewKey } from '../utils';
 
-import CommunityNodeInfo from '@/features/communityNodes/components/nodeCreator/CommunityNodeInfo.vue';
-import CommunityNodeFooter from '@/features/communityNodes/components/nodeCreator/CommunityNodeFooter.vue';
+import CommunityNodeInfo from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.vue';
+import CommunityNodeFooter from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeFooter.vue';
 import { useCalloutHelpers } from '@/composables/useCalloutHelpers';
 
 import { N8nCallout, N8nInfoTip } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index 647b32eb75b..74b2b194ab8 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -12,7 +12,7 @@ import NodesListPanel from './Panel/NodesListPanel.vue';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useUIStore } from '@/stores/ui.store';
 import { DRAG_EVENT_DATA_KEY } from '@/constants';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
 import type { NodeTypeSelectedPayload } from '@/Interface';
 import { onClickOutside } from '@vueuse/core';
 
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/CommunityNodeDetails.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/CommunityNodeDetails.vue
index cef70703d8d..12ac8739031 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/CommunityNodeDetails.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/CommunityNodeDetails.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { useInstallNode } from '@/features/communityNodes/composables/useInstallNode';
+import { useInstallNode } from '@/features/settings/communityNodes/composables/useInstallNode';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { getNodeIconSource } from '@/utils/nodeIcon';
 import { N8nButton, N8nIcon, N8nText, N8nTooltip } from '@n8n/design-system';
 import { i18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
index fd6a50c9ca8..c203f53d1ac 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
@@ -22,11 +22,11 @@ import { useI18n } from '@n8n/i18n';
 import { useDebounce } from '@/composables/useDebounce';
 import NodeIcon from '@/components/NodeIcon.vue';
 
-import CommunityNodeDetails from '@/features/communityNodes/components/nodeCreator/CommunityNodeDetails.vue';
-import CommunityNodeInfo from '@/features/communityNodes/components/nodeCreator/CommunityNodeInfo.vue';
-import CommunityNodeDocsLink from '@/features/communityNodes/components/nodeCreator/CommunityNodeDocsLink.vue';
-import CommunityNodeFooter from '@/features/communityNodes/components/nodeCreator/CommunityNodeFooter.vue';
-import { useUsersStore } from '@/features/users/users.store';
+import CommunityNodeDetails from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeDetails.vue';
+import CommunityNodeInfo from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.vue';
+import CommunityNodeDocsLink from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeDocsLink.vue';
+import CommunityNodeFooter from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeFooter.vue';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 import { N8nIcon, N8nNotice } from '@n8n/design-system';
 const i18n = useI18n();
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
index 5793b5a2ffc..939c4caf68a 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
@@ -10,7 +10,7 @@ import ItemsRenderer from './ItemsRenderer.vue';
 import CategoryItem from '../ItemTypes/CategoryItem.vue';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 
-import CommunityNodeInstallHint from '@/features/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue';
+import CommunityNodeInstallHint from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue';
 
 export interface Props {
 	elements: INodeCreateElement[];
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
index e6041f8e09c..ad481e50757 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
@@ -20,7 +20,7 @@ import { i18n } from '@n8n/i18n';
 
 import { getCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
 import { formatTriggerActionName } from '../utils';
-import { useEvaluationStore } from '@/features/evaluation.ee/evaluation.store';
+import { useEvaluationStore } from '@/features/ai/evaluation.ee/evaluation.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
 const PLACEHOLDER_RECOMMENDED_ACTION_KEY = 'placeholder_recommended';
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.ts
index 7b97651c5af..19cf76c6864 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -43,7 +43,7 @@ import type { CommunityNodeDetails, ViewStack } from './composables/useViewStack
 import {
 	PrebuiltAgentTemplates,
 	SampleTemplates,
-} from '@/features/templates/utils/workflowSamples';
+} from '@/features/workflows/templates/utils/workflowSamples';
 
 const COMMUNITY_NODE_TYPE_PREVIEW_TOKEN = '-preview';
 
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.spec.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.spec.ts
index d466caf20f8..dda4ec9f9c2 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.spec.ts
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.spec.ts
@@ -11,7 +11,7 @@ import { START_NODE_TYPE } from 'n8n-workflow';
 import { useSettingsStore } from '@/stores/settings.store';
 import { AIView } from './viewsData';
 import { mockNodeTypeDescription } from '@/__tests__/mocks';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { usePostHog } from '@/stores/posthog.store';
 
 let posthogStore: ReturnType<typeof usePostHog>;
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index 401ffef7d64..2e31c41c5e9 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -64,11 +64,11 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type { SimplifiedNodeType } from '@/Interface';
 import type { INodeTypeDescription, NodeConnectionType, Themed } from 'n8n-workflow';
 import { EVALUATION_TRIGGER_NODE_TYPE, NodeConnectionTypes } from 'n8n-workflow';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import type { BaseTextKey } from '@n8n/i18n';
 import camelCase from 'lodash/camelCase';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useEvaluationStore } from '@/features/evaluation.ee/evaluation.store';
+import { useEvaluationStore } from '@/features/ai/evaluation.ee/evaluation.store';
 import { getAiTemplatesCallout, getPreBuiltAgentsCalloutWithDivider } from './utils';
 import { useCalloutHelpers } from '@/composables/useCalloutHelpers';
 
diff --git a/packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts b/packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts
index 2c41ddb4ee9..2cdc2eb726f 100644
--- a/packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts
+++ b/packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts
@@ -4,7 +4,7 @@ import { waitFor, fireEvent } from '@testing-library/vue';
 import NodeDetailsView from '@/components/NodeDetailsView.vue';
 import { VIEWS } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/frontend/editor-ui/src/components/NodeSettings.vue b/packages/frontend/editor-ui/src/components/NodeSettings.vue
index b530d096722..8c4a997e6c6 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettings.vue
+++ b/packages/frontend/editor-ui/src/components/NodeSettings.vue
@@ -24,25 +24,25 @@ import NodeWebhooks from '@/components/NodeWebhooks.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
 import get from 'lodash/get';
 
-import ExperimentalEmbeddedNdvHeader from '@/features/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue';
+import ExperimentalEmbeddedNdvHeader from '@/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue';
 import FreeAiCreditsCallout from '@/components/FreeAiCreditsCallout.vue';
 import NodeActionsList from '@/components/NodeActionsList.vue';
 import NodeSettingsInvalidNodeWarning from '@/components/NodeSettingsInvalidNodeWarning.vue';
 import { useExternalHooks } from '@/composables/useExternalHooks';
-import { useInstalledCommunityPackage } from '@/features/communityNodes/composables/useInstalledCommunityPackage';
+import { useInstalledCommunityPackage } from '@/features/settings/communityNodes/composables/useInstalledCommunityPackage';
 import { useNodeCredentialOptions } from '@/features/credentials/composables/useNodeCredentialOptions';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useNodeSettingsParameters } from '@/composables/useNodeSettingsParameters';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { importCurlEventBus, ndvEventBus } from '@/event-bus';
-import NodeStorageLimitCallout from '@/features/dataTable/components/NodeStorageLimitCallout.vue';
+import NodeStorageLimitCallout from '@/features/core/dataTable/components/NodeStorageLimitCallout.vue';
 import NodeTitle from '@/components/NodeTitle.vue';
 import { RenameNodeCommand } from '@/models/history';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useHistoryStore } from '@/stores/history.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { NodeSettingsTab } from '@/types/nodeSettings';
 import { getNodeIconSource } from '@/utils/nodeIcon';
@@ -56,15 +56,15 @@ import {
 import { useI18n } from '@n8n/i18n';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { useResizeObserver } from '@vueuse/core';
-import CommunityNodeFooter from '@/features/communityNodes/components/nodeCreator/CommunityNodeFooter.vue';
-import CommunityNodeUpdateInfo from '@/features/communityNodes/components/nodeCreator/CommunityNodeUpdateInfo.vue';
+import CommunityNodeFooter from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeFooter.vue';
+import CommunityNodeUpdateInfo from '@/features/settings/communityNodes/components/nodeCreator/CommunityNodeUpdateInfo.vue';
 import NodeExecuteButton from './NodeExecuteButton.vue';
 
 import { N8nBlockUi, N8nIcon, N8nNotice, N8nText } from '@n8n/design-system';
 import { useRoute } from 'vue-router';
 import { useSettingsStore } from '@/stores/settings.store';
 import { injectWorkflowState } from '@/composables/useWorkflowState';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.test.ts b/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.test.ts
index 2916ceec842..37e6c9cd096 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.test.ts
+++ b/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.test.ts
@@ -1,13 +1,13 @@
 import { mockNode } from '@/__tests__/mocks';
 import { renderComponent } from '@/__tests__/render';
 import { mockedStore, type MockedStore } from '@/__tests__/utils';
-import { useInstallNode } from '@/features/communityNodes/composables/useInstallNode';
+import { useInstallNode } from '@/features/settings/communityNodes/composables/useInstallNode';
 import { type NodeTypesByTypeNameAndVersion } from '@/Interface';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { CommunityNodeType } from '@n8n/api-types';
 import type { TestingPinia } from '@pinia/testing';
 import { createTestingPinia } from '@pinia/testing';
@@ -16,7 +16,7 @@ import { vi, type MockedFunction } from 'vitest';
 import { ref } from 'vue';
 import NodeSettingsInvalidNodeWarning from './NodeSettingsInvalidNodeWarning.vue';
 
-vi.mock('@/features/communityNodes/composables/useInstallNode');
+vi.mock('@/features/settings/communityNodes/composables/useInstallNode');
 vi.mock('@/composables/useTelemetry', () => ({
 	useTelemetry: () => ({
 		track: vi.fn(),
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.vue b/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.vue
index 1b16f92175b..1a93c5e8021 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.vue
+++ b/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.vue
@@ -1,20 +1,20 @@
 <script setup lang="ts">
-import { useInstallNode } from '@/features/communityNodes/composables/useInstallNode';
+import { useInstallNode } from '@/features/settings/communityNodes/composables/useInstallNode';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { CUSTOM_NODES_DOCS_URL } from '@/constants';
-import { COMMUNITY_PACKAGE_INSTALL_MODAL_KEY } from '@/features/communityNodes/communityNodes.constants';
+import { COMMUNITY_PACKAGE_INSTALL_MODAL_KEY } from '@/features/settings/communityNodes/communityNodes.constants';
 import type { INodeUi } from '@/Interface';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { N8nButton, N8nIcon, N8nText } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
 import { isCommunityPackageName } from 'n8n-workflow';
 import { computed, watch } from 'vue';
 import { I18nT } from 'vue-i18n';
-import ContactAdministratorToInstall from '@/features/communityNodes/components/ContactAdministratorToInstall.vue';
+import ContactAdministratorToInstall from '@/features/settings/communityNodes/components/ContactAdministratorToInstall.vue';
 import { removePreviewToken } from './Node/NodeCreator/utils';
 
 const { node, previewMode = false } = defineProps<{ node: INodeUi; previewMode?: boolean }>();
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsTabs.test.ts b/packages/frontend/editor-ui/src/components/NodeSettingsTabs.test.ts
index b0bf37f1f31..3530b53e749 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettingsTabs.test.ts
+++ b/packages/frontend/editor-ui/src/components/NodeSettingsTabs.test.ts
@@ -4,12 +4,12 @@ import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
 import { ref } from 'vue';
-import type { ExtendedPublicInstalledPackage } from '@/features/communityNodes/communityNodes.utils';
-import { useInstalledCommunityPackage } from '@/features/communityNodes/composables/useInstalledCommunityPackage';
+import type { ExtendedPublicInstalledPackage } from '@/features/settings/communityNodes/communityNodes.utils';
+import { useInstalledCommunityPackage } from '@/features/settings/communityNodes/composables/useInstalledCommunityPackage';
 
 const renderComponent = createComponentRenderer(NodeSettingsTabs);
 
-vi.mock('@/features/communityNodes/composables/useInstalledCommunityPackage', () => ({
+vi.mock('@/features/settings/communityNodes/composables/useInstalledCommunityPackage', () => ({
 	useInstalledCommunityPackage: vi.fn(() => ({
 		installedPackage: ref<ExtendedPublicInstalledPackage | undefined>(undefined),
 		isCommunityNode: ref(false),
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue b/packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue
index 7e030368279..221ef1ecf6b 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue
+++ b/packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ITab } from '@/Interface';
-import { COMMUNITY_NODES_INSTALLATION_DOCS_URL } from '@/features/communityNodes/communityNodes.constants';
+import { COMMUNITY_NODES_INSTALLATION_DOCS_URL } from '@/features/settings/communityNodes/communityNodes.constants';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeTypeDescription } from 'n8n-workflow';
@@ -8,7 +8,7 @@ import { NodeConnectionTypes } from 'n8n-workflow';
 import { computed } from 'vue';
 
 import { useExternalHooks } from '@/composables/useExternalHooks';
-import { useInstalledCommunityPackage } from '@/features/communityNodes/composables/useInstalledCommunityPackage';
+import { useInstalledCommunityPackage } from '@/features/settings/communityNodes/composables/useInstalledCommunityPackage';
 import { useNodeDocsUrl } from '@/composables/useNodeDocsUrl';
 import { useTelemetry } from '@/composables/useTelemetry';
 import type { NodeSettingsTab } from '@/types/nodeSettings';
diff --git a/packages/frontend/editor-ui/src/components/OutputPanel.vue b/packages/frontend/editor-ui/src/components/OutputPanel.vue
index 1dcdaa30c1b..76c853239f6 100644
--- a/packages/frontend/editor-ui/src/components/OutputPanel.vue
+++ b/packages/frontend/editor-ui/src/components/OutputPanel.vue
@@ -12,14 +12,14 @@ import { useNodeType } from '@/composables/useNodeType';
 import { usePinnedData } from '@/composables/usePinnedData';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@n8n/i18n';
-import { waitingNodeTooltip } from '@/features/executions/executions.utils';
+import { waitingNodeTooltip } from '@/features/execution/executions/executions.utils';
 import { useNodeDirtiness } from '@/composables/useNodeDirtiness';
-import { CanvasNodeDirtiness } from '@/features/canvas/canvas.types';
+import { CanvasNodeDirtiness } from '@/features/workflows/canvas/canvas.types';
 import { NDV_UI_OVERHAUL_EXPERIMENT } from '@/constants';
 import { usePostHog } from '@/stores/posthog.store';
 import { type IRunDataDisplayMode } from '@/Interface';
 import { I18nT } from 'vue-i18n';
-import { useExecutionData } from '@/features/executions/composables/useExecutionData';
+import { useExecutionData } from '@/features/execution/executions/composables/useExecutionData';
 import NDVEmptyState from '@/components/NDVEmptyState.vue';
 import NodeExecuteButton from '@/components/NodeExecuteButton.vue';
 
diff --git a/packages/frontend/editor-ui/src/components/ParameterInput.test.ts b/packages/frontend/editor-ui/src/components/ParameterInput.test.ts
index af97ad00b3d..5b8b3cdeaac 100644
--- a/packages/frontend/editor-ui/src/components/ParameterInput.test.ts
+++ b/packages/frontend/editor-ui/src/components/ParameterInput.test.ts
@@ -75,7 +75,7 @@ vi.mock('@/stores/nodeTypes.store', () => {
 	};
 });
 
-vi.mock('@/features/editors/plugins/codemirror/completions/datatype.completions', () => {
+vi.mock('@/features/shared/editors/plugins/codemirror/completions/datatype.completions', () => {
 	return {
 		datatypeCompletions: vi.fn(() => mockCompletionResult),
 	};
diff --git a/packages/frontend/editor-ui/src/components/ParameterInput.vue b/packages/frontend/editor-ui/src/components/ParameterInput.vue
index b4d67bceaa4..8a0bf0d306c 100644
--- a/packages/frontend/editor-ui/src/components/ParameterInput.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInput.vue
@@ -27,18 +27,18 @@ import {
 	resolveRelativePath,
 } from 'n8n-workflow';
 
-import type { CodeNodeLanguageOption } from '@/features/editors/components/CodeNodeEditor/CodeNodeEditor.vue';
-import CodeNodeEditor from '@/features/editors/components/CodeNodeEditor/CodeNodeEditor.vue';
+import type { CodeNodeLanguageOption } from '@/features/shared/editors/components/CodeNodeEditor/CodeNodeEditor.vue';
+import CodeNodeEditor from '@/features/shared/editors/components/CodeNodeEditor/CodeNodeEditor.vue';
 import CredentialsSelect from '@/features/credentials/components/CredentialsSelect.vue';
 import ExpressionEditModal from '@/components/ExpressionEditModal.vue';
 import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
-import HtmlEditor from '@/features/editors/components/HtmlEditor/HtmlEditor.vue';
-import InlineExpressionTip from '@/features/editors/components/InlineExpressionEditor/InlineExpressionTip.vue';
-import JsEditor from '@/features/editors/components/JsEditor/JsEditor.vue';
-import JsonEditor from '@/features/editors/components/JsonEditor/JsonEditor.vue';
+import HtmlEditor from '@/features/shared/editors/components/HtmlEditor/HtmlEditor.vue';
+import InlineExpressionTip from '@/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue';
+import JsEditor from '@/features/shared/editors/components/JsEditor/JsEditor.vue';
+import JsonEditor from '@/features/shared/editors/components/JsonEditor/JsonEditor.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
 import ResourceLocator from '@/components/ResourceLocator/ResourceLocator.vue';
-import SqlEditor from '@/features/editors/components/SqlEditor/SqlEditor.vue';
+import SqlEditor from '@/features/shared/editors/components/SqlEditor/SqlEditor.vue';
 import TextEdit from '@/components/TextEdit.vue';
 import WorkflowSelectorParameterInput from '@/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue';
 
@@ -89,11 +89,11 @@ import {
 	isSelectableEl,
 } from '@/utils/typesUtils';
 import { completeExpressionSyntax, shouldConvertToExpression } from '@/utils/expressions';
-import CssEditor from '@/features/editors/components/CssEditor/CssEditor.vue';
+import CssEditor from '@/features/shared/editors/components/CssEditor/CssEditor.vue';
 import { useFocusPanelStore } from '@/stores/focusPanel.store';
-import ExperimentalEmbeddedNdvMapper from '@/features/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import ExperimentalEmbeddedNdvMapper from '@/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { getParameterDisplayableOptions } from '@/utils/nodes/nodeTransforms';
 
 import { ElColorPicker, ElDatePicker, ElDialog, ElSwitch } from 'element-plus';
diff --git a/packages/frontend/editor-ui/src/components/ParameterInputWrapper.vue b/packages/frontend/editor-ui/src/components/ParameterInputWrapper.vue
index 1e227f7e37f..fe754ab0829 100644
--- a/packages/frontend/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInputWrapper.vue
@@ -12,8 +12,8 @@ import {
 } from 'n8n-workflow';
 
 import { useResolvedExpression } from '@/composables/useResolvedExpression';
-import useEnvironmentsStore from '@/features/environments.ee/environments.store';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import useEnvironmentsStore from '@/features/settings/environments.ee/environments.store';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { isValueExpression, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
 import type { EventBus } from '@n8n/utils/event-bus';
diff --git a/packages/frontend/editor-ui/src/components/ParameterOptions.vue b/packages/frontend/editor-ui/src/components/ParameterOptions.vue
index 18d2d730ab1..14f13eafae7 100644
--- a/packages/frontend/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterOptions.vue
@@ -10,8 +10,8 @@ import { computed } from 'vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { AI_TRANSFORM_NODE_TYPE } from '@/constants';
 import { getParameterTypeOption } from '@/utils/nodeSettingsUtils';
-import { useIsInExperimentalNdv } from '@/features/canvas/experimental/composables/useIsInExperimentalNdv';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
+import { useIsInExperimentalNdv } from '@/features/workflows/canvas/experimental/composables/useIsInExperimentalNdv';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 
 import { N8nActionToggle, N8nIcon, N8nRadioButtons, N8nText, N8nTooltip } from '@n8n/design-system';
 interface Props {
diff --git a/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.test.ts b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.test.ts
index f5627af7d98..ed15c660943 100644
--- a/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.test.ts
+++ b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.test.ts
@@ -1,6 +1,6 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import ResourceLocator from './ResourceLocator.vue';
 import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index a43e53bdaec..89e72ad26c3 100644
--- a/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -54,7 +54,7 @@ import {
 	type FromAIOverride,
 } from '../../utils/fromAIOverrideUtils';
 import { completeExpressionSyntax } from '@/utils/expressions';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import FromAiOverrideButton from '@/components/ParameterInputOverrides/FromAiOverrideButton.vue';
 import FromAiOverrideField from '@/components/ParameterInputOverrides/FromAiOverrideField.vue';
 import ParameterOverrideSelectableList from '@/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue';
diff --git a/packages/frontend/editor-ui/src/components/ResourceMapper.test.ts b/packages/frontend/editor-ui/src/components/ResourceMapper.test.ts
index aafb91f410b..33ddbf7a362 100644
--- a/packages/frontend/editor-ui/src/components/ResourceMapper.test.ts
+++ b/packages/frontend/editor-ui/src/components/ResourceMapper.test.ts
@@ -10,7 +10,7 @@ import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
 import type { MockInstance } from 'vitest';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import type { ResourceMapperTypeOptions } from 'n8n-workflow';
 import { createTestNode, createTestNodeProperties } from '@/__tests__/mocks';
 
diff --git a/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 02c6790d971..720bc3d1a28 100644
--- a/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -29,7 +29,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDocumentVisibility } from '@/composables/useDocumentVisibility';
 import isEqual from 'lodash/isEqual';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 
 import { N8nButton, N8nCallout, N8nIcon, N8nNotice, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/RunData.test.ts b/packages/frontend/editor-ui/src/components/RunData.test.ts
index 6b837624cb1..bb6925faad7 100644
--- a/packages/frontend/editor-ui/src/components/RunData.test.ts
+++ b/packages/frontend/editor-ui/src/components/RunData.test.ts
@@ -38,7 +38,7 @@ vi.mock('vue-router', () => {
 	};
 });
 
-vi.mock('@/features/executions/composables/useExecutionHelpers', () => ({
+vi.mock('@/features/execution/executions/composables/useExecutionHelpers', () => ({
 	useExecutionHelpers: () => ({
 		trackOpeningRelatedExecution,
 		resolveRelatedExecutionUrl,
diff --git a/packages/frontend/editor-ui/src/components/RunData.vue b/packages/frontend/editor-ui/src/components/RunData.vue
index 6d9eacc0062..994554af350 100644
--- a/packages/frontend/editor-ui/src/components/RunData.vue
+++ b/packages/frontend/editor-ui/src/components/RunData.vue
@@ -38,7 +38,7 @@ import {
 
 import BinaryDataDisplay from '@/components/BinaryDataDisplay.vue';
 import NodeErrorView from '@/components/Error/NodeErrorView.vue';
-import JsonEditor from '@/features/editors/components/JsonEditor/JsonEditor.vue';
+import JsonEditor from '@/features/shared/editors/components/JsonEditor/JsonEditor.vue';
 
 import RunDataPinButton from '@/components/RunDataPinButton.vue';
 import { useExternalHooks } from '@/composables/useExternalHooks';
@@ -53,7 +53,7 @@ import { dataPinningEventBus, ndvEventBus } from '@/event-bus';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import { getGenericHints } from '@/utils/nodeViewUtils';
@@ -65,7 +65,7 @@ import { storeToRefs } from 'pinia';
 import { useRoute } from 'vue-router';
 import { useSchemaPreviewStore } from '@/stores/schemaPreview.store';
 import { asyncComputed } from '@vueuse/core';
-import ViewSubExecution from '@/features/executions/components/ViewSubExecution.vue';
+import ViewSubExecution from '@/features/execution/executions/components/ViewSubExecution.vue';
 import RunDataItemCount from '@/components/RunDataItemCount.vue';
 import RunDataDisplayModeSelect from '@/components/RunDataDisplayModeSelect.vue';
 import RunDataPaginationBar from '@/components/RunDataPaginationBar.vue';
@@ -73,9 +73,9 @@ import { parseAiContent } from '@/utils/aiUtils';
 import { usePostHog } from '@/stores/posthog.store';
 import { I18nT } from 'vue-i18n';
 import RunDataBinary from '@/components/RunDataBinary.vue';
-import { hasTrimmedRunData } from '@/features/executions/executions.utils';
+import { hasTrimmedRunData } from '@/features/execution/executions/executions.utils';
 import NDVEmptyState from '@/components/NDVEmptyState.vue';
-import { type SearchShortcut } from '@/features/canvas/canvas.types';
+import { type SearchShortcut } from '@/features/workflows/canvas/canvas.types';
 
 import {
 	N8nBlockUi,
diff --git a/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAi.vue b/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAi.vue
index f5690c72c62..9dd7f74a752 100644
--- a/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAi.vue
+++ b/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAi.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import LogsOverviewRows from '@/features/logs/components/LogsOverviewRows.vue';
-import { useLogsExecutionData } from '@/features/logs/composables/useLogsExecutionData';
-import { useLogsTreeExpand } from '@/features/logs/composables/useLogsTreeExpand';
-import type { LogEntry, LogTreeFilter } from '@/features/logs/logs.types';
-import { findLogEntryById } from '@/features/logs/logs.utils';
+import LogsOverviewRows from '@/features/execution/logs/components/LogsOverviewRows.vue';
+import { useLogsExecutionData } from '@/features/execution/logs/composables/useLogsExecutionData';
+import { useLogsTreeExpand } from '@/features/execution/logs/composables/useLogsTreeExpand';
+import type { LogEntry, LogTreeFilter } from '@/features/execution/logs/logs.types';
+import { findLogEntryById } from '@/features/execution/logs/logs.utils';
 import type { INodeUi } from '@/Interface';
 import { N8nText } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
index bc8ef3bbe9b..07f41ff38f1 100644
--- a/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
+++ b/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
@@ -6,12 +6,12 @@ import { computed } from 'vue';
 import NodeIcon from '@/components/NodeIcon.vue';
 import AiRunContentBlock from './AiRunContentBlock.vue';
 import { useI18n } from '@n8n/i18n';
-import { getConsumedTokens } from '@/features/logs/logs.utils';
+import { getConsumedTokens } from '@/features/execution/logs/logs.utils';
 import ConsumedTokensDetails from '@/components/ConsumedTokensDetails.vue';
-import ViewSubExecution from '@/features/executions/components/ViewSubExecution.vue';
+import ViewSubExecution from '@/features/execution/executions/components/ViewSubExecution.vue';
 import { formatTokenUsageCount } from '@/utils/aiUtils';
 import { getReferencedData } from '@/components/RunDataAi/utils';
-import { type LogEntry } from '@/features/logs/logs.types';
+import { type LogEntry } from '@/features/execution/logs/logs.types';
 
 import { N8nInfoTip, N8nTooltip } from '@n8n/design-system';
 interface RunMeta {
diff --git a/packages/frontend/editor-ui/src/components/RunDataSearch.vue b/packages/frontend/editor-ui/src/components/RunDataSearch.vue
index 5268adea252..1a89978ace6 100644
--- a/packages/frontend/editor-ui/src/components/RunDataSearch.vue
+++ b/packages/frontend/editor-ui/src/components/RunDataSearch.vue
@@ -6,7 +6,7 @@ import { useDebounce } from '@/composables/useDebounce';
 import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useEventListener } from '@vueuse/core';
 import { PopOutWindowKey } from '@/constants';
-import { type SearchShortcut } from '@/features/canvas/canvas.types';
+import { type SearchShortcut } from '@/features/workflows/canvas/canvas.types';
 
 import { N8nIcon, N8nInput } from '@n8n/design-system';
 type Props = {
diff --git a/packages/frontend/editor-ui/src/components/RunDataTable.test.ts b/packages/frontend/editor-ui/src/components/RunDataTable.test.ts
index 8d8f99b8e74..cb8e2c09ec7 100644
--- a/packages/frontend/editor-ui/src/components/RunDataTable.test.ts
+++ b/packages/frontend/editor-ui/src/components/RunDataTable.test.ts
@@ -23,7 +23,7 @@ const { trackOpeningRelatedExecution, resolveRelatedExecutionUrl } = vi.hoisted(
 	resolveRelatedExecutionUrl: vi.fn().mockReturnValue('https://test.com'),
 }));
 
-vi.mock('@/features/executions/composables/useExecutionHelpers', () => ({
+vi.mock('@/features/execution/executions/composables/useExecutionHelpers', () => ({
 	useExecutionHelpers: () => ({
 		trackOpeningRelatedExecution,
 		resolveRelatedExecutionUrl,
diff --git a/packages/frontend/editor-ui/src/components/RunDataTable.vue b/packages/frontend/editor-ui/src/components/RunDataTable.vue
index 928b3b71215..721823d4e61 100644
--- a/packages/frontend/editor-ui/src/components/RunDataTable.vue
+++ b/packages/frontend/editor-ui/src/components/RunDataTable.vue
@@ -14,7 +14,7 @@ import TextWithHighlights from './TextWithHighlights.vue';
 import { useI18n } from '@n8n/i18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { storeToRefs } from 'pinia';
-import { useExecutionHelpers } from '@/features/executions/composables/useExecutionHelpers';
+import { useExecutionHelpers } from '@/features/execution/executions/composables/useExecutionHelpers';
 import { I18nT } from 'vue-i18n';
 import { useTelemetryContext } from '@/composables/useTelemetryContext';
 
diff --git a/packages/frontend/editor-ui/src/components/Telemetry.test.ts b/packages/frontend/editor-ui/src/components/Telemetry.test.ts
index e877004ca05..80711894253 100644
--- a/packages/frontend/editor-ui/src/components/Telemetry.test.ts
+++ b/packages/frontend/editor-ui/src/components/Telemetry.test.ts
@@ -6,7 +6,7 @@ import { mockedStore } from '@/__tests__/utils';
 import Telemetry from './Telemetry.vue';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 
 vi.mock('vue-router', () => {
diff --git a/packages/frontend/editor-ui/src/components/Telemetry.vue b/packages/frontend/editor-ui/src/components/Telemetry.vue
index 29b63428a00..67bd1617cbb 100644
--- a/packages/frontend/editor-ui/src/components/Telemetry.vue
+++ b/packages/frontend/editor-ui/src/components/Telemetry.vue
@@ -2,8 +2,8 @@
 import type { ITelemetrySettings } from '@n8n/api-types';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { computed, onMounted, watch, ref } from 'vue';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useRoute } from 'vue-router';
diff --git a/packages/frontend/editor-ui/src/components/VirtualSchema.vue b/packages/frontend/editor-ui/src/components/VirtualSchema.vue
index 9198d4907da..baa5eb97e8f 100644
--- a/packages/frontend/editor-ui/src/components/VirtualSchema.vue
+++ b/packages/frontend/editor-ui/src/components/VirtualSchema.vue
@@ -35,7 +35,7 @@ import {
 import MappingPill from './MappingPill.vue';
 
 import { EnterpriseEditionFeature, PLACEHOLDER_FILLED_AT_EXECUTION_TIME } from '@/constants';
-import useEnvironmentsStore from '@/features/environments.ee/environments.store';
+import useEnvironmentsStore from '@/features/settings/environments.ee/environments.store';
 import { useSchemaPreviewStore } from '@/stores/schemaPreview.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { isEmpty } from '@/utils/typesUtils';
diff --git a/packages/frontend/editor-ui/src/components/WhatsNewModal.test.ts b/packages/frontend/editor-ui/src/components/WhatsNewModal.test.ts
index b2f67c98682..0549f78148e 100644
--- a/packages/frontend/editor-ui/src/components/WhatsNewModal.test.ts
+++ b/packages/frontend/editor-ui/src/components/WhatsNewModal.test.ts
@@ -6,7 +6,7 @@ import { mockedStore, type MockedStore } from '@/__tests__/utils';
 import { useUIStore } from '@/stores/ui.store';
 import { WHATS_NEW_MODAL_KEY, VERSIONS_MODAL_KEY } from '@/constants';
 import { useVersionsStore } from '@/stores/versions.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { Version } from '@n8n/rest-api-client/api/versions';
 
 import WhatsNewModal from './WhatsNewModal.vue';
diff --git a/packages/frontend/editor-ui/src/components/WhatsNewModal.vue b/packages/frontend/editor-ui/src/components/WhatsNewModal.vue
index d47fdb57f52..e8921dda650 100644
--- a/packages/frontend/editor-ui/src/components/WhatsNewModal.vue
+++ b/packages/frontend/editor-ui/src/components/WhatsNewModal.vue
@@ -8,7 +8,7 @@ import { computed, nextTick, ref } from 'vue';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import Modal from '@/components/Modal.vue';
 
 import {
diff --git a/packages/frontend/editor-ui/src/components/WorkflowCard.test.ts b/packages/frontend/editor-ui/src/components/WorkflowCard.test.ts
index 76e394ec998..c686956df57 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowCard.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowCard.test.ts
@@ -7,7 +7,7 @@ import { MODAL_CONFIRM, VIEWS } from '@/constants';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import type { WorkflowResource } from '@/Interface';
 import * as vueRouter from 'vue-router';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/frontend/editor-ui/src/components/WorkflowCard.vue b/packages/frontend/editor-ui/src/components/WorkflowCard.vue
index 425dc759c8c..4f53d9af05e 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowCard.vue
@@ -1,28 +1,31 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 import { DUPLICATE_MODAL_KEY, MODAL_CONFIRM, VIEWS, WORKFLOW_SHARE_MODAL_KEY } from '@/constants';
-import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/projects/projects.constants';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { getResourcePermissions } from '@n8n/permissions';
 import dateformat from 'dateformat';
 import WorkflowActivator from '@/components/WorkflowActivator.vue';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import TimeAgo from '@/components/TimeAgo.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import ProjectCardBadge from '@/features/collaboration/projects/components/ProjectCardBadge.vue';
 import { useI18n } from '@n8n/i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { ResourceType } from '@/features/projects/projects.utils';
+import { ResourceType } from '@/features/collaboration/projects/projects.utils';
 import type { EventBus } from '@n8n/utils/event-bus';
 import type { UserAction, WorkflowResource } from '@/Interface';
 import type { IUser } from 'n8n-workflow';
-import { type ProjectSharingData, ProjectTypes } from '@/features/projects/projects.types';
+import {
+	type ProjectSharingData,
+	ProjectTypes,
+} from '@/features/collaboration/projects/projects.types';
 import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
-import { useFoldersStore } from '@/features/folders/folders.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
 
 import {
 	N8nActionToggle,
@@ -34,8 +37,8 @@ import {
 	N8nText,
 	N8nTooltip,
 } from '@n8n/design-system';
-import { useMCPStore } from '@/features/mcpAccess/mcp.store';
-import { useMcp } from '@/features/mcpAccess/composables/useMcp';
+import { useMCPStore } from '@/features/ai/mcpAccess/mcp.store';
+import { useMcp } from '@/features/ai/mcpAccess/composables/useMcp';
 const WORKFLOW_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
 	SHARE: 'share',
diff --git a/packages/frontend/editor-ui/src/components/WorkflowPreview.test.ts b/packages/frontend/editor-ui/src/components/WorkflowPreview.test.ts
index abe51540d1a..a25088f3973 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowPreview.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowPreview.test.ts
@@ -5,8 +5,8 @@ import type { ExecutionSummary } from 'n8n-workflow';
 import { createComponentRenderer } from '@/__tests__/render';
 import type { INodeUi, IWorkflowDb } from '@/Interface';
 import WorkflowPreview from '@/components/WorkflowPreview.vue';
-import { useExecutionsStore } from '@/features/executions/executions.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 const renderComponent = createComponentRenderer(WorkflowPreview);
 
diff --git a/packages/frontend/editor-ui/src/components/WorkflowPreview.vue b/packages/frontend/editor-ui/src/components/WorkflowPreview.vue
index b0c308804a8..c91df4629d2 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowPreview.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowPreview.vue
@@ -4,8 +4,8 @@ import { useI18n } from '@n8n/i18n';
 import { useToast } from '@/composables/useToast';
 import type { IWorkflowDb } from '@/Interface';
 import type { IWorkflowTemplate } from '@n8n/rest-api-client/api/templates';
-import { useExecutionsStore } from '@/features/executions/executions.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 import { N8nLoading, N8nSpinner } from '@n8n/design-system';
 const props = withDefaults(
diff --git a/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts b/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts
index b09e0d3b57d..6ec9594b248 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts
@@ -2,16 +2,16 @@ import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import { ref } from 'vue';
 import WorkflowProductionChecklist from '@/components/WorkflowProductionChecklist.vue';
-import { useEvaluationStore } from '@/features/evaluation.ee/evaluation.store';
+import { useEvaluationStore } from '@/features/ai/evaluation.ee/evaluation.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowSettingsCache } from '@/composables/useWorkflowsCache';
 import { useUIStore } from '@/stores/ui.store';
 import { useMessage } from '@/composables/useMessage';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useRouter } from 'vue-router';
 import type { IWorkflowDb } from '@/Interface';
-import type { SourceControlPreferences } from '@/features/sourceControl.ee/sourceControl.types';
+import type { SourceControlPreferences } from '@/features/integrations/sourceControl.ee/sourceControl.types';
 import {
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_ACTIVE_MODAL_KEY,
diff --git a/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.vue b/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.vue
index 02d051f260c..bf299fc7539 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.vue
@@ -2,7 +2,7 @@
 import { computed, ref, onMounted, watch } from 'vue';
 import { useI18n } from '@n8n/i18n';
 import { useRouter } from 'vue-router';
-import { useEvaluationStore } from '@/features/evaluation.ee/evaluation.store';
+import { useEvaluationStore } from '@/features/ai/evaluation.ee/evaluation.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type { ActionType, WorkflowSettings } from '@/composables/useWorkflowsCache';
 import { useWorkflowSettingsCache } from '@/composables/useWorkflowsCache';
@@ -19,9 +19,9 @@ import {
 } from '@/constants';
 import { useMessage } from '@/composables/useMessage';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { MCP_DOCS_PAGE_URL } from '@/features/mcpAccess/mcp.constants';
-import { useMcp } from '@/features/mcpAccess/composables/useMcp';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { MCP_DOCS_PAGE_URL } from '@/features/ai/mcpAccess/mcp.constants';
+import { useMcp } from '@/features/ai/mcpAccess/composables/useMcp';
 
 import { N8nSuggestedActions } from '@n8n/design-system';
 import { useSettingsStore } from '@/stores/settings.store';
diff --git a/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.test.ts b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.test.ts
index 2f45df4d9f9..bfd513f938a 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.test.ts
@@ -10,7 +10,7 @@ import WorkflowSelectorParameterInput, {
 } from '@/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore } from '@/__tests__/utils';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 
 const { onDocumentVisible } = vi.hoisted(() => ({
diff --git a/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
index 0738e1310f5..1bcfd632944 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
@@ -20,7 +20,7 @@ import { useRouter } from 'vue-router';
 import { useWorkflowResourceLocatorDropdown } from './useWorkflowResourceLocatorDropdown';
 import { useWorkflowResourceLocatorModes } from './useWorkflowResourceLocatorModes';
 import { useWorkflowResourcesLocator } from './useWorkflowResourcesLocator';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { VIEWS } from '@/constants';
 import { SAMPLE_SUBWORKFLOW_TRIGGER_ID, SAMPLE_SUBWORKFLOW_WORKFLOW } from '@/constants.workflows';
diff --git a/packages/frontend/editor-ui/src/components/WorkflowSettings.test.ts b/packages/frontend/editor-ui/src/components/WorkflowSettings.test.ts
index efcc9b234cf..48a0bdb1a8c 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowSettings.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowSettings.test.ts
@@ -10,7 +10,7 @@ import { EnterpriseEditionFeature } from '@/constants';
 import WorkflowSettingsVue from '@/components/WorkflowSettings.vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 
 vi.mock('vue-router', async () => ({
 	useRouter: vi.fn(),
diff --git a/packages/frontend/editor-ui/src/components/WorkflowSettings.vue b/packages/frontend/editor-ui/src/components/WorkflowSettings.vue
index 54220319f03..4b5d470c849 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowSettings.vue
@@ -18,14 +18,14 @@ import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { useExternalHooks } from '@/composables/useExternalHooks';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import { getResourcePermissions } from '@n8n/permissions';
 import { useI18n } from '@n8n/i18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useDebounce } from '@/composables/useDebounce';
 import { injectWorkflowState } from '@/composables/useWorkflowState';
-import { useMcp } from '@/features/mcpAccess/composables/useMcp';
+import { useMcp } from '@/features/ai/mcpAccess/composables/useMcp';
 
 import { ElCol, ElRow, ElSwitch } from 'element-plus';
 import { N8nButton, N8nIcon, N8nInput, N8nOption, N8nSelect, N8nTooltip } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.test.ts b/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.test.ts
index 87a1721c0e7..01f4ba5738e 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.test.ts
@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import { waitFor } from '@testing-library/vue';
 import { useRouter } from 'vue-router';
 import type { FrontendSettings } from '@n8n/api-types';
-import { createProjectListItem } from '@/features/projects/__tests__/utils';
+import { createProjectListItem } from '@/features/collaboration/projects/__tests__/utils';
 import type { MockedStore } from '@/__tests__/utils';
 import { mockedStore, getDropdownItems } from '@/__tests__/utils';
 import { createComponentRenderer } from '@/__tests__/render';
@@ -13,7 +13,7 @@ import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useRolesStore } from '@/stores/roles.store';
 import { useWorkflowSaving } from '@/composables/useWorkflowSaving';
 
diff --git a/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.vue
index 194e5ebb245..cc78045f719 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -15,15 +15,15 @@ import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import type { BaseTextKey } from '@n8n/i18n';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectSharingData, Project } from '@/features/projects/projects.types';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import ProjectSharing from '@/features/collaboration/projects/components/ProjectSharing.vue';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import type { ProjectSharingData, Project } from '@/features/collaboration/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import { useRolesStore } from '@/stores/roles.store';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitErrorBanner.vue b/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitErrorBanner.vue
index 20ce7c5cdd5..c0d2131ef88 100644
--- a/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitErrorBanner.vue
+++ b/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitErrorBanner.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useI18n } from '@n8n/i18n';
 import BaseBanner from '@/components/banners/BaseBanner.vue';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 
 const dataTableStore = useDataTableStore();
 const i18n = useI18n();
diff --git a/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitWarningBanner.vue b/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitWarningBanner.vue
index a183ebc11bc..50aeae9b567 100644
--- a/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitWarningBanner.vue
+++ b/packages/frontend/editor-ui/src/components/banners/DataTableStorageLimitWarningBanner.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useI18n } from '@n8n/i18n';
 import BaseBanner from '@/components/banners/BaseBanner.vue';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 
 const dataTableStore = useDataTableStore();
 const i18n = useI18n();
diff --git a/packages/frontend/editor-ui/src/components/banners/EmailConfirmationBanner.vue b/packages/frontend/editor-ui/src/components/banners/EmailConfirmationBanner.vue
index 3e46195a37d..45f4e4d34a3 100644
--- a/packages/frontend/editor-ui/src/components/banners/EmailConfirmationBanner.vue
+++ b/packages/frontend/editor-ui/src/components/banners/EmailConfirmationBanner.vue
@@ -2,7 +2,7 @@
 import BaseBanner from '@/components/banners/BaseBanner.vue';
 import { useToast } from '@/composables/useToast';
 import { i18n as locale } from '@n8n/i18n';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed } from 'vue';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 
diff --git a/packages/frontend/editor-ui/src/components/banners/V1Banner.test.ts b/packages/frontend/editor-ui/src/components/banners/V1Banner.test.ts
index 57cc0ae76d3..97514318ca3 100644
--- a/packages/frontend/editor-ui/src/components/banners/V1Banner.test.ts
+++ b/packages/frontend/editor-ui/src/components/banners/V1Banner.test.ts
@@ -1,7 +1,7 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import V1Banner from './V1Banner.vue';
 import { createPinia, setActivePinia } from 'pinia';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { ROLE } from '@n8n/api-types';
 import type { IUser } from '@n8n/rest-api-client/api/users';
 
diff --git a/packages/frontend/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/frontend/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index 2e2f2715c6a..5843c381a4a 100644
--- a/packages/frontend/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/frontend/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -2,9 +2,9 @@
 import { computed, watch, onBeforeMount } from 'vue';
 import { EnterpriseEditionFeature } from '@/constants';
 import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
+import ProjectSharing from '@/features/collaboration/projects/components/ProjectSharing.vue';
 import type { BaseFilters } from '@/Interface';
 import { useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.test.ts b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
index 595920b8ebf..7e19e61d61b 100644
--- a/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
+++ b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
@@ -5,7 +5,7 @@ import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import type { Resource } from '@/Interface';
 import type router from 'vue-router';
 import { waitAllPromises } from '@/__tests__/utils';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 
 const TEST_HOME_PROJECT: ProjectSharingData = vi.hoisted(() => ({
 	id: '1',
diff --git a/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 9dbfd5ab63c..fb3713bff5b 100644
--- a/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -4,7 +4,7 @@ import { computed, nextTick, ref, onMounted, watch, onBeforeUnmount } from 'vue'
 import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { DatatableColumn } from '@n8n/design-system';
 import { useDebounce } from '@/composables/useDebounce';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/frontend/editor-ui/src/composables/useCalloutHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useCalloutHelpers.test.ts
index 1432d5ed00d..bc2f811ca0b 100644
--- a/packages/frontend/editor-ui/src/composables/useCalloutHelpers.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useCalloutHelpers.test.ts
@@ -4,7 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import {
 	PrebuiltAgentTemplates,
 	SampleTemplates,
-} from '@/features/templates/utils/workflowSamples';
+} from '@/features/workflows/templates/utils/workflowSamples';
 import { useNDVStore } from '@/stores/ndv.store';
 import { mockedStore } from '@/__tests__/utils';
 import { NODE_CREATOR_OPEN_SOURCES, VIEWS } from '@/constants';
@@ -40,7 +40,7 @@ vi.mock('@/stores/posthog.store', () => ({
 	}),
 }));
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: () => ({
 		isCalloutDismissed: mocks.isCalloutDismissed,
 		setCalloutDismissed: mocks.setCalloutDismissed,
@@ -67,7 +67,7 @@ vi.mock('@n8n/rest-api-client/api/users', () => ({
 	updateCurrentUserSettings: vi.fn(),
 }));
 
-vi.mock('@/features/projects/projects.store', () => ({
+vi.mock('@/features/collaboration/projects/projects.store', () => ({
 	useProjectsStore: () => ({
 		currentProjectId: 'test-project-id',
 	}),
diff --git a/packages/frontend/editor-ui/src/composables/useCalloutHelpers.ts b/packages/frontend/editor-ui/src/composables/useCalloutHelpers.ts
index a3e9afaa415..136d4826c3d 100644
--- a/packages/frontend/editor-ui/src/composables/useCalloutHelpers.ts
+++ b/packages/frontend/editor-ui/src/composables/useCalloutHelpers.ts
@@ -3,7 +3,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useI18n } from '@n8n/i18n';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { usePostHog } from '@/stores/posthog.store';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -26,10 +26,10 @@ import {
 	isPrebuiltAgentTemplateId,
 	isTutorialTemplateId,
 	SampleTemplates,
-} from '@/features/templates/utils/workflowSamples';
+} from '@/features/workflows/templates/utils/workflowSamples';
 import type { INodeCreateElement, OpenTemplateElement } from '@/Interface';
 import { useUIStore } from '@/stores/ui.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 export function useCalloutHelpers() {
 	const route = useRoute();
diff --git a/packages/frontend/editor-ui/src/composables/useCanvasOperations.test.ts b/packages/frontend/editor-ui/src/composables/useCanvasOperations.test.ts
index 16d0cd2e627..2174fb14cb7 100644
--- a/packages/frontend/editor-ui/src/composables/useCanvasOperations.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useCanvasOperations.test.ts
@@ -8,10 +8,10 @@ import type {
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import { NodeConnectionTypes, NodeHelpers, UserError } from 'n8n-workflow';
-import type { CanvasConnection, CanvasNode } from '@/features/canvas/canvas.types';
-import { CanvasConnectionMode } from '@/features/canvas/canvas.types';
+import type { CanvasConnection, CanvasNode } from '@/features/workflows/canvas/canvas.types';
+import { CanvasConnectionMode } from '@/features/workflows/canvas/canvas.types';
 import type { INodeUi, IWorkflowDb, WorkflowDataWithTemplateId } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { ICredentialsResponse } from '@/features/credentials/credentials.types';
 import type { IWorkflowTemplate, IWorkflowTemplateNode } from '@n8n/rest-api-client/api/templates';
 import { RemoveNodeCommand, ReplaceNodeParametersCommand } from '@/models/history';
@@ -29,9 +29,9 @@ import {
 import { mock } from 'vitest-mock-extended';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { waitFor } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
 import { mockedStore } from '@/__tests__/utils';
@@ -46,9 +46,9 @@ import {
 import { STORES } from '@n8n/stores';
 import type { Connection } from '@vue-flow/core';
 import { useClipboard } from '@/composables/useClipboard';
-import { createCanvasConnectionHandleString } from '@/features/canvas/canvas.utils';
+import { createCanvasConnectionHandleString } from '@/features/workflows/canvas/canvas.utils';
 import { nextTick, reactive, ref } from 'vue';
-import type { CanvasLayoutEvent } from '@/features/canvas/composables/useCanvasLayout';
+import type { CanvasLayoutEvent } from '@/features/workflows/canvas/composables/useCanvasLayout';
 import { useTelemetry } from './useTelemetry';
 import { useToast } from '@/composables/useToast';
 import * as nodeHelpers from '@/composables/useNodeHelpers';
@@ -60,7 +60,7 @@ import {
 
 import { TelemetryHelpers } from 'n8n-workflow';
 import { useRouter } from 'vue-router';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 
 const mockRoute = reactive({
 	query: {},
diff --git a/packages/frontend/editor-ui/src/composables/useCanvasOperations.ts b/packages/frontend/editor-ui/src/composables/useCanvasOperations.ts
index c604ab94a9c..12f7ca78329 100644
--- a/packages/frontend/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/frontend/editor-ui/src/composables/useCanvasOperations.ts
@@ -12,7 +12,7 @@ import type {
 	WorkflowDataWithTemplateId,
 	XYPosition,
 } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { IUsedCredential } from '@/features/credentials/credentials.types';
 import type { ITag } from '@n8n/rest-api-client/api/tags';
 import type { IWorkflowTemplate } from '@n8n/rest-api-client/api/templates';
@@ -25,7 +25,7 @@ import { type PinDataSource, usePinnedData } from '@/composables/usePinnedData';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { getExecutionErrorToastConfiguration } from '@/features/executions/executions.utils';
+import { getExecutionErrorToastConfiguration } from '@/features/execution/executions/executions.utils';
 import {
 	EnterpriseEditionFeature,
 	FORM_TRIGGER_NODE_TYPE,
@@ -46,7 +46,7 @@ import {
 } from '@/models/history';
 import { useCanvasStore } from '@/stores/canvas.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useHistoryStore } from '@/stores/history.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
@@ -63,15 +63,15 @@ import type {
 	CanvasNode,
 	CanvasNodeMoveEvent,
 	ViewportBoundaries,
-} from '@/features/canvas/canvas.types';
-import { CanvasConnectionMode } from '@/features/canvas/canvas.types';
+} from '@/features/workflows/canvas/canvas.types';
+import { CanvasConnectionMode } from '@/features/workflows/canvas/canvas.types';
 import {
 	createCanvasConnectionHandleString,
 	mapCanvasConnectionToLegacyConnection,
 	mapLegacyConnectionsToCanvasConnections,
 	mapLegacyConnectionToCanvasConnection,
 	parseCanvasConnectionHandleString,
-} from '@/features/canvas/canvas.utils';
+} from '@/features/workflows/canvas/canvas.utils';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
 import {
 	GRID_SIZE,
@@ -115,22 +115,22 @@ import { useClipboard } from '@/composables/useClipboard';
 import { useUniqueNodeName } from '@/composables/useUniqueNodeName';
 import { injectWorkflowState } from '@/composables/useWorkflowState';
 import { isPresent } from '@/utils/typesUtils';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { CanvasLayoutEvent } from '@/features/canvas/composables/useCanvasLayout';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import type { CanvasLayoutEvent } from '@/features/workflows/canvas/composables/useCanvasLayout';
 import { chatEventBus } from '@n8n/chat/event-buses';
 import { useLogsStore } from '@/stores/logs.store';
 import { isChatNode } from '@/utils/aiUtils';
 import cloneDeep from 'lodash/cloneDeep';
 import uniq from 'lodash/uniq';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
 import { useFocusPanelStore } from '@/stores/focusPanel.store';
 import type { TelemetryNdvSource, TelemetryNdvType } from '@/types/telemetry';
 import { useRoute, useRouter } from 'vue-router';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { isValidNodeConnectionType } from '@/utils/typeGuards';
-import { useParentFolder } from '@/features/folders/composables/useParentFolder';
+import { useParentFolder } from '@/features/core/folders/composables/useParentFolder';
 
 type AddNodeData = Partial<INodeUi> & {
 	type: string;
diff --git a/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts b/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
index 5b6eab755c7..ea2c04ab1a2 100644
--- a/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
@@ -1,7 +1,7 @@
 import jp from 'jsonpath';
 import { useDataSchema, useFlattenSchema, type SchemaNode } from '@/composables/useDataSchema';
 import type { INodeUi, Schema } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { setActivePinia } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
 import {
diff --git a/packages/frontend/editor-ui/src/composables/useFloatingUiOffsets.ts b/packages/frontend/editor-ui/src/composables/useFloatingUiOffsets.ts
index 231c91d6e43..dc4e29aa459 100644
--- a/packages/frontend/editor-ui/src/composables/useFloatingUiOffsets.ts
+++ b/packages/frontend/editor-ui/src/composables/useFloatingUiOffsets.ts
@@ -1,5 +1,5 @@
 import { NDV_UI_OVERHAUL_EXPERIMENT } from '@/constants';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { useLogsStore } from '@/stores/logs.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { usePostHog } from '@/stores/posthog.store';
diff --git a/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.test.ts b/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.test.ts
index 13a2572f22d..c09f533635c 100644
--- a/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.test.ts
@@ -1,6 +1,6 @@
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { mockedStore } from '@/__tests__/utils';
 import type router from 'vue-router';
 import { flushPromises } from '@vue/test-utils';
@@ -8,11 +8,11 @@ import { useToast } from '@/composables/useToast';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import type { CloudPlanState } from '@/Interface';
 
 import { VIEWS } from '@/constants';
-import type { Project, ProjectListItem } from '@/features/projects/projects.types';
+import type { Project, ProjectListItem } from '@/features/collaboration/projects/projects.types';
 
 import { useGlobalEntityCreation } from './useGlobalEntityCreation';
 
diff --git a/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.ts b/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.ts
index 225bd65092d..1501c08afa4 100644
--- a/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.ts
+++ b/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.ts
@@ -4,10 +4,10 @@ import { useRouter } from 'vue-router';
 import { useI18n } from '@n8n/i18n';
 import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
 import { useToast } from '@/composables/useToast';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { getResourcePermissions } from '@n8n/permissions';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import type { Scope } from '@n8n/permissions';
diff --git a/packages/frontend/editor-ui/src/composables/useHistoryHelper.ts b/packages/frontend/editor-ui/src/composables/useHistoryHelper.ts
index 3f0b5121a77..186bdea3ca4 100644
--- a/packages/frontend/editor-ui/src/composables/useHistoryHelper.ts
+++ b/packages/frontend/editor-ui/src/composables/useHistoryHelper.ts
@@ -11,7 +11,7 @@ import { getNodeViewTab } from '@/utils/nodeViewUtils';
 import type { RouteLocationNormalizedLoaded } from 'vue-router';
 import { useTelemetry } from './useTelemetry';
 import { useDebounce } from '@/composables/useDebounce';
-import { shouldIgnoreCanvasShortcut } from '@/features/canvas/canvas.utils';
+import { shouldIgnoreCanvasShortcut } from '@/features/workflows/canvas/canvas.utils';
 
 const UNDO_REDO_DEBOUNCE_INTERVAL = 100;
 const ELEMENT_UI_OVERLAY_SELECTOR = '.el-overlay';
diff --git a/packages/frontend/editor-ui/src/composables/useKeybindings.ts b/packages/frontend/editor-ui/src/composables/useKeybindings.ts
index f495ab8bc92..f1baab9a23c 100644
--- a/packages/frontend/editor-ui/src/composables/useKeybindings.ts
+++ b/packages/frontend/editor-ui/src/composables/useKeybindings.ts
@@ -1,5 +1,5 @@
 import { PopOutWindowKey } from '@/constants';
-import { shouldIgnoreCanvasShortcut } from '@/features/canvas/canvas.utils';
+import { shouldIgnoreCanvasShortcut } from '@/features/workflows/canvas/canvas.utils';
 import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useActiveElement, useEventListener } from '@vueuse/core';
 import type { MaybeRefOrGetter } from 'vue';
diff --git a/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.test.ts b/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.test.ts
index 68800f1c03d..a1f7d3028e5 100644
--- a/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.test.ts
@@ -8,7 +8,7 @@ const mockOverview = {
 // Create a shared storage object that persists between calls
 let mockLocalStorageValue: Record<string, unknown> = {};
 
-vi.mock('@/features/projects/composables/useProjectPages', () => ({
+vi.mock('@/features/collaboration/projects/composables/useProjectPages', () => ({
 	useProjectPages: vi.fn(() => mockOverview),
 }));
 
diff --git a/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.ts b/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.ts
index 44d4c2f0305..0cee67d96b6 100644
--- a/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.ts
+++ b/packages/frontend/editor-ui/src/composables/useN8nLocalStorage.ts
@@ -1,4 +1,4 @@
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { LOCAL_STORAGE_WORKFLOW_LIST_PREFERENCES_KEY } from '@/constants';
 import { useLocalStorage } from '@vueuse/core';
 
diff --git a/packages/frontend/editor-ui/src/composables/useNodeConnections.test.ts b/packages/frontend/editor-ui/src/composables/useNodeConnections.test.ts
index e828e1c79de..1190c3625ad 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeConnections.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useNodeConnections.test.ts
@@ -1,9 +1,9 @@
 import { ref } from 'vue';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import { useNodeConnections } from '@/composables/useNodeConnections';
-import type { CanvasNodeData } from '@/features/canvas/canvas.types';
-import { CanvasConnectionMode } from '@/features/canvas/canvas.types';
-import { createCanvasConnectionHandleString } from '@/features/canvas/canvas.utils';
+import type { CanvasNodeData } from '@/features/workflows/canvas/canvas.types';
+import { CanvasConnectionMode } from '@/features/workflows/canvas/canvas.types';
+import { createCanvasConnectionHandleString } from '@/features/workflows/canvas/canvas.utils';
 
 describe('useNodeConnections', () => {
 	const defaultConnections = {
diff --git a/packages/frontend/editor-ui/src/composables/useNodeConnections.ts b/packages/frontend/editor-ui/src/composables/useNodeConnections.ts
index 5bee24dbf89..2eadc923a37 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeConnections.ts
+++ b/packages/frontend/editor-ui/src/composables/useNodeConnections.ts
@@ -1,10 +1,10 @@
-import type { CanvasNodeData } from '@/features/canvas/canvas.types';
-import { CanvasConnectionMode } from '@/features/canvas/canvas.types';
+import type { CanvasNodeData } from '@/features/workflows/canvas/canvas.types';
+import { CanvasConnectionMode } from '@/features/workflows/canvas/canvas.types';
 import type { MaybeRef } from 'vue';
 import { computed, unref } from 'vue';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import type { Connection } from '@vue-flow/core';
-import { parseCanvasConnectionHandleString } from '@/features/canvas/canvas.utils';
+import { parseCanvasConnectionHandleString } from '@/features/workflows/canvas/canvas.utils';
 
 export function useNodeConnections({
 	inputs,
diff --git a/packages/frontend/editor-ui/src/composables/useNodeDirtiness.test.ts b/packages/frontend/editor-ui/src/composables/useNodeDirtiness.test.ts
index 343080e4e1f..7a6bfde8c01 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeDirtiness.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useNodeDirtiness.test.ts
@@ -8,7 +8,7 @@ import { type INodeUi } from '@/Interface';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { CanvasNodeDirtiness } from '@/features/canvas/canvas.types';
+import { CanvasNodeDirtiness } from '@/features/workflows/canvas/canvas.types';
 import { createTestingPinia } from '@pinia/testing';
 import { NodeConnectionTypes, type IConnections, type IRunData } from 'n8n-workflow';
 import { defineComponent } from 'vue';
diff --git a/packages/frontend/editor-ui/src/composables/useNodeDirtiness.ts b/packages/frontend/editor-ui/src/composables/useNodeDirtiness.ts
index 40e81303e00..fbe5ecd525a 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeDirtiness.ts
+++ b/packages/frontend/editor-ui/src/composables/useNodeDirtiness.ts
@@ -9,7 +9,10 @@ import {
 } from '@/models/history';
 import { useHistoryStore } from '@/stores/history.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { CanvasNodeDirtiness, type CanvasNodeDirtinessType } from '@/features/canvas/canvas.types';
+import {
+	CanvasNodeDirtiness,
+	type CanvasNodeDirtinessType,
+} from '@/features/workflows/canvas/canvas.types';
 import type { INodeConnections, NodeConnectionType } from 'n8n-workflow';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import { computed } from 'vue';
diff --git a/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.test.ts b/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.test.ts
index daa4bc04dee..2eea4f78caa 100644
--- a/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.test.ts
+++ b/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.test.ts
@@ -3,7 +3,7 @@ import { useSettingsStore } from '@/stores/settings.store';
 import merge from 'lodash/merge';
 import { usePageRedirectionHelper } from './usePageRedirectionHelper';
 import { defaultSettings } from '@/__tests__/defaults';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { createPinia, setActivePinia } from 'pinia';
 import * as cloudPlanApi from '@n8n/rest-api-client/api/cloudPlans';
 import { useVersionsStore } from '@/stores/versions.store';
diff --git a/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.ts b/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.ts
index ca096e00d04..4ae9de4c211 100644
--- a/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.ts
+++ b/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useVersionsStore } from '@/stores/versions.store';
 import { useTelemetry } from './useTelemetry';
diff --git a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.test.ts b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.test.ts
index ad421bdc204..e255127a389 100644
--- a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.test.ts
+++ b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.test.ts
@@ -1,8 +1,8 @@
 import { builderCreditsUpdated } from './builderCreditsUpdated';
 import type { BuilderCreditsPushMessage } from '@n8n/api-types/push/builder-credits';
-import { useBuilderStore } from '@/features/assistant/builder.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 
-vi.mock('@/features/assistant/builder.store', () => ({
+vi.mock('@/features/ai/assistant/builder.store', () => ({
 	useBuilderStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.ts b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.ts
index 96c7ca06111..76a6fa3f93f 100644
--- a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.ts
+++ b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/builderCreditsUpdated.ts
@@ -1,5 +1,5 @@
 import type { BuilderCreditsPushMessage } from '@n8n/api-types/push/builder-credits';
-import { useBuilderStore } from '@/features/assistant/builder.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 
 export async function builderCreditsUpdated(event: BuilderCreditsPushMessage): Promise<void> {
 	const builderStore = useBuilderStore();
diff --git a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/executionFinished.ts b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/executionFinished.ts
index a21823e5c29..f5348e09d55 100644
--- a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/executionFinished.ts
+++ b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/executionFinished.ts
@@ -1,4 +1,4 @@
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
@@ -19,12 +19,12 @@ import {
 	SampleTemplates,
 	isPrebuiltAgentTemplateId,
 	isTutorialTemplateId,
-} from '@/features/templates/utils/workflowSamples';
+} from '@/features/workflows/templates/utils/workflowSamples';
 import {
 	clearPopupWindowState,
 	getExecutionErrorMessage,
 	getExecutionErrorToastConfiguration,
-} from '@/features/executions/executions.utils';
+} from '@/features/execution/executions/executions.utils';
 import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import type { ExecutionFinished } from '@n8n/api-types/push/execution';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.test.ts b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.test.ts
index 754ed1898bb..af8b21648b6 100644
--- a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.test.ts
+++ b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.test.ts
@@ -2,7 +2,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { nodeExecuteAfter } from './nodeExecuteAfter';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { mockedStore } from '@/__tests__/utils';
 import type { NodeExecuteAfter } from '@n8n/api-types/push/execution';
 import { TRIMMED_TASK_DATA_CONNECTIONS_KEY } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.ts b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.ts
index 8f72aac96ed..8d7454e6b7f 100644
--- a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.ts
+++ b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.ts
@@ -1,5 +1,5 @@
 import type { NodeExecuteAfter } from '@n8n/api-types/push/execution';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeExecutionData, ITaskData } from 'n8n-workflow';
 import { TRIMMED_TASK_DATA_CONNECTIONS_KEY } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/sendWorkerStatusMessage.ts b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/sendWorkerStatusMessage.ts
index bf7e3e669ea..78450ea8cbc 100644
--- a/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/sendWorkerStatusMessage.ts
+++ b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/sendWorkerStatusMessage.ts
@@ -1,5 +1,5 @@
 import type { SendWorkerStatusMessage } from '@n8n/api-types';
-import { useOrchestrationStore } from '@/features/orchestration.ee/orchestration.store';
+import { useOrchestrationStore } from '@/features/settings/orchestration.ee/orchestration.store';
 
 /**
  * Handles the 'sendWorkerStatusMessage' event from the push connection, which indicates
diff --git a/packages/frontend/editor-ui/src/composables/useRunWorkflow.test.ts b/packages/frontend/editor-ui/src/composables/useRunWorkflow.test.ts
index 0a22693f28b..5e7cde9993a 100644
--- a/packages/frontend/editor-ui/src/composables/useRunWorkflow.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useRunWorkflow.test.ts
@@ -20,7 +20,7 @@ import {
 	type WorkflowState,
 } from '@/composables/useWorkflowState';
 import type { IStartRunData } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { WorkflowData } from '@n8n/rest-api-client/api/workflows';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/frontend/editor-ui/src/composables/useRunWorkflow.ts b/packages/frontend/editor-ui/src/composables/useRunWorkflow.ts
index 58e75dca9d6..b4b39ff3803 100644
--- a/packages/frontend/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/frontend/editor-ui/src/composables/useRunWorkflow.ts
@@ -3,7 +3,7 @@ import type {
 	IExecutionPushResponse,
 	IExecutionResponse,
 	IExecutionsStopData,
-} from '@/features/executions/executions.types';
+} from '@/features/execution/executions/executions.types';
 
 import type {
 	IRunData,
@@ -30,14 +30,14 @@ import {
 
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { displayForm } from '@/features/executions/executions.utils';
+import { displayForm } from '@/features/execution/executions/executions.utils';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import type { useRouter } from 'vue-router';
 import { isEmpty } from '@/utils/typesUtils';
 import { useI18n } from '@n8n/i18n';
 import get from 'lodash/get';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useTelemetry } from './useTelemetry';
 import { useSettingsStore } from '@/stores/settings.store';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.test.ts b/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.test.ts
index fb768f61ecc..b2e7a5da1c0 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.test.ts
@@ -4,7 +4,7 @@ import { WORKFLOW_DIFF_MODAL_KEY } from '@/constants';
 import {
 	SOURCE_CONTROL_PULL_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
-} from '@/features/sourceControl.ee/sourceControl.constants';
+} from '@/features/integrations/sourceControl.ee/sourceControl.constants';
 
 // Mock vue-router
 const mockRoute = ref({
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.ts b/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.ts
index 25d8df7c7fb..380fbcaa877 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowDiffRouting.ts
@@ -6,7 +6,7 @@ import { WORKFLOW_DIFF_MODAL_KEY } from '@/constants';
 import {
 	SOURCE_CONTROL_PULL_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
-} from '@/features/sourceControl.ee/sourceControl.constants';
+} from '@/features/integrations/sourceControl.ee/sourceControl.constants';
 
 /**
  * Composable that handles source control modal state based on URL query parameters
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
index 852b8a57ae5..6d8d57590d2 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
@@ -1,5 +1,5 @@
 import type { IWorkflowDb } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { WorkflowData } from '@n8n/rest-api-client/api/workflows';
 import { resolveParameter, useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { createTestingPinia } from '@pinia/testing';
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
index 7a77ec30651..7c09c0561a8 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -33,7 +33,7 @@ import {
 import * as workflowUtils from 'n8n-workflow/common';
 
 import type { INodeTypesMaxCount, INodeUi, IWorkflowDb, TargetItem, XYPosition } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { ICredentialsResponse } from '@/features/credentials/credentials.types';
 import type { ITag } from '@n8n/rest-api-client/api/tags';
 import type { WorkflowData, WorkflowDataUpdate } from '@n8n/rest-api-client/api/workflows';
@@ -42,7 +42,7 @@ import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
 import get from 'lodash/get';
 
-import { useEnvironmentsStore } from '@/features/environments.ee/environments.store';
+import { useEnvironmentsStore } from '@/features/settings/environments.ee/environments.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
@@ -51,7 +51,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getSourceItems } from '@/utils/pairedItemUtils';
 import { getCredentialTypeName, isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
 import { useI18n } from '@n8n/i18n';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useTagsStore } from '@/stores/tags.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { findWebhook } from '@n8n/rest-api-client/api/webhooks';
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowSaving.ts b/packages/frontend/editor-ui/src/composables/useWorkflowSaving.ts
index 70e047318d2..92c39c295c7 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowSaving.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowSaving.ts
@@ -13,7 +13,7 @@ import {
 } from '@/constants';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useCanvasStore } from '@/stores/canvas.store';
 import type { IUpdateInformation, IWorkflowDb, NotificationOptions } from '@/Interface';
 import type { ITag } from '@n8n/rest-api-client/api/tags';
@@ -25,7 +25,7 @@ import { useExternalHooks } from './useExternalHooks';
 import { useTelemetry } from './useTelemetry';
 import { useNodeHelpers } from './useNodeHelpers';
 import { tryToParseNumber } from '@/utils/typesUtils';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useFocusPanelStore } from '@/stores/focusPanel.store';
 import { injectWorkflowState } from './useWorkflowState';
 
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowState.ts b/packages/frontend/editor-ui/src/composables/useWorkflowState.ts
index c124c836808..c3a0603550a 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowState.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowState.ts
@@ -12,7 +12,7 @@ import type {
 import type {
 	IExecutionResponse,
 	IExecutionsStopData,
-} from '@/features/executions/executions.types';
+} from '@/features/execution/executions/executions.types';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getPairedItemsMapping } from '@/utils/pairedItemUtils';
@@ -28,9 +28,9 @@ import { inject } from 'vue';
 import * as workflowsApi from '@/api/workflows';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { isEmpty } from '@/utils/typesUtils';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import { clearPopupWindowState } from '@/features/executions/executions.utils';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
+import { clearPopupWindowState } from '@/features/execution/executions/executions.utils';
 import { useDocumentTitle } from './useDocumentTitle';
 import { useWorkflowStateStore } from '@/stores/workflowState.store';
 import { isObject } from '@/utils/objectUtils';
diff --git a/packages/frontend/editor-ui/src/constants.ts b/packages/frontend/editor-ui/src/constants.ts
index 255048b359f..2c6715e5f20 100644
--- a/packages/frontend/editor-ui/src/constants.ts
+++ b/packages/frontend/editor-ui/src/constants.ts
@@ -9,10 +9,10 @@ import type {
 	CanvasInjectionData,
 	CanvasNodeHandleInjectionData,
 	CanvasNodeInjectionData,
-} from '@/features/canvas/canvas.types';
+} from '@/features/workflows/canvas/canvas.types';
 import type { ComputedRef, InjectionKey, Ref } from 'vue';
 import type { ExpressionLocalResolveContext } from './types/expressions';
-import { DATA_TABLE_MODULE_NAME } from './features/dataTable/constants';
+import { DATA_TABLE_MODULE_NAME } from '@/features/core/dataTable/constants';
 import type { TelemetryContext } from './types/telemetry';
 import type { IconName } from '@n8n/design-system/src/components/N8nIcon/icons';
 import type { WorkflowState } from './composables/useWorkflowState';
diff --git a/packages/frontend/editor-ui/src/experiments/aiTemplatesStarterCollection/stores/aiTemplatesStarterCollection.store.ts b/packages/frontend/editor-ui/src/experiments/aiTemplatesStarterCollection/stores/aiTemplatesStarterCollection.store.ts
index cb1ab78b3c4..6675806a346 100644
--- a/packages/frontend/editor-ui/src/experiments/aiTemplatesStarterCollection/stores/aiTemplatesStarterCollection.store.ts
+++ b/packages/frontend/editor-ui/src/experiments/aiTemplatesStarterCollection/stores/aiTemplatesStarterCollection.store.ts
@@ -1,4 +1,4 @@
-import { useFoldersStore } from '@/features/folders/folders.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { WorkflowDataCreate } from '@n8n/rest-api-client';
 import { STORES } from '@n8n/stores';
diff --git a/packages/frontend/editor-ui/src/experiments/personalizedTemplates/stores/personalizedTemplates.store.ts b/packages/frontend/editor-ui/src/experiments/personalizedTemplates/stores/personalizedTemplates.store.ts
index b5bf1f063d7..3434c86ca98 100644
--- a/packages/frontend/editor-ui/src/experiments/personalizedTemplates/stores/personalizedTemplates.store.ts
+++ b/packages/frontend/editor-ui/src/experiments/personalizedTemplates/stores/personalizedTemplates.store.ts
@@ -7,7 +7,7 @@ import {
 } from '@/constants';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { usePostHog } from '@/stores/posthog.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import type { ITemplatesWorkflowFull } from '@n8n/rest-api-client';
 import { STORES } from '@n8n/stores';
 import { jsonParse } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/experiments/personalizedTemplatesV3/stores/personalizedTemplatesV3.store.ts b/packages/frontend/editor-ui/src/experiments/personalizedTemplatesV3/stores/personalizedTemplatesV3.store.ts
index 3ad3ac4cd5b..2d674153828 100644
--- a/packages/frontend/editor-ui/src/experiments/personalizedTemplatesV3/stores/personalizedTemplatesV3.store.ts
+++ b/packages/frontend/editor-ui/src/experiments/personalizedTemplatesV3/stores/personalizedTemplatesV3.store.ts
@@ -2,7 +2,7 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { PERSONALIZED_TEMPLATES_V3, VIEWS } from '@/constants';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { usePostHog } from '@/stores/posthog.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { STORES } from '@n8n/stores';
 import { defineStore } from 'pinia';
diff --git a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflows/stores/readyToRunWorkflows.store.ts b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflows/stores/readyToRunWorkflows.store.ts
index 8aff37b8cfa..b01e893d047 100644
--- a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflows/stores/readyToRunWorkflows.store.ts
+++ b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflows/stores/readyToRunWorkflows.store.ts
@@ -1,7 +1,7 @@
 import { useTelemetry } from '@/composables/useTelemetry';
 import { BATCH_11AUG_EXPERIMENT } from '@/constants';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
-import { useFoldersStore } from '@/features/folders/folders.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
 import { usePostHog } from '@/stores/posthog.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/ReadyToRunV2Button.vue b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/ReadyToRunV2Button.vue
index 5d84cd6d45f..302a0cfca2d 100644
--- a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/ReadyToRunV2Button.vue
+++ b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/ReadyToRunV2Button.vue
@@ -4,10 +4,10 @@ import { useRoute } from 'vue-router';
 import { N8nButton } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
 import { getResourcePermissions } from '@n8n/permissions';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { useFoldersStore } from '@/features/folders/folders.store';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
 import { useToast } from '@/composables/useToast';
 import { useReadyToRunWorkflowsV2Store } from '../stores/readyToRunWorkflowsV2.store';
 
diff --git a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/SimplifiedEmptyLayout.vue b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/SimplifiedEmptyLayout.vue
index b2ff4c359ea..4990cf8ad77 100644
--- a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/SimplifiedEmptyLayout.vue
+++ b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/components/SimplifiedEmptyLayout.vue
@@ -3,11 +3,11 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { N8nCard, N8nHeading, N8nText, N8nIcon } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
-import { useUsersStore } from '@/features/users/users.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { getResourcePermissions } from '@n8n/permissions';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { useToast } from '@/composables/useToast';
 import { useReadyToRunWorkflowsV2Store } from '../stores/readyToRunWorkflowsV2.store';
 import type { IUser } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/composables/useEmptyStateDetection.ts b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/composables/useEmptyStateDetection.ts
index 6b60b053581..0b1592879f6 100644
--- a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/composables/useEmptyStateDetection.ts
+++ b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/composables/useEmptyStateDetection.ts
@@ -1,6 +1,6 @@
 import type { RouteLocationNormalized } from 'vue-router';
-import { useFoldersStore } from '@/features/folders/folders.store';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { useRoute } from 'vue-router';
 
 /**
diff --git a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/stores/readyToRunWorkflowsV2.store.ts b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/stores/readyToRunWorkflowsV2.store.ts
index ffcf8dab984..b25e81f402a 100644
--- a/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/stores/readyToRunWorkflowsV2.store.ts
+++ b/packages/frontend/editor-ui/src/experiments/readyToRunWorkflowsV2/stores/readyToRunWorkflowsV2.store.ts
@@ -5,7 +5,7 @@ import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { usePostHog } from '@/stores/posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useI18n } from '@n8n/i18n';
 import { STORES } from '@n8n/stores';
diff --git a/packages/frontend/editor-ui/src/experiments/templateRecoV2/stores/templateRecoV2.store.ts b/packages/frontend/editor-ui/src/experiments/templateRecoV2/stores/templateRecoV2.store.ts
index e631bdf6260..bf752de422f 100644
--- a/packages/frontend/editor-ui/src/experiments/templateRecoV2/stores/templateRecoV2.store.ts
+++ b/packages/frontend/editor-ui/src/experiments/templateRecoV2/stores/templateRecoV2.store.ts
@@ -2,7 +2,7 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { TEMPLATE_RECO_V2, VIEWS } from '@/constants';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { usePostHog } from '@/stores/posthog.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { STORES } from '@n8n/stores';
 import { defineStore } from 'pinia';
 import { computed } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/assistant/assistant.store.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/assistant/assistant.store.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.test.ts
index 2f26f5a3e4c..eb310657b94 100644
--- a/packages/frontend/editor-ui/src/features/assistant/assistant.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.test.ts
@@ -9,9 +9,9 @@ import {
 import { ASSISTANT_ENABLED_VIEWS } from './constants';
 
 const ENABLED_VIEWS = ASSISTANT_ENABLED_VIEWS;
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { ChatRequest } from '@/features/assistant/assistant.types';
+import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
 import { usePostHog } from '@/stores/posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { defaultSettings } from '@/__tests__/defaults';
diff --git a/packages/frontend/editor-ui/src/features/assistant/assistant.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/assistant/assistant.store.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.ts
index 6715747350d..ade4a906f56 100644
--- a/packages/frontend/editor-ui/src/features/assistant/assistant.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.ts
@@ -3,13 +3,13 @@ import { type VIEWS, PLACEHOLDER_EMPTY_WORKFLOW_ID, EDITABLE_CANVAS_VIEWS } from
 import { CREDENTIAL_EDIT_MODAL_KEY } from '@/features/credentials/credentials.constants';
 import { ASSISTANT_ENABLED_VIEWS } from './constants';
 import { STORES } from '@n8n/stores';
-import type { ChatRequest } from '@/features/assistant/assistant.types';
+import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
 import type { ChatUI } from '@n8n/design-system/types/assistant';
 import { defineStore } from 'pinia';
 import type { PushPayload } from '@n8n/api-types';
 import { computed, h, ref, watch } from 'vue';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useRoute } from 'vue-router';
 import { useSettingsStore } from '@/stores/settings.store';
 import { assert } from '@n8n/utils/assert';
@@ -26,7 +26,7 @@ import { useUIStore } from '@/stores/ui.store';
 import AiUpdatedCodeMessage from '@/components/AiUpdatedCodeMessage.vue';
 import { useChatPanelStateStore } from './chatPanelState.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
+import { useAIAssistantHelpers } from '@/features/ai/assistant/composables/useAIAssistantHelpers';
 import type { WorkflowState } from '@/composables/useWorkflowState';
 
 export const ENABLED_VIEWS = ASSISTANT_ENABLED_VIEWS;
diff --git a/packages/frontend/editor-ui/src/features/assistant/assistant.types.ts b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/assistant.types.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/builder.store.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/builder.store.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/builder.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/builder.store.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/builder.utils.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
similarity index 90%
rename from packages/frontend/editor-ui/src/features/assistant/builder.utils.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
index 8ee8acb298e..3452970f77e 100644
--- a/packages/frontend/editor-ui/src/features/assistant/builder.utils.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
@@ -1,5 +1,5 @@
-import type { ChatRequest } from '@/features/assistant/assistant.types';
-import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
+import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
+import { useAIAssistantHelpers } from '@/features/ai/assistant/composables/useAIAssistantHelpers';
 import type { IRunExecutionData } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interface';
 
diff --git a/packages/frontend/editor-ui/src/features/assistant/chatPanel.store.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/chatPanel.store.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/assistant/chatPanel.store.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/chatPanel.store.test.ts
index 803e0e0a61d..c3e57d7b2cc 100644
--- a/packages/frontend/editor-ui/src/features/assistant/chatPanel.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/chatPanel.store.test.ts
@@ -9,14 +9,14 @@ import {
 } from './chatPanel.store';
 import { useChatPanelStateStore } from './chatPanelState.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { useBuilderStore } from './builder.store';
 import { ASSISTANT_ENABLED_VIEWS, BUILDER_ENABLED_VIEWS } from './constants';
 import { VIEWS } from '@/constants';
 import { reactive } from 'vue';
 import { mockedStore } from '@/__tests__/utils';
 import type { ICredentialType } from 'n8n-workflow';
-import type { ChatRequest } from '@/features/assistant/assistant.types';
+import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
 import type { ChatUI } from '@n8n/design-system/types/assistant';
 
 // Mock vue-router
diff --git a/packages/frontend/editor-ui/src/features/assistant/chatPanel.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/chatPanel.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/chatPanel.store.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/chatPanel.store.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/chatPanelState.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/chatPanelState.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/chatPanelState.store.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/chatPanelState.store.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
index ccbcf945ad5..0df50029b3b 100644
--- a/packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
@@ -108,7 +108,7 @@ import { mockedStore } from '@/__tests__/utils';
 import { STORES } from '@n8n/stores';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeUi } from '@/Interface';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 vi.mock('@/event-bus', () => ({
 	nodeViewEventBus: {
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
index e4922b69caf..bbdfad12b3b 100644
--- a/packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useBuilderStore } from '../../builder.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed, watch, ref } from 'vue';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.test.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
index e9df400cf9c..ae3e0c339ce 100644
--- a/packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
@@ -9,13 +9,13 @@ import { computed, onBeforeUnmount, onMounted, ref, watch, type WatchStopHandle
 import { useRouter } from 'vue-router';
 
 import NodeIssueItem from './NodeIssueItem.vue';
-import CanvasRunWorkflowButton from '@/features/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue';
+import CanvasRunWorkflowButton from '@/features/workflows/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue';
 import { useLogsStore } from '@/stores/logs.store';
 import { isChatNode } from '@/utils/aiUtils';
 import { useToast } from '@/composables/useToast';
 import { N8nTooltip } from '@n8n/design-system';
 import { nextTick } from 'vue';
-import { useBuilderStore } from '@/features/assistant/builder.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 import type { WorkflowValidationIssue } from '@/Interface';
 
 interface Emits {
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.test.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/AssistantsHub.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/AssistantsHub.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/features/assistant/components/AssistantsHub.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/AssistantsHub.vue
index fd558bec8d9..3a2abc3d1e9 100644
--- a/packages/frontend/editor-ui/src/features/assistant/components/AssistantsHub.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/AssistantsHub.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import { useBuilderStore } from '@/features/assistant/builder.store';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useDebounce } from '@/composables/useDebounce';
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
@@ -13,7 +13,7 @@ import { BUILDER_ENABLED_VIEWS } from '../constants';
 import type { VIEWS } from '@/constants';
 
 import { N8nResizeWrapper } from '@n8n/design-system';
-import HubSwitcher from '@/features/assistant/components/HubSwitcher.vue';
+import HubSwitcher from '@/features/ai/assistant/components/HubSwitcher.vue';
 
 const builderStore = useBuilderStore();
 const assistantStore = useAssistantStore();
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantChat.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/AskAssistantChat.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantChat.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/AskAssistantChat.vue
index 1ab897f4fb6..a5046a92190 100644
--- a/packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantChat.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/AskAssistantChat.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { useAssistantStore } from '@/features/assistant/assistant.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed, ref } from 'vue';
 import { N8nAskAssistantChat } from '@n8n/design-system';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantFloatingButton.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/AskAssistantFloatingButton.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantFloatingButton.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/AskAssistantFloatingButton.vue
index 66b202361c2..f5cbfc2d49e 100644
--- a/packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantFloatingButton.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/AskAssistantFloatingButton.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from '@n8n/i18n';
 import { useStyles } from '@/composables/useStyles';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import { useBuilderStore } from '../../builder.store';
 import { useChatPanelStore } from '../../chatPanel.store';
 import { computed } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/Chat/NewAssistantSessionModal.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/NewAssistantSessionModal.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/features/assistant/components/Chat/NewAssistantSessionModal.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/NewAssistantSessionModal.vue
index dcfdeb184cc..1221bca9726 100644
--- a/packages/frontend/editor-ui/src/features/assistant/components/Chat/NewAssistantSessionModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Chat/NewAssistantSessionModal.vue
@@ -4,8 +4,8 @@ import Modal from '@/components/Modal.vue';
 import { useI18n } from '@n8n/i18n';
 import { useUIStore } from '@/stores/ui.store';
 import { useChatPanelStore } from '../../chatPanel.store';
-import type { ChatRequest } from '@/features/assistant/assistant.types';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import type { ICredentialType } from 'n8n-workflow';
 
 import { N8nAssistantIcon, N8nAssistantText, N8nButton, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/assistant/components/HubSwitcher.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/HubSwitcher.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/components/HubSwitcher.vue
rename to packages/frontend/editor-ui/src/features/ai/assistant/components/HubSwitcher.vue
diff --git a/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.constants.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useAIAssistantHelpers.test.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.constants.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/composables/useAIAssistantHelpers.test.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useAIAssistantHelpers.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/composables/useAIAssistantHelpers.test.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useAIAssistantHelpers.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/composables/useAIAssistantHelpers.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/composables/useBuilderMessages.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/composables/useBuilderMessages.test.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.test.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/composables/useBuilderMessages.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/composables/useBuilderMessages.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.ts
diff --git a/packages/frontend/editor-ui/src/features/assistant/constants.ts b/packages/frontend/editor-ui/src/features/ai/assistant/constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/assistant/constants.ts
rename to packages/frontend/editor-ui/src/features/ai/assistant/constants.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/ChatView.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/chatHub/ChatView.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
index 529919dae50..4a11b5590e1 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/ChatView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
@@ -4,18 +4,18 @@ import {
 	LOCAL_STORAGE_CHAT_HUB_CREDENTIALS,
 	LOCAL_STORAGE_CHAT_HUB_SELECTED_MODEL,
 } from '@/constants';
-import { findOneFromModelsResponse } from '@/features/chatHub/chat.utils';
-import ChatConversationHeader from '@/features/chatHub/components/ChatConversationHeader.vue';
-import ChatMessage from '@/features/chatHub/components/ChatMessage.vue';
-import ChatPrompt from '@/features/chatHub/components/ChatPrompt.vue';
-import ChatStarter from '@/features/chatHub/components/ChatStarter.vue';
+import { findOneFromModelsResponse } from '@/features/ai/chatHub/chat.utils';
+import ChatConversationHeader from '@/features/ai/chatHub/components/ChatConversationHeader.vue';
+import ChatMessage from '@/features/ai/chatHub/components/ChatMessage.vue';
+import ChatPrompt from '@/features/ai/chatHub/components/ChatPrompt.vue';
+import ChatStarter from '@/features/ai/chatHub/components/ChatStarter.vue';
 import {
 	CHAT_CONVERSATION_VIEW,
 	CHAT_VIEW,
 	MOBILE_MEDIA_QUERY,
-} from '@/features/chatHub/constants';
+} from '@/features/ai/chatHub/constants';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import {
 	chatHubConversationModelSchema,
 	type ChatHubProvider,
diff --git a/packages/frontend/editor-ui/src/features/chatHub/chat.api.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/chat.api.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/chat.api.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/chat.store.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/chat.store.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/chat.types.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/chat.types.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/chat.types.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/chat.utils.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/chat.utils.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatConversationHeader.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
similarity index 87%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatConversationHeader.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
index 09c4f8ada15..41fcdf6b3a4 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/ChatConversationHeader.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { useChatStore } from '@/features/chatHub/chat.store';
-import type { CredentialsMap } from '@/features/chatHub/chat.types';
-import CredentialSelectorModal from '@/features/chatHub/components/CredentialSelectorModal.vue';
-import ModelSelector from '@/features/chatHub/components/ModelSelector.vue';
-import { useChatHubSidebarState } from '@/features/chatHub/composables/useChatHubSidebarState';
-import { CHAT_VIEW } from '@/features/chatHub/constants';
+import { useChatStore } from '@/features/ai/chatHub/chat.store';
+import type { CredentialsMap } from '@/features/ai/chatHub/chat.types';
+import CredentialSelectorModal from '@/features/ai/chatHub/components/CredentialSelectorModal.vue';
+import ModelSelector from '@/features/ai/chatHub/components/ModelSelector.vue';
+import { useChatHubSidebarState } from '@/features/ai/chatHub/composables/useChatHubSidebarState';
+import { CHAT_VIEW } from '@/features/ai/chatHub/constants';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useUIStore } from '@/stores/ui.store';
 import {
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatMessage.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatMessage.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
index 4c5d1b0c8ab..34bdcbc79f9 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/ChatMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
@@ -7,9 +7,9 @@ import ChatMessageActions from './ChatMessageActions.vue';
 import CredentialIcon from '@/features/credentials/components/CredentialIcon.vue';
 import { useClipboard } from '@/composables/useClipboard';
 import { ref, nextTick, watch, useTemplateRef, computed, onBeforeMount } from 'vue';
-import ChatTypingIndicator from '@/features/chatHub/components/ChatTypingIndicator.vue';
+import ChatTypingIndicator from '@/features/ai/chatHub/components/ChatTypingIndicator.vue';
 import { PROVIDER_CREDENTIAL_TYPE_MAP } from '@n8n/api-types';
-import { useChatHubMarkdownOptions } from '@/features/chatHub/composables/useChatHubMarkdownOptions';
+import { useChatHubMarkdownOptions } from '@/features/ai/chatHub/composables/useChatHubMarkdownOptions';
 import { useSpeechSynthesis } from '@vueuse/core';
 import type { ChatMessage } from '../chat.types';
 import type { ChatMessageId } from '@n8n/api-types';
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatMessageActions.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatMessageActions.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatPrompt.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatPrompt.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatSessionMenuItem.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSessionMenuItem.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatSessionMenuItem.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSessionMenuItem.vue
index 0a0ebc06934..8c16da2a557 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/ChatSessionMenuItem.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSessionMenuItem.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import ChatSidebarLink from '@/features/chatHub/components/ChatSidebarLink.vue';
-import { CHAT_CONVERSATION_VIEW } from '@/features/chatHub/constants';
+import ChatSidebarLink from '@/features/ai/chatHub/components/ChatSidebarLink.vue';
+import { CHAT_CONVERSATION_VIEW } from '@/features/ai/chatHub/constants';
 import CredentialIcon from '@/features/credentials/components/CredentialIcon.vue';
 import { PROVIDER_CREDENTIAL_TYPE_MAP, type ChatHubSessionDto } from '@n8n/api-types';
 import { N8nIcon, N8nInput } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebar.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebar.vue
similarity index 84%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebar.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebar.vue
index d8ac7e59cca..f1cf860bd14 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebar.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebar.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import ModalDrawer from '@/components/ModalDrawer.vue';
 import { CHAT_HUB_SIDE_MENU_DRAWER_MODAL_KEY } from '@/constants';
-import ChatSidebarContent from '@/features/chatHub/components/ChatSidebarContent.vue';
-import { useChatHubSidebarState } from '@/features/chatHub/composables/useChatHubSidebarState';
-import { MOBILE_MEDIA_QUERY } from '@/features/chatHub/constants';
+import ChatSidebarContent from '@/features/ai/chatHub/components/ChatSidebarContent.vue';
+import { useChatHubSidebarState } from '@/features/ai/chatHub/composables/useChatHubSidebarState';
+import { MOBILE_MEDIA_QUERY } from '@/features/ai/chatHub/constants';
 import { useUIStore } from '@/stores/ui.store';
 import { useMediaQuery } from '@vueuse/core';
 import { onBeforeUnmount, watch } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebarContent.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarContent.vue
similarity index 92%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebarContent.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarContent.vue
index e4d3f21d9fc..e34ddeed0fc 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebarContent.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarContent.vue
@@ -3,11 +3,11 @@ import MainSidebarUserArea from '@/components/MainSidebarUserArea.vue';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { MODAL_CONFIRM, VIEWS } from '@/constants';
-import { useChatStore } from '@/features/chatHub/chat.store';
-import { groupConversationsByDate } from '@/features/chatHub/chat.utils';
-import ChatSidebarLink from '@/features/chatHub/components/ChatSidebarLink.vue';
-import { useChatHubSidebarState } from '@/features/chatHub/composables/useChatHubSidebarState';
-import { CHAT_VIEW } from '@/features/chatHub/constants';
+import { useChatStore } from '@/features/ai/chatHub/chat.store';
+import { groupConversationsByDate } from '@/features/ai/chatHub/chat.utils';
+import ChatSidebarLink from '@/features/ai/chatHub/components/ChatSidebarLink.vue';
+import { useChatHubSidebarState } from '@/features/ai/chatHub/composables/useChatHubSidebarState';
+import { CHAT_VIEW } from '@/features/ai/chatHub/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { N8nIconButton, N8nScrollArea, N8nText } from '@n8n/design-system';
 import Logo from '@n8n/design-system/components/N8nLogo';
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebarLink.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarLink.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatSidebarLink.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarLink.vue
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatStarter.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatStarter.vue
similarity index 92%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatStarter.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatStarter.vue
index a15c42272b3..9fcb739eddd 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/ChatStarter.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatStarter.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { Suggestion } from '@/features/chatHub/chat.types';
-import { SUGGESTIONS } from '@/features/chatHub/constants';
+import type { Suggestion } from '@/features/ai/chatHub/chat.types';
+import { SUGGESTIONS } from '@/features/ai/chatHub/constants';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { N8nHeading, N8nText } from '@n8n/design-system';
 import Logo from '@n8n/design-system/components/N8nLogo/Logo.vue';
 import { computed } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ChatTypingIndicator.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatTypingIndicator.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ChatTypingIndicator.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatTypingIndicator.vue
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/CredentialSelectorModal.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/chatHub/components/CredentialSelectorModal.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
index ab0c890a9a8..44caebc733f 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/CredentialSelectorModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
@@ -6,7 +6,7 @@ import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import type { ICredentialsResponse } from '@/features/credentials/credentials.types';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { PROVIDER_CREDENTIAL_TYPE_MAP, type ChatHubProvider } from '@n8n/api-types';
-import { providerDisplayNames } from '@/features/chatHub/constants';
+import { providerDisplayNames } from '@/features/ai/chatHub/constants';
 import CredentialIcon from '@/features/credentials/components/CredentialIcon.vue';
 
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/features/chatHub/components/ModelSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/chatHub/components/ModelSelector.vue
rename to packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
index 0d1ee149de6..7b134b26850 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/components/ModelSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
@@ -9,7 +9,7 @@ import {
 	type ChatModelsResponse,
 	PROVIDER_CREDENTIAL_TYPE_MAP,
 } from '@n8n/api-types';
-import { providerDisplayNames } from '@/features/chatHub/constants';
+import { providerDisplayNames } from '@/features/ai/chatHub/constants';
 import CredentialIcon from '@/features/credentials/components/CredentialIcon.vue';
 
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/features/chatHub/composables/languageModules.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/languageModules.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/composables/languageModules.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/composables/languageModules.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/composables/useChatHubMarkdownOptions.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/composables/useChatHubMarkdownOptions.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/composables/useChatHubSidebarState.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubSidebarState.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/chatHub/composables/useChatHubSidebarState.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubSidebarState.ts
index bb93a4049b1..bdefafeaef6 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/composables/useChatHubSidebarState.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubSidebarState.ts
@@ -6,7 +6,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useLocalStorage, useMediaQuery } from '@vueuse/core';
 import { computed } from 'vue';
 import { MOBILE_MEDIA_QUERY } from '../constants';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 export function useChatHubSidebarState() {
 	const isMobileDevice = useMediaQuery(MOBILE_MEDIA_QUERY);
diff --git a/packages/frontend/editor-ui/src/features/chatHub/constants.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/chatHub/constants.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/constants.ts
diff --git a/packages/frontend/editor-ui/src/features/chatHub/module.descriptor.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
similarity index 82%
rename from packages/frontend/editor-ui/src/features/chatHub/module.descriptor.ts
rename to packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
index 641a29d17db..a0ce88019f7 100644
--- a/packages/frontend/editor-ui/src/features/chatHub/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
@@ -1,8 +1,8 @@
 import { type FrontendModuleDescription } from '@/moduleInitializer/module.types';
 import { CHAT_VIEW, CHAT_CONVERSATION_VIEW } from './constants';
 
-const ChatSidebar = async () => await import('@/features/chatHub/components/ChatSidebar.vue');
-const ChatView = async () => await import('@/features/chatHub/ChatView.vue');
+const ChatSidebar = async () => await import('@/features/ai/chatHub/components/ChatSidebar.vue');
+const ChatView = async () => await import('@/features/ai/chatHub/ChatView.vue');
 
 export const ChatModule: FrontendModuleDescription = {
 	id: 'chat-hub',
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/MetricsChart.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/ListRuns/MetricsChart.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/MetricsChart.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/ListRuns/MetricsChart.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/RunsSection.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/ListRuns/RunsSection.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/RunsSection.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/ListRuns/RunsSection.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/TestRunsTable.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/ListRuns/TestRunsTable.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/TestRunsTable.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/ListRuns/TestRunsTable.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/Paywall/EvaluationsPaywall.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/Paywall/EvaluationsPaywall.vue
similarity index 88%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/Paywall/EvaluationsPaywall.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/Paywall/EvaluationsPaywall.vue
index 58d21468e18..7a02e9c913d 100644
--- a/packages/frontend/editor-ui/src/features/evaluation.ee/components/Paywall/EvaluationsPaywall.vue
+++ b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/Paywall/EvaluationsPaywall.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from '@n8n/i18n';
-import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/usage/usage.constants';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/settings/usage/usage.constants';
 import { useUIStore } from '@/stores/ui.store';
 
 import { N8nActionBox } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/SetupWizard/SetupWizard.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/SetupWizard/SetupWizard.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/SetupWizard/SetupWizard.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/SetupWizard/SetupWizard.vue
index 6fb631f2294..63e4a69d674 100644
--- a/packages/frontend/editor-ui/src/features/evaluation.ee/components/SetupWizard/SetupWizard.vue
+++ b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/SetupWizard/SetupWizard.vue
@@ -6,7 +6,7 @@ import { useEvaluationStore } from '../../evaluation.store';
 import { PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
 import StepHeader from '../shared/StepHeader.vue';
 import { useRouter } from 'vue-router';
-import { useUsageStore } from '@/features/usage/usage.store';
+import { useUsageStore } from '@/features/settings/usage/usage.store';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { I18nT } from 'vue-i18n';
 
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepHeader.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/StepHeader.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepHeader.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/StepHeader.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepIndicator.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/StepIndicator.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepIndicator.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/StepIndicator.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableCell.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/TableCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableCell.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/TableCell.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableStatusCell.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/TableStatusCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableStatusCell.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/TableStatusCell.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TestTableBase.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/TestTableBase.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TestTableBase.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/components/shared/TestTableBase.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.test.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/composables/useMetricsChart.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.test.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/composables/useMetricsChart.test.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/composables/useMetricsChart.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/composables/useMetricsChart.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.api.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.api.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.api.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.constants.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.constants.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.test.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.test.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.store.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.types.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.types.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.types.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.test.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.test.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/evaluation.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.test.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsRootView.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.test.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsRootView.test.ts
index df7c4f53c48..0a6e49dff61 100644
--- a/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsRootView.test.ts
@@ -6,8 +6,8 @@ import EvaluationRootView from './EvaluationsRootView.vue';
 
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useEvaluationStore } from '../evaluation.store';
-import { useUsageStore } from '@/features/usage/usage.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useUsageStore } from '@/features/settings/usage/usage.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { mockedStore } from '@/__tests__/utils';
 import type { IWorkflowDb } from '@/Interface';
 import { waitFor } from '@testing-library/vue';
@@ -16,7 +16,7 @@ import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { EVALUATION_NODE_TYPE, EVALUATION_TRIGGER_NODE_TYPE, NodeHelpers } from 'n8n-workflow';
 import { mockNodeTypeDescription } from '@/__tests__/mocks';
-import type { SourceControlPreferences } from '@/features/sourceControl.ee/sourceControl.types';
+import type { SourceControlPreferences } from '@/features/integrations/sourceControl.ee/sourceControl.types';
 
 vi.mock('@/composables/useTelemetry', () => {
 	const track = vi.fn();
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsRootView.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsRootView.vue
index 661eec152de..e8859778ed7 100644
--- a/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsRootView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useUsageStore } from '@/features/usage/usage.store';
+import { useUsageStore } from '@/features/settings/usage/usage.store';
 import { useAsyncState } from '@vueuse/core';
 import { PLACEHOLDER_EMPTY_WORKFLOW_ID, EVALUATIONS_DOCS_URL } from '@/constants';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
@@ -9,7 +9,7 @@ import { useToast } from '@/composables/useToast';
 import { useI18n } from '@n8n/i18n';
 import { useEvaluationStore } from '../evaluation.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 
 import { computed, watch } from 'vue';
 import EvaluationsPaywall from '../components/Paywall/EvaluationsPaywall.vue';
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.test.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsView.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.test.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsView.test.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/EvaluationsView.vue
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.test.ts b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/TestRunDetailView.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.test.ts
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/TestRunDetailView.test.ts
diff --git a/packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.vue b/packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/TestRunDetailView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.vue
rename to packages/frontend/editor-ui/src/features/ai/evaluation.ee/views/TestRunDetailView.vue
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.test.constants.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.test.constants.ts
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.test.ts
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.ts
index 87c5dad9ead..f8b878932a9 100644
--- a/packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.ts
@@ -4,7 +4,7 @@ import { vi } from 'vitest';
 import { mockedStore, waitAllPromises } from '@/__tests__/utils';
 import { createTestingPinia } from '@pinia/testing';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useMCPStore } from './mcp.store';
 import { MCP_WORKFLOWS } from './SettingsMCPView.test.constants';
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.vue
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.vue
index 3820edf1af2..55f178a0e87 100644
--- a/packages/frontend/editor-ui/src/features/mcpAccess/SettingsMCPView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.vue
@@ -10,11 +10,11 @@ import { computed, onMounted, ref } from 'vue';
 import { VIEWS } from '@/constants';
 import router from '@/router';
 import { isIconOrEmoji, type IconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
-import { useMCPStore } from '@/features/mcpAccess/mcp.store';
-import { useUsersStore } from '@/features/users/users.store';
-import MCPConnectionInstructions from '@/features/mcpAccess/components/MCPConnectionInstructions.vue';
-import ProjectIcon from '@/features/projects/components/ProjectIcon.vue';
-import { LOADING_INDICATOR_TIMEOUT } from '@/features/mcpAccess/mcp.constants';
+import { useMCPStore } from '@/features/ai/mcpAccess/mcp.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import MCPConnectionInstructions from '@/features/ai/mcpAccess/components/MCPConnectionInstructions.vue';
+import ProjectIcon from '@/features/collaboration/projects/components/ProjectIcon.vue';
+import { LOADING_INDICATOR_TIMEOUT } from '@/features/ai/mcpAccess/mcp.constants';
 
 import { ElSwitch } from 'element-plus';
 import {
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/components/ConnectionParameter.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/ConnectionParameter.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/mcpAccess/components/ConnectionParameter.vue
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/components/ConnectionParameter.vue
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/components/MCPConnectionInstructions.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/mcpAccess/components/MCPConnectionInstructions.vue
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.vue
index 6d4a6c85d04..9a92c8ee991 100644
--- a/packages/frontend/editor-ui/src/features/mcpAccess/components/MCPConnectionInstructions.vue
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.vue
@@ -14,7 +14,7 @@ import {
 } from '@n8n/design-system';
 import type { ApiKey } from '@n8n/api-types';
 import ConnectionParameter from './ConnectionParameter.vue';
-import { MCP_DOCS_PAGE_URL } from '@/features/mcpAccess/mcp.constants';
+import { MCP_DOCS_PAGE_URL } from '@/features/ai/mcpAccess/mcp.constants';
 
 const MCP_ENDPOINT = 'mcp-server/http';
 
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/composables/useMcp.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/composables/useMcp.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/mcpAccess/composables/useMcp.ts
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/composables/useMcp.ts
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/mcp.api.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/mcpAccess/mcp.api.ts
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.api.ts
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/mcp.constants.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/mcpAccess/mcp.constants.ts
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/mcp.store.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.store.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/mcpAccess/mcp.store.ts
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.store.ts
index 84bc6deb9dc..3c9f1bf1dab 100644
--- a/packages/frontend/editor-ui/src/features/mcpAccess/mcp.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.store.ts
@@ -8,7 +8,7 @@ import {
 	toggleWorkflowMcpAccessApi,
 	fetchApiKey,
 	rotateApiKey,
-} from '@/features/mcpAccess/mcp.api';
+} from '@/features/ai/mcpAccess/mcp.api';
 import { computed, ref } from 'vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { isWorkflowListItem } from '@/utils/typeGuards';
diff --git a/packages/frontend/editor-ui/src/features/mcpAccess/module.descriptor.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
similarity index 81%
rename from packages/frontend/editor-ui/src/features/mcpAccess/module.descriptor.ts
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
index 53383e77ecd..25381a81f61 100644
--- a/packages/frontend/editor-ui/src/features/mcpAccess/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
@@ -1,10 +1,10 @@
 import { useI18n } from '@n8n/i18n';
 import { type FrontendModuleDescription } from '@/moduleInitializer/module.types';
-import { MCP_SETTINGS_VIEW } from '@/features/mcpAccess/mcp.constants';
+import { MCP_SETTINGS_VIEW } from '@/features/ai/mcpAccess/mcp.constants';
 
 const i18n = useI18n();
 
-const SettingsMCPView = async () => await import('@/features/mcpAccess/SettingsMCPView.vue');
+const SettingsMCPView = async () => await import('@/features/ai/mcpAccess/SettingsMCPView.vue');
 
 export const MCPModule: FrontendModuleDescription = {
 	id: 'mcp',
diff --git a/packages/frontend/editor-ui/src/features/collaboration/collaboration.store.ts b/packages/frontend/editor-ui/src/features/collaboration/collaboration/collaboration.store.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/collaboration/collaboration.store.ts
rename to packages/frontend/editor-ui/src/features/collaboration/collaboration/collaboration.store.ts
index 196063d1f23..4341b51566d 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/collaboration.store.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/collaboration/collaboration.store.ts
@@ -8,7 +8,7 @@ import { STORES } from '@n8n/stores';
 import { useBeforeUnload } from '@/composables/useBeforeUnload';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useUIStore } from '@/stores/ui.store';
 
 const HEARTBEAT_INTERVAL = 5 * TIME.MINUTE;
diff --git a/packages/frontend/editor-ui/src/features/collaboration/components/CollaborationPane.test.ts b/packages/frontend/editor-ui/src/features/collaboration/collaboration/components/CollaborationPane.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/collaboration/components/CollaborationPane.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/collaboration/components/CollaborationPane.test.ts
diff --git a/packages/frontend/editor-ui/src/features/collaboration/components/CollaborationPane.vue b/packages/frontend/editor-ui/src/features/collaboration/collaboration/components/CollaborationPane.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/collaboration/components/CollaborationPane.vue
rename to packages/frontend/editor-ui/src/features/collaboration/collaboration/components/CollaborationPane.vue
index 2a7f5158669..80339df4930 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/components/CollaborationPane.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/collaboration/components/CollaborationPane.vue
@@ -2,7 +2,7 @@
 import { onMounted, onBeforeUnmount, computed, watch } from 'vue';
 import { useDocumentVisibility } from '@vueuse/core';
 
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useCollaborationStore } from '../collaboration.store';
 
 import { N8nUserStack } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/projects/__tests__/utils.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/__tests__/utils.ts
similarity index 83%
rename from packages/frontend/editor-ui/src/features/projects/__tests__/utils.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/__tests__/utils.ts
index 279a6b80e16..e392e1736b6 100644
--- a/packages/frontend/editor-ui/src/features/projects/__tests__/utils.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/__tests__/utils.ts
@@ -4,9 +4,9 @@ import type {
 	ProjectListItem,
 	ProjectSharingData,
 	ProjectType,
-} from '@/features/projects/projects.types';
-import { ProjectTypes } from '@/features/projects/projects.types';
-import { MAX_NAME_LENGTH } from '@/features/projects/projects.utils';
+} from '@/features/collaboration/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
+import { MAX_NAME_LENGTH } from '@/features/collaboration/projects/projects.utils';
 
 export const createProjectSharingData = (projectType?: ProjectType): ProjectSharingData => ({
 	id: faker.string.uuid(),
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectCardBadge.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectCardBadge.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectCardBadge.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectCardBadge.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectCardBadge.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectCardBadge.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectCardBadge.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectCardBadge.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectCreateResource.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectCreateResource.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectCreateResource.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectCreateResource.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectDeleteDialog.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectDeleteDialog.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectDeleteDialog.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectDeleteDialog.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectDeleteDialog.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectDeleteDialog.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectDeleteDialog.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectDeleteDialog.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectHeader.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectHeader.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectHeader.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectHeader.test.ts
index e878b6aa1e5..c28c7a51528 100644
--- a/packages/frontend/editor-ui/src/features/projects/components/ProjectHeader.test.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectHeader.test.ts
@@ -12,7 +12,7 @@ import { VIEWS } from '@/constants';
 import userEvent from '@testing-library/user-event';
 import { waitFor, within } from '@testing-library/vue';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { useUIStore } from '@/stores/ui.store';
 
 const mockPush = vi.fn();
@@ -32,7 +32,7 @@ vi.mock('vue-router', async () => {
 	};
 });
 
-vi.mock('@/features/projects/composables/useProjectPages', () => ({
+vi.mock('@/features/collaboration/projects/composables/useProjectPages', () => ({
 	useProjectPages: vi.fn().mockReturnValue({
 		isOverviewSubPage: false,
 		isSharedSubPage: false,
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectHeader.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectHeader.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectHeader.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectHeader.vue
index c5e47de66d4..90ba870352d 100644
--- a/packages/frontend/editor-ui/src/features/projects/components/ProjectHeader.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectHeader.vue
@@ -10,16 +10,16 @@ import ProjectTabs from './ProjectTabs.vue';
 import ProjectIcon from './ProjectIcon.vue';
 import { getResourcePermissions } from '@n8n/permissions';
 import { VIEWS } from '@/constants';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import ProjectCreateResource from './ProjectCreateResource.vue';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { truncateTextToFitWidth } from '@/utils/formatters/textFormatter';
 import { type IconName } from '@n8n/design-system/components/N8nIcon/icons';
 import type { IUser } from 'n8n-workflow';
 import { type IconOrEmoji, isIconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
 import { useUIStore } from '@/stores/ui.store';
-import { PROJECT_DATA_TABLES } from '@/features/dataTable/constants';
+import { PROJECT_DATA_TABLES } from '@/features/core/dataTable/constants';
 import ReadyToRunV2Button from '@/experiments/readyToRunWorkflowsV2/components/ReadyToRunV2Button.vue';
 
 import { N8nButton, N8nHeading, N8nText, N8nTooltip } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectIcon.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectIcon.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectIcon.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectIcon.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMembersActionsCell.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersActionsCell.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMembersActionsCell.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersActionsCell.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMembersActionsCell.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersActionsCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMembersActionsCell.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersActionsCell.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMembersRoleCell.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMembersRoleCell.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMembersRoleCell.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMembersRoleCell.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMembersTable.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMembersTable.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMembersTable.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMembersTable.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMoveResourceModal.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMoveResourceModal.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMoveResourceModal.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMoveResourceModal.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModal.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMoveResourceModalCredentialsList.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModalCredentialsList.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMoveResourceModalCredentialsList.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveResourceModalCredentialsList.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMoveSuccessToastMessage.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMoveSuccessToastMessage.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectMoveSuccessToastMessage.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectMoveSuccessToastMessage.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMoveSuccessToastMessage.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectNavigation.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectNavigation.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.test.ts
index 66d8589f0b1..07f990bb5b1 100644
--- a/packages/frontend/editor-ui/src/features/projects/components/ProjectNavigation.test.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.test.ts
@@ -6,7 +6,7 @@ import { createProjectListItem } from '../__tests__/utils';
 import ProjectsNavigation from './ProjectNavigation.vue';
 import { useProjectsStore } from '../projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 vi.mock('vue-router', async () => {
 	const actual = await vi.importActual('vue-router');
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectNavigation.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectNavigation.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.vue
index 13f523f6f69..503e17e91ea 100644
--- a/packages/frontend/editor-ui/src/features/projects/components/ProjectNavigation.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.vue
@@ -3,7 +3,7 @@ import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
 import { VIEWS } from '@/constants';
 import { useProjectsStore } from '../projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { ProjectListItem } from '../projects.types';
 import type { IMenuItem } from '@n8n/design-system/types';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectRoleUpgradeDialog.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectRoleUpgradeDialog.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectRoleUpgradeDialog.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectRoleUpgradeDialog.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectSharing.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectSharing.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectSharing.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectSharing.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectSharingInfo.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharingInfo.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectSharingInfo.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharingInfo.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectTabs.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectTabs.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectTabs.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectTabs.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/components/ProjectTabs.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectTabs.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/components/ProjectTabs.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectTabs.vue
diff --git a/packages/frontend/editor-ui/src/features/projects/composables/useProjectPages.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/composables/useProjectPages.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/composables/useProjectPages.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/composables/useProjectPages.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.api.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/projects.api.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.api.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.constants.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/projects.constants.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.routes.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.routes.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/projects/projects.routes.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.routes.ts
index 4ae657669df..0893873b269 100644
--- a/packages/frontend/editor-ui/src/features/projects/projects.routes.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.routes.ts
@@ -8,7 +8,8 @@ const WorkflowsView = async () => await import('@/views/WorkflowsView.vue');
 const CredentialsView = async () =>
 	await import('@/features/credentials/views/CredentialsView.vue');
 const ProjectSettings = async () => await import('./views/ProjectSettings.vue');
-const ExecutionsView = async () => await import('@/features/executions/views/ExecutionsView.vue');
+const ExecutionsView = async () =>
+	await import('@/features/execution/executions/views/ExecutionsView.vue');
 const ProjectVariables = async () => await import('./views/ProjectVariables.vue');
 
 const checkProjectAvailability = (to?: RouteLocationNormalized): boolean => {
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.store.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/projects.store.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.store.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.store.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/projects/projects.store.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.store.ts
index a78a8a37048..1510977ceac 100644
--- a/packages/frontend/editor-ui/src/features/projects/projects.store.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.store.ts
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { ref, watch, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import * as dataTableApi from '@/features/dataTable/dataTable.api';
+import * as dataTableApi from '@/features/core/dataTable/dataTable.api';
 import * as projectsApi from './projects.api';
 import * as workflowsApi from '@/api/workflows';
 import * as workflowsEEApi from '@/api/workflows.ee';
@@ -15,10 +15,10 @@ import { hasPermission } from '@/utils/rbac/permissions';
 import type { IWorkflowDb } from '@/Interface';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { STORES } from '@n8n/stores';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { getResourcePermissions } from '@n8n/permissions';
 import type { CreateProjectDto, UpdateProjectDto } from '@n8n/api-types';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 
 export type ResourceCounts = {
 	credentials: number;
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.types.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/projects.types.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.types.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.utils.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/projects.utils.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/projects.utils.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/projects/projects.utils.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/projects.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/projects/views/ProjectSettings.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectSettings.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/projects/views/ProjectSettings.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectSettings.test.ts
index 10d8c70f20e..d6f96ad4678 100644
--- a/packages/frontend/editor-ui/src/features/projects/views/ProjectSettings.test.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectSettings.test.ts
@@ -16,7 +16,7 @@ import type { Project } from '../projects.types';
 import { ProjectTypes } from '../projects.types';
 import { createProjectListItem } from '../__tests__/utils';
 import { createUser } from '@/__tests__/data/users';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRolesStore } from '@/stores/roles.store';
 import type { FrontendSettings } from '@n8n/api-types';
diff --git a/packages/frontend/editor-ui/src/features/projects/views/ProjectSettings.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectSettings.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/projects/views/ProjectSettings.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectSettings.vue
index 98d739904d5..4d927c4ba03 100644
--- a/packages/frontend/editor-ui/src/features/projects/views/ProjectSettings.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectSettings.vue
@@ -4,7 +4,7 @@ import { computed, ref, watch, onBeforeMount, onMounted, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
 import { deepCopy } from 'n8n-workflow';
 import { useDebounceFn } from '@vueuse/core';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useI18n } from '@n8n/i18n';
 import { type ResourceCounts, useProjectsStore } from '../projects.store';
 import type { Project, ProjectRelation, ProjectMemberData } from '../projects.types';
diff --git a/packages/frontend/editor-ui/src/features/projects/views/ProjectVariables.test.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectVariables.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/projects/views/ProjectVariables.test.ts
rename to packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectVariables.test.ts
index e44160ee7d7..1d91e10463a 100644
--- a/packages/frontend/editor-ui/src/features/projects/views/ProjectVariables.test.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectVariables.test.ts
@@ -1,10 +1,10 @@
 import ProjectVariables from './ProjectVariables.vue';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useUIStore } from '@/stores/ui.store';
 import { createComponentRenderer } from '@/__tests__/render';
 import { EnterpriseEditionFeature } from '@/constants';
-import { VARIABLE_MODAL_KEY } from '@/features/environments.ee/environments.constants';
+import { VARIABLE_MODAL_KEY } from '@/features/settings/environments.ee/environments.constants';
 import { STORES } from '@n8n/stores';
 import { createTestingPinia } from '@pinia/testing';
 import { mockedStore, SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
@@ -13,8 +13,8 @@ import userEvent from '@testing-library/user-event';
 import { waitFor } from '@testing-library/vue';
 import type { IUser } from '@n8n/rest-api-client/api/users';
 import type { Scope } from '@n8n/permissions';
-import type { EnvironmentVariable } from '@/features/environments.ee/environments.types';
-import useEnvironmentsStore from '@/features/environments.ee/environments.store';
+import type { EnvironmentVariable } from '@/features/settings/environments.ee/environments.types';
+import useEnvironmentsStore from '@/features/settings/environments.ee/environments.store';
 
 const router = createRouter({
 	history: createWebHistory(),
diff --git a/packages/frontend/editor-ui/src/features/projects/views/ProjectVariables.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectVariables.vue
similarity index 93%
rename from packages/frontend/editor-ui/src/features/projects/views/ProjectVariables.vue
rename to packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectVariables.vue
index 00975522026..ebbc6781ad2 100644
--- a/packages/frontend/editor-ui/src/features/projects/views/ProjectVariables.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/views/ProjectVariables.vue
@@ -6,7 +6,7 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { useRoute, useRouter, type LocationQueryRaw } from 'vue-router';
 
@@ -15,7 +15,7 @@ import type { BaseFilters, Resource, VariableResource, DatatableColumn } from '@
 
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
-import { VARIABLE_MODAL_KEY } from '@/features/environments.ee/environments.constants';
+import { VARIABLE_MODAL_KEY } from '@/features/settings/environments.ee/environments.constants';
 import { getResourcePermissions } from '@n8n/permissions';
 import {
 	N8nActionBox,
@@ -33,15 +33,15 @@ import {
 import { useAsyncState } from '@vueuse/core';
 import pickBy from 'lodash/pickBy';
 import type { ComponentExposed } from 'vue-component-type-helpers';
-import { useInsightsStore } from '@/features/insights/insights.store';
-import InsightsSummary from '@/features/insights/components/InsightsSummary.vue';
-import { useEnvironmentsStore } from '@/features/environments.ee/environments.store';
-import type { EnvironmentVariable } from '@/features/environments.ee/environments.types';
-import VariablesUsageBadge from '@/features/environments.ee/components/VariablesUsageBadge.vue';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import ProjectHeader from '@/features/projects/components/ProjectHeader.vue';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
+import InsightsSummary from '@/features/execution/insights/components/InsightsSummary.vue';
+import { useEnvironmentsStore } from '@/features/settings/environments.ee/environments.store';
+import type { EnvironmentVariable } from '@/features/settings/environments.ee/environments.types';
+import VariablesUsageBadge from '@/features/settings/environments.ee/components/VariablesUsageBadge.vue';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import ProjectHeader from '@/features/collaboration/projects/components/ProjectHeader.vue';
 import { isVariableResource } from '@/utils/typeGuards';
 import type { IconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
 
diff --git a/packages/frontend/editor-ui/src/features/auth/auth.eventBus.ts b/packages/frontend/editor-ui/src/features/core/auth/auth.eventBus.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/auth.eventBus.ts
rename to packages/frontend/editor-ui/src/features/core/auth/auth.eventBus.ts
diff --git a/packages/frontend/editor-ui/src/features/auth/components/ChangePasswordModal.test.ts b/packages/frontend/editor-ui/src/features/core/auth/components/ChangePasswordModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/components/ChangePasswordModal.test.ts
rename to packages/frontend/editor-ui/src/features/core/auth/components/ChangePasswordModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/auth/components/ChangePasswordModal.vue b/packages/frontend/editor-ui/src/features/core/auth/components/ChangePasswordModal.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/auth/components/ChangePasswordModal.vue
rename to packages/frontend/editor-ui/src/features/core/auth/components/ChangePasswordModal.vue
index 0d237db915d..d1650af4616 100644
--- a/packages/frontend/editor-ui/src/features/auth/components/ChangePasswordModal.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/components/ChangePasswordModal.vue
@@ -3,7 +3,7 @@ import { ref, onMounted } from 'vue';
 import { useToast } from '@/composables/useToast';
 import { CHANGE_PASSWORD_MODAL_KEY } from '@/constants';
 import Modal from '@/components/Modal.vue';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { createFormEventBus } from '@n8n/design-system/utils';
 import { createEventBus } from '@n8n/utils/event-bus';
 import type { IFormInputs, IFormInput, FormFieldValueUpdate, FormValues } from '@/Interface';
diff --git a/packages/frontend/editor-ui/src/features/auth/components/ConfirmPasswordModal.test.ts b/packages/frontend/editor-ui/src/features/core/auth/components/ConfirmPasswordModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/components/ConfirmPasswordModal.test.ts
rename to packages/frontend/editor-ui/src/features/core/auth/components/ConfirmPasswordModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/auth/components/ConfirmPasswordModal.vue b/packages/frontend/editor-ui/src/features/core/auth/components/ConfirmPasswordModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/components/ConfirmPasswordModal.vue
rename to packages/frontend/editor-ui/src/features/core/auth/components/ConfirmPasswordModal.vue
diff --git a/packages/frontend/editor-ui/src/features/auth/components/MfaSetupModal.vue b/packages/frontend/editor-ui/src/features/core/auth/components/MfaSetupModal.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/auth/components/MfaSetupModal.vue
rename to packages/frontend/editor-ui/src/features/core/auth/components/MfaSetupModal.vue
index 3c248be2e38..c0c169d7fc1 100644
--- a/packages/frontend/editor-ui/src/features/auth/components/MfaSetupModal.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/components/MfaSetupModal.vue
@@ -7,7 +7,7 @@ import {
 	VIEWS,
 } from '@/constants';
 import { ref, onMounted } from 'vue';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { mfaEventBus } from '../auth.eventBus';
 import { useToast } from '@/composables/useToast';
 //@ts-ignore
diff --git a/packages/frontend/editor-ui/src/features/auth/components/PromptMfaCodeModal.vue b/packages/frontend/editor-ui/src/features/core/auth/components/PromptMfaCodeModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/components/PromptMfaCodeModal.vue
rename to packages/frontend/editor-ui/src/features/core/auth/components/PromptMfaCodeModal.vue
diff --git a/packages/frontend/editor-ui/src/features/auth/components/__snapshots__/ChangePasswordModal.test.ts.snap b/packages/frontend/editor-ui/src/features/core/auth/components/__snapshots__/ChangePasswordModal.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/components/__snapshots__/ChangePasswordModal.test.ts.snap
rename to packages/frontend/editor-ui/src/features/core/auth/components/__snapshots__/ChangePasswordModal.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/auth/components/__snapshots__/ConfirmPasswordModal.test.ts.snap b/packages/frontend/editor-ui/src/features/core/auth/components/__snapshots__/ConfirmPasswordModal.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/components/__snapshots__/ConfirmPasswordModal.test.ts.snap
rename to packages/frontend/editor-ui/src/features/core/auth/components/__snapshots__/ConfirmPasswordModal.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/auth/views/AuthView.test.ts b/packages/frontend/editor-ui/src/features/core/auth/views/AuthView.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/views/AuthView.test.ts
rename to packages/frontend/editor-ui/src/features/core/auth/views/AuthView.test.ts
diff --git a/packages/frontend/editor-ui/src/features/auth/views/AuthView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/AuthView.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/auth/views/AuthView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/AuthView.vue
index b62fb3439f8..a188e3df257 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/AuthView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/AuthView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { N8nLogo } from '@n8n/design-system';
-import SSOLogin from '@/features/sso/components/SSOLogin.vue';
+import SSOLogin from '@/features/settings/sso/components/SSOLogin.vue';
 import type { FormFieldValueUpdate, IFormBoxConfig } from '@/Interface';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { EmailOrLdapLoginIdAndPassword } from './SigninView.vue';
diff --git a/packages/frontend/editor-ui/src/features/auth/views/ChangePasswordView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/ChangePasswordView.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/auth/views/ChangePasswordView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/ChangePasswordView.vue
index fde9bab64be..b5b54a72edc 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/ChangePasswordView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/ChangePasswordView.vue
@@ -6,7 +6,7 @@ import AuthView from './AuthView.vue';
 
 import { useI18n } from '@n8n/i18n';
 import { useToast } from '@/composables/useToast';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 import type { FormFieldValueUpdate, IFormBoxConfig } from '@/Interface';
 import { MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH, VIEWS } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/auth/views/ForgotMyPasswordView.test.ts b/packages/frontend/editor-ui/src/features/core/auth/views/ForgotMyPasswordView.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/auth/views/ForgotMyPasswordView.test.ts
rename to packages/frontend/editor-ui/src/features/core/auth/views/ForgotMyPasswordView.test.ts
index a88f6cb1063..77ecda6455e 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/ForgotMyPasswordView.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/ForgotMyPasswordView.test.ts
@@ -4,7 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
 import ForgotMyPasswordView from './ForgotMyPasswordView.vue';
 import { useToast } from '@/composables/useToast';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
 vi.mock('vue-router', () => {
diff --git a/packages/frontend/editor-ui/src/features/auth/views/ForgotMyPasswordView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/ForgotMyPasswordView.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/auth/views/ForgotMyPasswordView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/ForgotMyPasswordView.vue
index a35cbb1677f..8041286183e 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/ForgotMyPasswordView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/ForgotMyPasswordView.vue
@@ -4,7 +4,7 @@ import type { IFormBoxConfig } from '@/Interface';
 import { useI18n } from '@n8n/i18n';
 import { useToast } from '@/composables/useToast';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed, ref } from 'vue';
 
 const settingsStore = useSettingsStore();
diff --git a/packages/frontend/editor-ui/src/features/auth/views/MfaView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/MfaView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/auth/views/MfaView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/MfaView.vue
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SettingsPersonalView.test.ts b/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/auth/views/SettingsPersonalView.test.ts
rename to packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.test.ts
index 16577560548..1e111ff0b91 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SettingsPersonalView.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.test.ts
@@ -3,13 +3,13 @@ import { createPinia } from 'pinia';
 import { waitAllPromises } from '@/__tests__/utils';
 import SettingsPersonalView from './SettingsPersonalView.vue';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { createComponentRenderer } from '@/__tests__/render';
 import { setupServer } from '@/__tests__/server';
 import { ROLE } from '@n8n/api-types';
 import { useUIStore } from '@/stores/ui.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 import { UserManagementAuthenticationMethod } from '@/Interface';
 
 let pinia: ReturnType<typeof createPinia>;
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SettingsPersonalView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/auth/views/SettingsPersonalView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.vue
index 7c32ce6db13..f65ecfafb60 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SettingsPersonalView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.vue
@@ -14,14 +14,14 @@ import {
 	PROMPT_MFA_CODE_MODAL_KEY,
 } from '@/constants';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { createFormEventBus } from '@n8n/design-system/utils';
 import type { MfaModalEvents } from '../auth.eventBus';
 import { promptMfaCodeBus } from '../auth.eventBus';
 import type { BaseTextKey } from '@n8n/i18n';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 import type { ConfirmPasswordModalEvents } from '../auth.eventBus';
 import { confirmPasswordEventBus } from '../auth.eventBus';
 
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SetupView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/SetupView.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/auth/views/SetupView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/SetupView.vue
index b6e2bd89b65..ecacf42f60b 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SetupView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SetupView.vue
@@ -6,7 +6,7 @@ import { useToast } from '@/composables/useToast';
 import { useI18n } from '@n8n/i18n';
 
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 import type { IFormBoxConfig } from '@/Interface';
 import { VIEWS } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SigninView.test.ts b/packages/frontend/editor-ui/src/features/core/auth/views/SigninView.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/auth/views/SigninView.test.ts
rename to packages/frontend/editor-ui/src/features/core/auth/views/SigninView.test.ts
index 652b464ff39..cf0e2bc1f3f 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SigninView.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SigninView.test.ts
@@ -4,7 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
 import { useRouter, useRoute } from 'vue-router';
 import SigninView from './SigninView.vue';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { VIEWS } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SigninView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/SigninView.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/auth/views/SigninView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/SigninView.vue
index 44d9d1f3808..1df3021f4d0 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SigninView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SigninView.vue
@@ -9,9 +9,9 @@ import { useToast } from '@/composables/useToast';
 import { useI18n } from '@n8n/i18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 
 import type { IFormBoxConfig } from '@/Interface';
 import { MFA_AUTHENTICATION_REQUIRED_ERROR_CODE, VIEWS, MFA_FORM } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SignoutView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/SignoutView.vue
similarity index 89%
rename from packages/frontend/editor-ui/src/features/auth/views/SignoutView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/SignoutView.vue
index 7977b69ac57..d176033f2a1 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SignoutView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SignoutView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { VIEWS } from '@/constants';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useToast } from '@/composables/useToast';
 import { useRouter } from 'vue-router';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SignupView.test.ts b/packages/frontend/editor-ui/src/features/core/auth/views/SignupView.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/auth/views/SignupView.test.ts
rename to packages/frontend/editor-ui/src/features/core/auth/views/SignupView.test.ts
index 2887f2170f0..7fff7303e6d 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SignupView.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SignupView.test.ts
@@ -5,7 +5,7 @@ import userEvent from '@testing-library/user-event';
 import { useToast } from '@/composables/useToast';
 import SignupView from './SignupView.vue';
 import { VIEWS } from '@/constants';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { mockedStore } from '@/__tests__/utils';
 
 vi.mock('vue-router', () => {
diff --git a/packages/frontend/editor-ui/src/features/auth/views/SignupView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/SignupView.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/auth/views/SignupView.vue
rename to packages/frontend/editor-ui/src/features/core/auth/views/SignupView.vue
index d8d391c578c..cde974d4b95 100644
--- a/packages/frontend/editor-ui/src/features/auth/views/SignupView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SignupView.vue
@@ -5,7 +5,7 @@ import { useToast } from '@/composables/useToast';
 import { computed, onMounted, ref } from 'vue';
 import type { IFormBoxConfig } from '@/Interface';
 import { VIEWS } from '@/constants';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useI18n } from '@n8n/i18n';
 import { useRoute, useRouter } from 'vue-router';
 
diff --git a/packages/frontend/editor-ui/src/features/dataTable/DataTableDetailsView.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableDetailsView.test.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/dataTable/DataTableDetailsView.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/DataTableDetailsView.test.ts
index 3288e575e08..c5111f861c9 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/DataTableDetailsView.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableDetailsView.test.ts
@@ -1,10 +1,10 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import DataTableDetailsView from '@/features/dataTable/DataTableDetailsView.vue';
+import DataTableDetailsView from '@/features/core/dataTable/DataTableDetailsView.vue';
 import { createTestingPinia } from '@pinia/testing';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { useToast } from '@/composables/useToast';
 import { useRouter } from 'vue-router';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 import { waitFor } from '@testing-library/vue';
 
 vi.mock('@/composables/useToast');
diff --git a/packages/frontend/editor-ui/src/features/dataTable/DataTableDetailsView.vue b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableDetailsView.vue
similarity index 93%
rename from packages/frontend/editor-ui/src/features/dataTable/DataTableDetailsView.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/DataTableDetailsView.vue
index 7ec47dae5c2..79b80fa24bb 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/DataTableDetailsView.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableDetailsView.vue
@@ -4,13 +4,13 @@ import type {
 	AddColumnResponse,
 	DataTable,
 	DataTableColumnCreatePayload,
-} from '@/features/dataTable/dataTable.types';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+} from '@/features/core/dataTable/dataTable.types';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@n8n/i18n';
 import { useRouter } from 'vue-router';
-import { DATA_TABLE_VIEW, MIN_LOADING_TIME } from '@/features/dataTable/constants';
-import DataTableBreadcrumbs from '@/features/dataTable/components/DataTableBreadcrumbs.vue';
+import { DATA_TABLE_VIEW, MIN_LOADING_TIME } from '@/features/core/dataTable/constants';
+import DataTableBreadcrumbs from '@/features/core/dataTable/components/DataTableBreadcrumbs.vue';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import DataTableTable from './components/dataGrid/DataTableTable.vue';
 import { useDebounce } from '@/composables/useDebounce';
diff --git a/packages/frontend/editor-ui/src/features/dataTable/DataTableView.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableView.test.ts
similarity index 91%
rename from packages/frontend/editor-ui/src/features/dataTable/DataTableView.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/DataTableView.test.ts
index 60090409ceb..73d533e9707 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/DataTableView.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableView.test.ts
@@ -1,18 +1,18 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore, waitAllPromises } from '@/__tests__/utils';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import DataTableView from '@/features/dataTable/DataTableView.vue';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import DataTableView from '@/features/core/dataTable/DataTableView.vue';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { STORES } from '@n8n/stores';
 import { createTestingPinia } from '@pinia/testing';
 import { createRouter, createWebHistory } from 'vue-router';
-import type { DataTableResource } from '@/features/dataTable/types';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import type { DataTableResource } from '@/features/core/dataTable/types';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import type { Mock } from 'vitest';
-import { type Project } from '@/features/projects/projects.types';
+import { type Project } from '@/features/collaboration/projects/projects.types';
 
-vi.mock('@/features/projects/composables/useProjectPages', () => ({
+vi.mock('@/features/collaboration/projects/composables/useProjectPages', () => ({
 	useProjectPages: vi.fn().mockReturnValue({
 		isOverviewSubPage: false,
 		isSharedSubPage: false,
diff --git a/packages/frontend/editor-ui/src/features/dataTable/DataTableView.vue b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableView.vue
similarity index 83%
rename from packages/frontend/editor-ui/src/features/dataTable/DataTableView.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/DataTableView.vue
index a7a8b24c35d..618ebc74337 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/DataTableView.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/DataTableView.vue
@@ -1,27 +1,27 @@
 <script setup lang="ts">
-import ProjectHeader from '@/features/projects/components/ProjectHeader.vue';
-import InsightsSummary from '@/features/insights/components/InsightsSummary.vue';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
-import { useInsightsStore } from '@/features/insights/insights.store';
+import ProjectHeader from '@/features/collaboration/projects/components/ProjectHeader.vue';
+import InsightsSummary from '@/features/execution/insights/components/InsightsSummary.vue';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 
 import { useI18n } from '@n8n/i18n';
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import type { SortingAndPaginationUpdates } from '@/Interface';
-import type { DataTableResource } from '@/features/dataTable/types';
-import DataTableCard from '@/features/dataTable/components/DataTableCard.vue';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import type { DataTableResource } from '@/features/core/dataTable/types';
+import DataTableCard from '@/features/core/dataTable/components/DataTableCard.vue';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import {
 	ADD_DATA_TABLE_MODAL_KEY,
 	DEFAULT_DATA_TABLE_PAGE_SIZE,
 	PROJECT_DATA_TABLES,
-} from '@/features/dataTable/constants';
+} from '@/features/core/dataTable/constants';
 import { useDebounce } from '@/composables/useDebounce';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useToast } from '@/composables/useToast';
 import { useUIStore } from '@/stores/ui.store';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 
 import { N8nActionBox } from '@n8n/design-system';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/AddDataTableModal.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/AddDataTableModal.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/dataTable/components/AddDataTableModal.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/AddDataTableModal.vue
index efd617a6a5f..8d72f3f3adf 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/AddDataTableModal.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/AddDataTableModal.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
 import { useI18n } from '@n8n/i18n';
 import { onMounted, ref } from 'vue';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useToast } from '@/composables/useToast';
 import { useRoute, useRouter } from 'vue-router';
-import { DATA_TABLE_DETAILS, PROJECT_DATA_TABLES } from '@/features/dataTable/constants';
+import { DATA_TABLE_DETAILS, PROJECT_DATA_TABLES } from '@/features/core/dataTable/constants';
 import { useTelemetry } from '@/composables/useTelemetry';
 
 import { N8nButton, N8nInput, N8nInputLabel } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableActions.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableActions.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/dataTable/components/DataTableActions.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableActions.test.ts
index c9d0c5f4f08..1d793fb4453 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableActions.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableActions.test.ts
@@ -2,10 +2,10 @@ import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import { vi } from 'vitest';
-import DataTableActions from '@/features/dataTable/components/DataTableActions.vue';
-import { DATA_TABLE_CARD_ACTIONS } from '@/features/dataTable/constants';
+import DataTableActions from '@/features/core/dataTable/components/DataTableActions.vue';
+import { DATA_TABLE_CARD_ACTIONS } from '@/features/core/dataTable/constants';
 import { MODAL_CONFIRM } from '@/constants';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 
 const mockMessage = {
 	confirm: vi.fn(),
@@ -25,7 +25,7 @@ vi.mock('@/composables/useToast', () => ({
 	useToast: () => mockToast,
 }));
 
-vi.mock('@/features/dataTable/dataTable.store', () => ({
+vi.mock('@/features/core/dataTable/dataTable.store', () => ({
 	useDataTableStore: () => ({
 		deleteDataTable: mockDeleteDataTable,
 	}),
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableActions.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableActions.vue
similarity index 92%
rename from packages/frontend/editor-ui/src/features/dataTable/components/DataTableActions.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableActions.vue
index 0b63ef02c2b..0342f9a2239 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableActions.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableActions.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 import type { IUser, UserAction } from '@n8n/design-system';
-import { DATA_TABLE_CARD_ACTIONS } from '@/features/dataTable/constants';
+import { DATA_TABLE_CARD_ACTIONS } from '@/features/core/dataTable/constants';
 import { useI18n } from '@n8n/i18n';
 import { computed } from 'vue';
 import { useMessage } from '@/composables/useMessage';
 import { MODAL_CONFIRM } from '@/constants';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { useToast } from '@/composables/useToast';
 import { useTelemetry } from '@/composables/useTelemetry';
 
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableBreadcrumbs.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableBreadcrumbs.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/dataTable/components/DataTableBreadcrumbs.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableBreadcrumbs.test.ts
index 010a5276eb6..849f3868871 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableBreadcrumbs.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableBreadcrumbs.test.ts
@@ -2,8 +2,8 @@ import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import { vi } from 'vitest';
-import DataTableBreadcrumbs from '@/features/dataTable/components/DataTableBreadcrumbs.vue';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import DataTableBreadcrumbs from '@/features/core/dataTable/components/DataTableBreadcrumbs.vue';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 
 const mockRouter = {
 	push: vi.fn(),
@@ -27,7 +27,7 @@ vi.mock('@/composables/useToast', () => ({
 	useToast: () => mockToast,
 }));
 
-vi.mock('@/features/dataTable/dataTable.store', () => ({
+vi.mock('@/features/core/dataTable/dataTable.store', () => ({
 	useDataTableStore: () => ({
 		updateDataTable: mockUpdateDataTable,
 	}),
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableBreadcrumbs.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableBreadcrumbs.vue
similarity index 90%
rename from packages/frontend/editor-ui/src/features/dataTable/components/DataTableBreadcrumbs.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableBreadcrumbs.vue
index f9a1cb1ae2c..fc7fe75e286 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableBreadcrumbs.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableBreadcrumbs.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
 import { computed, nextTick, ref, useTemplateRef, watch } from 'vue';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 import { useI18n } from '@n8n/i18n';
 import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
 import { useRouter } from 'vue-router';
-import DataTableActions from '@/features/dataTable/components/DataTableActions.vue';
-import { PROJECT_DATA_TABLES } from '@/features/dataTable/constants';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import DataTableActions from '@/features/core/dataTable/components/DataTableActions.vue';
+import { PROJECT_DATA_TABLES } from '@/features/core/dataTable/constants';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { useToast } from '@/composables/useToast';
 import { telemetry } from '@/plugins/telemetry';
 
 import { N8nBreadcrumbs, N8nInlineTextEdit } from '@n8n/design-system';
-import ProjectBreadcrumb from '@/features/folders/components/ProjectBreadcrumb.vue';
+import ProjectBreadcrumb from '@/features/core/folders/components/ProjectBreadcrumb.vue';
 const BREADCRUMBS_SEPARATOR = '/';
 
 type Props = {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableCard.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableCard.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/dataTable/components/DataTableCard.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableCard.test.ts
index 152fac59e9a..141c470f336 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableCard.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableCard.test.ts
@@ -1,9 +1,9 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import DataTableCard from '@/features/dataTable/components/DataTableCard.vue';
+import DataTableCard from '@/features/core/dataTable/components/DataTableCard.vue';
 import { createPinia, setActivePinia } from 'pinia';
-import type { DataTableResource } from '@/features/dataTable/types';
+import type { DataTableResource } from '@/features/core/dataTable/types';
 
-vi.mock('@/features/projects/projects.store');
+vi.mock('@/features/collaboration/projects/projects.store');
 
 vi.mock('vue-router', async () => {
 	const { reactive } = await import('vue');
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableCard.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableCard.vue
similarity index 92%
rename from packages/frontend/editor-ui/src/features/dataTable/components/DataTableCard.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableCard.vue
index eab5ba55955..49189b368cf 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/DataTableCard.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/DataTableCard.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { DataTable } from '@/features/dataTable/dataTable.types';
-import { DATA_TABLE_DETAILS } from '@/features/dataTable/constants';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
+import { DATA_TABLE_DETAILS } from '@/features/core/dataTable/constants';
 import { useI18n } from '@n8n/i18n';
 import { computed } from 'vue';
-import DataTableActions from '@/features/dataTable/components/DataTableActions.vue';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import DataTableActions from '@/features/core/dataTable/components/DataTableActions.vue';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import TimeAgo from '@/components/TimeAgo.vue';
 
 import { N8nBadge, N8nCard, N8nIcon, N8nLink, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/NodeStorageLimitCallout.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/NodeStorageLimitCallout.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/features/dataTable/components/NodeStorageLimitCallout.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/NodeStorageLimitCallout.vue
index 98387792737..27ea2978cc6 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/NodeStorageLimitCallout.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/NodeStorageLimitCallout.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useI18n } from '@n8n/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 import { DATA_TABLE_NODES } from '@/constants';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 
 import { N8nCallout } from '@n8n/design-system';
 const i18n = useI18n();
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddColumnButton.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddColumnButton.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.test.ts
index b672cde1db5..9057eb358f0 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddColumnButton.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.test.ts
@@ -1,10 +1,10 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import AddColumnButton from '@/features/dataTable/components/dataGrid/AddColumnButton.vue';
+import AddColumnButton from '@/features/core/dataTable/components/dataGrid/AddColumnButton.vue';
 import { fireEvent, waitFor } from '@testing-library/vue';
 import { createPinia, setActivePinia } from 'pinia';
-import { MAX_COLUMN_NAME_LENGTH } from '@/features/dataTable/constants';
+import { MAX_COLUMN_NAME_LENGTH } from '@/features/core/dataTable/constants';
 
-vi.mock('@/features/dataTable/composables/useDataTableTypes', () => ({
+vi.mock('@/features/core/dataTable/composables/useDataTableTypes', () => ({
 	useDataTableTypes: () => ({
 		getIconForType: (type: string) => {
 			const iconMap: Record<string, string> = {
@@ -27,7 +27,7 @@ vi.mock('@/composables/useDebounce', () => ({
 	}),
 }));
 
-vi.mock('@/features/dataTable/constants', async (importOriginal) => ({
+vi.mock('@/features/core/dataTable/constants', async (importOriginal) => ({
 	...(await importOriginal()),
 	COLUMN_NAME_REGEX: /^[a-zA-Z][a-zA-Z0-9_-]*$/,
 }));
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddColumnButton.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddColumnButton.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.vue
index f9d69bf0363..4945336481a 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddColumnButton.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.vue
@@ -4,11 +4,11 @@ import type {
 	AddColumnResponse,
 	DataTableColumnCreatePayload,
 	DataTableColumnType,
-} from '@/features/dataTable/dataTable.types';
-import { DATA_TABLE_COLUMN_TYPES } from '@/features/dataTable/dataTable.types';
+} from '@/features/core/dataTable/dataTable.types';
+import { DATA_TABLE_COLUMN_TYPES } from '@/features/core/dataTable/dataTable.types';
 import { useI18n } from '@n8n/i18n';
-import { useDataTableTypes } from '@/features/dataTable/composables/useDataTableTypes';
-import { COLUMN_NAME_REGEX, MAX_COLUMN_NAME_LENGTH } from '@/features/dataTable/constants';
+import { useDataTableTypes } from '@/features/core/dataTable/composables/useDataTableTypes';
+import { COLUMN_NAME_REGEX, MAX_COLUMN_NAME_LENGTH } from '@/features/core/dataTable/constants';
 import { useDebounce } from '@/composables/useDebounce';
 
 import {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddRowButton.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddRowButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/AddRowButton.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddRowButton.vue
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ColumnHeader.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ColumnHeader.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.test.ts
index f789aabb7d3..466e0bb8833 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ColumnHeader.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.test.ts
@@ -4,7 +4,7 @@ import { vi } from 'vitest';
 import { createComponentRenderer } from '@/__tests__/render';
 import ColumnHeader, {
 	type HeaderParamsWithDelete,
-} from '@/features/dataTable/components/dataGrid/ColumnHeader.vue';
+} from '@/features/core/dataTable/components/dataGrid/ColumnHeader.vue';
 
 // Mock N8nActionDropdown to make it easy to trigger item selection
 vi.mock('@n8n/design-system', async (importOriginal) => {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ColumnHeader.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ColumnHeader.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.vue
index e9fb248f1cd..42e43c36569 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ColumnHeader.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import type { IHeaderParams, SortDirection } from 'ag-grid-community';
-import { useDataTableTypes } from '@/features/dataTable/composables/useDataTableTypes';
+import { useDataTableTypes } from '@/features/core/dataTable/composables/useDataTableTypes';
 import { ref, computed, onMounted, onUnmounted } from 'vue';
 import { useI18n } from '@n8n/i18n';
-import { isAGGridCellType } from '@/features/dataTable/typeGuards';
+import { isAGGridCellType } from '@/features/core/dataTable/typeGuards';
 import { N8nActionDropdown, N8nIcon, N8nIconButton } from '@n8n/design-system';
 
 export type HeaderParamsWithDelete = IHeaderParams & {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/DataTableTable.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.test.ts
similarity index 88%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/DataTableTable.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.test.ts
index 23dc2f837a1..137b881bbab 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/DataTableTable.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.test.ts
@@ -1,8 +1,8 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import DataTableTable from '@/features/dataTable/components/dataGrid/DataTableTable.vue';
+import DataTableTable from '@/features/core/dataTable/components/dataGrid/DataTableTable.vue';
 import { createPinia, setActivePinia } from 'pinia';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 
 // Mock ag-grid-vue3
 interface MockComponentInstance {
@@ -55,12 +55,12 @@ vi.mock('ag-grid-community', () => ({
 }));
 
 // Mock the n8n theme
-vi.mock('@/features/dataTable/components/dataGrid/n8nTheme', () => ({
+vi.mock('@/features/core/dataTable/components/dataGrid/n8nTheme', () => ({
 	n8nTheme: 'n8n-theme',
 }));
 
 // Mock AddColumnPopover
-vi.mock('@/features/dataTable/components/dataGrid/AddColumnPopover.vue', () => ({
+vi.mock('@/features/core/dataTable/components/dataGrid/AddColumnPopover.vue', () => ({
 	default: {
 		name: 'AddColumnPopover',
 		template:
@@ -78,7 +78,7 @@ vi.mock('@/composables/useToast', () => ({
 	}),
 }));
 
-vi.mock('@/features/dataTable/composables/useDataTablePagination', () => ({
+vi.mock('@/features/core/dataTable/composables/useDataTablePagination', () => ({
 	useDataTablePagination: () => ({
 		totalItems: 0,
 		setTotalItems: vi.fn(),
@@ -101,7 +101,7 @@ vi.mock('@n8n/i18n', async (importOriginal) => ({
 	}),
 }));
 
-vi.mock('@/features/dataTable/composables/useDataTableTypes', () => ({
+vi.mock('@/features/core/dataTable/composables/useDataTableTypes', () => ({
 	useDataTableTypes: () => ({
 		mapToAGCellType: (type: string) => {
 			const typeMap: Record<string, string> = {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/DataTableTable.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
similarity index 91%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/DataTableTable.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
index 4478320c959..e87a64daf02 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/DataTableTable.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
@@ -4,26 +4,26 @@ import type {
 	DataTable,
 	DataTableColumnCreatePayload,
 	DataTableRow,
-} from '@/features/dataTable/dataTable.types';
+} from '@/features/core/dataTable/dataTable.types';
 import { AgGridVue } from 'ag-grid-vue3';
 import type { GetRowIdParams, GridReadyEvent, SortChangedEvent } from 'ag-grid-community';
-import { n8nTheme } from '@/features/dataTable/components/dataGrid/n8nTheme';
-import { registerAgGridModulesOnce } from '@/features/dataTable/components/dataGrid/registerAgGridModulesOnce';
+import { n8nTheme } from '@/features/core/dataTable/components/dataGrid/n8nTheme';
+import { registerAgGridModulesOnce } from '@/features/core/dataTable/components/dataGrid/registerAgGridModulesOnce';
 import SelectedItemsInfo from '@/components/common/SelectedItemsInfo.vue';
 import {
 	DATA_TABLE_HEADER_HEIGHT,
 	DATA_TABLE_ROW_HEIGHT,
 	DEFAULT_ID_COLUMN_NAME,
 	ADD_ROW_ROW_ID,
-} from '@/features/dataTable/constants';
-import { useDataTablePagination } from '@/features/dataTable/composables/useDataTablePagination';
-import { useAgGrid } from '@/features/dataTable/composables/useAgGrid';
-import { useDataTableColumns } from '@/features/dataTable/composables/useDataTableColumns';
-import { useDataTableSelection } from '@/features/dataTable/composables/useDataTableSelection';
-import { useDataTableOperations } from '@/features/dataTable/composables/useDataTableOperations';
-import { useDataTableColumnFilters } from '@/features/dataTable/composables/useDataTableColumnFilters';
+} from '@/features/core/dataTable/constants';
+import { useDataTablePagination } from '@/features/core/dataTable/composables/useDataTablePagination';
+import { useAgGrid } from '@/features/core/dataTable/composables/useAgGrid';
+import { useDataTableColumns } from '@/features/core/dataTable/composables/useDataTableColumns';
+import { useDataTableSelection } from '@/features/core/dataTable/composables/useDataTableSelection';
+import { useDataTableOperations } from '@/features/core/dataTable/composables/useDataTableOperations';
+import { useDataTableColumnFilters } from '@/features/core/dataTable/composables/useDataTableColumnFilters';
 import { useI18n } from '@n8n/i18n';
-import { GRID_FILTER_CONFIG } from '@/features/dataTable/utils/filterMappings';
+import { GRID_FILTER_CONFIG } from '@/features/core/dataTable/utils/filterMappings';
 
 import { ElPagination } from 'element-plus';
 registerAgGridModulesOnce();
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ElDatePickerCellEditor.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ElDatePickerCellEditor.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ElDatePickerCellEditor.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ElDatePickerCellEditor.vue
index b166a30bb12..83a8ff7ac15 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ElDatePickerCellEditor.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ElDatePickerCellEditor.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
 import type { ICellEditorParams } from 'ag-grid-community';
-import { useDatePickerCommon } from '@/features/dataTable/composables/useDatePickerCommon';
+import { useDatePickerCommon } from '@/features/core/dataTable/composables/useDatePickerCommon';
 
 import { ElDatePicker } from 'element-plus';
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ElDatePickerFilter.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ElDatePickerFilter.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ElDatePickerFilter.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ElDatePickerFilter.vue
index 067681249a8..8b76530e390 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/ElDatePickerFilter.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ElDatePickerFilter.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted } from 'vue';
 import type { IDateParams } from 'ag-grid-community';
-import { useDatePickerCommon } from '@/features/dataTable/composables/useDatePickerCommon';
+import { useDatePickerCommon } from '@/features/core/dataTable/composables/useDatePickerCommon';
 
 import { ElDatePicker } from 'element-plus';
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/NullEmptyCellRenderer.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/NullEmptyCellRenderer.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/NullEmptyCellRenderer.vue
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/NullEmptyCellRenderer.vue
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/n8nTheme.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/n8nTheme.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/n8nTheme.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/n8nTheme.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/registerAgGridModulesOnce.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/registerAgGridModulesOnce.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/components/dataGrid/registerAgGridModulesOnce.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/registerAgGridModulesOnce.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useAgGrid.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useAgGrid.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useAgGrid.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useAgGrid.test.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useAgGrid.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useAgGrid.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useAgGrid.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useAgGrid.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumnFilters.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumnFilters.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumnFilters.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumnFilters.test.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumnFilters.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumnFilters.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumnFilters.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumnFilters.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumns.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumns.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.test.ts
index c94d28302a7..97ceb36734b 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumns.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.test.ts
@@ -1,9 +1,9 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { ref } from 'vue';
 import { useDataTableColumns } from './useDataTableColumns';
-import type { DataTableColumn } from '@/features/dataTable/dataTable.types';
+import type { DataTableColumn } from '@/features/core/dataTable/dataTable.types';
 
-vi.mock('@/features/dataTable/composables/useDataTableTypes', () => ({
+vi.mock('@/features/core/dataTable/composables/useDataTableTypes', () => ({
 	useDataTableTypes: () => ({
 		mapToAGCellType: (type: string) => (type === 'string' ? 'text' : type),
 	}),
@@ -15,27 +15,27 @@ vi.mock('@n8n/i18n', () => ({
 	}),
 }));
 
-vi.mock('@/features/dataTable/components/dataGrid/ColumnHeader.vue', () => ({
+vi.mock('@/features/core/dataTable/components/dataGrid/ColumnHeader.vue', () => ({
 	default: {},
 }));
 
-vi.mock('@/features/dataTable/components/dataGrid/ElDatePickerCellEditor.vue', () => ({
+vi.mock('@/features/core/dataTable/components/dataGrid/ElDatePickerCellEditor.vue', () => ({
 	default: {},
 }));
 
-vi.mock('@/features/dataTable/components/dataGrid/ElDatePickerFilter.vue', () => ({
+vi.mock('@/features/core/dataTable/components/dataGrid/ElDatePickerFilter.vue', () => ({
 	default: {},
 }));
 
-vi.mock('@/features/dataTable/components/dataGrid/AddColumnButton.vue', () => ({
+vi.mock('@/features/core/dataTable/components/dataGrid/AddColumnButton.vue', () => ({
 	default: {},
 }));
 
-vi.mock('@/features/dataTable/components/dataGrid/AddRowButton.vue', () => ({
+vi.mock('@/features/core/dataTable/components/dataGrid/AddRowButton.vue', () => ({
 	default: {},
 }));
 
-vi.mock('@/features/dataTable/utils/columnUtils', () => ({
+vi.mock('@/features/core/dataTable/utils/columnUtils', () => ({
 	getCellClass: vi.fn(),
 	createValueGetter: vi.fn(),
 	createCellRendererSelector: vi.fn(),
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumns.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.ts
similarity index 87%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumns.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.ts
index 28f22b0698d..8ca114e50d5 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableColumns.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.ts
@@ -4,21 +4,21 @@ import type {
 	AddColumnResponse,
 	DataTableColumn,
 	DataTableColumnCreatePayload,
-} from '@/features/dataTable/dataTable.types';
+} from '@/features/core/dataTable/dataTable.types';
 import {
 	ADD_ROW_ROW_ID,
 	DATA_TABLE_ID_COLUMN_WIDTH,
 	DEFAULT_COLUMN_WIDTH,
 	DEFAULT_ID_COLUMN_NAME,
-} from '@/features/dataTable/constants';
-import { useDataTableTypes } from '@/features/dataTable/composables/useDataTableTypes';
-import ColumnHeader from '@/features/dataTable/components/dataGrid/ColumnHeader.vue';
-import ElDatePickerCellEditor from '@/features/dataTable/components/dataGrid/ElDatePickerCellEditor.vue';
-import ElDatePickerFilter from '@/features/dataTable/components/dataGrid/ElDatePickerFilter.vue';
+} from '@/features/core/dataTable/constants';
+import { useDataTableTypes } from '@/features/core/dataTable/composables/useDataTableTypes';
+import ColumnHeader from '@/features/core/dataTable/components/dataGrid/ColumnHeader.vue';
+import ElDatePickerCellEditor from '@/features/core/dataTable/components/dataGrid/ElDatePickerCellEditor.vue';
+import ElDatePickerFilter from '@/features/core/dataTable/components/dataGrid/ElDatePickerFilter.vue';
 import orderBy from 'lodash/orderBy';
-import AddColumnButton from '@/features/dataTable/components/dataGrid/AddColumnButton.vue';
-import AddRowButton from '@/features/dataTable/components/dataGrid/AddRowButton.vue';
-import { reorderItem } from '@/features/dataTable/utils';
+import AddColumnButton from '@/features/core/dataTable/components/dataGrid/AddColumnButton.vue';
+import AddRowButton from '@/features/core/dataTable/components/dataGrid/AddRowButton.vue';
+import { reorderItem } from '@/features/core/dataTable/utils';
 import {
 	getCellClass,
 	createValueGetter,
@@ -31,9 +31,9 @@ import {
 	getDateColumnFilterOptions,
 	getNumberColumnFilterOptions,
 	getBooleanColumnFilterOptions,
-} from '@/features/dataTable/utils/columnUtils';
+} from '@/features/core/dataTable/utils/columnUtils';
 import { useI18n } from '@n8n/i18n';
-import { GRID_FILTER_CONFIG } from '@/features/dataTable/utils/filterMappings';
+import { GRID_FILTER_CONFIG } from '@/features/core/dataTable/utils/filterMappings';
 
 export const useDataTableColumns = ({
 	onDeleteColumn,
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableOperations.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableOperations.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.test.ts
index 2d77c2f596c..1f7bc20cb18 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableOperations.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.test.ts
@@ -1,7 +1,7 @@
 import {
 	useDataTableOperations,
 	type UseDataTableOperationsParams,
-} from '@/features/dataTable/composables/useDataTableOperations';
+} from '@/features/core/dataTable/composables/useDataTableOperations';
 import { ref } from 'vue';
 import type {
 	GridApi,
@@ -11,15 +11,15 @@ import type {
 } from 'ag-grid-community';
 import { setActivePinia } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { ResponseError } from '@n8n/rest-api-client';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { MODAL_CONFIRM } from '@/constants';
-import type { DataTableRow } from '@/features/dataTable/dataTable.types';
+import type { DataTableRow } from '@/features/core/dataTable/dataTable.types';
 
-vi.mock('@/features/dataTable/dataTable.store', () => ({
+vi.mock('@/features/core/dataTable/dataTable.store', () => ({
 	useDataTableStore: vi.fn(() => ({})),
 }));
 
@@ -48,13 +48,13 @@ vi.mock('@n8n/i18n', () => ({
 	})),
 }));
 
-vi.mock('@/features/dataTable/composables/useDataTableTypes', () => ({
+vi.mock('@/features/core/dataTable/composables/useDataTableTypes', () => ({
 	useDataTableTypes: vi.fn(() => ({
 		mapToDataTableColumnType: vi.fn(),
 	})),
 }));
 
-vi.mock('@/features/dataTable/typeGuards', () => ({
+vi.mock('@/features/core/dataTable/typeGuards', () => ({
 	isDataTableValue: vi.fn((value: unknown) => value !== undefined && value !== null),
 	isAGGridCellType: vi.fn(() => true),
 }));
@@ -570,7 +570,7 @@ describe('useDataTableOperations', () => {
 		});
 
 		it('should revert cell value when update fails', async () => {
-			const isDataTableValue = await import('@/features/dataTable/typeGuards').then(
+			const isDataTableValue = await import('@/features/core/dataTable/typeGuards').then(
 				(m) => m.isDataTableValue,
 			);
 			vi.mocked(isDataTableValue).mockReturnValue(true);
@@ -600,7 +600,7 @@ describe('useDataTableOperations', () => {
 		});
 
 		it('should revert cell value to null when old value is invalid', async () => {
-			const isDataTableValue = await import('@/features/dataTable/typeGuards').then(
+			const isDataTableValue = await import('@/features/core/dataTable/typeGuards').then(
 				(m) => m.isDataTableValue,
 			);
 			vi.mocked(isDataTableValue).mockReturnValue(false);
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableOperations.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableOperations.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.ts
index 0b823b1e0d1..41e34b4cc8a 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableOperations.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.ts
@@ -6,7 +6,7 @@ import type {
 	DataTableColumn,
 	DataTableColumnCreatePayload,
 	DataTableRow,
-} from '@/features/dataTable/dataTable.types';
+} from '@/features/core/dataTable/dataTable.types';
 import { ref, type Ref } from 'vue';
 import { useI18n } from '@n8n/i18n';
 import type {
@@ -16,11 +16,11 @@ import type {
 	ColumnMovedEvent,
 	GridApi,
 } from 'ag-grid-community';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { MODAL_CONFIRM } from '@/constants';
-import { isDataTableValue, isAGGridCellType } from '@/features/dataTable/typeGuards';
-import { useDataTableTypes } from '@/features/dataTable/composables/useDataTableTypes';
-import { areValuesEqual } from '@/features/dataTable/utils/typeUtils';
+import { isDataTableValue, isAGGridCellType } from '@/features/core/dataTable/typeGuards';
+import { useDataTableTypes } from '@/features/core/dataTable/composables/useDataTableTypes';
+import { areValuesEqual } from '@/features/core/dataTable/utils/typeUtils';
 import { ResponseError } from '@n8n/rest-api-client';
 
 export type UseDataTableOperationsParams = {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTablePagination.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTablePagination.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTablePagination.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTablePagination.test.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTablePagination.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTablePagination.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTablePagination.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTablePagination.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableSelection.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableSelection.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableSelection.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableSelection.test.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableSelection.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableSelection.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableSelection.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableSelection.ts
index c0cfe5927aa..2318fa855d4 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableSelection.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableSelection.ts
@@ -1,6 +1,6 @@
 import { computed, ref, type Ref } from 'vue';
 import type { GridApi, RowSelectionOptions } from 'ag-grid-community';
-import { ADD_ROW_ROW_ID } from '@/features/dataTable/constants';
+import { ADD_ROW_ROW_ID } from '@/features/core/dataTable/constants';
 
 export const useDataTableSelection = ({
 	gridApi,
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableTypes.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableTypes.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableTypes.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableTypes.test.ts
index b0468410502..99c78edd8a6 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableTypes.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableTypes.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { useDataTableTypes } from './useDataTableTypes';
-import type { AGGridCellType } from '@/features/dataTable/dataTable.types';
+import type { AGGridCellType } from '@/features/core/dataTable/dataTable.types';
 
 describe('useDataTableTypes', () => {
 	const { getIconForType, mapToAGCellType, mapToDataTableColumnType } = useDataTableTypes();
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableTypes.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableTypes.ts
similarity index 83%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableTypes.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableTypes.ts
index f37330b90a9..8b2906602b8 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDataTableTypes.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableTypes.ts
@@ -1,5 +1,8 @@
-import type { AGGridCellType, DataTableColumnType } from '@/features/dataTable/dataTable.types';
-import { isAGGridCellType } from '@/features/dataTable/typeGuards';
+import type {
+	AGGridCellType,
+	DataTableColumnType,
+} from '@/features/core/dataTable/dataTable.types';
+import { isAGGridCellType } from '@/features/core/dataTable/typeGuards';
 import { DATA_TYPE_ICON_MAP } from '@/constants';
 
 export const useDataTableTypes = () => {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDatePickerCommon.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDatePickerCommon.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDatePickerCommon.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDatePickerCommon.test.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/composables/useDatePickerCommon.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDatePickerCommon.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/dataTable/composables/useDatePickerCommon.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/composables/useDatePickerCommon.ts
index 280688f4001..26ba8fa1ad4 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/composables/useDatePickerCommon.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDatePickerCommon.ts
@@ -1,5 +1,5 @@
 import { ref, nextTick, useTemplateRef } from 'vue';
-import { parseLooseDateInput } from '@/features/dataTable/utils/typeUtils';
+import { parseLooseDateInput } from '@/features/core/dataTable/utils/typeUtils';
 import { isFocusableEl } from '@/utils/typesUtils';
 
 export interface DatePickerCallbacks {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/constants.ts b/packages/frontend/editor-ui/src/features/core/dataTable/constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/constants.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/constants.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/dataTable.api.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/dataTable/dataTable.api.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.test.ts
index 52cd4101562..80daa707db6 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/dataTable.api.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.test.ts
@@ -1,4 +1,4 @@
-import { deleteDataTableRowsApi } from '@/features/dataTable/dataTable.api';
+import { deleteDataTableRowsApi } from '@/features/core/dataTable/dataTable.api';
 import { makeRestApiRequest } from '@n8n/rest-api-client';
 import { expect } from 'vitest';
 
diff --git a/packages/frontend/editor-ui/src/features/dataTable/dataTable.api.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/dataTable/dataTable.api.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.ts
index 19ec8868bd9..c579112548c 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/dataTable.api.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.ts
@@ -6,7 +6,7 @@ import type {
 	DataTable,
 	DataTableColumn,
 	DataTableRow,
-} from '@/features/dataTable/dataTable.types';
+} from '@/features/core/dataTable/dataTable.types';
 import type { DataTablesSizeResult } from 'n8n-workflow';
 
 export const fetchDataTablesApi = async (
diff --git a/packages/frontend/editor-ui/src/features/dataTable/dataTable.store.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/dataTable/dataTable.store.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.test.ts
index 25889188b1c..6b6048138dd 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/dataTable.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.test.ts
@@ -1,13 +1,13 @@
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 import { faker } from '@faker-js/faker';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { createPinia, setActivePinia } from 'pinia';
-import * as dataTableApi from '@/features/dataTable/dataTable.api';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import * as dataTableApi from '@/features/core/dataTable/dataTable.api';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 
-vi.mock('@/features/projects/projects.store');
+vi.mock('@/features/collaboration/projects/projects.store');
 vi.mock('@/stores/settings.store');
 
 function createTable(data: Partial<DataTable>) {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/dataTable.store.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/dataTable/dataTable.store.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.ts
index b77bdec4508..bb075507f2e 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/dataTable.store.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import { DATA_TABLE_STORE } from '@/features/dataTable/constants';
+import { DATA_TABLE_STORE } from '@/features/core/dataTable/constants';
 import { computed, ref } from 'vue';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import {
@@ -15,14 +15,14 @@ import {
 	updateDataTableRowsApi,
 	deleteDataTableRowsApi,
 	fetchDataTableGlobalLimitInBytes,
-} from '@/features/dataTable/dataTable.api';
+} from '@/features/core/dataTable/dataTable.api';
 import type {
 	DataTable,
 	DataTableColumnCreatePayload,
 	DataTableRow,
-} from '@/features/dataTable/dataTable.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { reorderItem } from '@/features/dataTable/utils';
+} from '@/features/core/dataTable/dataTable.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { reorderItem } from '@/features/core/dataTable/utils';
 import { type DataTableSizeStatus } from 'n8n-workflow';
 import { useSettingsStore } from '@/stores/settings.store';
 
diff --git a/packages/frontend/editor-ui/src/features/dataTable/dataTable.types.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.types.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/dataTable/dataTable.types.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/dataTable.types.ts
index 9347a076c9b..559a9185202 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/dataTable.types.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.types.ts
@@ -1,4 +1,4 @@
-import type { Project } from '@/features/projects/projects.types';
+import type { Project } from '@/features/collaboration/projects/projects.types';
 
 export type DataTable = {
 	id: string;
diff --git a/packages/frontend/editor-ui/src/features/dataTable/module.descriptor.ts b/packages/frontend/editor-ui/src/features/core/dataTable/module.descriptor.ts
similarity index 90%
rename from packages/frontend/editor-ui/src/features/dataTable/module.descriptor.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/module.descriptor.ts
index bae88618539..97c25f83fe0 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/module.descriptor.ts
@@ -5,14 +5,14 @@ import {
 	DATA_TABLE_DETAILS,
 	DATA_TABLE_VIEW,
 	PROJECT_DATA_TABLES,
-} from '@/features/dataTable/constants';
+} from '@/features/core/dataTable/constants';
 
 const i18n = useI18n();
 
 const MainSidebar = async () => await import('@/components/MainSidebar.vue');
-const DataTableView = async () => await import('@/features/dataTable/DataTableView.vue');
+const DataTableView = async () => await import('@/features/core/dataTable/DataTableView.vue');
 const DataTableDetailsView = async () =>
-	await import('@/features/dataTable/DataTableDetailsView.vue');
+	await import('@/features/core/dataTable/DataTableDetailsView.vue');
 
 export const DataTableModule: FrontendModuleDescription = {
 	id: 'data-table',
diff --git a/packages/frontend/editor-ui/src/features/dataTable/typeGuards.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/typeGuards.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/typeGuards.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/typeGuards.test.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/typeGuards.ts b/packages/frontend/editor-ui/src/features/core/dataTable/typeGuards.ts
similarity index 80%
rename from packages/frontend/editor-ui/src/features/dataTable/typeGuards.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/typeGuards.ts
index cc8e3d14b65..2dc243a0364 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/typeGuards.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/typeGuards.ts
@@ -2,8 +2,11 @@ import type {
 	AGGridCellType,
 	DataTableValue,
 	DataTableColumnType,
-} from '@/features/dataTable/dataTable.types';
-import { AG_GRID_CELL_TYPES, DATA_TABLE_COLUMN_TYPES } from '@/features/dataTable/dataTable.types';
+} from '@/features/core/dataTable/dataTable.types';
+import {
+	AG_GRID_CELL_TYPES,
+	DATA_TABLE_COLUMN_TYPES,
+} from '@/features/core/dataTable/dataTable.types';
 
 export const isDataTableValue = (value: unknown): value is DataTableValue => {
 	return (
diff --git a/packages/frontend/editor-ui/src/features/dataTable/types.ts b/packages/frontend/editor-ui/src/features/core/dataTable/types.ts
similarity index 86%
rename from packages/frontend/editor-ui/src/features/dataTable/types.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/types.ts
index 92806f94533..5af592a52c2 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/types.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/types.ts
@@ -1,5 +1,5 @@
 import type { BaseResource } from '@/Interface';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 
 /**
  * Data Table resource type definition
diff --git a/packages/frontend/editor-ui/src/features/dataTable/types/dataTableFilters.types.ts b/packages/frontend/editor-ui/src/features/core/dataTable/types/dataTableFilters.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/types/dataTableFilters.types.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/types/dataTableFilters.types.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/utils.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils/columnUtils.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils/columnUtils.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/dataTable/utils/columnUtils.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils/columnUtils.test.ts
index 08c68c485a3..5d1ce08bc7c 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/utils/columnUtils.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/utils/columnUtils.test.ts
@@ -9,7 +9,7 @@ import type {
 } from 'ag-grid-community';
 import { ref } from 'vue';
 import type { I18nClass } from '@n8n/i18n';
-import type { DataTableColumn, DataTableRow } from '@/features/dataTable/dataTable.types';
+import type { DataTableColumn, DataTableRow } from '@/features/core/dataTable/dataTable.types';
 import {
 	getCellClass,
 	createValueGetter,
@@ -23,8 +23,8 @@ import {
 	getNumberColumnFilterOptions,
 	getDateColumnFilterOptions,
 } from './columnUtils';
-import { ADD_ROW_ROW_ID, NULL_VALUE, EMPTY_VALUE } from '@/features/dataTable/constants';
-import NullEmptyCellRenderer from '@/features/dataTable/components/dataGrid/NullEmptyCellRenderer.vue';
+import { ADD_ROW_ROW_ID, NULL_VALUE, EMPTY_VALUE } from '@/features/core/dataTable/constants';
+import NullEmptyCellRenderer from '@/features/core/dataTable/components/dataGrid/NullEmptyCellRenderer.vue';
 
 describe('columnUtils', () => {
 	let mockI18n: I18nClass;
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils/columnUtils.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils/columnUtils.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/dataTable/utils/columnUtils.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils/columnUtils.ts
index 6393e42fc36..04be99e979f 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/utils/columnUtils.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/utils/columnUtils.ts
@@ -9,7 +9,7 @@ import type {
 import type { Ref } from 'vue';
 import { DateTime } from 'luxon';
 import type { I18nClass } from '@n8n/i18n';
-import type { DataTableColumn, DataTableRow } from '@/features/dataTable/dataTable.types';
+import type { DataTableColumn, DataTableRow } from '@/features/core/dataTable/dataTable.types';
 import {
 	ADD_ROW_ROW_ID,
 	EMPTY_VALUE,
@@ -17,9 +17,9 @@ import {
 	NUMBER_DECIMAL_SEPARATOR,
 	NUMBER_THOUSAND_SEPARATOR,
 	NUMBER_WITH_SPACES_REGEX,
-} from '@/features/dataTable/constants';
-import NullEmptyCellRenderer from '@/features/dataTable/components/dataGrid/NullEmptyCellRenderer.vue';
-import { isDataTableValue } from '@/features/dataTable/typeGuards';
+} from '@/features/core/dataTable/constants';
+import NullEmptyCellRenderer from '@/features/core/dataTable/components/dataGrid/NullEmptyCellRenderer.vue';
+import { isDataTableValue } from '@/features/core/dataTable/typeGuards';
 
 export const getCellClass = (params: CellClassParams): string => {
 	if (params.data?.id === ADD_ROW_ROW_ID) {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils/filterMappings.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils/filterMappings.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/dataTable/utils/filterMappings.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils/filterMappings.ts
index 193c6eb9471..2efe3044fad 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/utils/filterMappings.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/utils/filterMappings.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_ID_COLUMN_NAME } from '@/features/dataTable/constants';
+import { DEFAULT_ID_COLUMN_NAME } from '@/features/core/dataTable/constants';
 import type { BackendFilterCondition, FilterOperation } from '../types/dataTableFilters.types';
 
 export const SPECIAL_COLUMNS = [DEFAULT_ID_COLUMN_NAME, 'add-column', 'ag-Grid-SelectionColumn'];
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils/filterProcessors.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils/filterProcessors.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/utils/filterProcessors.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils/filterProcessors.test.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils/filterProcessors.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils/filterProcessors.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/dataTable/utils/filterProcessors.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils/filterProcessors.ts
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils/typeUtils.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils/typeUtils.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/dataTable/utils/typeUtils.test.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils/typeUtils.test.ts
index 146dfb58788..7e9a1102e7f 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/utils/typeUtils.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/utils/typeUtils.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 
-import { parseLooseDateInput, areValuesEqual } from '@/features/dataTable/utils/typeUtils';
+import { parseLooseDateInput, areValuesEqual } from '@/features/core/dataTable/utils/typeUtils';
 
 describe('Loose Date Parsing', () => {
 	it('parses full loose datetime with single-digit parts', () => {
diff --git a/packages/frontend/editor-ui/src/features/dataTable/utils/typeUtils.ts b/packages/frontend/editor-ui/src/features/core/dataTable/utils/typeUtils.ts
similarity index 91%
rename from packages/frontend/editor-ui/src/features/dataTable/utils/typeUtils.ts
rename to packages/frontend/editor-ui/src/features/core/dataTable/utils/typeUtils.ts
index 8cb75772f94..a9a7951a0eb 100644
--- a/packages/frontend/editor-ui/src/features/dataTable/utils/typeUtils.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/utils/typeUtils.ts
@@ -1,5 +1,5 @@
-import { LOOSE_DATE_REGEX } from '@/features/dataTable/constants';
-import type { DataTableColumnType } from '@/features/dataTable/dataTable.types';
+import { LOOSE_DATE_REGEX } from '@/features/core/dataTable/constants';
+import type { DataTableColumnType } from '@/features/core/dataTable/dataTable.types';
 
 /**
  * Parses a loose date string into a Date object.
diff --git a/packages/frontend/editor-ui/src/features/folders/components/DeleteFolderModal.vue b/packages/frontend/editor-ui/src/features/core/folders/components/DeleteFolderModal.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/folders/components/DeleteFolderModal.vue
rename to packages/frontend/editor-ui/src/features/core/folders/components/DeleteFolderModal.vue
index fa5b0b20ad7..504b239ede1 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/DeleteFolderModal.vue
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/DeleteFolderModal.vue
@@ -7,8 +7,8 @@ import { createEventBus, type EventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@n8n/i18n';
 import { useFoldersStore } from '../folders.store';
 import { useRoute } from 'vue-router';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import type { ChangeLocationSearchResult } from '../folders.types';
 
 import { ElRadio } from 'element-plus';
diff --git a/packages/frontend/editor-ui/src/features/folders/components/EmptySharedSectionActionBox.vue b/packages/frontend/editor-ui/src/features/core/folders/components/EmptySharedSectionActionBox.vue
similarity index 93%
rename from packages/frontend/editor-ui/src/features/folders/components/EmptySharedSectionActionBox.vue
rename to packages/frontend/editor-ui/src/features/core/folders/components/EmptySharedSectionActionBox.vue
index 3085481ef81..e4c879df5e6 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/EmptySharedSectionActionBox.vue
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/EmptySharedSectionActionBox.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from '@n8n/i18n';
 import { VIEWS } from '@/constants';
-import type { Project } from '@/features/projects/projects.types';
+import type { Project } from '@/features/collaboration/projects/projects.types';
 import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 
diff --git a/packages/frontend/editor-ui/src/features/folders/components/FolderBreadcrumbs.test.ts b/packages/frontend/editor-ui/src/features/core/folders/components/FolderBreadcrumbs.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/folders/components/FolderBreadcrumbs.test.ts
rename to packages/frontend/editor-ui/src/features/core/folders/components/FolderBreadcrumbs.test.ts
index d7717685546..a9e184b647a 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/FolderBreadcrumbs.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/FolderBreadcrumbs.test.ts
@@ -7,8 +7,8 @@ import { createTestingPinia } from '@pinia/testing';
 import { useRoute } from 'vue-router';
 import type { Mock } from 'vitest';
 import { mockedStore } from '@/__tests__/utils';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { ProjectTypes, type Project } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { ProjectTypes, type Project } from '@/features/collaboration/projects/projects.types';
 import { useFoldersStore } from '../folders.store';
 import type { IUser } from 'n8n-workflow';
 
diff --git a/packages/frontend/editor-ui/src/features/folders/components/FolderBreadcrumbs.vue b/packages/frontend/editor-ui/src/features/core/folders/components/FolderBreadcrumbs.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/folders/components/FolderBreadcrumbs.vue
rename to packages/frontend/editor-ui/src/features/core/folders/components/FolderBreadcrumbs.vue
index 84e289cb1cc..dcd54743e7d 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/FolderBreadcrumbs.vue
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/FolderBreadcrumbs.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { useI18n } from '@n8n/i18n';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import type { UserAction } from '@n8n/design-system/types';
 import { type PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
 import { computed, onBeforeUnmount, ref, watch } from 'vue';
 import { useFoldersStore } from '../folders.store';
 import type { FolderPathItem, FolderShortInfo } from '../folders.types';
 import type { IUser } from 'n8n-workflow';
-import ProjectBreadcrumb from '@/features/folders/components/ProjectBreadcrumb.vue';
+import ProjectBreadcrumb from '@/features/core/folders/components/ProjectBreadcrumb.vue';
 
 import { N8nActionToggle, N8nBreadcrumbs } from '@n8n/design-system';
 type Props = {
diff --git a/packages/frontend/editor-ui/src/features/folders/components/FolderCard.test.ts b/packages/frontend/editor-ui/src/features/core/folders/components/FolderCard.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/components/FolderCard.test.ts
rename to packages/frontend/editor-ui/src/features/core/folders/components/FolderCard.test.ts
diff --git a/packages/frontend/editor-ui/src/features/folders/components/FolderCard.vue b/packages/frontend/editor-ui/src/features/core/folders/components/FolderCard.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/folders/components/FolderCard.vue
rename to packages/frontend/editor-ui/src/features/core/folders/components/FolderCard.vue
index 9edd4a66fc6..a02c21fd7d5 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/FolderCard.vue
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/FolderCard.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 import { FOLDER_LIST_ITEM_ACTIONS } from '../folders.constants';
-import { ProjectTypes, type Project } from '@/features/projects/projects.types';
+import { ProjectTypes, type Project } from '@/features/collaboration/projects/projects.types';
 import { useI18n } from '@n8n/i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { VIEWS } from '@/constants';
 import type { UserAction, FolderResource } from '@/Interface';
-import { ResourceType } from '@/features/projects/projects.utils';
+import { ResourceType } from '@/features/collaboration/projects/projects.utils';
 import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
 import { useFoldersStore } from '../folders.store';
 import { type IUser } from 'n8n-workflow';
 import TimeAgo from '@/components/TimeAgo.vue';
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import ProjectCardBadge from '@/features/collaboration/projects/components/ProjectCardBadge.vue';
 
 import {
 	N8nActionToggle,
diff --git a/packages/frontend/editor-ui/src/features/folders/components/MoveToFolderDropdown.vue b/packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderDropdown.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/components/MoveToFolderDropdown.vue
rename to packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderDropdown.vue
diff --git a/packages/frontend/editor-ui/src/features/folders/components/MoveToFolderModal.test.ts b/packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderModal.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/folders/components/MoveToFolderModal.test.ts
rename to packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderModal.test.ts
index de52b20990d..c1feb9770ab 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/MoveToFolderModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderModal.test.ts
@@ -6,7 +6,7 @@ import { createComponentRenderer } from '@/__tests__/render';
 import {
 	createProjectListItem,
 	createProjectSharingData,
-} from '@/features/projects/__tests__/utils';
+} from '@/features/collaboration/projects/__tests__/utils';
 import {
 	getDropdownItems,
 	getSelectedDropdownValue,
@@ -17,7 +17,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { MOVE_FOLDER_MODAL_KEY } from '../folders.constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { FrontendSettings } from '@n8n/api-types';
-import type { Project } from '@/features/projects/projects.types';
+import type { Project } from '@/features/collaboration/projects/projects.types';
 import type {
 	ICredentialsResponse,
 	IUsedCredential,
@@ -26,7 +26,7 @@ import type { ChangeLocationSearchResult } from '../folders.types';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useFoldersStore } from '../folders.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import MoveToFolderModal from './MoveToFolderModal.vue';
 import type { EventBus } from '@n8n/utils/event-bus';
 
diff --git a/packages/frontend/editor-ui/src/features/folders/components/MoveToFolderModal.vue b/packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderModal.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/folders/components/MoveToFolderModal.vue
rename to packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderModal.vue
index 4c86c67a753..c0a26ab8e47 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/MoveToFolderModal.vue
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/MoveToFolderModal.vue
@@ -5,12 +5,15 @@ import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
 import { EnterpriseEditionFeature } from '@/constants';
 import { MOVE_FOLDER_MODAL_KEY } from '../folders.constants';
 import { useFoldersStore } from '../folders.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { type EventBus, createEventBus } from '@n8n/utils/event-bus';
-import { ProjectTypes } from '@/features/projects/projects.types';
-import type { ProjectListItem, ProjectSharingData } from '@/features/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
+import type {
+	ProjectListItem,
+	ProjectSharingData,
+} from '@/features/collaboration/projects/projects.types';
 import type { ChangeLocationSearchResult } from '../folders.types';
 import type {
 	ICredentialsResponse,
@@ -20,9 +23,12 @@ import { getResourcePermissions } from '@n8n/permissions';
 import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
 import Modal from '@/components/Modal.vue';
 import MoveToFolderDropdown from './MoveToFolderDropdown.vue';
-import ProjectMoveResourceModalCredentialsList from '@/features/projects/components/ProjectMoveResourceModalCredentialsList.vue';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
-import { ResourceType, getTruncatedProjectName } from '@/features/projects/projects.utils';
+import ProjectMoveResourceModalCredentialsList from '@/features/collaboration/projects/components/ProjectMoveResourceModalCredentialsList.vue';
+import ProjectSharing from '@/features/collaboration/projects/components/ProjectSharing.vue';
+import {
+	ResourceType,
+	getTruncatedProjectName,
+} from '@/features/collaboration/projects/projects.utils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { I18nT } from 'vue-i18n';
 
diff --git a/packages/frontend/editor-ui/src/features/folders/components/ProjectBreadcrumb.test.ts b/packages/frontend/editor-ui/src/features/core/folders/components/ProjectBreadcrumb.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/folders/components/ProjectBreadcrumb.test.ts
rename to packages/frontend/editor-ui/src/features/core/folders/components/ProjectBreadcrumb.test.ts
index 3d5828eaea1..a330122d61c 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/ProjectBreadcrumb.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/ProjectBreadcrumb.test.ts
@@ -1,8 +1,8 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { fireEvent } from '@testing-library/vue';
 import ProjectBreadcrumb from './ProjectBreadcrumb.vue';
-import { ProjectTypes } from '@/features/projects/projects.types';
-import { createTestProject } from '@/features/projects/__tests__/utils';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
+import { createTestProject } from '@/features/collaboration/projects/__tests__/utils';
 
 vi.mock('@n8n/i18n', async (importOriginal) => ({
 	...(await importOriginal()),
diff --git a/packages/frontend/editor-ui/src/features/folders/components/ProjectBreadcrumb.vue b/packages/frontend/editor-ui/src/features/core/folders/components/ProjectBreadcrumb.vue
similarity index 93%
rename from packages/frontend/editor-ui/src/features/folders/components/ProjectBreadcrumb.vue
rename to packages/frontend/editor-ui/src/features/core/folders/components/ProjectBreadcrumb.vue
index 6d0ecad37ba..a2689c76f87 100644
--- a/packages/frontend/editor-ui/src/features/folders/components/ProjectBreadcrumb.vue
+++ b/packages/frontend/editor-ui/src/features/core/folders/components/ProjectBreadcrumb.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { useI18n } from '@n8n/i18n';
-import { type Project, ProjectTypes } from '@/features/projects/projects.types';
+import { type Project, ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import { isIconOrEmoji, type IconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
 
 import { N8nLink, N8nText } from '@n8n/design-system';
-import ProjectIcon from '@/features/projects/components/ProjectIcon.vue';
+import ProjectIcon from '@/features/collaboration/projects/components/ProjectIcon.vue';
 type Props = {
 	currentProject?: Project;
 	isDragging?: boolean;
diff --git a/packages/frontend/editor-ui/src/features/folders/composables/useFolders.test.ts b/packages/frontend/editor-ui/src/features/core/folders/composables/useFolders.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/folders/composables/useFolders.test.ts
rename to packages/frontend/editor-ui/src/features/core/folders/composables/useFolders.test.ts
index 037788cdcfd..fe39709b2e0 100644
--- a/packages/frontend/editor-ui/src/features/folders/composables/useFolders.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/folders/composables/useFolders.test.ts
@@ -4,7 +4,7 @@ import { FOLDER_NAME_MAX_LENGTH } from '../folders.constants';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 
-vi.mock('@/features/folders/folders.store', () => ({
+vi.mock('@/features/core/folders/folders.store', () => ({
 	useFoldersStore: vi.fn(() => ({
 		draggedElement: null,
 		activeDropTarget: null,
diff --git a/packages/frontend/editor-ui/src/features/folders/composables/useFolders.ts b/packages/frontend/editor-ui/src/features/core/folders/composables/useFolders.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/composables/useFolders.ts
rename to packages/frontend/editor-ui/src/features/core/folders/composables/useFolders.ts
diff --git a/packages/frontend/editor-ui/src/features/folders/composables/useParentFolder.ts b/packages/frontend/editor-ui/src/features/core/folders/composables/useParentFolder.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/folders/composables/useParentFolder.ts
rename to packages/frontend/editor-ui/src/features/core/folders/composables/useParentFolder.ts
index ec3f4235c7f..a0dc6644059 100644
--- a/packages/frontend/editor-ui/src/features/folders/composables/useParentFolder.ts
+++ b/packages/frontend/editor-ui/src/features/core/folders/composables/useParentFolder.ts
@@ -1,5 +1,5 @@
 import { useFoldersStore } from '../folders.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 
 export function useParentFolder() {
diff --git a/packages/frontend/editor-ui/src/features/folders/folders.api.ts b/packages/frontend/editor-ui/src/features/core/folders/folders.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/folders.api.ts
rename to packages/frontend/editor-ui/src/features/core/folders/folders.api.ts
diff --git a/packages/frontend/editor-ui/src/features/folders/folders.constants.ts b/packages/frontend/editor-ui/src/features/core/folders/folders.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/folders.constants.ts
rename to packages/frontend/editor-ui/src/features/core/folders/folders.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/folders/folders.store.test.ts b/packages/frontend/editor-ui/src/features/core/folders/folders.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/folders.store.test.ts
rename to packages/frontend/editor-ui/src/features/core/folders/folders.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/folders/folders.store.ts b/packages/frontend/editor-ui/src/features/core/folders/folders.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/folders.store.ts
rename to packages/frontend/editor-ui/src/features/core/folders/folders.store.ts
diff --git a/packages/frontend/editor-ui/src/features/folders/folders.types.ts b/packages/frontend/editor-ui/src/features/core/folders/folders.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/folders/folders.types.ts
rename to packages/frontend/editor-ui/src/features/core/folders/folders.types.ts
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.test.ts b/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.test.ts
index 8fcac5815d8..3e2833a44aa 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.test.ts
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.test.ts
@@ -5,8 +5,8 @@ import { createTestingPinia } from '@pinia/testing';
 import { createComponentRenderer } from '@/__tests__/render';
 import CredentialCard from './CredentialCard.vue';
 import type { CredentialsResource } from '@/Interface';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 const renderComponent = createComponentRenderer(CredentialCard);
 
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.vue
index 222477b2055..e7072dbd300 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialCard.vue
@@ -2,17 +2,17 @@
 import { computed } from 'vue';
 import dateformat from 'dateformat';
 import { MODAL_CONFIRM } from '@/constants';
-import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/projects/projects.constants';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
 import { useMessage } from '@/composables/useMessage';
 import CredentialIcon from './CredentialIcon.vue';
 import { getResourcePermissions } from '@n8n/permissions';
 import { useUIStore } from '@/stores/ui.store';
 import { useCredentialsStore } from '../credentials.store';
 import TimeAgo from '@/components/TimeAgo.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import ProjectCardBadge from '@/features/collaboration/projects/components/ProjectCardBadge.vue';
 import { useI18n } from '@n8n/i18n';
-import { ResourceType } from '@/features/projects/projects.utils';
+import { ResourceType } from '@/features/collaboration/projects/projects.utils';
 import type { CredentialsResource } from '@/Interface';
 
 import { N8nActionToggle, N8nBadge, N8nCard, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialConfig.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialConfig.vue
index 377e36ed83f..b6dd1ac52e5 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialConfig.vue
@@ -31,8 +31,8 @@ import CopyInput from '@/components/CopyInput.vue';
 import CredentialInputs from './CredentialInputs.vue';
 import GoogleAuthButton from './GoogleAuthButton.vue';
 import OauthButton from './OauthButton.vue';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
-import { useAssistantStore } from '@/features/assistant/assistant.store';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
+import { useAssistantStore } from '@/features/ai/assistant/assistant.store';
 import FreeAiCreditsCallout from '@/components/FreeAiCreditsCallout.vue';
 
 import {
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialEdit.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialEdit.vue
index 8db57269bb8..5dab2c147ee 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialEdit.vue
@@ -32,14 +32,14 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { Project, ProjectSharingData } from '@/features/projects/projects.types';
+import type { Project, ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import { getResourcePermissions } from '@n8n/permissions';
 import { assert } from '@n8n/utils/assert';
 import { createEventBus } from '@n8n/utils/event-bus';
 
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { isExpression, isTestableExpression } from '@/utils/expressions';
 import {
 	getNodeAuthOptions,
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialSharing.ee.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialSharing.ee.vue
index 9f105271b65..20a6b30c0f3 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialEdit/CredentialSharing.ee.vue
@@ -1,18 +1,21 @@
 <script setup lang="ts">
 import type { AllRolesMap, PermissionsRecord } from '@n8n/permissions';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import ProjectSharing from '@/features/collaboration/projects/components/ProjectSharing.vue';
 import { useI18n } from '@n8n/i18n';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { EnterpriseEditionFeature } from '@/constants';
 import type { ICredentialsDecryptedResponse, ICredentialsResponse } from '../../credentials.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useRolesStore } from '@/stores/roles.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
-import type { ProjectListItem, ProjectSharingData } from '@/features/projects/projects.types';
-import { ProjectTypes } from '@/features/projects/projects.types';
-import { splitName } from '@/features/projects/projects.utils';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import type {
+	ProjectListItem,
+	ProjectSharingData,
+} from '@/features/collaboration/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
+import { splitName } from '@/features/collaboration/projects/projects.utils';
 import type { EventBus } from '@n8n/utils/event-bus';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { computed, onMounted, ref, watch } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/credentials/credentials.store.ts b/packages/frontend/editor-ui/src/features/credentials/credentials.store.ts
index b49346f1715..0468960c772 100644
--- a/packages/frontend/editor-ui/src/features/credentials/credentials.store.ts
+++ b/packages/frontend/editor-ui/src/features/credentials/credentials.store.ts
@@ -12,10 +12,10 @@ import * as credentialsEeApi from './credentials.ee.api';
 import { EnterpriseEditionFeature } from '@/constants';
 import { STORES } from '@n8n/stores';
 import { i18n } from '@n8n/i18n';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import { makeRestApiRequest } from '@n8n/rest-api-client';
 import { getAppNameFromCredType } from '@/utils/nodeTypesUtils';
-import { splitName } from '@/features/projects/projects.utils';
+import { splitName } from '@/features/collaboration/projects/projects.utils';
 import { isEmpty, isPresent } from '@/utils/typesUtils';
 import type {
 	ICredentialsDecrypted,
diff --git a/packages/frontend/editor-ui/src/features/credentials/credentials.types.ts b/packages/frontend/editor-ui/src/features/credentials/credentials.types.ts
index 6fd14bc151f..54e3f5bc2a5 100644
--- a/packages/frontend/editor-ui/src/features/credentials/credentials.types.ts
+++ b/packages/frontend/editor-ui/src/features/credentials/credentials.types.ts
@@ -1,6 +1,6 @@
 import type { Iso8601DateTimeString } from '@n8n/api-types';
 import type { ICredentialsDecrypted, ICredentialsEncrypted, ICredentialType } from 'n8n-workflow';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import type { Scope } from '@n8n/permissions';
 import type { IUserResponse } from '@n8n/rest-api-client/api/users';
 
diff --git a/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.test.ts b/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.test.ts
index b2bbcd97c86..db4d7c117ef 100644
--- a/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.test.ts
+++ b/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.test.ts
@@ -1,5 +1,5 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import { createTestProject } from '@/features/projects/__tests__/utils';
+import { createTestProject } from '@/features/collaboration/projects/__tests__/utils';
 import { createTestingPinia } from '@pinia/testing';
 import { useCredentialsStore } from '../credentials.store';
 import CredentialsView from './CredentialsView.vue';
@@ -9,7 +9,7 @@ import { waitFor, within, fireEvent } from '@testing-library/vue';
 import { STORES } from '@n8n/stores';
 import { CREDENTIAL_SELECT_MODAL_KEY } from '../credentials.constants';
 import { VIEWS } from '@/constants';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { createRouter, createWebHistory } from 'vue-router';
 import { flushPromises } from '@vue/test-utils';
 import { CREDENTIAL_EMPTY_VALUE } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue b/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue
index 38439b9a5c8..05ff860e116 100644
--- a/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue
@@ -1,28 +1,28 @@
 <script setup lang="ts">
 import CredentialCard from '../components/CredentialCard.vue';
-import EmptySharedSectionActionBox from '@/features/folders/components/EmptySharedSectionActionBox.vue';
+import EmptySharedSectionActionBox from '@/features/core/folders/components/EmptySharedSectionActionBox.vue';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import type { BaseFilters, Resource } from '@/Interface';
 import type { ICredentialTypeMap } from '../credentials.types';
-import ProjectHeader from '@/features/projects/components/ProjectHeader.vue';
+import ProjectHeader from '@/features/collaboration/projects/components/ProjectHeader.vue';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { CREDENTIAL_EDIT_MODAL_KEY, CREDENTIAL_SELECT_MODAL_KEY } from '../credentials.constants';
 import { EnterpriseEditionFeature, VIEWS } from '@/constants';
-import InsightsSummary from '@/features/insights/components/InsightsSummary.vue';
-import { useInsightsStore } from '@/features/insights/insights.store';
+import InsightsSummary from '@/features/execution/insights/components/InsightsSummary.vue';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 import { getResourcePermissions } from '@n8n/permissions';
 import { useCredentialsStore } from '../credentials.store';
-import useEnvironmentsStore from '@/features/environments.ee/environments.store';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import useEnvironmentsStore from '@/features/settings/environments.ee/environments.store';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { listenForModalChanges, useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
-import type { Project } from '@/features/projects/projects.types';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import type { Project } from '@/features/collaboration/projects/projects.types';
 import { isCredentialsResource } from '@/utils/typeGuards';
 import { useI18n } from '@n8n/i18n';
 import pickBy from 'lodash/pickBy';
diff --git a/packages/frontend/editor-ui/src/features/directory_structure.txt b/packages/frontend/editor-ui/src/features/directory_structure.txt
deleted file mode 100644
index 8f523fafb30..00000000000
--- a/packages/frontend/editor-ui/src/features/directory_structure.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-├── dataTable
-│   ├── components
-│   │   ├── dataGrid
-│   │   │   ├── AddColumnButton.vue
-│   │   │   ├── AddRowButton.vue
-│   │   │   ├── ColumnHeader.vue
-│   │   │   ├── DataTableTable.vue
-│   │   │   ├── ElDatePickerCellEditor.vue
-│   │   │   ├── ElDatePickerFilter.vue
-│   │   │   ├── n8nTheme.ts
-│   │   │   ├── NullEmptyCellRenderer.vue
-│   │   │   └── registerAgGridModulesOnce.ts
-│   │   ├── AddDataTableModal.vue
-│   │   ├── DataTableActions.vue
-│   │   ├── DataTableBreadcrumbs.vue
-│   │   ├── DataTableCard.vue
-│   │   └── NodeStorageLimitCallout.vue
-│   ├── composables
-│   │   ├── useAgGrid.ts
-│   │   ├── useDataTableColumnFilters.ts
-│   │   ├── useDataTableColumns.ts
-│   │   ├── useDataTableOperations.ts
-│   │   ├── useDataTablePagination.ts
-│   │   ├── useDataTableSelection.ts
-│   │   ├── useDataTableTypes.ts
-│   │   └── useDatePickerCommon.ts
-│   ├── constants.ts
-│   ├── dataTable.api.ts
-│   ├── dataTable.store.ts
-│   ├── dataTable.types.ts
-│   ├── DataTableDetailsView.vue
-│   ├── DataTableView.vue
-│   ├── module.descriptor.ts
-│   ├── typeGuards.test.ts
-│   ├── typeGuards.ts
-│   ├── types.ts
-│   ├── utils
-│   │   ├── columnUtils.ts
-│   │   ├── filterMappings.ts
-│   │   ├── filterProcessors.ts
-│   │   └── typeUtils.ts
-│   └── utils.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/ConcurrentExecutionsHeader.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/ConcurrentExecutionsHeader.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/ConcurrentExecutionsHeader.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/ConcurrentExecutionsHeader.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/ConcurrentExecutionsHeader.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/ConcurrentExecutionsHeader.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/ConcurrentExecutionsHeader.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/ConcurrentExecutionsHeader.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/DebugPaywallModal.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/DebugPaywallModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/DebugPaywallModal.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/DebugPaywallModal.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/ExecutionsFilter.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/ExecutionsFilter.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/ExecutionsFilter.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/ExecutionsFilter.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/ExecutionsFilter.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/ExecutionsFilter.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/ExecutionsFilter.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/ExecutionsFilter.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/ExecutionsTime.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/ExecutionsTime.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/ExecutionsTime.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/ExecutionsTime.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/ViewSubExecution.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/ViewSubExecution.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/ViewSubExecution.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/ViewSubExecution.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsList.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsList.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsList.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsList.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsList.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsList.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsList.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsList.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItem.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItem.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItem.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItem.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItem.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItem.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItem.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItem.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItemQueuedTooltip.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItemQueuedTooltip.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItemQueuedTooltip.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItemQueuedTooltip.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItemQueuedTooltip.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItemQueuedTooltip.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/global/GlobalExecutionsListItemQueuedTooltip.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/global/GlobalExecutionsListItemQueuedTooltip.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/VoteButtons.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/VoteButtons.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/VoteButtons.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/VoteButtons.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionAnnotationPanel.ee.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionAnnotationPanel.ee.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionAnnotationPanel.ee.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionAnnotationPanel.ee.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionAnnotationTags.ee.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsCard.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsCard.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsCard.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsCard.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsCard.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsCard.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsCard.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsCard.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsInfoAccordion.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsInfoAccordion.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsInfoAccordion.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsInfoAccordion.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsLandingPage.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsLandingPage.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsLandingPage.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsLandingPage.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsList.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsList.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsList.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsList.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsPreview.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsPreview.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsPreview.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsPreview.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsPreview.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsPreview.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsPreview.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsPreview.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsSidebar.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsSidebar.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsSidebar.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsSidebar.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsSidebar.vue b/packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsSidebar.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/components/workflow/WorkflowExecutionsSidebar.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/components/workflow/WorkflowExecutionsSidebar.vue
diff --git a/packages/frontend/editor-ui/src/features/executions/composables/useExecutionData.ts b/packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionData.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/composables/useExecutionData.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionData.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/composables/useExecutionDebugging.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionDebugging.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/composables/useExecutionDebugging.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionDebugging.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/composables/useExecutionDebugging.ts b/packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionDebugging.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/composables/useExecutionDebugging.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionDebugging.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/composables/useExecutionHelpers.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionHelpers.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/composables/useExecutionHelpers.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionHelpers.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/composables/useExecutionHelpers.ts b/packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionHelpers.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/composables/useExecutionHelpers.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/composables/useExecutionHelpers.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/executions.constants.ts b/packages/frontend/editor-ui/src/features/execution/executions/executions.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/executions.constants.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/executions.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/executions.store.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/executions.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/executions.store.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/executions.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/executions.store.ts b/packages/frontend/editor-ui/src/features/execution/executions/executions.store.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/executions/executions.store.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/executions.store.ts
index 763da58c2f2..08f2a37f217 100644
--- a/packages/frontend/editor-ui/src/features/executions/executions.store.ts
+++ b/packages/frontend/editor-ui/src/features/execution/executions/executions.store.ts
@@ -18,7 +18,7 @@ import {
 	executionFilterToQueryFilter,
 	getDefaultExecutionFilters,
 } from './executions.utils';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
 export const useExecutionsStore = defineStore('executions', () => {
diff --git a/packages/frontend/editor-ui/src/features/executions/executions.types.ts b/packages/frontend/editor-ui/src/features/execution/executions/executions.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/executions.types.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/executions.types.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/executions.utils.test.ts b/packages/frontend/editor-ui/src/features/execution/executions/executions.utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/executions.utils.test.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/executions.utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/executions.utils.ts b/packages/frontend/editor-ui/src/features/execution/executions/executions.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/executions/executions.utils.ts
rename to packages/frontend/editor-ui/src/features/execution/executions/executions.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/executions/views/ExecutionsView.vue b/packages/frontend/editor-ui/src/features/execution/executions/views/ExecutionsView.vue
similarity index 89%
rename from packages/frontend/editor-ui/src/features/executions/views/ExecutionsView.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/views/ExecutionsView.vue
index a7046ba6eb6..a6b7f469e92 100644
--- a/packages/frontend/editor-ui/src/features/executions/views/ExecutionsView.vue
+++ b/packages/frontend/editor-ui/src/features/execution/executions/views/ExecutionsView.vue
@@ -1,15 +1,15 @@
 <script lang="ts" setup>
 import type { ExecutionFilterType } from '../executions.types';
-import ProjectHeader from '@/features/projects/components/ProjectHeader.vue';
+import ProjectHeader from '@/features/collaboration/projects/components/ProjectHeader.vue';
 import GlobalExecutionsList from '../components/global/GlobalExecutionsList.vue';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useI18n } from '@n8n/i18n';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
-import InsightsSummary from '@/features/insights/components/InsightsSummary.vue';
-import { useInsightsStore } from '@/features/insights/insights.store';
+import InsightsSummary from '@/features/execution/insights/components/InsightsSummary.vue';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 import { useExecutionsStore } from '../executions.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { storeToRefs } from 'pinia';
diff --git a/packages/frontend/editor-ui/src/features/executions/views/WorkflowExecutionsView.vue b/packages/frontend/editor-ui/src/features/execution/executions/views/WorkflowExecutionsView.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/executions/views/WorkflowExecutionsView.vue
rename to packages/frontend/editor-ui/src/features/execution/executions/views/WorkflowExecutionsView.vue
index 3991aab7f85..4430c244572 100644
--- a/packages/frontend/editor-ui/src/features/executions/views/WorkflowExecutionsView.vue
+++ b/packages/frontend/editor-ui/src/features/execution/executions/views/WorkflowExecutionsView.vue
@@ -7,7 +7,7 @@ import type { ExecutionFilterType } from '../executions.types';
 import type { IWorkflowDb } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { NO_NETWORK_ERROR_CODE } from '@n8n/rest-api-client';
 import { useToast } from '@/composables/useToast';
 import { NEW_WORKFLOW_ID, PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/insights/chartjs.utils.ts b/packages/frontend/editor-ui/src/features/execution/insights/chartjs.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/insights/chartjs.utils.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/chartjs.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/insights/components/InsightsDashboard.test.ts b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDashboard.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/insights/components/InsightsDashboard.test.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDashboard.test.ts
index 413ae12a05b..59e8ac24ecf 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/InsightsDashboard.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDashboard.test.ts
@@ -3,7 +3,7 @@ import { createComponentRenderer } from '@/__tests__/render';
 import InsightsDashboard from './InsightsDashboard.vue';
 import { createTestingPinia } from '@pinia/testing';
 import { defaultSettings } from '@/__tests__/defaults';
-import { useInsightsStore } from '@/features/insights/insights.store';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 import {
 	mockedStore,
 	type MockedStore,
@@ -13,16 +13,16 @@ import {
 } from '@/__tests__/utils';
 import { within, screen, waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import { createProjectListItem } from '@/features/projects/__tests__/utils';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { createProjectListItem } from '@/features/collaboration/projects/__tests__/utils';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import type {
 	FrontendModuleSettings,
 	InsightsByTime,
 	InsightsByWorkflow,
 	InsightsSummaryType,
 } from '@n8n/api-types';
-import { INSIGHT_TYPES } from '@/features/insights/insights.constants';
-import type { InsightsSummaryDisplay } from '@/features/insights/insights.types';
+import { INSIGHT_TYPES } from '@/features/execution/insights/insights.constants';
+import type { InsightsSummaryDisplay } from '@/features/execution/insights/insights.types';
 import { vi } from 'vitest';
 
 const { emitters, addEmitter } = useEmitters<'n8nDataTableServer'>();
diff --git a/packages/frontend/editor-ui/src/features/insights/components/InsightsDashboard.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDashboard.vue
similarity index 86%
rename from packages/frontend/editor-ui/src/features/insights/components/InsightsDashboard.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDashboard.vue
index 12b419e19d1..3aa43ec9017 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/InsightsDashboard.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDashboard.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import ProjectSharing from '@/features/collaboration/projects/components/ProjectSharing.vue';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useTelemetry } from '@/composables/useTelemetry';
-import InsightsSummary from '@/features/insights/components/InsightsSummary.vue';
-import { useInsightsStore } from '@/features/insights/insights.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import InsightsSummary from '@/features/execution/insights/components/InsightsSummary.vue';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import type { InsightsDateRange, InsightsSummaryType } from '@n8n/api-types';
 import { useI18n } from '@n8n/i18n';
 import { computed, defineAsyncComponent, onBeforeMount, onMounted, ref, watch } from 'vue';
@@ -16,25 +16,31 @@ import InsightsUpgradeModal from './InsightsUpgradeModal.vue';
 
 import { N8nHeading, N8nSpinner } from '@n8n/design-system';
 const InsightsPaywall = defineAsyncComponent(
-	async () => await import('@/features/insights/components/InsightsPaywall.vue'),
+	async () => await import('@/features/execution/insights/components/InsightsPaywall.vue'),
 );
 const InsightsChartTotal = defineAsyncComponent(
-	async () => await import('@/features/insights/components/charts/InsightsChartTotal.vue'),
+	async () =>
+		await import('@/features/execution/insights/components/charts/InsightsChartTotal.vue'),
 );
 const InsightsChartFailed = defineAsyncComponent(
-	async () => await import('@/features/insights/components/charts/InsightsChartFailed.vue'),
+	async () =>
+		await import('@/features/execution/insights/components/charts/InsightsChartFailed.vue'),
 );
 const InsightsChartFailureRate = defineAsyncComponent(
-	async () => await import('@/features/insights/components/charts/InsightsChartFailureRate.vue'),
+	async () =>
+		await import('@/features/execution/insights/components/charts/InsightsChartFailureRate.vue'),
 );
 const InsightsChartTimeSaved = defineAsyncComponent(
-	async () => await import('@/features/insights/components/charts/InsightsChartTimeSaved.vue'),
+	async () =>
+		await import('@/features/execution/insights/components/charts/InsightsChartTimeSaved.vue'),
 );
 const InsightsChartAverageRuntime = defineAsyncComponent(
-	async () => await import('@/features/insights/components/charts/InsightsChartAverageRuntime.vue'),
+	async () =>
+		await import('@/features/execution/insights/components/charts/InsightsChartAverageRuntime.vue'),
 );
 const InsightsTableWorkflows = defineAsyncComponent(
-	async () => await import('@/features/insights/components/tables/InsightsTableWorkflows.vue'),
+	async () =>
+		await import('@/features/execution/insights/components/tables/InsightsTableWorkflows.vue'),
 );
 
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/features/insights/components/InsightsDateRangeSelect.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDateRangeSelect.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/insights/components/InsightsDateRangeSelect.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDateRangeSelect.vue
index 6fb310edd35..1a480d40c37 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/InsightsDateRangeSelect.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsDateRangeSelect.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useInsightsStore } from '@/features/insights/insights.store';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 import type { InsightsDateRange } from '@n8n/api-types';
 import { ref } from 'vue';
 import { UNLICENSED_TIME_RANGE } from '../insights.constants';
diff --git a/packages/frontend/editor-ui/src/features/insights/components/InsightsPaywall.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsPaywall.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/insights/components/InsightsPaywall.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/InsightsPaywall.vue
diff --git a/packages/frontend/editor-ui/src/features/insights/components/InsightsSummary.test.ts b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsSummary.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/insights/components/InsightsSummary.test.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/components/InsightsSummary.test.ts
index 15bd89a0261..de75850667e 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/InsightsSummary.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsSummary.test.ts
@@ -1,7 +1,7 @@
 import { reactive } from 'vue';
-import InsightsSummary from '@/features/insights/components/InsightsSummary.vue';
+import InsightsSummary from '@/features/execution/insights/components/InsightsSummary.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import type { InsightsSummaryDisplay } from '@/features/insights/insights.types';
+import type { InsightsSummaryDisplay } from '@/features/execution/insights/insights.types';
 
 vi.mock('vue-router', () => ({
 	useRouter: () => ({}),
diff --git a/packages/frontend/editor-ui/src/features/insights/components/InsightsSummary.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsSummary.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/insights/components/InsightsSummary.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/InsightsSummary.vue
index ee97823fe97..46d4f133be9 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/InsightsSummary.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsSummary.vue
@@ -4,8 +4,8 @@ import { VIEWS } from '@/constants';
 import {
 	INSIGHT_IMPACT_TYPES,
 	INSIGHTS_UNIT_IMPACT_MAPPING,
-} from '@/features/insights/insights.constants';
-import type { InsightsSummaryDisplay } from '@/features/insights/insights.types';
+} from '@/features/execution/insights/insights.constants';
+import type { InsightsSummaryDisplay } from '@/features/execution/insights/insights.types';
 import type { InsightsDateRange, InsightsSummary } from '@n8n/api-types';
 import { useI18n } from '@n8n/i18n';
 import { smartDecimal } from '@n8n/utils/number/smartDecimal';
diff --git a/packages/frontend/editor-ui/src/features/insights/components/InsightsUpgradeModal.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/InsightsUpgradeModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/insights/components/InsightsUpgradeModal.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/InsightsUpgradeModal.vue
diff --git a/packages/frontend/editor-ui/src/features/insights/components/__snapshots__/InsightsSummary.test.ts.snap b/packages/frontend/editor-ui/src/features/execution/insights/components/__snapshots__/InsightsSummary.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/insights/components/__snapshots__/InsightsSummary.test.ts.snap
rename to packages/frontend/editor-ui/src/features/execution/insights/components/__snapshots__/InsightsSummary.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartAverageRuntime.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartAverageRuntime.vue
similarity index 88%
rename from packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartAverageRuntime.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartAverageRuntime.vue
index af814ace80f..4e6434d0188 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartAverageRuntime.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartAverageRuntime.vue
@@ -3,12 +3,12 @@ import { useI18n } from '@n8n/i18n';
 import {
 	generateLinearGradient,
 	generateLineChartOptions,
-} from '@/features/insights/chartjs.utils';
+} from '@/features/execution/insights/chartjs.utils';
 import {
 	GRANULARITY_DATE_FORMAT_MASK,
 	INSIGHTS_UNIT_MAPPING,
-} from '@/features/insights/insights.constants';
-import { transformInsightsAverageRunTime } from '@/features/insights/insights.utils';
+} from '@/features/execution/insights/insights.constants';
+import { transformInsightsAverageRunTime } from '@/features/execution/insights/insights.utils';
 import { smartDecimal } from '@n8n/utils/number/smartDecimal';
 import { type ChartData, Filler, type ScriptableContext } from 'chart.js';
 import { computed } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartFailed.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartFailed.vue
similarity index 87%
rename from packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartFailed.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartFailed.vue
index d6a50254e61..fc01fbbb3a7 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartFailed.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartFailed.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useI18n } from '@n8n/i18n';
-import { generateBarChartOptions } from '@/features/insights/chartjs.utils';
-import { GRANULARITY_DATE_FORMAT_MASK } from '@/features/insights/insights.constants';
+import { generateBarChartOptions } from '@/features/execution/insights/chartjs.utils';
+import { GRANULARITY_DATE_FORMAT_MASK } from '@/features/execution/insights/insights.constants';
 import { smartDecimal } from '@n8n/utils/number/smartDecimal';
 import { useCssVar } from '@vueuse/core';
 import type { ChartData } from 'chart.js';
diff --git a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartFailureRate.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartFailureRate.vue
similarity index 85%
rename from packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartFailureRate.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartFailureRate.vue
index b053430c555..00a4576d4ac 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartFailureRate.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartFailureRate.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
 import { useI18n } from '@n8n/i18n';
-import { generateBarChartOptions } from '@/features/insights/chartjs.utils';
+import { generateBarChartOptions } from '@/features/execution/insights/chartjs.utils';
 import {
 	GRANULARITY_DATE_FORMAT_MASK,
 	INSIGHTS_UNIT_MAPPING,
-} from '@/features/insights/insights.constants';
-import { transformInsightsFailureRate } from '@/features/insights/insights.utils';
+} from '@/features/execution/insights/insights.constants';
+import { transformInsightsFailureRate } from '@/features/execution/insights/insights.utils';
 import { smartDecimal } from '@n8n/utils/number/smartDecimal';
 import { useCssVar } from '@vueuse/core';
 import type { ChartData } from 'chart.js';
diff --git a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartTimeSaved.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartTimeSaved.vue
similarity index 89%
rename from packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartTimeSaved.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartTimeSaved.vue
index b6a48fc073d..d4257c88de0 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartTimeSaved.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartTimeSaved.vue
@@ -3,13 +3,13 @@ import { useI18n } from '@n8n/i18n';
 import {
 	generateLinearGradient,
 	generateLineChartOptions,
-} from '@/features/insights/chartjs.utils';
-import { transformInsightsTimeSaved } from '@/features/insights/insights.utils';
+} from '@/features/execution/insights/chartjs.utils';
+import { transformInsightsTimeSaved } from '@/features/execution/insights/insights.utils';
 
 import {
 	GRANULARITY_DATE_FORMAT_MASK,
 	INSIGHTS_UNIT_MAPPING,
-} from '@/features/insights/insights.constants';
+} from '@/features/execution/insights/insights.constants';
 import { type ChartData, Filler, type ScriptableContext } from 'chart.js';
 import { computed } from 'vue';
 import { Line } from 'vue-chartjs';
diff --git a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartTotal.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartTotal.vue
similarity index 88%
rename from packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartTotal.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartTotal.vue
index 78eb0cd7590..04f71a57972 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/charts/InsightsChartTotal.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/InsightsChartTotal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useI18n } from '@n8n/i18n';
-import { generateBarChartOptions } from '@/features/insights/chartjs.utils';
-import { GRANULARITY_DATE_FORMAT_MASK } from '@/features/insights/insights.constants';
+import { generateBarChartOptions } from '@/features/execution/insights/chartjs.utils';
+import { GRANULARITY_DATE_FORMAT_MASK } from '@/features/execution/insights/insights.constants';
 import { useCssVar } from '@vueuse/core';
 import type { ChartData } from 'chart.js';
 import { computed } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/insights/components/charts/insightChartProps.ts b/packages/frontend/editor-ui/src/features/execution/insights/components/charts/insightChartProps.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/insights/components/charts/insightChartProps.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/components/charts/insightChartProps.ts
diff --git a/packages/frontend/editor-ui/src/features/insights/components/tables/InsightsTableWorkflows.test.ts b/packages/frontend/editor-ui/src/features/execution/insights/components/tables/InsightsTableWorkflows.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/insights/components/tables/InsightsTableWorkflows.test.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/components/tables/InsightsTableWorkflows.test.ts
index 53412bde257..800d7c8c8be 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/tables/InsightsTableWorkflows.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/tables/InsightsTableWorkflows.test.ts
@@ -5,7 +5,7 @@ import { vi } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
 import { useEmitters } from '@/__tests__/utils';
-import InsightsTableWorkflows from '@/features/insights/components/tables/InsightsTableWorkflows.vue';
+import InsightsTableWorkflows from '@/features/execution/insights/components/tables/InsightsTableWorkflows.vue';
 import type { InsightsByWorkflow } from '@n8n/api-types';
 
 const { emitters, addEmitter } = useEmitters<'n8nDataTableServer'>();
diff --git a/packages/frontend/editor-ui/src/features/insights/components/tables/InsightsTableWorkflows.vue b/packages/frontend/editor-ui/src/features/execution/insights/components/tables/InsightsTableWorkflows.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/insights/components/tables/InsightsTableWorkflows.vue
rename to packages/frontend/editor-ui/src/features/execution/insights/components/tables/InsightsTableWorkflows.vue
index 22de4d70259..c18c64f4e04 100644
--- a/packages/frontend/editor-ui/src/features/insights/components/tables/InsightsTableWorkflows.vue
+++ b/packages/frontend/editor-ui/src/features/execution/insights/components/tables/InsightsTableWorkflows.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup="">
 import { useI18n } from '@n8n/i18n';
-import { INSIGHTS_UNIT_MAPPING } from '@/features/insights/insights.constants';
+import { INSIGHTS_UNIT_MAPPING } from '@/features/execution/insights/insights.constants';
 import {
 	transformInsightsAverageRunTime,
 	transformInsightsFailureRate,
 	transformInsightsTimeSaved,
-} from '@/features/insights/insights.utils';
+} from '@/features/execution/insights/insights.utils';
 import type { InsightsByWorkflow } from '@n8n/api-types';
 import type { TableHeader } from '@n8n/design-system/components/N8nDataTableServer';
 import { smartDecimal } from '@n8n/utils/number/smartDecimal';
@@ -16,7 +16,7 @@ import { type RouteLocationRaw, type LocationQueryRaw, RouterLink } from 'vue-ro
 
 import { N8nDataTableServer, N8nHeading, N8nTooltip } from '@n8n/design-system';
 const InsightsPaywall = defineAsyncComponent(
-	async () => await import('@/features/insights/components/InsightsPaywall.vue'),
+	async () => await import('@/features/execution/insights/components/InsightsPaywall.vue'),
 );
 
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/features/insights/insights.api.ts b/packages/frontend/editor-ui/src/features/execution/insights/insights.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/insights/insights.api.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/insights.api.ts
diff --git a/packages/frontend/editor-ui/src/features/insights/insights.constants.ts b/packages/frontend/editor-ui/src/features/execution/insights/insights.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/insights/insights.constants.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/insights.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/insights/insights.store.test.ts b/packages/frontend/editor-ui/src/features/execution/insights/insights.store.test.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/insights/insights.store.test.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/insights.store.test.ts
index 76c68f1a5da..66f25cdbf1f 100644
--- a/packages/frontend/editor-ui/src/features/insights/insights.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/insights.store.test.ts
@@ -1,9 +1,9 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { createTestingPinia } from '@pinia/testing';
-import { useInsightsStore } from '@/features/insights/insights.store';
-import * as insightsApi from '@/features/insights/insights.api';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
+import * as insightsApi from '@/features/execution/insights/insights.api';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { mockedStore, type MockedStore } from '@/__tests__/utils';
 import type { IUser } from '@n8n/rest-api-client/api/users';
@@ -13,7 +13,7 @@ import type { FrontendModuleSettings } from '@n8n/api-types';
 vi.mock('vue-router', () => ({
 	useRoute: () => reactive({}),
 }));
-vi.mock('@/features/insights/insights.api');
+vi.mock('@/features/execution/insights/insights.api');
 
 const mockFilter = { dateRange: 'week' as const };
 const mockData = [
diff --git a/packages/frontend/editor-ui/src/features/insights/insights.store.ts b/packages/frontend/editor-ui/src/features/execution/insights/insights.store.ts
similarity index 91%
rename from packages/frontend/editor-ui/src/features/insights/insights.store.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/insights.store.ts
index 6ed5d44aab7..be86dae8076 100644
--- a/packages/frontend/editor-ui/src/features/insights/insights.store.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/insights.store.ts
@@ -2,11 +2,11 @@ import { computed } from 'vue';
 import { defineStore } from 'pinia';
 import { useAsyncState } from '@vueuse/core';
 import type { ListInsightsWorkflowQueryDto, InsightsDateRange } from '@n8n/api-types';
-import * as insightsApi from '@/features/insights/insights.api';
+import * as insightsApi from '@/features/execution/insights/insights.api';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { transformInsightsSummary } from '@/features/insights/insights.utils';
+import { transformInsightsSummary } from '@/features/execution/insights/insights.utils';
 import { getResourcePermissions } from '@n8n/permissions';
 
 export const useInsightsStore = defineStore('insights', () => {
diff --git a/packages/frontend/editor-ui/src/features/insights/insights.types.ts b/packages/frontend/editor-ui/src/features/execution/insights/insights.types.ts
similarity index 89%
rename from packages/frontend/editor-ui/src/features/insights/insights.types.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/insights.types.ts
index 1808a47e109..5c663eb340c 100644
--- a/packages/frontend/editor-ui/src/features/insights/insights.types.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/insights.types.ts
@@ -1,7 +1,7 @@
 import type {
 	INSIGHTS_UNIT_MAPPING,
 	INSIGHTS_DEVIATION_UNIT_MAPPING,
-} from '@/features/insights/insights.constants';
+} from '@/features/execution/insights/insights.constants';
 
 type InsightsDisplayUnits = typeof INSIGHTS_UNIT_MAPPING;
 type InsightsDisplayDeviationUnits = typeof INSIGHTS_DEVIATION_UNIT_MAPPING;
diff --git a/packages/frontend/editor-ui/src/features/insights/insights.utils.test.ts b/packages/frontend/editor-ui/src/features/execution/insights/insights.utils.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/insights/insights.utils.test.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/insights.utils.test.ts
index e3fe15b2de1..5fece6a5ce4 100644
--- a/packages/frontend/editor-ui/src/features/insights/insights.utils.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/insights.utils.test.ts
@@ -12,7 +12,7 @@ import {
 	INSIGHTS_UNIT_MAPPING,
 	INSIGHTS_DEVIATION_UNIT_MAPPING,
 	INSIGHTS_SUMMARY_ORDER,
-} from '@/features/insights/insights.constants';
+} from '@/features/execution/insights/insights.constants';
 
 describe('Insights Transformers', () => {
 	describe('transformInsightsTimeSaved', () => {
diff --git a/packages/frontend/editor-ui/src/features/insights/insights.utils.ts b/packages/frontend/editor-ui/src/features/execution/insights/insights.utils.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/insights/insights.utils.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/insights.utils.ts
index 7a2bee2e738..1d1c16294b6 100644
--- a/packages/frontend/editor-ui/src/features/insights/insights.utils.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/insights.utils.ts
@@ -1,11 +1,11 @@
 import { useI18n } from '@n8n/i18n';
 import type { InsightsSummary, InsightsSummaryType } from '@n8n/api-types';
-import type { InsightsSummaryDisplay } from '@/features/insights/insights.types';
+import type { InsightsSummaryDisplay } from '@/features/execution/insights/insights.types';
 import {
 	INSIGHTS_SUMMARY_ORDER,
 	INSIGHTS_UNIT_MAPPING,
 	INSIGHTS_DEVIATION_UNIT_MAPPING,
-} from '@/features/insights/insights.constants';
+} from '@/features/execution/insights/insights.constants';
 
 export const transformInsightsTimeSaved = (minutes: number): number =>
 	Math.round(minutes / (Math.abs(minutes) < 60 ? 1 : 60)); // we want to show saved time in minutes or hours
diff --git a/packages/frontend/editor-ui/src/features/insights/module.descriptor.ts b/packages/frontend/editor-ui/src/features/execution/insights/module.descriptor.ts
similarity index 88%
rename from packages/frontend/editor-ui/src/features/insights/module.descriptor.ts
rename to packages/frontend/editor-ui/src/features/execution/insights/module.descriptor.ts
index 265a0d5c065..56385b8e401 100644
--- a/packages/frontend/editor-ui/src/features/insights/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/execution/insights/module.descriptor.ts
@@ -1,11 +1,11 @@
 import { RouterView } from 'vue-router';
 import type { FrontendModuleDescription } from '@/moduleInitializer/module.types';
-import { useInsightsStore } from '@/features/insights/insights.store';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 import { VIEWS } from '@/constants';
 
 const MainSidebar = async () => await import('@/components/MainSidebar.vue');
 const InsightsDashboard = async () =>
-	await import('@/features/insights/components/InsightsDashboard.vue');
+	await import('@/features/execution/insights/components/InsightsDashboard.vue');
 
 export const InsightsModule: FrontendModuleDescription = {
 	id: 'insights',
diff --git a/packages/frontend/editor-ui/src/features/logs/__test__/data.ts b/packages/frontend/editor-ui/src/features/execution/logs/__test__/data.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/logs/__test__/data.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/__test__/data.ts
index c7a553a3ee1..50d7d9245c7 100644
--- a/packages/frontend/editor-ui/src/features/logs/__test__/data.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/__test__/data.ts
@@ -6,7 +6,7 @@ import {
 	CHAT_TRIGGER_NODE_TYPE,
 	MANUAL_TRIGGER_NODE_TYPE,
 } from '@/constants';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { WorkflowOperationError, type IRunData, type Workflow } from 'n8n-workflow';
 import type { LogTreeCreationContext } from '../logs.types';
 
diff --git a/packages/frontend/editor-ui/src/features/logs/__test__/mocks.ts b/packages/frontend/editor-ui/src/features/execution/logs/__test__/mocks.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/__test__/mocks.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/__test__/mocks.ts
diff --git a/packages/frontend/editor-ui/src/features/logs/__test__/useChatMessaging.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/__test__/useChatMessaging.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/logs/__test__/useChatMessaging.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/__test__/useChatMessaging.test.ts
index 7164cff878e..d9879697411 100644
--- a/packages/frontend/editor-ui/src/features/logs/__test__/useChatMessaging.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/__test__/useChatMessaging.test.ts
@@ -4,7 +4,7 @@ import { ref, computed } from 'vue';
 import type { Ref, ComputedRef } from 'vue';
 import type { IRunExecutionData } from 'n8n-workflow';
 import type { INodeUi } from '@/Interface';
-import type { IExecutionPushResponse } from '@/features/executions/executions.types';
+import type { IExecutionPushResponse } from '@/features/execution/executions/executions.types';
 import type { RunWorkflowChatPayload } from '../composables/useChatMessaging';
 import { vi } from 'vitest';
 import type { ChatMessage } from '@n8n/chat/types';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/ChatMessagesPanel.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/ChatMessagesPanel.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/logs/components/ChatMessagesPanel.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/ChatMessagesPanel.vue
index 5305344eedc..01465c4f580 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/ChatMessagesPanel.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/ChatMessagesPanel.vue
@@ -10,7 +10,7 @@ import ChatInput from '@n8n/chat/components/Input.vue';
 import { computed, ref } from 'vue';
 import { useClipboard } from '@/composables/useClipboard';
 import { useToast } from '@/composables/useToast';
-import LogsPanelHeader from '@/features/logs/components/LogsPanelHeader.vue';
+import LogsPanelHeader from '@/features/execution/logs/components/LogsPanelHeader.vue';
 import { N8nButton, N8nIconButton, N8nTooltip } from '@n8n/design-system';
 interface Props {
 	pastChatMessages: string[];
diff --git a/packages/frontend/editor-ui/src/features/logs/components/DemoFooter.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/DemoFooter.vue
similarity index 81%
rename from packages/frontend/editor-ui/src/features/logs/components/DemoFooter.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/DemoFooter.vue
index 9d082bc5ef8..bd06992254a 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/DemoFooter.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/DemoFooter.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import LogsPanel from '@/features/logs/components/LogsPanel.vue';
+import LogsPanel from '@/features/execution/logs/components/LogsPanel.vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { computed } from 'vue';
 
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogDetailsPanel.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/components/LogDetailsPanel.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/logs/components/LogDetailsPanel.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogDetailsPanel.test.ts
index 5030d79a394..166e233baee 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogDetailsPanel.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogDetailsPanel.test.ts
@@ -13,7 +13,7 @@ import {
 	defaultNodeTypes,
 	mockLoadedNodeType,
 } from '@/__tests__/mocks';
-import { LOG_DETAILS_PANEL_STATE } from '@/features/logs/logs.constants';
+import { LOG_DETAILS_PANEL_STATE } from '@/features/execution/logs/logs.constants';
 import type { LogEntry } from '../logs.types';
 import { createTestLogEntry } from '../__test__/mocks';
 import { NodeConnectionTypes } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogDetailsPanel.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogDetailsPanel.vue
similarity index 90%
rename from packages/frontend/editor-ui/src/features/logs/components/LogDetailsPanel.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogDetailsPanel.vue
index dddb199bb71..c5f166018ce 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogDetailsPanel.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogDetailsPanel.vue
@@ -1,23 +1,26 @@
 <script setup lang="ts">
-import LogsViewExecutionSummary from '@/features/logs/components/LogsViewExecutionSummary.vue';
-import LogsPanelHeader from '@/features/logs/components/LogsPanelHeader.vue';
-import LogsViewRunData from '@/features/logs/components/LogsViewRunData.vue';
+import LogsViewExecutionSummary from '@/features/execution/logs/components/LogsViewExecutionSummary.vue';
+import LogsPanelHeader from '@/features/execution/logs/components/LogsPanelHeader.vue';
+import LogsViewRunData from '@/features/execution/logs/components/LogsViewRunData.vue';
 import { useResizablePanel } from '@/composables/useResizablePanel';
 import {
 	type LatestNodeInfo,
 	type LogEntry,
 	type LogDetailsPanelState,
-} from '@/features/logs/logs.types';
+} from '@/features/execution/logs/logs.types';
 import NodeIcon from '@/components/NodeIcon.vue';
 import { useI18n } from '@n8n/i18n';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import LogsViewNodeName from '@/features/logs/components/LogsViewNodeName.vue';
+import LogsViewNodeName from '@/features/execution/logs/components/LogsViewNodeName.vue';
 import { computed, useTemplateRef } from 'vue';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
-import { getSubtreeTotalConsumedTokens, isPlaceholderLog } from '@/features/logs/logs.utils';
-import { LOG_DETAILS_PANEL_STATE } from '@/features/logs/logs.constants';
+import {
+	getSubtreeTotalConsumedTokens,
+	isPlaceholderLog,
+} from '@/features/execution/logs/logs.utils';
+import { LOG_DETAILS_PANEL_STATE } from '@/features/execution/logs/logs.constants';
 import { useNDVStore } from '@/stores/ndv.store';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 
 import { N8nButton, N8nResizeWrapper, N8nText } from '@n8n/design-system';
 const MIN_IO_PANEL_WIDTH = 200;
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsOverviewPanel.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewPanel.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsOverviewPanel.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewPanel.test.ts
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsOverviewPanel.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewPanel.vue
similarity index 88%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsOverviewPanel.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewPanel.vue
index 3f28cd252e6..ca37f9d4388 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogsOverviewPanel.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewPanel.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
-import LogsOverviewRows from '@/features/logs/components/LogsOverviewRows.vue';
-import LogsPanelHeader from '@/features/logs/components/LogsPanelHeader.vue';
-import LogsViewExecutionSummary from '@/features/logs/components/LogsViewExecutionSummary.vue';
-import { useClearExecutionButtonVisible } from '@/features/logs/composables/useClearExecutionButtonVisible';
-import type { LatestNodeInfo, LogEntry } from '@/features/logs/logs.types';
-import { getSubtreeTotalConsumedTokens, getTotalConsumedTokens } from '@/features/logs/logs.utils';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import LogsOverviewRows from '@/features/execution/logs/components/LogsOverviewRows.vue';
+import LogsPanelHeader from '@/features/execution/logs/components/LogsPanelHeader.vue';
+import LogsViewExecutionSummary from '@/features/execution/logs/components/LogsViewExecutionSummary.vue';
+import { useClearExecutionButtonVisible } from '@/features/execution/logs/composables/useClearExecutionButtonVisible';
+import type { LatestNodeInfo, LogEntry } from '@/features/execution/logs/logs.types';
+import {
+	getSubtreeTotalConsumedTokens,
+	getTotalConsumedTokens,
+} from '@/features/execution/logs/logs.utils';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { getScrollbarWidth } from '@/utils/htmlUtils';
 import { N8nButton, N8nRadioButtons, N8nText, N8nTooltip } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsOverviewRow.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewRow.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsOverviewRow.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewRow.vue
index 9bca8d5cc53..976992d78a9 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogsOverviewRow.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewRow.vue
@@ -1,16 +1,19 @@
 <script setup lang="ts">
 import { computed, nextTick, useTemplateRef, watch } from 'vue';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import LogsViewConsumedTokenCountText from '@/features/logs/components/LogsViewConsumedTokenCountText.vue';
+import LogsViewConsumedTokenCountText from '@/features/execution/logs/components/LogsViewConsumedTokenCountText.vue';
 import NodeIcon from '@/components/NodeIcon.vue';
 import upperFirst from 'lodash/upperFirst';
 import { type BaseTextKey, useI18n } from '@n8n/i18n';
 import { I18nT } from 'vue-i18n';
 import { toDayMonth, toTime } from '@/utils/formatters/dateFormatter';
-import LogsViewNodeName from '@/features/logs/components/LogsViewNodeName.vue';
-import { getSubtreeTotalConsumedTokens, hasSubExecution } from '@/features/logs/logs.utils';
+import LogsViewNodeName from '@/features/execution/logs/components/LogsViewNodeName.vue';
+import {
+	getSubtreeTotalConsumedTokens,
+	hasSubExecution,
+} from '@/features/execution/logs/logs.utils';
 import { useTimestamp } from '@vueuse/core';
-import type { LatestNodeInfo, LogEntry } from '@/features/logs/logs.types';
+import type { LatestNodeInfo, LogEntry } from '@/features/execution/logs/logs.types';
 
 import { N8nButton, N8nIcon, N8nIconButton, N8nText } from '@n8n/design-system';
 import AnimatedSpinner from '@/components/AnimatedSpinner.vue';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsOverviewRows.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewRows.vue
similarity index 93%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsOverviewRows.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewRows.vue
index dda50a11aa1..02db4aa1339 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogsOverviewRows.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsOverviewRows.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
-import LogsOverviewRow from '@/features/logs/components/LogsOverviewRow.vue';
-import type { LatestNodeInfo, LogEntry } from '@/features/logs/logs.types';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import LogsOverviewRow from '@/features/execution/logs/components/LogsOverviewRow.vue';
+import type { LatestNodeInfo, LogEntry } from '@/features/execution/logs/logs.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { useVirtualList } from '@vueuse/core';
 import { watch } from 'vue';
 import { nextTick } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsPanel.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanel.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsPanel.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanel.test.ts
index 03edcbd9abd..440e2a73f4b 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogsPanel.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanel.test.ts
@@ -1,7 +1,7 @@
 import { renderComponent } from '@/__tests__/render';
 import { fireEvent, waitFor, within } from '@testing-library/vue';
 import { mockedStore } from '@/__tests__/utils';
-import LogsPanel from '@/features/logs/components/LogsPanel.vue';
+import LogsPanel from '@/features/execution/logs/components/LogsPanel.vue';
 import { createTestingPinia, type TestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { createRouter, createWebHistory } from 'vue-router';
@@ -28,7 +28,7 @@ import { LOGS_PANEL_STATE } from '../logs.constants';
 import { ChatOptionsSymbol, ChatSymbol } from '@n8n/chat/constants';
 import { userEvent } from '@testing-library/user-event';
 import type { ChatMessage } from '@n8n/chat/types';
-import * as useChatMessaging from '@/features/logs/composables/useChatMessaging';
+import * as useChatMessaging from '@/features/execution/logs/composables/useChatMessaging';
 import { chatEventBus } from '@n8n/chat/event-buses';
 import { useToast } from '@/composables/useToast';
 import { useWorkflowState, type WorkflowState } from '@/composables/useWorkflowState';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsPanel.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanel.vue
similarity index 91%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsPanel.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanel.vue
index 3e84fdf7492..12e82fc9d1f 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogsPanel.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanel.vue
@@ -1,18 +1,18 @@
 <script setup lang="ts">
 import { nextTick, computed, useTemplateRef, ref } from 'vue';
-import { useChatState } from '@/features/logs/composables/useChatState';
-import LogsOverviewPanel from '@/features/logs/components/LogsOverviewPanel.vue';
-import ChatMessagesPanel from '@/features/logs/components/ChatMessagesPanel.vue';
-import LogsDetailsPanel from '@/features/logs/components/LogDetailsPanel.vue';
-import LogsPanelActions from '@/features/logs/components/LogsPanelActions.vue';
-import { useLogsExecutionData } from '@/features/logs/composables/useLogsExecutionData';
+import { useChatState } from '@/features/execution/logs/composables/useChatState';
+import LogsOverviewPanel from '@/features/execution/logs/components/LogsOverviewPanel.vue';
+import ChatMessagesPanel from '@/features/execution/logs/components/ChatMessagesPanel.vue';
+import LogsDetailsPanel from '@/features/execution/logs/components/LogDetailsPanel.vue';
+import LogsPanelActions from '@/features/execution/logs/components/LogsPanelActions.vue';
+import { useLogsExecutionData } from '@/features/execution/logs/composables/useLogsExecutionData';
 import { useNDVStore } from '@/stores/ndv.store';
 import { ndvEventBus } from '@/event-bus';
-import { useLogsSelection } from '@/features/logs/composables/useLogsSelection';
-import { useLogsTreeExpand } from '@/features/logs/composables/useLogsTreeExpand';
-import { type LogEntry } from '@/features/logs/logs.types';
+import { useLogsSelection } from '@/features/execution/logs/composables/useLogsSelection';
+import { useLogsTreeExpand } from '@/features/execution/logs/composables/useLogsTreeExpand';
+import { type LogEntry } from '@/features/execution/logs/logs.types';
 import { useLogsStore } from '@/stores/logs.store';
-import { useLogsPanelLayout } from '@/features/logs/composables/useLogsPanelLayout';
+import { useLogsPanelLayout } from '@/features/execution/logs/composables/useLogsPanelLayout';
 import { type KeyMap } from '@/composables/useKeybindings';
 import LogsViewKeyboardEventListener from './LogsViewKeyboardEventListener.vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsPanelActions.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanelActions.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsPanelActions.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanelActions.vue
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsPanelHeader.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanelHeader.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsPanelHeader.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsPanelHeader.vue
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsViewConsumedTokenCountText.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewConsumedTokenCountText.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsViewConsumedTokenCountText.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewConsumedTokenCountText.vue
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsViewExecutionSummary.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewExecutionSummary.vue
similarity index 93%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsViewExecutionSummary.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewExecutionSummary.vue
index fb036bbd35a..1c998b8fe76 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogsViewExecutionSummary.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewExecutionSummary.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import LogsViewConsumedTokenCountText from '@/features/logs/components/LogsViewConsumedTokenCountText.vue';
+import LogsViewConsumedTokenCountText from '@/features/execution/logs/components/LogsViewConsumedTokenCountText.vue';
 import { useI18n } from '@n8n/i18n';
 import { type LlmTokenUsageData } from '@/Interface';
 import { useTimestamp } from '@vueuse/core';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsViewKeyboardEventListener.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewKeyboardEventListener.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsViewKeyboardEventListener.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewKeyboardEventListener.vue
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsViewNodeName.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewNodeName.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsViewNodeName.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewNodeName.vue
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsViewRunData.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewRunData.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsViewRunData.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewRunData.test.ts
diff --git a/packages/frontend/editor-ui/src/features/logs/components/LogsViewRunData.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewRunData.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/logs/components/LogsViewRunData.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewRunData.vue
index 47a399f0a95..5924a5f3858 100644
--- a/packages/frontend/editor-ui/src/features/logs/components/LogsViewRunData.vue
+++ b/packages/frontend/editor-ui/src/features/execution/logs/components/LogsViewRunData.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import RunData from '@/components/RunData.vue';
-import { type LogEntry } from '@/features/logs/logs.types';
+import { type LogEntry } from '@/features/execution/logs/logs.types';
 import { useI18n } from '@n8n/i18n';
 import { type IRunDataDisplayMode, type NodePanelType } from '@/Interface';
 import { useNDVStore } from '@/stores/ndv.store';
-import { waitingNodeTooltip } from '@/features/executions/executions.utils';
+import { waitingNodeTooltip } from '@/features/execution/executions/executions.utils';
 import { computed, inject, ref } from 'vue';
 import { I18nT } from 'vue-i18n';
 import { PopOutWindowKey } from '@/constants';
 import { isSubNodeLog } from '../logs.utils';
 import RunDataItemCount from '@/components/RunDataItemCount.vue';
-import { type SearchShortcut } from '@/features/canvas/canvas.types';
+import { type SearchShortcut } from '@/features/workflows/canvas/canvas.types';
 import NDVEmptyState from '@/components/NDVEmptyState.vue';
 
 import { N8nLink, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/logs/components/MessageOptionAction.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/MessageOptionAction.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/MessageOptionAction.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/MessageOptionAction.vue
diff --git a/packages/frontend/editor-ui/src/features/logs/components/MessageOptionTooltip.vue b/packages/frontend/editor-ui/src/features/execution/logs/components/MessageOptionTooltip.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/components/MessageOptionTooltip.vue
rename to packages/frontend/editor-ui/src/features/execution/logs/components/MessageOptionTooltip.vue
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useChatMessaging.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useChatMessaging.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/logs/composables/useChatMessaging.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useChatMessaging.ts
index 3bbb328e3aa..88084d46444 100644
--- a/packages/frontend/editor-ui/src/features/logs/composables/useChatMessaging.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/composables/useChatMessaging.ts
@@ -17,9 +17,13 @@ import { usePinnedData } from '@/composables/usePinnedData';
 import { MODAL_CONFIRM } from '@/constants';
 import { useI18n } from '@n8n/i18n';
 import type { INodeUi } from '@/Interface';
-import type { IExecutionPushResponse } from '@/features/executions/executions.types';
+import type { IExecutionPushResponse } from '@/features/execution/executions/executions.types';
 
-import { extractBotResponse, getInputKey, processFiles } from '@/features/logs/logs.utils';
+import {
+	extractBotResponse,
+	getInputKey,
+	processFiles,
+} from '@/features/execution/logs/logs.utils';
 
 export type RunWorkflowChatPayload = {
 	triggerNode: string;
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useChatState.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useChatState.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/logs/composables/useChatState.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useChatState.ts
index 4c061f2f3a7..98256e099f2 100644
--- a/packages/frontend/editor-ui/src/features/logs/composables/useChatState.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/composables/useChatState.ts
@@ -1,5 +1,5 @@
-import type { RunWorkflowChatPayload } from '@/features/logs/composables/useChatMessaging';
-import { useChatMessaging } from '@/features/logs/composables/useChatMessaging';
+import type { RunWorkflowChatPayload } from '@/features/execution/logs/composables/useChatMessaging';
+import { useChatMessaging } from '@/features/execution/logs/composables/useChatMessaging';
 import { useI18n } from '@n8n/i18n';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
@@ -14,7 +14,7 @@ import type { InjectionKey, Ref } from 'vue';
 import { computed, provide, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { useLogsStore } from '@/stores/logs.store';
-import { restoreChatHistory } from '@/features/logs/logs.utils';
+import { restoreChatHistory } from '@/features/execution/logs/logs.utils';
 import type { INodeParameters } from 'n8n-workflow';
 import { isChatNode } from '@/utils/aiUtils';
 import { constructChatWebsocketUrl } from '@n8n/chat/utils';
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useClearExecutionButtonVisible.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useClearExecutionButtonVisible.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/logs/composables/useClearExecutionButtonVisible.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useClearExecutionButtonVisible.ts
index a077b847f96..34dad599970 100644
--- a/packages/frontend/editor-ui/src/features/logs/composables/useClearExecutionButtonVisible.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/composables/useClearExecutionButtonVisible.ts
@@ -1,5 +1,5 @@
 import { START_NODE_TYPE } from '@/constants';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { computed } from 'vue';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useLogsExecutionData.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsExecutionData.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/composables/useLogsExecutionData.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsExecutionData.test.ts
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useLogsExecutionData.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsExecutionData.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/logs/composables/useLogsExecutionData.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsExecutionData.ts
index 3498df474b7..14f77d6cd2c 100644
--- a/packages/frontend/editor-ui/src/features/logs/composables/useLogsExecutionData.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsExecutionData.ts
@@ -1,5 +1,5 @@
 import { watch, computed, ref, type ComputedRef } from 'vue';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { Workflow, type IRunExecutionData, type ITaskStartedData } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
@@ -8,7 +8,7 @@ import {
 	createLogTree,
 	findSubExecutionLocator,
 	mergeStartData,
-} from '@/features/logs/logs.utils';
+} from '@/features/execution/logs/logs.utils';
 import { parse } from 'flatted';
 import { useToast } from '@/composables/useToast';
 import type { LatestNodeInfo, LogEntry, LogTreeFilter } from '../logs.types';
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useLogsPanelLayout.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsPanelLayout.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/logs/composables/useLogsPanelLayout.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsPanelLayout.ts
index 70944df2408..bfe6b47875f 100644
--- a/packages/frontend/editor-ui/src/features/logs/composables/useLogsPanelLayout.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsPanelLayout.ts
@@ -2,13 +2,13 @@ import { computed, onBeforeUnmount, watch, type ComputedRef, type ShallowRef } f
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useLogsStore } from '@/stores/logs.store';
 import { useResizablePanel } from '@/composables/useResizablePanel';
-import { usePopOutWindow } from '@/features/logs/composables/usePopOutWindow';
+import { usePopOutWindow } from '@/features/execution/logs/composables/usePopOutWindow';
 import {
 	LOGS_PANEL_STATE,
 	LOCAL_STORAGE_OVERVIEW_PANEL_WIDTH,
 	LOCAL_STORAGE_PANEL_HEIGHT,
 	LOCAL_STORAGE_PANEL_WIDTH,
-} from '@/features/logs/logs.constants';
+} from '@/features/execution/logs/logs.constants';
 
 const INITIAL_POPUP_HEIGHT = 400;
 const COLLAPSED_PANEL_HEIGHT = 32;
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useLogsSelection.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsSelection.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/logs/composables/useLogsSelection.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsSelection.ts
index 25096090649..1148b700718 100644
--- a/packages/frontend/editor-ui/src/features/logs/composables/useLogsSelection.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsSelection.ts
@@ -1,14 +1,14 @@
-import type { LogEntry, LogEntrySelection } from '@/features/logs/logs.types';
+import type { LogEntry, LogEntrySelection } from '@/features/execution/logs/logs.types';
 import {
 	findLogEntryRec,
 	findSelectedLogEntry,
 	getDepth,
 	getEntryAtRelativeIndex,
 	isSubNodeLog,
-} from '@/features/logs/logs.utils';
+} from '@/features/execution/logs/logs.utils';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { useCanvasStore } from '@/stores/canvas.store';
 import { useLogsStore } from '@/stores/logs.store';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/useLogsTreeExpand.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsTreeExpand.ts
similarity index 89%
rename from packages/frontend/editor-ui/src/features/logs/composables/useLogsTreeExpand.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsTreeExpand.ts
index f5609695c03..eeb94df2359 100644
--- a/packages/frontend/editor-ui/src/features/logs/composables/useLogsTreeExpand.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/composables/useLogsTreeExpand.ts
@@ -1,4 +1,4 @@
-import { flattenLogEntries, hasSubExecution } from '@/features/logs/logs.utils';
+import { flattenLogEntries, hasSubExecution } from '@/features/execution/logs/logs.utils';
 import { computed, shallowRef, type Ref } from 'vue';
 import type { LogEntry } from '../logs.types';
 
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/usePopOutWindow.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/usePopOutWindow.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/composables/usePopOutWindow.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/usePopOutWindow.test.ts
diff --git a/packages/frontend/editor-ui/src/features/logs/composables/usePopOutWindow.ts b/packages/frontend/editor-ui/src/features/execution/logs/composables/usePopOutWindow.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/composables/usePopOutWindow.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/composables/usePopOutWindow.ts
diff --git a/packages/frontend/editor-ui/src/features/logs/logs.constants.ts b/packages/frontend/editor-ui/src/features/execution/logs/logs.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logs/logs.constants.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/logs.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/logs/logs.types.ts b/packages/frontend/editor-ui/src/features/execution/logs/logs.types.ts
similarity index 91%
rename from packages/frontend/editor-ui/src/features/logs/logs.types.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/logs.types.ts
index 8b46efc9df6..97a019cec86 100644
--- a/packages/frontend/editor-ui/src/features/logs/logs.types.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/logs.types.ts
@@ -1,4 +1,7 @@
-import type { LOG_DETAILS_PANEL_STATE, LOGS_PANEL_STATE } from '@/features/logs/logs.constants';
+import type {
+	LOG_DETAILS_PANEL_STATE,
+	LOGS_PANEL_STATE,
+} from '@/features/execution/logs/logs.constants';
 import type { INodeUi, LlmTokenUsageData } from '@/Interface';
 import type { IRunExecutionData, ITaskData, Workflow } from 'n8n-workflow';
 
diff --git a/packages/frontend/editor-ui/src/features/logs/logs.utils.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/logs/logs.utils.test.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/logs.utils.test.ts
index 81bb46f1132..7222d0b46c3 100644
--- a/packages/frontend/editor-ui/src/features/logs/logs.utils.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.test.ts
@@ -25,7 +25,7 @@ import {
 	createTestLogTreeCreationContext,
 } from './__test__/data';
 import type { LogEntrySelection } from './logs.types';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { createTestLogEntry } from './__test__/mocks';
 import { AGENT_NODE_TYPE, CHAT_TRIGGER_NODE_TYPE } from '@/constants';
 
diff --git a/packages/frontend/editor-ui/src/features/logs/logs.utils.ts b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/logs/logs.utils.ts
rename to packages/frontend/editor-ui/src/features/execution/logs/logs.utils.ts
index 3d7ee9f53ad..2563260bb39 100644
--- a/packages/frontend/editor-ui/src/features/logs/logs.utils.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.ts
@@ -1,5 +1,5 @@
 import type { INodeUi, LlmTokenUsageData, IWorkflowDb } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { addTokenUsageData, emptyTokenUsageData, isChatNode } from '@/utils/aiUtils';
 import {
 	NodeConnectionTypes,
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/assets/images/aws-secrets-manager.svg b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/aws-secrets-manager.svg
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/assets/images/aws-secrets-manager.svg
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/aws-secrets-manager.svg
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/assets/images/azure-key-vault.svg b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/azure-key-vault.svg
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/assets/images/azure-key-vault.svg
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/azure-key-vault.svg
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/assets/images/doppler.webp b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/doppler.webp
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/assets/images/doppler.webp
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/doppler.webp
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/assets/images/gcp-secrets-manager.svg b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/gcp-secrets-manager.svg
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/assets/images/gcp-secrets-manager.svg
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/gcp-secrets-manager.svg
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/assets/images/hashicorp.webp b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/hashicorp.webp
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/assets/images/hashicorp.webp
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/hashicorp.webp
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/assets/images/infisical.webp b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/infisical.webp
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/assets/images/infisical.webp
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/assets/images/infisical.webp
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderCard.ee.vue b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderCard.ee.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderCard.ee.vue
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderCard.ee.vue
index ed1d16dae42..d71d1d3a2cf 100644
--- a/packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderCard.ee.vue
+++ b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderCard.ee.vue
@@ -6,7 +6,7 @@ import { useExternalSecretsStore } from '../externalSecrets.ee.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@n8n/i18n';
-import { useExternalSecretsProvider } from '@/features/externalSecrets/composables/useExternalSecretsProvider';
+import { useExternalSecretsProvider } from '@/features/integrations/externalSecrets.ee/composables/useExternalSecretsProvider';
 import { EXTERNAL_SECRETS_PROVIDER_MODAL_KEY } from '@/constants';
 import { DateTime } from 'luxon';
 import { computed, nextTick, onMounted, toRef } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderConnectionSwitch.ee.vue b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderConnectionSwitch.ee.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderConnectionSwitch.ee.vue
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderConnectionSwitch.ee.vue
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderImage.ee.vue b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderImage.ee.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderImage.ee.vue
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderImage.ee.vue
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderModal.ee.vue b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderModal.ee.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderModal.ee.vue
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderModal.ee.vue
index 2a91fa05742..87310aae5de 100644
--- a/packages/frontend/editor-ui/src/features/externalSecrets/components/ExternalSecretsProviderModal.ee.vue
+++ b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/components/ExternalSecretsProviderModal.ee.vue
@@ -3,7 +3,7 @@ import Modal from '@/components/Modal.vue';
 import { EXTERNAL_SECRETS_PROVIDER_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import { computed, onMounted, ref } from 'vue';
 import type { EventBus } from '@n8n/utils/event-bus';
-import { useExternalSecretsProvider } from '@/features/externalSecrets/composables/useExternalSecretsProvider';
+import { useExternalSecretsProvider } from '@/features/integrations/externalSecrets.ee/composables/useExternalSecretsProvider';
 import { useI18n } from '@n8n/i18n';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/composables/useExternalSecretsProvider.ts b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/composables/useExternalSecretsProvider.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/externalSecrets/composables/useExternalSecretsProvider.ts
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/composables/useExternalSecretsProvider.ts
index 99517fe149c..3aafca6594a 100644
--- a/packages/frontend/editor-ui/src/features/externalSecrets/composables/useExternalSecretsProvider.ts
+++ b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/composables/useExternalSecretsProvider.ts
@@ -7,7 +7,7 @@ import type {
 } from '../externalSecrets.types';
 import type { ComputedRef, Ref } from 'vue';
 import { computed, ref } from 'vue';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 import { useToast } from '@/composables/useToast';
 
 export function useExternalSecretsProvider(
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/externalSecrets.ee.store.ts b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/externalSecrets.ee.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/externalSecrets.ee.store.ts
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/externalSecrets.ee.store.ts
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/externalSecrets.types.ts b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/externalSecrets.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/externalSecrets.types.ts
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/externalSecrets.types.ts
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/views/SettingsExternalSecrets.test.ts b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/views/SettingsExternalSecrets.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/views/SettingsExternalSecrets.test.ts
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/views/SettingsExternalSecrets.test.ts
diff --git a/packages/frontend/editor-ui/src/features/externalSecrets/views/SettingsExternalSecrets.vue b/packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/views/SettingsExternalSecrets.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/externalSecrets/views/SettingsExternalSecrets.vue
rename to packages/frontend/editor-ui/src/features/integrations/externalSecrets.ee/views/SettingsExternalSecrets.vue
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventDestinationCard.vue b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventDestinationCard.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventDestinationCard.vue
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventDestinationCard.vue
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventDestinationSettingsModal.vue b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventDestinationSettingsModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventDestinationSettingsModal.vue
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventDestinationSettingsModal.vue
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventSelection.spec.ts b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventSelection.spec.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventSelection.spec.ts
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventSelection.spec.ts
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventSelection.vue b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventSelection.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/components/EventSelection.vue
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/components/EventSelection.vue
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.constants.ts b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.constants.ts
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.store.test.ts b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.store.test.ts
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.store.ts b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.store.ts
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.store.ts
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.utils.ts b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/logStreaming.utils.ts
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/logStreaming.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/logStreaming.ee/views/SettingsLogStreamingView.vue b/packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/views/SettingsLogStreamingView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/logStreaming.ee/views/SettingsLogStreamingView.vue
rename to packages/frontend/editor-ui/src/features/integrations/logStreaming.ee/views/SettingsLogStreamingView.vue
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlInitializationErrorMessage.vue b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlInitializationErrorMessage.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlInitializationErrorMessage.vue
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlInitializationErrorMessage.vue
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPullModal.test.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPullModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPullModal.test.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPullModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPullModal.vue b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPullModal.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPullModal.vue
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPullModal.vue
index df677e69d42..e9805b9e87c 100644
--- a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPullModal.vue
+++ b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPullModal.vue
@@ -5,10 +5,10 @@ import { useToast } from '@/composables/useToast';
 import { VIEWS } from '@/constants';
 import { SOURCE_CONTROL_PULL_MODAL_KEY } from '../sourceControl.constants';
 import { sourceControlEventBus } from '../sourceControl.eventBus';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useSourceControlStore } from '../sourceControl.store';
-import type { ProjectListItem } from '@/features/projects/projects.types';
+import type { ProjectListItem } from '@/features/collaboration/projects/projects.types';
 import {
 	getPullPriorityByStatus,
 	getStatusText,
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPushModal.test.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPushModal.test.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.test.ts
index 7b8fceeeb56..970b5caeba7 100644
--- a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPushModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.test.ts
@@ -9,8 +9,8 @@ import { useSourceControlStore } from '../sourceControl.store';
 import { mockedStore } from '@/__tests__/utils';
 import { VIEWS } from '@/constants';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectListItem } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import type { ProjectListItem } from '@/features/collaboration/projects/projects.types';
 import { reactive } from 'vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { defaultSettings } from '@/__tests__/defaults';
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPushModal.vue b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPushModal.vue
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue
index b23ac9a55a0..96200bfa6d0 100644
--- a/packages/frontend/editor-ui/src/features/sourceControl.ee/components/SourceControlPushModal.vue
+++ b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue
@@ -1,17 +1,20 @@
 <script lang="ts" setup>
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import ProjectCardBadge from '@/features/collaboration/projects/components/ProjectCardBadge.vue';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { VIEWS } from '@/constants';
 import { SOURCE_CONTROL_PUSH_MODAL_KEY } from '../sourceControl.constants';
 import type { WorkflowResource } from '@/Interface';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useSourceControlStore } from '../sourceControl.store';
-import { useUsersStore } from '@/features/users/users.store';
-import type { ProjectListItem, ProjectSharingData } from '@/features/projects/projects.types';
-import { ResourceType } from '@/features/projects/projects.utils';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import type {
+	ProjectListItem,
+	ProjectSharingData,
+} from '@/features/collaboration/projects/projects.types';
+import { ResourceType } from '@/features/collaboration/projects/projects.utils';
 import { getPushPriorityByStatus, getStatusText, getStatusTheme } from '../sourceControl.utils';
 import type { SourceControlledFile } from '@n8n/api-types';
 import {
@@ -30,7 +33,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller';
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
 import Modal from '@/components/Modal.vue';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import ProjectSharing from '@/features/collaboration/projects/components/ProjectSharing.vue';
 import {
 	N8nBadge,
 	N8nButton,
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.api.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.api.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.api.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.constants.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.constants.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.eventBus.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.eventBus.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.eventBus.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.eventBus.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.store.test.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.store.test.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.store.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.store.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.store.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.types.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.types.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.types.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.utils.test.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.utils.test.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.utils.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/sourceControl.utils.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/sourceControl.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/views/SettingsSourceControl.test.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/views/SettingsSourceControl.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/views/SettingsSourceControl.test.ts
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/views/SettingsSourceControl.test.ts
diff --git a/packages/frontend/editor-ui/src/features/sourceControl.ee/views/SettingsSourceControl.vue b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/views/SettingsSourceControl.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sourceControl.ee/views/SettingsSourceControl.vue
rename to packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/views/SettingsSourceControl.vue
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/apiKeys.constants.ts b/packages/frontend/editor-ui/src/features/settings/apiKeys/apiKeys.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/apiKeys.constants.ts
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/apiKeys.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/apiKeys.store.ts b/packages/frontend/editor-ui/src/features/settings/apiKeys/apiKeys.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/apiKeys.store.ts
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/apiKeys.store.ts
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyCard.vue b/packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyCard.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyCard.vue
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyCard.vue
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyCreateOrEditModal.test.ts b/packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyCreateOrEditModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyCreateOrEditModal.test.ts
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyCreateOrEditModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyCreateOrEditModal.vue b/packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyCreateOrEditModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyCreateOrEditModal.vue
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyCreateOrEditModal.vue
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyScopes.vue b/packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyScopes.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/components/ApiKeyScopes.vue
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/components/ApiKeyScopes.vue
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/views/SettingsApiView.test.ts b/packages/frontend/editor-ui/src/features/settings/apiKeys/views/SettingsApiView.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/views/SettingsApiView.test.ts
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/views/SettingsApiView.test.ts
diff --git a/packages/frontend/editor-ui/src/features/apiKeys/views/SettingsApiView.vue b/packages/frontend/editor-ui/src/features/settings/apiKeys/views/SettingsApiView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/apiKeys/views/SettingsApiView.vue
rename to packages/frontend/editor-ui/src/features/settings/apiKeys/views/SettingsApiView.vue
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/communityNodes.constants.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/communityNodes.constants.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/communityNodes.store.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/communityNodes.store.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.store.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/communityNodes.types.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/communityNodes.types.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.types.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/communityNodes.utils.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/communityNodes.utils.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/communityNodes.utils.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/communityNodes.utils.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/communityNodes.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageCard.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageCard.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageCard.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageCard.test.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageCard.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageCard.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageCard.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageCard.vue
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageInstallModal.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageInstallModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageInstallModal.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageInstallModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageInstallModal.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageInstallModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageInstallModal.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageInstallModal.vue
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageManageConfirmModal.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageManageConfirmModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageManageConfirmModal.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageManageConfirmModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageManageConfirmModal.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageManageConfirmModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/CommunityPackageManageConfirmModal.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/CommunityPackageManageConfirmModal.vue
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/ContactAdministratorToInstall.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/ContactAdministratorToInstall.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/ContactAdministratorToInstall.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/ContactAdministratorToInstall.vue
index 4d4b98de08d..2ad269a3f98 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/components/ContactAdministratorToInstall.vue
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/ContactAdministratorToInstall.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { N8nIcon, N8nText } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
 import { computed, useCssModule } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/NodesInWorkflowTable.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/NodesInWorkflowTable.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/NodesInWorkflowTable.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/NodesInWorkflowTable.test.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/NodesInWorkflowTable.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/NodesInWorkflowTable.vue
similarity index 92%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/NodesInWorkflowTable.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/NodesInWorkflowTable.vue
index f448545be11..e32b1729101 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/components/NodesInWorkflowTable.vue
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/NodesInWorkflowTable.vue
@@ -4,10 +4,10 @@ import type { TableHeader } from '@n8n/design-system/components/N8nDataTableServ
 import type { RouteLocationRaw } from 'vue-router';
 import { VIEWS } from '@/constants';
 import type { WorkflowResource } from '@/Interface';
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import ProjectCardBadge from '@/features/collaboration/projects/components/ProjectCardBadge.vue';
 import { useI18n } from '@n8n/i18n';
-import { ResourceType } from '@/features/projects/projects.utils';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { ResourceType } from '@/features/collaboration/projects/projects.utils';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 import { N8nDataTableServer, N8nText } from '@n8n/design-system';
 type WorkflowData = WorkflowResource[];
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDetails.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDetails.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDetails.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDetails.test.ts
index a83b22cacc9..d0dae4121db 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDetails.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDetails.test.ts
@@ -67,7 +67,7 @@ vi.mock('../../communityNodes.store', () => ({
 	})),
 }));
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(() => usersStore),
 }));
 
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDetails.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDetails.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDetails.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDetails.vue
index 7ec26144b46..80137903016 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDetails.vue
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDetails.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { useInstallNode } from '@/features/communityNodes/composables/useInstallNode';
+import { useInstallNode } from '@/features/settings/communityNodes/composables/useInstallNode';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { getNodeIconSource } from '@/utils/nodeIcon';
 import { N8nButton, N8nIcon, N8nText, N8nTooltip } from '@n8n/design-system';
 import { i18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDocsLink.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDocsLink.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeDocsLink.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeDocsLink.vue
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeFooter.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeFooter.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeFooter.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeFooter.test.ts
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeFooter.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeFooter.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeFooter.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeFooter.vue
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInfo.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInfo.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.test.ts
index df28334fb24..cbc3965b89e 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInfo.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.test.ts
@@ -38,7 +38,7 @@ vi.mock('@/stores/nodeTypes.store', () => ({
 	})),
 }));
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(() => ({
 		isInstanceOwner: true,
 	})),
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInfo.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInfo.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.vue
index 3318ced8246..0baf7058572 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInfo.vue
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInfo.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
 import { useViewStacks } from '@/components/Node/NodeCreator/composables/useViewStacks';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { i18n } from '@n8n/i18n';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { captureException } from '@sentry/vue';
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue
similarity index 91%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue
index 0fc56e83303..6e9be2f48d5 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeInstallHint.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed } from 'vue';
 
 import { N8nIcon, N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeUpdateInfo.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeUpdateInfo.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/components/nodeCreator/CommunityNodeUpdateInfo.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/components/nodeCreator/CommunityNodeUpdateInfo.vue
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstallNode.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstallNode.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/communityNodes/composables/useInstallNode.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstallNode.test.ts
index 0eb1a0ab7ca..6f0aa85a86b 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstallNode.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstallNode.test.ts
@@ -3,7 +3,7 @@ import type { IWorkflowDb } from '@/Interface';
 import { useCommunityNodesStore } from '../communityNodes.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { CommunityNodeType } from '@n8n/api-types';
 import { createTestingPinia } from '@pinia/testing';
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstallNode.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstallNode.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/communityNodes/composables/useInstallNode.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstallNode.ts
index 07ea96edc1d..47957be149c 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstallNode.ts
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstallNode.ts
@@ -1,7 +1,7 @@
 import { useCommunityNodesStore } from '../communityNodes.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed, nextTick, ref } from 'vue';
 import { i18n } from '@n8n/i18n';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstalledCommunityPackage.test.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstalledCommunityPackage.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/communityNodes/composables/useInstalledCommunityPackage.test.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstalledCommunityPackage.test.ts
index 21217bbe00e..885744fabf9 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstalledCommunityPackage.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstalledCommunityPackage.test.ts
@@ -6,7 +6,7 @@ import { mockedStore } from '@/__tests__/utils';
 
 import { useInstalledCommunityPackage } from './useInstalledCommunityPackage';
 import { useCommunityNodesStore } from '../communityNodes.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { ExtendedPublicInstalledPackage } from '../communityNodes.utils';
 import type * as n8nWorkflow from 'n8n-workflow';
 
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstalledCommunityPackage.ts b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstalledCommunityPackage.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/communityNodes/composables/useInstalledCommunityPackage.ts
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstalledCommunityPackage.ts
index ed4c79bf849..9fafed624f2 100644
--- a/packages/frontend/editor-ui/src/features/communityNodes/composables/useInstalledCommunityPackage.ts
+++ b/packages/frontend/editor-ui/src/features/settings/communityNodes/composables/useInstalledCommunityPackage.ts
@@ -1,5 +1,5 @@
 import { useCommunityNodesStore } from '../communityNodes.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { isCommunityPackageName } from 'n8n-workflow';
 import {
 	type ExtendedPublicInstalledPackage,
diff --git a/packages/frontend/editor-ui/src/features/communityNodes/views/SettingsCommunityNodesView.vue b/packages/frontend/editor-ui/src/features/settings/communityNodes/views/SettingsCommunityNodesView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/communityNodes/views/SettingsCommunityNodesView.vue
rename to packages/frontend/editor-ui/src/features/settings/communityNodes/views/SettingsCommunityNodesView.vue
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/completions/variables.completions.test.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/completions/variables.completions.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/completions/variables.completions.test.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/completions/variables.completions.test.ts
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/completions/variables.completions.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/completions/variables.completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/completions/variables.completions.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/completions/variables.completions.ts
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/components/VariableModal.test.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariableModal.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/environments.ee/components/VariableModal.test.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariableModal.test.ts
index 9c1403c0ae0..d425d855fd1 100644
--- a/packages/frontend/editor-ui/src/features/environments.ee/components/VariableModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariableModal.test.ts
@@ -8,7 +8,7 @@ import userEvent from '@testing-library/user-event';
 import { useUIStore } from '@/stores/ui.store';
 import useEnvironmentsStore from '../environments.store';
 import type { EnvironmentVariable } from '../environments.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 vi.mock('vue-router', () => ({
 	useRouter: () => ({
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/components/VariableModal.vue b/packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariableModal.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/environments.ee/components/VariableModal.vue
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariableModal.vue
index 2d0fc76762f..84cec6eee97 100644
--- a/packages/frontend/editor-ui/src/features/environments.ee/components/VariableModal.vue
+++ b/packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariableModal.vue
@@ -18,7 +18,7 @@ import {
 import type { Rule, RuleGroup } from '@/Interface';
 import type { EnvironmentVariable } from '../environments.types';
 import { useEnvironmentsStore } from '../environments.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useI18n } from '@n8n/i18n';
 import type { IconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
 
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/components/VariablesForm.vue b/packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariablesForm.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/components/VariablesForm.vue
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariablesForm.vue
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/components/VariablesUsageBadge.test.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariablesUsageBadge.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/components/VariablesUsageBadge.test.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariablesUsageBadge.test.ts
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/components/VariablesUsageBadge.vue b/packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariablesUsageBadge.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/components/VariablesUsageBadge.vue
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/components/VariablesUsageBadge.vue
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/environments.api.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/environments.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/environments.api.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/environments.api.ts
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/environments.constants.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/environments.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/environments.constants.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/environments.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/environments.store.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/environments.store.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/environments.ee/environments.store.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/environments.store.ts
index 57960d1501b..eb387a501b0 100644
--- a/packages/frontend/editor-ui/src/features/environments.ee/environments.store.ts
+++ b/packages/frontend/editor-ui/src/features/settings/environments.ee/environments.store.ts
@@ -8,7 +8,7 @@ import type {
 import * as environmentsApi from './environments.api';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { ExpressionError } from 'n8n-workflow';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 export const useEnvironmentsStore = defineStore('environments', () => {
 	const rootStore = useRootStore();
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/environments.test.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/environments.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/environments.ee/environments.test.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/environments.test.ts
index b786210d31f..de9ed7d63d2 100644
--- a/packages/frontend/editor-ui/src/features/environments.ee/environments.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/environments.ee/environments.test.ts
@@ -3,8 +3,8 @@ import { setActivePinia, createPinia } from 'pinia';
 import { setupServer } from '@/__tests__/server';
 import { useEnvironmentsStore } from './environments.store';
 import type { EnvironmentVariable } from './environments.types';
-import type { Project } from '@/features/projects/projects.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import type { Project } from '@/features/collaboration/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 describe('environments.store', () => {
 	let server: ReturnType<typeof setupServer>;
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/environments.types.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/environments.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/environments.ee/environments.types.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/environments.types.ts
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/views/VariablesView.test.ts b/packages/frontend/editor-ui/src/features/settings/environments.ee/views/VariablesView.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/environments.ee/views/VariablesView.test.ts
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/views/VariablesView.test.ts
index 8ca6a8ea3d4..56920ae336f 100644
--- a/packages/frontend/editor-ui/src/features/environments.ee/views/VariablesView.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/environments.ee/views/VariablesView.test.ts
@@ -1,6 +1,6 @@
 import VariablesView from './VariablesView.vue';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useRBACStore } from '@/stores/rbac.store';
 import { useEnvironmentsStore } from '../environments.store';
 import { createComponentRenderer } from '@/__tests__/render';
diff --git a/packages/frontend/editor-ui/src/features/environments.ee/views/VariablesView.vue b/packages/frontend/editor-ui/src/features/settings/environments.ee/views/VariablesView.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/environments.ee/views/VariablesView.vue
rename to packages/frontend/editor-ui/src/features/settings/environments.ee/views/VariablesView.vue
index 6c762cec2f7..e86c11eb54f 100644
--- a/packages/frontend/editor-ui/src/features/environments.ee/views/VariablesView.vue
+++ b/packages/frontend/editor-ui/src/features/settings/environments.ee/views/VariablesView.vue
@@ -8,9 +8,9 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useEnvironmentsStore } from '../environments.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { useRoute, useRouter, type LocationQueryRaw } from 'vue-router';
 
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerAccordion.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerAccordion.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerAccordion.vue
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerAccordion.vue
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerCard.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerCard.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerCard.vue
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerCard.vue
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerChartsAccordion.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerChartsAccordion.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerChartsAccordion.vue
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerChartsAccordion.vue
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerJobAccordion.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerJobAccordion.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerJobAccordion.vue
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerJobAccordion.vue
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerList.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerList.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerList.vue
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerList.vue
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerNetAccordion.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerNetAccordion.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/components/WorkerNetAccordion.vue
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerNetAccordion.vue
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/orchestration.store.ts b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/orchestration.store.ts
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.store.ts
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/orchestration.utils.ts b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/orchestration.utils.ts
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/orchestration.ee/views/WorkerView.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/views/WorkerView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/orchestration.ee/views/WorkerView.vue
rename to packages/frontend/editor-ui/src/features/settings/orchestration.ee/views/WorkerView.vue
diff --git a/packages/frontend/editor-ui/src/features/sso/components/SSOLogin.test.ts b/packages/frontend/editor-ui/src/features/settings/sso/components/SSOLogin.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sso/components/SSOLogin.test.ts
rename to packages/frontend/editor-ui/src/features/settings/sso/components/SSOLogin.test.ts
diff --git a/packages/frontend/editor-ui/src/features/sso/components/SSOLogin.vue b/packages/frontend/editor-ui/src/features/settings/sso/components/SSOLogin.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sso/components/SSOLogin.vue
rename to packages/frontend/editor-ui/src/features/settings/sso/components/SSOLogin.vue
diff --git a/packages/frontend/editor-ui/src/features/sso/sso.store.ts b/packages/frontend/editor-ui/src/features/settings/sso/sso.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sso/sso.store.ts
rename to packages/frontend/editor-ui/src/features/settings/sso/sso.store.ts
diff --git a/packages/frontend/editor-ui/src/features/sso/sso.test.ts b/packages/frontend/editor-ui/src/features/settings/sso/sso.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/sso/sso.test.ts
rename to packages/frontend/editor-ui/src/features/settings/sso/sso.test.ts
index 446422d3420..9c180069aa7 100644
--- a/packages/frontend/editor-ui/src/features/sso/sso.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/sso/sso.test.ts
@@ -1,5 +1,5 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useSSOStore, SupportedProtocols } from '@/features/sso/sso.store';
+import { useSSOStore, SupportedProtocols } from '@/features/settings/sso/sso.store';
 import type { UserManagementAuthenticationMethod } from '@/Interface';
 
 let ssoStore: ReturnType<typeof useSSOStore>;
diff --git a/packages/frontend/editor-ui/src/features/sso/views/SamlOnboarding.test.ts b/packages/frontend/editor-ui/src/features/settings/sso/views/SamlOnboarding.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/sso/views/SamlOnboarding.test.ts
rename to packages/frontend/editor-ui/src/features/settings/sso/views/SamlOnboarding.test.ts
index 5bc81f6bf5c..c04d918ff67 100644
--- a/packages/frontend/editor-ui/src/features/sso/views/SamlOnboarding.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/sso/views/SamlOnboarding.test.ts
@@ -6,7 +6,7 @@ import SamlOnboarding from './SamlOnboarding.vue';
 import { STORES } from '@n8n/stores';
 import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
 import { createComponentRenderer } from '@/__tests__/render';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 vi.mock('vue-router', () => {
 	const push = vi.fn();
diff --git a/packages/frontend/editor-ui/src/features/sso/views/SamlOnboarding.vue b/packages/frontend/editor-ui/src/features/settings/sso/views/SamlOnboarding.vue
similarity index 92%
rename from packages/frontend/editor-ui/src/features/sso/views/SamlOnboarding.vue
rename to packages/frontend/editor-ui/src/features/settings/sso/views/SamlOnboarding.vue
index 1473f7e1382..7bee52d4482 100644
--- a/packages/frontend/editor-ui/src/features/sso/views/SamlOnboarding.vue
+++ b/packages/frontend/editor-ui/src/features/settings/sso/views/SamlOnboarding.vue
@@ -2,11 +2,11 @@
 import { reactive, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import type { IFormBoxConfig } from '@n8n/design-system';
-import AuthView from '@/features/auth/views/AuthView.vue';
+import AuthView from '@/features/core/auth/views/AuthView.vue';
 import { VIEWS } from '@/constants';
 import { useI18n } from '@n8n/i18n';
 import { useToast } from '@/composables/useToast';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 const router = useRouter();
 const locale = useI18n();
diff --git a/packages/frontend/editor-ui/src/features/sso/views/SettingsLdapView.vue b/packages/frontend/editor-ui/src/features/settings/sso/views/SettingsLdapView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sso/views/SettingsLdapView.vue
rename to packages/frontend/editor-ui/src/features/settings/sso/views/SettingsLdapView.vue
diff --git a/packages/frontend/editor-ui/src/features/sso/views/SettingsSso.test.ts b/packages/frontend/editor-ui/src/features/settings/sso/views/SettingsSso.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sso/views/SettingsSso.test.ts
rename to packages/frontend/editor-ui/src/features/settings/sso/views/SettingsSso.test.ts
diff --git a/packages/frontend/editor-ui/src/features/sso/views/SettingsSso.vue b/packages/frontend/editor-ui/src/features/settings/sso/views/SettingsSso.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/sso/views/SettingsSso.vue
rename to packages/frontend/editor-ui/src/features/settings/sso/views/SettingsSso.vue
diff --git a/packages/frontend/editor-ui/src/features/usage/components/CommunityPlusEnrollmentModal.test.ts b/packages/frontend/editor-ui/src/features/settings/usage/components/CommunityPlusEnrollmentModal.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/usage/components/CommunityPlusEnrollmentModal.test.ts
rename to packages/frontend/editor-ui/src/features/settings/usage/components/CommunityPlusEnrollmentModal.test.ts
index 5404bdee6ae..96888d32f13 100644
--- a/packages/frontend/editor-ui/src/features/usage/components/CommunityPlusEnrollmentModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/usage/components/CommunityPlusEnrollmentModal.test.ts
@@ -7,7 +7,7 @@ import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '../usage.constants';
 import { useUsageStore } from '../usage.store';
 import { useToast } from '@/composables/useToast';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 vi.mock('@/composables/useToast', () => {
 	const showMessage = vi.fn();
diff --git a/packages/frontend/editor-ui/src/features/usage/components/CommunityPlusEnrollmentModal.vue b/packages/frontend/editor-ui/src/features/settings/usage/components/CommunityPlusEnrollmentModal.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/usage/components/CommunityPlusEnrollmentModal.vue
rename to packages/frontend/editor-ui/src/features/settings/usage/components/CommunityPlusEnrollmentModal.vue
index a7173192f54..6b8204c3e5b 100644
--- a/packages/frontend/editor-ui/src/features/usage/components/CommunityPlusEnrollmentModal.vue
+++ b/packages/frontend/editor-ui/src/features/settings/usage/components/CommunityPlusEnrollmentModal.vue
@@ -9,7 +9,7 @@ import { useI18n } from '@n8n/i18n';
 import { useToast } from '@/composables/useToast';
 import { useUsageStore } from '../usage.store';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 
 import { N8nButton, N8nFormInput, N8nText } from '@n8n/design-system';
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/features/usage/usage.constants.ts b/packages/frontend/editor-ui/src/features/settings/usage/usage.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/usage/usage.constants.ts
rename to packages/frontend/editor-ui/src/features/settings/usage/usage.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/usage/usage.store.ts b/packages/frontend/editor-ui/src/features/settings/usage/usage.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/usage/usage.store.ts
rename to packages/frontend/editor-ui/src/features/settings/usage/usage.store.ts
diff --git a/packages/frontend/editor-ui/src/features/usage/usage.test.ts b/packages/frontend/editor-ui/src/features/settings/usage/usage.test.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/usage/usage.test.ts
rename to packages/frontend/editor-ui/src/features/settings/usage/usage.test.ts
index 8083be2bcf4..416b94c6218 100644
--- a/packages/frontend/editor-ui/src/features/usage/usage.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/usage/usage.test.ts
@@ -1,5 +1,5 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useUsageStore } from '@/features/usage/usage.store';
+import { useUsageStore } from '@/features/settings/usage/usage.store';
 
 describe('Usage and plan store', () => {
 	beforeEach(() => {
diff --git a/packages/frontend/editor-ui/src/features/usage/views/SettingsUsageAndPlan.test.ts b/packages/frontend/editor-ui/src/features/settings/usage/views/SettingsUsageAndPlan.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/usage/views/SettingsUsageAndPlan.test.ts
rename to packages/frontend/editor-ui/src/features/settings/usage/views/SettingsUsageAndPlan.test.ts
index da5e6af8686..4ccc29d68b9 100644
--- a/packages/frontend/editor-ui/src/features/usage/views/SettingsUsageAndPlan.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/usage/views/SettingsUsageAndPlan.test.ts
@@ -6,7 +6,7 @@ import { useUsageStore } from '../usage.store';
 import SettingsUsageAndPlan from './SettingsUsageAndPlan.vue';
 import { useUIStore } from '@/stores/ui.store';
 import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '../usage.constants';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { IUser } from '@n8n/rest-api-client/api/users';
 
 vi.mock('vue-router', () => {
diff --git a/packages/frontend/editor-ui/src/features/usage/views/SettingsUsageAndPlan.vue b/packages/frontend/editor-ui/src/features/settings/usage/views/SettingsUsageAndPlan.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/usage/views/SettingsUsageAndPlan.vue
rename to packages/frontend/editor-ui/src/features/settings/usage/views/SettingsUsageAndPlan.vue
index 402d010f95e..f74e490f81d 100644
--- a/packages/frontend/editor-ui/src/features/usage/views/SettingsUsageAndPlan.vue
+++ b/packages/frontend/editor-ui/src/features/settings/usage/views/SettingsUsageAndPlan.vue
@@ -10,7 +10,7 @@ import { useToast } from '@/composables/useToast';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { hasPermission } from '@/utils/rbac/permissions';
 import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '../usage.constants';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { getResourcePermissions } from '@n8n/permissions';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { I18nT } from 'vue-i18n';
diff --git a/packages/frontend/editor-ui/src/features/users/components/DeleteUserModal.test.ts b/packages/frontend/editor-ui/src/features/settings/users/components/DeleteUserModal.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/users/components/DeleteUserModal.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/components/DeleteUserModal.test.ts
index 957cb780c18..b7bf690d34d 100644
--- a/packages/frontend/editor-ui/src/features/users/components/DeleteUserModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/users/components/DeleteUserModal.test.ts
@@ -3,10 +3,10 @@ import { type MockedStore, mockedStore } from '@/__tests__/utils';
 import DeleteUserModal from './DeleteUserModal.vue';
 import { createTestingPinia } from '@pinia/testing';
 import { getDropdownItems } from '@/__tests__/utils';
-import { createProjectListItem } from '@/features/projects/__tests__/utils';
+import { createProjectListItem } from '@/features/collaboration/projects/__tests__/utils';
 import { DELETE_USER_MODAL_KEY } from '../users.constants';
 import { STORES } from '@n8n/stores';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import userEvent from '@testing-library/user-event';
 import { useUsersStore } from '../users.store';
 import { ROLE, type UsersList, type User } from '@n8n/api-types';
diff --git a/packages/frontend/editor-ui/src/features/users/components/DeleteUserModal.vue b/packages/frontend/editor-ui/src/features/settings/users/components/DeleteUserModal.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/users/components/DeleteUserModal.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/DeleteUserModal.vue
index 76d0be96a22..79aa0441aae 100644
--- a/packages/frontend/editor-ui/src/features/users/components/DeleteUserModal.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/components/DeleteUserModal.vue
@@ -2,11 +2,11 @@
 import { ref, computed, onBeforeMount } from 'vue';
 import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import ProjectSharing from '@/features/collaboration/projects/components/ProjectSharing.vue';
 import { useUsersStore } from '../users.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { createEventBus } from '@n8n/utils/event-bus';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import { useI18n } from '@n8n/i18n';
 
 import { ElRadio } from 'element-plus';
diff --git a/packages/frontend/editor-ui/src/features/users/components/InviteUsersModal.vue b/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/InviteUsersModal.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
diff --git a/packages/frontend/editor-ui/src/features/users/components/PersonalizationModal.test.ts b/packages/frontend/editor-ui/src/features/settings/users/components/PersonalizationModal.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/PersonalizationModal.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/components/PersonalizationModal.test.ts
diff --git a/packages/frontend/editor-ui/src/features/users/components/PersonalizationModal.vue b/packages/frontend/editor-ui/src/features/settings/users/components/PersonalizationModal.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/users/components/PersonalizationModal.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/PersonalizationModal.vue
index 501217f9eff..6b75f470a83 100644
--- a/packages/frontend/editor-ui/src/features/users/components/PersonalizationModal.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/components/PersonalizationModal.vue
@@ -80,7 +80,7 @@ import {
 	REPORTED_SOURCE_OTHER,
 	REPORTED_SOURCE_OTHER_KEY,
 } from '../users.constants';
-import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/usage/usage.constants';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/settings/usage/usage.constants';
 import { useToast } from '@/composables/useToast';
 import Modal from '@/components/Modal.vue';
 import type { IFormInputs } from '@/Interface';
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersActionsCell.test.ts b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersActionsCell.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersActionsCell.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersActionsCell.test.ts
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersActionsCell.vue b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersActionsCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersActionsCell.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersActionsCell.vue
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersLastActiveCell.vue b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersLastActiveCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersLastActiveCell.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersLastActiveCell.vue
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersProjectsCell.test.ts b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersProjectsCell.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersProjectsCell.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersProjectsCell.test.ts
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersProjectsCell.vue b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersProjectsCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersProjectsCell.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersProjectsCell.vue
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersRoleCell.test.ts b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersRoleCell.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.test.ts
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersRoleCell.vue b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersRoleCell.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.vue
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersTable.test.ts b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersTable.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.test.ts
diff --git a/packages/frontend/editor-ui/src/features/users/components/SettingsUsersTable.vue b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/components/SettingsUsersTable.vue
rename to packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.vue
diff --git a/packages/frontend/editor-ui/src/features/users/invitation.api.ts b/packages/frontend/editor-ui/src/features/settings/users/invitation.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/invitation.api.ts
rename to packages/frontend/editor-ui/src/features/settings/users/invitation.api.ts
diff --git a/packages/frontend/editor-ui/src/features/users/users.constants.ts b/packages/frontend/editor-ui/src/features/settings/users/users.constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/users.constants.ts
rename to packages/frontend/editor-ui/src/features/settings/users/users.constants.ts
diff --git a/packages/frontend/editor-ui/src/features/users/users.store.test.ts b/packages/frontend/editor-ui/src/features/settings/users/users.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/users.store.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/users.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/users/users.store.ts b/packages/frontend/editor-ui/src/features/settings/users/users.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/users.store.ts
rename to packages/frontend/editor-ui/src/features/settings/users/users.store.ts
diff --git a/packages/frontend/editor-ui/src/features/users/users.types.ts b/packages/frontend/editor-ui/src/features/settings/users/users.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/users.types.ts
rename to packages/frontend/editor-ui/src/features/settings/users/users.types.ts
diff --git a/packages/frontend/editor-ui/src/features/users/users.utils.ts b/packages/frontend/editor-ui/src/features/settings/users/users.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/users/users.utils.ts
rename to packages/frontend/editor-ui/src/features/settings/users/users.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/users/views/SettingsUsersView.test.ts b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/users/views/SettingsUsersView.test.ts
rename to packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.test.ts
index 4820d4275e5..c81c9f43c0c 100644
--- a/packages/frontend/editor-ui/src/features/users/views/SettingsUsersView.test.ts
+++ b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.test.ts
@@ -14,7 +14,7 @@ import { mockedStore, type MockedStore } from '@/__tests__/utils';
 import { useUsersStore } from '../users.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 import * as permissions from '@/utils/rbac/permissions';
 
 const { emitters, addEmitter } = useEmitters<'settingsUsersTable'>();
diff --git a/packages/frontend/editor-ui/src/features/users/views/SettingsUsersView.vue b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/users/views/SettingsUsersView.vue
rename to packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
index 779fce8e027..11ba6ea4ffa 100644
--- a/packages/frontend/editor-ui/src/features/users/views/SettingsUsersView.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
@@ -19,7 +19,7 @@ import { useToast } from '@/composables/useToast';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '../users.store';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 import { hasPermission } from '@/utils/rbac/permissions';
 import { useClipboard } from '@/composables/useClipboard';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/components/CommandBarItemTitle.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/components/CommandBarItemTitle.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/components/CommandBarItemTitle.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/components/CommandBarItemTitle.test.ts
index 6a6027b0648..fba9ad0ca6e 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/components/CommandBarItemTitle.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/components/CommandBarItemTitle.test.ts
@@ -1,8 +1,8 @@
 import { describe, it, expect, vi } from 'vitest';
 import { createComponentRenderer } from '@/__tests__/render';
-import CommandBarItemTitle from '@/features/ui/commandBar/components/CommandBarItemTitle.vue';
+import CommandBarItemTitle from '@/features/shared/commandBar/components/CommandBarItemTitle.vue';
 
-vi.mock('@/features/projects/components/ProjectIcon.vue', () => ({
+vi.mock('@/features/collaboration/projects/components/ProjectIcon.vue', () => ({
 	default: {
 		name: 'ProjectIcon',
 		template: '<div data-test-id="project-icon"></div>',
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/components/CommandBarItemTitle.vue b/packages/frontend/editor-ui/src/features/shared/commandBar/components/CommandBarItemTitle.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/components/CommandBarItemTitle.vue
rename to packages/frontend/editor-ui/src/features/shared/commandBar/components/CommandBarItemTitle.vue
index a23f31a6e05..decf4b02cc4 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/components/CommandBarItemTitle.vue
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/components/CommandBarItemTitle.vue
@@ -2,7 +2,7 @@
 import type { IconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
 import type { KeyboardShortcut } from '@n8n/design-system/types/keyboardshortcut';
 import { N8nKeyboardShortcut } from '@n8n/design-system';
-import ProjectIcon from '@/features/projects/components/ProjectIcon.vue';
+import ProjectIcon from '@/features/collaboration/projects/components/ProjectIcon.vue';
 
 interface Props {
 	title: string;
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCommandBar.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCommandBar.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCommandBar.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCommandBar.test.ts
index 66b4ebb856b..b1475071d6f 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCommandBar.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCommandBar.test.ts
@@ -30,7 +30,7 @@ const loadNodeTypesIfNotLoaded = vi.fn().mockResolvedValue(undefined);
 vi.mock('@/stores/nodeTypes.store', () => ({
 	useNodeTypesStore: () => ({ loadNodeTypesIfNotLoaded }),
 }));
-vi.mock('@/features/projects/projects.store', () => ({
+vi.mock('@/features/collaboration/projects/projects.store', () => ({
 	useProjectsStore: () => ({
 		personalProject: { id: 'p1' },
 		myProjects: [{ id: 'p1', name: 'Personal' }],
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCommandBar.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCommandBar.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCommandBar.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCommandBar.ts
index 1d0b261b4fd..45bd97adef2 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCommandBar.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCommandBar.ts
@@ -1,7 +1,7 @@
 import { computed, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { COMMAND_BAR_EXPERIMENT, VIEWS } from '@/constants';
 import { type CommandBarItem } from '@n8n/design-system/components/N8nCommandBar/types';
 import { useNodeCommands } from './useNodeCommands';
@@ -17,7 +17,7 @@ import { useRecentResources } from './useRecentResources';
 import type { CommandGroup } from '../types';
 import { usePostHog } from '@/stores/posthog.store';
 import { useI18n } from '@n8n/i18n';
-import { PROJECT_DATA_TABLES, DATA_TABLE_VIEW } from '@/features/dataTable/constants';
+import { PROJECT_DATA_TABLES, DATA_TABLE_VIEW } from '@/features/core/dataTable/constants';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCredentialNavigationCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCredentialNavigationCommands.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCredentialNavigationCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCredentialNavigationCommands.test.ts
index f2d881d7cf9..5adaf2faf86 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCredentialNavigationCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCredentialNavigationCommands.test.ts
@@ -3,13 +3,13 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import * as permissionsModule from '@n8n/permissions';
 import { useCredentialNavigationCommands } from './useCredentialNavigationCommands';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import type { ICredentialsResponse } from '@/features/credentials/credentials.types';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import { VIEWS } from '@/constants';
 
 vi.mock('vue-router', () => ({
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCredentialNavigationCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCredentialNavigationCommands.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCredentialNavigationCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCredentialNavigationCommands.ts
index 69c3e500238..ab2f12e6bfe 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useCredentialNavigationCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useCredentialNavigationCommands.ts
@@ -5,13 +5,13 @@ import { useI18n } from '@n8n/i18n';
 import debounce from 'lodash/debounce';
 import type { ICredentialsResponse } from '@/features/credentials/credentials.types';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useUIStore } from '@/stores/ui.store';
 import type { CommandBarItem } from '../types';
 import { VIEWS } from '@/constants';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import CredentialIcon from '@/features/credentials/components/CredentialIcon.vue';
-import CommandBarItemTitle from '@/features/ui/commandBar/components/CommandBarItemTitle.vue';
+import CommandBarItemTitle from '@/features/shared/commandBar/components/CommandBarItemTitle.vue';
 import { getResourcePermissions } from '@n8n/permissions';
 
 const ITEM_ID = {
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useDataTableNavigationCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useDataTableNavigationCommands.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useDataTableNavigationCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useDataTableNavigationCommands.test.ts
index ae6dfc0ffa5..92cf07ff769 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useDataTableNavigationCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useDataTableNavigationCommands.test.ts
@@ -2,14 +2,14 @@ import { ref } from 'vue';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import * as permissionsModule from '@n8n/permissions';
 import { useDataTableNavigationCommands } from './useDataTableNavigationCommands';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 import { VIEWS } from '@/constants';
-import { createTestProject } from '@/features/projects/__tests__/utils';
+import { createTestProject } from '@/features/collaboration/projects/__tests__/utils';
 
 const routerPushMock = vi.fn();
 vi.mock('vue-router', () => ({
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useDataTableNavigationCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useDataTableNavigationCommands.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useDataTableNavigationCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useDataTableNavigationCommands.ts
index 45e6e413c5f..b098459b549 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useDataTableNavigationCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useDataTableNavigationCommands.ts
@@ -2,14 +2,14 @@ import { computed, ref, type Ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from '@n8n/i18n';
 import debounce from 'lodash/debounce';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import { DATA_TABLE_DETAILS, PROJECT_DATA_TABLES } from '@/features/dataTable/constants';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { DATA_TABLE_DETAILS, PROJECT_DATA_TABLES } from '@/features/core/dataTable/constants';
 import type { CommandBarItem } from '../types';
-import type { DataTable } from '@/features/dataTable/dataTable.types';
+import type { DataTable } from '@/features/core/dataTable/dataTable.types';
 import { N8nIcon } from '@n8n/design-system';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import CommandBarItemTitle from '@/features/ui/commandBar/components/CommandBarItemTitle.vue';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import CommandBarItemTitle from '@/features/shared/commandBar/components/CommandBarItemTitle.vue';
 import { getResourcePermissions } from '@n8n/permissions';
 
 const ITEM_ID = {
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionCommands.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionCommands.test.ts
index e571cb68514..fedec5e0f0b 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionCommands.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { useExecutionCommands } from './useExecutionCommands';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { createTestingPinia } from '@pinia/testing';
@@ -71,7 +71,7 @@ vi.mock('@n8n/permissions', () => ({
 	})),
 }));
 
-vi.mock('@/features/executions/executions.utils', async (importOriginal) => ({
+vi.mock('@/features/execution/executions/executions.utils', async (importOriginal) => ({
 	...(await importOriginal()),
 	executionRetryMessage: vi.fn((status: string) => ({
 		title: `Execution ${status}`,
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionCommands.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionCommands.ts
index 17b03b1d4a9..5b857958f40 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionCommands.ts
@@ -2,7 +2,7 @@ import { computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from '@n8n/i18n';
 import { N8nIcon } from '@n8n/design-system';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useToast } from '@/composables/useToast';
@@ -10,7 +10,7 @@ import { useMessage } from '@/composables/useMessage';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { getResourcePermissions } from '@n8n/permissions';
 import { EnterpriseEditionFeature, MODAL_CONFIRM, VIEWS } from '@/constants';
-import { executionRetryMessage } from '@/features/executions/executions.utils';
+import { executionRetryMessage } from '@/features/execution/executions/executions.utils';
 import type { ExecutionSummary, AnnotationVote } from 'n8n-workflow';
 import type { CommandGroup, CommandBarItem } from '../types';
 
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionNavigationCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionNavigationCommands.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionNavigationCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionNavigationCommands.test.ts
index 98620979ef4..a2dd46f1823 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionNavigationCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionNavigationCommands.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { useExecutionNavigationCommands } from './useExecutionNavigationCommands';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { VIEWS } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionNavigationCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionNavigationCommands.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionNavigationCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionNavigationCommands.ts
index d8ef2fb40a8..edb4de43244 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useExecutionNavigationCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useExecutionNavigationCommands.ts
@@ -1,7 +1,7 @@
 import { computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from '@n8n/i18n';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import type { CommandGroup, CommandBarItem } from '../types';
 import { VIEWS } from '@/constants';
 import { N8nIcon } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useGenericCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useGenericCommands.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useGenericCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useGenericCommands.ts
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useNodeCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useNodeCommands.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useNodeCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useNodeCommands.test.ts
index 63527ab2c70..7f9b97814c0 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useNodeCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useNodeCommands.test.ts
@@ -2,14 +2,14 @@ import { ref } from 'vue';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { useNodeCommands } from './useNodeCommands';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { getResourcePermissions } from '@n8n/permissions';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
 
 const mockEditableWorkflow = {
 	value: {
@@ -30,7 +30,7 @@ vi.mock('@/composables/useCanvasOperations', () => ({
 	}),
 }));
 
-vi.mock('@/features/canvas/canvas.eventBus', () => ({
+vi.mock('@/features/workflows/canvas/canvas.eventBus', () => ({
 	canvasEventBus: {
 		emit: vi.fn(),
 	},
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useNodeCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useNodeCommands.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useNodeCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useNodeCommands.ts
index 7f0be0cdc24..e2980bffc59 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useNodeCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useNodeCommands.ts
@@ -5,14 +5,14 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
 import { useActionsGenerator } from '@/components/Node/NodeCreator/composables/useActionsGeneration';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
 import { type CommandBarItem } from '@n8n/design-system/components/N8nCommandBar/types';
 import type { CommandGroup } from '../types';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getResourcePermissions } from '@n8n/permissions';
 import NodeIcon from '@/components/NodeIcon.vue';
-import CommandBarItemTitle from '@/features/ui/commandBar/components/CommandBarItemTitle.vue';
+import CommandBarItemTitle from '@/features/shared/commandBar/components/CommandBarItemTitle.vue';
 
 const ITEM_ID = {
 	ADD_NODE: 'add-node',
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useProjectNavigationCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useProjectNavigationCommands.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useProjectNavigationCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useProjectNavigationCommands.test.ts
index 6c6fa0bdc20..41ed1b48dd4 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useProjectNavigationCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useProjectNavigationCommands.test.ts
@@ -1,11 +1,11 @@
 import { ref } from 'vue';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { useProjectNavigationCommands } from './useProjectNavigationCommands';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { VIEWS } from '@/constants';
-import type { ProjectListItem } from '@/features/projects/projects.types';
+import type { ProjectListItem } from '@/features/collaboration/projects/projects.types';
 
 const routerPushMock = vi.fn();
 vi.mock('vue-router', () => ({
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useProjectNavigationCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useProjectNavigationCommands.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useProjectNavigationCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useProjectNavigationCommands.ts
index 04ed4422741..ac8e97a7aec 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useProjectNavigationCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useProjectNavigationCommands.ts
@@ -3,11 +3,11 @@ import { useRouter } from 'vue-router';
 import { N8nIcon } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
 import { VIEWS } from '@/constants';
-import type { ProjectListItem } from '@/features/projects/projects.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import type { ProjectListItem } from '@/features/collaboration/projects/projects.types';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import type { CommandBarItem } from '../types';
 import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
-import CommandBarItemTitle from '@/features/ui/commandBar/components/CommandBarItemTitle.vue';
+import CommandBarItemTitle from '@/features/shared/commandBar/components/CommandBarItemTitle.vue';
 
 const ITEM_ID = {
 	CREATE_PROJECT: 'create-project',
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useRecentResources.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useRecentResources.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useRecentResources.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useRecentResources.test.ts
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useRecentResources.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useRecentResources.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useRecentResources.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useRecentResources.ts
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useTemplateCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useTemplateCommands.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useTemplateCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useTemplateCommands.ts
index bf903b806ad..e27dd2ab9a6 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useTemplateCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useTemplateCommands.ts
@@ -1,6 +1,6 @@
 import { computed } from 'vue';
 import { useI18n } from '@n8n/i18n';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
 import type { CommandGroup } from '../types';
 
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowCommands.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowCommands.test.ts
index b4ab8d50efd..1068d3a9f37 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowCommands.test.ts
@@ -4,9 +4,9 @@ import { useWorkflowCommands } from './useWorkflowCommands';
 import * as useCanvasOperations from '@/composables/useCanvasOperations';
 import { useTagsStore } from '@/stores/tags.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
 import { nodeViewEventBus } from '@/event-bus';
 import { createTestWorkflow } from '@/__tests__/mocks';
 import type { IWorkflowDb, INodeUi } from '@/Interface';
@@ -20,7 +20,7 @@ vi.mock('@/composables/useWorkflowHelpers');
 vi.mock('@/composables/useTelemetry');
 vi.mock('@/composables/useWorkflowSaving');
 vi.mock('@/composables/useWorkflowActivate');
-vi.mock('@/features/canvas/canvas.eventBus');
+vi.mock('@/features/workflows/canvas/canvas.eventBus');
 vi.mock('@/event-bus');
 vi.mock('vue-router', () => ({
 	useRouter: () => ({
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowCommands.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowCommands.ts
index 05ad10930f6..76ffbad275e 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowCommands.ts
@@ -7,7 +7,7 @@ import { getResourcePermissions } from '@n8n/permissions';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useTagsStore } from '@/stores/tags.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowSaving } from '@/composables/useWorkflowSaving';
@@ -21,7 +21,7 @@ import {
 	VIEWS,
 	WORKFLOW_SETTINGS_MODAL_KEY,
 } from '@/constants';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
 import type { IWorkflowToShare } from '@/Interface';
 import { saveAs } from 'file-saver';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -29,7 +29,7 @@ import { useWorkflowActivate } from '@/composables/useWorkflowActivate';
 import type { CommandGroup, CommandBarItem } from '../types';
 import uniqBy from 'lodash/uniqBy';
 import { nodeViewEventBus } from '@/event-bus';
-import CommandBarItemTitle from '@/features/ui/commandBar/components/CommandBarItemTitle.vue';
+import CommandBarItemTitle from '@/features/shared/commandBar/components/CommandBarItemTitle.vue';
 
 const ITEM_ID = {
 	OPEN_CREDENTIAL: 'open-credential',
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowNavigationCommands.test.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowNavigationCommands.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowNavigationCommands.test.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowNavigationCommands.test.ts
index b833661458c..19efb6f6778 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowNavigationCommands.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowNavigationCommands.test.ts
@@ -2,14 +2,14 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { ref } from 'vue';
 import { waitFor } from '@testing-library/vue';
 import { useWorkflowNavigationCommands } from './useWorkflowNavigationCommands';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useTagsStore } from '@/stores/tags.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { useFoldersStore } from '@/features/folders/folders.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import * as permissionsModule from '@n8n/permissions';
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowNavigationCommands.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowNavigationCommands.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowNavigationCommands.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowNavigationCommands.ts
index 8f12e0ccda9..c5230b986c4 100644
--- a/packages/frontend/editor-ui/src/features/ui/commandBar/composables/useWorkflowNavigationCommands.ts
+++ b/packages/frontend/editor-ui/src/features/shared/commandBar/composables/useWorkflowNavigationCommands.ts
@@ -2,7 +2,7 @@ import { computed, ref, type Ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { N8nIcon } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
-import { ProjectTypes } from '@/features/projects/projects.types';
+import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useActionsGenerator } from '@/components/Node/NodeCreator/composables/useActionsGeneration';
@@ -10,12 +10,12 @@ import debounce from 'lodash/debounce';
 import { VIEWS } from '@/constants';
 import type { IWorkflowDb } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import type { CommandGroup, CommandBarItem } from '../types';
 import { useTagsStore } from '@/stores/tags.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { useFoldersStore } from '@/features/folders/folders.store';
-import CommandBarItemTitle from '@/features/ui/commandBar/components/CommandBarItemTitle.vue';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
+import CommandBarItemTitle from '@/features/shared/commandBar/components/CommandBarItemTitle.vue';
 import { isIconOrEmoji, type IconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
 import NodeIcon from '@/components/NodeIcon.vue';
 import { getResourcePermissions } from '@n8n/permissions';
diff --git a/packages/frontend/editor-ui/src/features/ui/commandBar/types.ts b/packages/frontend/editor-ui/src/features/shared/commandBar/types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/ui/commandBar/types.ts
rename to packages/frontend/editor-ui/src/features/shared/commandBar/types.ts
diff --git a/packages/frontend/editor-ui/src/features/ui/contextMenu/components/ContextMenu.vue b/packages/frontend/editor-ui/src/features/shared/contextMenu/components/ContextMenu.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/ui/contextMenu/components/ContextMenu.vue
rename to packages/frontend/editor-ui/src/features/shared/contextMenu/components/ContextMenu.vue
diff --git a/packages/frontend/editor-ui/src/features/ui/contextMenu/composables/__snapshots__/useContextMenu.test.ts.snap b/packages/frontend/editor-ui/src/features/shared/contextMenu/composables/__snapshots__/useContextMenu.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/ui/contextMenu/composables/__snapshots__/useContextMenu.test.ts.snap
rename to packages/frontend/editor-ui/src/features/shared/contextMenu/composables/__snapshots__/useContextMenu.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenu.test.ts b/packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenu.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenu.test.ts
rename to packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenu.test.ts
index d5bcf5a3dc1..f3ac3544853 100644
--- a/packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenu.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenu.test.ts
@@ -3,7 +3,7 @@ import { useContextMenu } from './useContextMenu';
 import { BASIC_CHAIN_NODE_TYPE, NO_OP_NODE_TYPE, STICKY_NODE_TYPE } from '@/constants';
 import { faker } from '@faker-js/faker';
 import { createPinia, setActivePinia } from 'pinia';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import {
diff --git a/packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenu.ts b/packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenu.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenu.ts
rename to packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenu.ts
diff --git a/packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenuItems.ts b/packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenuItems.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenuItems.ts
rename to packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenuItems.ts
index 30a02cf1389..2ba80b838a1 100644
--- a/packages/frontend/editor-ui/src/features/ui/contextMenu/composables/useContextMenuItems.ts
+++ b/packages/frontend/editor-ui/src/features/shared/contextMenu/composables/useContextMenuItems.ts
@@ -1,7 +1,7 @@
 import type { ActionDropdownItem, INodeUi } from '@/Interface';
 import { NOT_DUPLICATABLE_NODE_TYPES, STICKY_NODE_TYPE } from '@/constants';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useI18n } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/AskAI/AskAI.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/AskAI/AskAI.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/AskAI/AskAI.vue
index 25bc52e5c05..3d603535edf 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -24,7 +24,7 @@ import {
 	ASK_AI_MIN_PROMPT_LENGTH,
 	ASK_AI_LOADING_DURATION_MS,
 } from '@/constants';
-import type { AskAiRequest } from '@/features/assistant/assistant.types';
+import type { AskAiRequest } from '@/features/ai/assistant/assistant.types';
 const emit = defineEmits<{
 	submit: [code: string];
 	replaceCode: [code: string];
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/CodeNodeEditor.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/CodeNodeEditor.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/CodeNodeEditor.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completer.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completer.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completer.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completer.ts
index d3db4a891f6..7250478f454 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completer.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completer.ts
@@ -17,7 +17,7 @@ import { useJsonFieldCompletions } from './completions/jsonField.completions';
 import { useLuxonCompletions } from './completions/luxon.completions';
 import { usePrevNodeCompletions } from './completions/prevNode.completions';
 import { useRequireCompletions } from './completions/require.completions';
-import { useVariablesCompletions } from '@/features/environments.ee/completions/variables.completions';
+import { useVariablesCompletions } from '@/features/settings/environments.ee/completions/variables.completions';
 import { useWorkflowCompletions } from './completions/workflow.completions';
 
 export const useCompleter = (
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/base.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/base.completions.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/base.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/base.completions.ts
index fb952d17b61..3d657aeb9d0 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/base.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/base.completions.ts
@@ -1,6 +1,6 @@
 import { NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION } from '../constants';
 import { addInfoRenderer } from '../utils';
-import { addVarType } from '@/features/environments.ee/completions/variables.completions';
+import { addVarType } from '@/features/settings/environments.ee/completions/variables.completions';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { INodeUi } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/execution.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/execution.completions.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/execution.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/execution.completions.ts
index 057c123af8f..1fc5b5e8307 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/execution.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/execution.completions.ts
@@ -1,5 +1,5 @@
 import { addInfoRenderer, escape } from '../utils';
-import { addVarType } from '@/features/environments.ee/completions/variables.completions';
+import { addVarType } from '@/features/settings/environments.ee/completions/variables.completions';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import { useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/itemField.completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/itemField.completions.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/itemField.completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/itemField.completions.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/itemField.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/itemField.completions.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/itemField.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/itemField.completions.ts
index c57d0b6a2bb..a048dee3397 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/itemField.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/itemField.completions.ts
@@ -1,5 +1,5 @@
 import { addInfoRenderer, escape } from '../utils';
-import { addVarType } from '@/features/environments.ee/completions/variables.completions';
+import { addVarType } from '@/features/settings/environments.ee/completions/variables.completions';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import { useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/itemIndex.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/itemIndex.completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/itemIndex.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/itemIndex.completions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/js.snippets.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/js.snippets.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/js.snippets.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/js.snippets.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/jsonField.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/jsonField.completions.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/jsonField.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/jsonField.completions.ts
index a84bcbfa62f..9045f46ad9b 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/jsonField.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/jsonField.completions.ts
@@ -2,7 +2,7 @@ import { escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { isAllowedInDotNotation } from '@/features/editors/plugins/codemirror/completions/utils';
+import { isAllowedInDotNotation } from '@/features/shared/editors/plugins/codemirror/completions/utils';
 import { useI18n } from '@n8n/i18n';
 import type { IPinData, IRunData, IDataObject } from 'n8n-workflow';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/luxon.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/luxon.completions.ts
similarity index 86%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/luxon.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/luxon.completions.ts
index d6936b31189..d39f60e53b9 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/luxon.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/luxon.completions.ts
@@ -1,8 +1,8 @@
 import { escape } from '../utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { createInfoBoxRenderer } from '@/features/editors/plugins/codemirror/completions/infoBoxRenderer';
-import { luxonStaticDocs } from '@/features/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs';
-import { luxonInstanceDocs } from '@/features/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs';
+import { createInfoBoxRenderer } from '@/features/shared/editors/plugins/codemirror/completions/infoBoxRenderer';
+import { luxonStaticDocs } from '@/features/shared/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs';
+import { luxonInstanceDocs } from '@/features/shared/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs';
 
 export function useLuxonCompletions() {
 	/**
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/prevNode.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/prevNode.completions.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/prevNode.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/prevNode.completions.ts
index 3175b4af9ac..61c55c3636f 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/prevNode.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/prevNode.completions.ts
@@ -1,4 +1,4 @@
-import { addVarType } from '@/features/environments.ee/completions/variables.completions';
+import { addVarType } from '@/features/settings/environments.ee/completions/variables.completions';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import { useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/require.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/require.completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/require.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/require.completions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/secrets.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/secrets.completions.ts
similarity index 88%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/secrets.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/secrets.completions.ts
index 9731d4500d5..9779996e95b 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/secrets.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/secrets.completions.ts
@@ -1,6 +1,6 @@
-import { addVarType } from '@/features/environments.ee/completions/variables.completions';
+import { addVarType } from '@/features/settings/environments.ee/completions/variables.completions';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 
 const escape = (str: string) => str.replace('$', '\\$');
 
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/workflow.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/workflow.completions.ts
similarity index 91%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/workflow.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/workflow.completions.ts
index a9a0247f054..c5f8c2422e5 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/completions/workflow.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/completions/workflow.completions.ts
@@ -1,4 +1,4 @@
-import { addVarType } from '@/features/environments.ee/completions/variables.completions';
+import { addVarType } from '@/features/settings/environments.ee/completions/variables.completions';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import { useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/constants.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/constants.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/constants.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/linter.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/linter.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/linter.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/linter.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/theme.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/theme.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/theme.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/theme.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/types.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/types.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/types.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/utils.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/utils.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/utils.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CodeNodeEditor/utils.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CodeNodeEditor/utils.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/CssEditor/CssEditor.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/CssEditor/CssEditor.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/CssEditor/CssEditor.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/CssEditor/CssEditor.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/HtmlEditor.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/HtmlEditor.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/HtmlEditor.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/HtmlEditor.test.ts
index 27dd717fbac..a5090e76141 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/HtmlEditor.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/HtmlEditor.test.ts
@@ -3,7 +3,7 @@ import { STORES } from '@n8n/stores';
 import { createTestingPinia } from '@pinia/testing';
 
 import { renderComponent } from '@/__tests__/render';
-import HtmlEditor from '@/features/editors/components/HtmlEditor/HtmlEditor.vue';
+import HtmlEditor from '@/features/shared/editors/components/HtmlEditor/HtmlEditor.vue';
 import { userEvent } from '@testing-library/user-event';
 import { waitFor } from '@testing-library/vue';
 import { setActivePinia } from 'pinia';
diff --git a/packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/HtmlEditor.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/HtmlEditor.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/HtmlEditor.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/HtmlEditor.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/types.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/types.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/types.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/utils.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/utils.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/utils.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/HtmlEditor/utils.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/HtmlEditor/utils.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/ExpressionOutput.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/ExpressionOutput.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/ExpressionOutput.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/ExpressionOutput.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionTip.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionTip.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.test.ts
index b2e520133ce..a729614cd70 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionTip.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.test.ts
@@ -1,6 +1,6 @@
 import { renderComponent } from '@/__tests__/render';
-import InlineExpressionTip from '@/features/editors/components/InlineExpressionEditor/InlineExpressionTip.vue';
-import { FIELDS_SECTION } from '@/features/editors/plugins/codemirror/completions/constants';
+import InlineExpressionTip from '@/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue';
+import { FIELDS_SECTION } from '@/features/shared/editors/plugins/codemirror/completions/constants';
 import type { useNDVStore } from '@/stores/ndv.store';
 import type { CompletionResult } from '@codemirror/autocomplete';
 import { EditorSelection, EditorState } from '@codemirror/state';
@@ -16,7 +16,7 @@ vi.mock('@/stores/ndv.store', () => {
 	};
 });
 
-vi.mock('@/features/editors/plugins/codemirror/completions/datatype.completions', () => {
+vi.mock('@/features/shared/editors/plugins/codemirror/completions/datatype.completions', () => {
 	return {
 		datatypeCompletions: vi.fn(() => mockCompletionResult),
 	};
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/InlineExpressionTip.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/OutputItemSelect.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/OutputItemSelect.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/OutputItemSelect.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/OutputItemSelect.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/theme.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/theme.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/theme.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/theme.ts
index 6549c8f8020..884e3257338 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/InlineExpressionEditor/theme.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/theme.ts
@@ -1,5 +1,5 @@
 import { EditorView } from '@codemirror/view';
-import { highlighter } from '@/features/editors/plugins/codemirror/resolvableHighlighter';
+import { highlighter } from '@/features/shared/editors/plugins/codemirror/resolvableHighlighter';
 
 const commonThemeProps = (isReadOnly = false) => ({
 	'&.cm-focused': {
diff --git a/packages/frontend/editor-ui/src/features/editors/components/JsEditor/JsEditor.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/JsEditor/JsEditor.test.ts
similarity index 86%
rename from packages/frontend/editor-ui/src/features/editors/components/JsEditor/JsEditor.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/JsEditor/JsEditor.test.ts
index 7b6722ffdf8..9845cc21c0e 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/JsEditor/JsEditor.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/JsEditor/JsEditor.test.ts
@@ -1,5 +1,5 @@
 import { createTestingPinia } from '@pinia/testing';
-import JsEditor from '@/features/editors/components/JsEditor/JsEditor.vue';
+import JsEditor from '@/features/shared/editors/components/JsEditor/JsEditor.vue';
 import { renderComponent } from '@/__tests__/render';
 
 describe('JsEditor', () => {
diff --git a/packages/frontend/editor-ui/src/features/editors/components/JsEditor/JsEditor.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/JsEditor/JsEditor.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/JsEditor/JsEditor.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/JsEditor/JsEditor.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/JsonEditor/JsonEditor.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/JsonEditor/JsonEditor.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/editors/components/JsonEditor/JsonEditor.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/JsonEditor/JsonEditor.test.ts
index 7972efb80a2..a6b5388ce08 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/JsonEditor/JsonEditor.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/JsonEditor/JsonEditor.test.ts
@@ -1,5 +1,5 @@
 import { createTestingPinia } from '@pinia/testing';
-import JsonEditor from '@/features/editors/components/JsonEditor/JsonEditor.vue';
+import JsonEditor from '@/features/shared/editors/components/JsonEditor/JsonEditor.vue';
 import { renderComponent } from '@/__tests__/render';
 import { waitFor } from '@testing-library/vue';
 import { userEvent } from '@testing-library/user-event';
diff --git a/packages/frontend/editor-ui/src/features/editors/components/JsonEditor/JsonEditor.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/JsonEditor/JsonEditor.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/JsonEditor/JsonEditor.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/JsonEditor/JsonEditor.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/components/SqlEditor/SQLEditor.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/components/SqlEditor/SQLEditor.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/editors/components/SqlEditor/SQLEditor.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/components/SqlEditor/SQLEditor.test.ts
index 6145836d75d..b48622a5733 100644
--- a/packages/frontend/editor-ui/src/features/editors/components/SqlEditor/SQLEditor.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/SqlEditor/SQLEditor.test.ts
@@ -3,7 +3,7 @@ import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import { STORES } from '@n8n/stores';
 import { createTestingPinia } from '@pinia/testing';
 
-import SqlEditor from '@/features/editors/components/SqlEditor/SqlEditor.vue';
+import SqlEditor from '@/features/shared/editors/components/SqlEditor/SqlEditor.vue';
 import { renderComponent, type RenderOptions } from '@/__tests__/render';
 import { waitFor } from '@testing-library/vue';
 import { userEvent } from '@testing-library/user-event';
diff --git a/packages/frontend/editor-ui/src/features/editors/components/SqlEditor/SqlEditor.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/SqlEditor/SqlEditor.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/components/SqlEditor/SqlEditor.vue
rename to packages/frontend/editor-ui/src/features/shared/editors/components/SqlEditor/SqlEditor.vue
diff --git a/packages/frontend/editor-ui/src/features/editors/composables/useCodeEditor.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/composables/useCodeEditor.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/composables/useCodeEditor.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/composables/useCodeEditor.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/composables/useCodeEditor.ts b/packages/frontend/editor-ui/src/features/shared/editors/composables/useCodeEditor.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/composables/useCodeEditor.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/composables/useCodeEditor.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/composables/useExpressionEditor.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/composables/useExpressionEditor.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/composables/useExpressionEditor.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/composables/useExpressionEditor.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/composables/useExpressionEditor.ts b/packages/frontend/editor-ui/src/features/shared/editors/composables/useExpressionEditor.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/composables/useExpressionEditor.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/composables/useExpressionEditor.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/__tests__/mock.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/__tests__/mock.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/__tests__/mock.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/__tests__/mock.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/addCompletions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/addCompletions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/addCompletions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/addCompletions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/base.completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/base.completions.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/base.completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/base.completions.test.ts
index d56fca1a9b9..ceb85c7ed25 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/base.completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/base.completions.test.ts
@@ -3,17 +3,17 @@ import { setActivePinia } from 'pinia';
 import { DateTime } from 'luxon';
 
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
-import * as utils from '@/features/editors/plugins/codemirror/completions/utils';
+import * as utils from '@/features/shared/editors/plugins/codemirror/completions/utils';
 import {
 	extensions,
 	luxonInstanceOptions,
 	natives,
-} from '@/features/editors/plugins/codemirror/completions/datatype.completions';
+} from '@/features/shared/editors/plugins/codemirror/completions/datatype.completions';
 
 import type { CompletionSource, CompletionResult } from '@codemirror/autocomplete';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
-import { n8nLang } from '@/features/editors/plugins/codemirror/n8nLang';
+import { n8nLang } from '@/features/shared/editors/plugins/codemirror/n8nLang';
 import { LUXON_RECOMMENDED_OPTIONS, STRING_RECOMMENDED_OPTIONS } from './constants';
 import uniqBy from 'lodash/uniqBy';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/blank.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/blank.completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/blank.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/blank.completions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/bracketAccess.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/bracketAccess.completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/bracketAccess.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/bracketAccess.completions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/completions.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/completions.test.ts
index a984c099c6c..ab08bee8357 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/completions.test.ts
@@ -3,20 +3,20 @@ import { setActivePinia } from 'pinia';
 import { DateTime } from 'luxon';
 
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
-import * as utils from '@/features/editors/plugins/codemirror/completions/utils';
+import * as utils from '@/features/shared/editors/plugins/codemirror/completions/utils';
 import {
 	extensions,
 	luxonInstanceOptions,
 	luxonStaticOptions,
 	natives,
-} from '@/features/editors/plugins/codemirror/completions/datatype.completions';
+} from '@/features/shared/editors/plugins/codemirror/completions/datatype.completions';
 
 import { mockProxy } from './__tests__/mock';
 import type { CompletionSource, CompletionResult } from '@codemirror/autocomplete';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
-import { n8nLang } from '@/features/editors/plugins/codemirror/n8nLang';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import { n8nLang } from '@/features/shared/editors/plugins/codemirror/n8nLang';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { EnterpriseEditionFeature } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/constants.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/constants.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/constants.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/datatype.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/datatype.completions.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/datatype.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/datatype.completions.ts
index 139b851657e..23ed33abbd8 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/datatype.completions.ts
@@ -1,7 +1,7 @@
 import { VALID_EMAIL_REGEX } from '@/constants';
 import { i18n } from '@n8n/i18n';
-import { useEnvironmentsStore } from '@/features/environments.ee/environments.store';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import { useEnvironmentsStore } from '@/features/settings/environments.ee/environments.store';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 
 import type {
 	Completion,
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/dollar.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/dollar.completions.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/dollar.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/dollar.completions.ts
index 953372c725d..63a2e19cd0c 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/dollar.completions.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/dollar.completions.ts
@@ -11,7 +11,7 @@ import {
 	isInHttpNodePagination,
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 import { escapeMappingString } from '@/utils/mappingUtils';
 import {
 	METADATA_SECTION,
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/infoBoxRenderer.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/infoBoxRenderer.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/infoBoxRenderer.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/infoBoxRenderer.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/itemField.completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/itemField.completions.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/itemField.completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/itemField.completions.test.ts
index 2704000e732..5e6761904ef 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/itemField.completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/itemField.completions.test.ts
@@ -2,8 +2,8 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
-import { n8nLang } from '@/features/editors/plugins/codemirror/n8nLang';
-import { useItemFieldCompletions } from '@/features/editors/components/CodeNodeEditor/completions/itemField.completions';
+import { n8nLang } from '@/features/shared/editors/plugins/codemirror/n8nLang';
+import { useItemFieldCompletions } from '@/features/shared/editors/components/CodeNodeEditor/completions/itemField.completions';
 
 describe('itemFieldCompletions', () => {
 	let context: CompletionContext;
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/itemIndex.completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/itemIndex.completions.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/itemIndex.completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/itemIndex.completions.test.ts
index ec4881470ab..d7c505e2363 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/itemIndex.completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/itemIndex.completions.test.ts
@@ -3,7 +3,7 @@ import { setActivePinia } from 'pinia';
 import { EditorState } from '@codemirror/state';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { describe, test, expect, beforeEach } from 'vitest';
-import { useItemIndexCompletions } from '@/features/editors/components/CodeNodeEditor/completions/itemIndex.completions';
+import { useItemIndexCompletions } from '@/features/shared/editors/components/CodeNodeEditor/completions/itemIndex.completions';
 
 let mode: 'runOnceForEachItem' | 'runOnceForAllItems';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/jsonField.completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/jsonField.completions.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/jsonField.completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/jsonField.completions.test.ts
index 2356be2b849..7fef5984eb0 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/jsonField.completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/jsonField.completions.test.ts
@@ -2,16 +2,16 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
-import * as utils from '@/features/editors/plugins/codemirror/completions/utils';
+import * as utils from '@/features/shared/editors/plugins/codemirror/completions/utils';
 import {
 	extensions,
 	natives,
-} from '@/features/editors/plugins/codemirror/completions/datatype.completions';
+} from '@/features/shared/editors/plugins/codemirror/completions/datatype.completions';
 
 import type { CompletionSource, CompletionResult } from '@codemirror/autocomplete';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
-import { n8nLang } from '@/features/editors/plugins/codemirror/n8nLang';
+import { n8nLang } from '@/features/shared/editors/plugins/codemirror/n8nLang';
 
 beforeEach(async () => {
 	setActivePinia(createTestingPinia());
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/nonDollar.completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/nonDollar.completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/nonDollar.completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/nonDollar.completions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/prevNode.completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/prevNode.completions.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/prevNode.completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/prevNode.completions.test.ts
index 6db6b95b318..8260ccc685c 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/prevNode.completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/prevNode.completions.test.ts
@@ -2,7 +2,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
-import { usePrevNodeCompletions } from '@/features/editors/components/CodeNodeEditor/completions/prevNode.completions';
+import { usePrevNodeCompletions } from '@/features/shared/editors/components/CodeNodeEditor/completions/prevNode.completions';
 
 describe('prevNodeCompletions', () => {
 	const { prevNodeCompletions } = usePrevNodeCompletions();
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/require.completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/require.completions.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/require.completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/require.completions.test.ts
index 0685dfca66a..dde193590ea 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/require.completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/require.completions.test.ts
@@ -3,9 +3,9 @@ import { setActivePinia } from 'pinia';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useRequireCompletions } from '@/features/editors/components/CodeNodeEditor/completions/require.completions';
-import { AUTOCOMPLETABLE_BUILT_IN_MODULES_JS } from '@/features/editors/components/CodeNodeEditor/constants';
-import * as utils from '@/features/editors/plugins/codemirror/completions/utils';
+import { useRequireCompletions } from '@/features/shared/editors/components/CodeNodeEditor/completions/require.completions';
+import { AUTOCOMPLETABLE_BUILT_IN_MODULES_JS } from '@/features/shared/editors/components/CodeNodeEditor/constants';
+import * as utils from '@/features/shared/editors/plugins/codemirror/completions/utils';
 
 let settingsStore: ReturnType<typeof useSettingsStore>;
 
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/types.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/types.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/types.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/utils.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/utils.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/utils.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/completions/utils.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/completions/utils.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/dragAndDrop.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/dragAndDrop.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/dragAndDrop.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/dragAndDrop.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/dragAndDrop.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/dragAndDrop.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/dragAndDrop.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/dragAndDrop.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/expressionCloseBrackets.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/expressionCloseBrackets.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/expressionCloseBrackets.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/expressionCloseBrackets.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/expressionCloseBrackets.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/expressionCloseBrackets.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/expressionCloseBrackets.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/expressionCloseBrackets.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/format.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/format.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/format.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/format.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/keymap.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/keymap.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/keymap.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/keymap.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/multiCursor.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/multiCursor.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/multiCursor.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/multiCursor.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/n8nLang.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/n8nLang.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/n8nLang.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/n8nLang.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/resolvableHighlighter.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/resolvableHighlighter.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/resolvableHighlighter.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/resolvableHighlighter.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/tooltips/InfoBoxTooltip.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/tooltips/InfoBoxTooltip.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/tooltips/InfoBoxTooltip.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/tooltips/InfoBoxTooltip.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/tooltips/infoBoxTooltip.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
index 4d6532e150d..5b9bdab0a8d 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
@@ -2,9 +2,9 @@ import { EditorState } from '@codemirror/state';
 import { EditorView, getTooltip, showTooltip, type Tooltip } from '@codemirror/view';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
-import { n8nLang } from '@/features/editors/plugins/codemirror/n8nLang';
+import { n8nLang } from '@/features/shared/editors/plugins/codemirror/n8nLang';
 import { hoverTooltipSource, infoBoxTooltips } from './InfoBoxTooltip';
-import * as utils from '@/features/editors/plugins/codemirror/completions/utils';
+import * as utils from '@/features/shared/editors/plugins/codemirror/completions/utils';
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
 import { completionStatus } from '@codemirror/autocomplete';
 
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/completions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/facet.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/facet.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/facet.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/facet.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/hoverTooltip.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/hoverTooltip.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/hoverTooltip.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/hoverTooltip.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/linter.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/linter.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/linter.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/linter.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/snippets.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/snippets.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/snippets.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/snippets.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/tests/completions.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/tests/completions.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/tests/completions.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/tests/completions.test.ts
index 5bc78981f6f..e420dbb9f95 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/tests/completions.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/tests/completions.test.ts
@@ -1,7 +1,7 @@
 import { matchText } from '../completions';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
-import { n8nLang } from '@/features/editors/plugins/codemirror/n8nLang';
+import { n8nLang } from '@/features/shared/editors/plugins/codemirror/n8nLang';
 
 describe('matchText', () => {
 	afterEach(() => {
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/useTypescript.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/useTypescript.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/useTypescript.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/useTypescript.ts
index 1f7f5bebc07..36e3467765f 100644
--- a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/client/useTypescript.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/client/useTypescript.ts
@@ -1,8 +1,8 @@
 import { useDataSchema } from '@/composables/useDataSchema';
 import { useDebounce } from '@/composables/useDebounce';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
-import { autocompletableNodeNames } from '@/features/editors/plugins/codemirror/completions/utils';
-import useEnvironmentsStore from '@/features/environments.ee/environments.store';
+import { autocompletableNodeNames } from '@/features/shared/editors/plugins/codemirror/completions/utils';
+import useEnvironmentsStore from '@/features/settings/environments.ee/environments.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { forceParse } from '@/utils/forceParse';
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/types.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/types.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/types.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/completions.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/completions.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/completions.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/completions.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/constants.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/constants.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/constants.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/constants.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/dynamicTypes.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/dynamicTypes.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/dynamicTypes.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/dynamicTypes.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/dynamicTypes.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/env.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/env.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/env.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/env.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/hoverTooltip.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/hoverTooltip.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/hoverTooltip.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/hoverTooltip.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/linter.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/linter.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/linter.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/linter.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/linter.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/linter.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/linter.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/linter.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/npmTypesLoader.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/npmTypesLoader.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/npmTypesLoader.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/npmTypesLoader.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/typescript.worker.test.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/typescript.worker.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/typescript.worker.test.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/typescript.worker.test.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/typescript.worker.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/typescript.worker.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/typescript.worker.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/typescript.worker.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/typescriptAst.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/typescriptAst.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/typescriptAst.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/typescriptAst.ts
diff --git a/packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/utils.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/editors/plugins/codemirror/typescript/worker/utils.ts
rename to packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/utils.ts
diff --git a/packages/frontend/editor-ui/src/features/env-feature-flag/EnvFeatureFlag.test.ts b/packages/frontend/editor-ui/src/features/shared/envFeatureFlag/EnvFeatureFlag.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/env-feature-flag/EnvFeatureFlag.test.ts
rename to packages/frontend/editor-ui/src/features/shared/envFeatureFlag/EnvFeatureFlag.test.ts
index 5662b83ce46..c140bbbde38 100644
--- a/packages/frontend/editor-ui/src/features/env-feature-flag/EnvFeatureFlag.test.ts
+++ b/packages/frontend/editor-ui/src/features/shared/envFeatureFlag/EnvFeatureFlag.test.ts
@@ -2,7 +2,7 @@ import { createTestingPinia } from '@pinia/testing';
 import type { FrontendSettings, N8nEnvFeatFlags, N8nEnvFeatFlagValue } from '@n8n/api-types';
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore, type MockedStore } from '@/__tests__/utils';
-import EnvFeatureFlag from '@/features/env-feature-flag/EnvFeatureFlag.vue';
+import EnvFeatureFlag from './EnvFeatureFlag.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 
 const renderComponent = createComponentRenderer(EnvFeatureFlag);
diff --git a/packages/frontend/editor-ui/src/features/env-feature-flag/EnvFeatureFlag.vue b/packages/frontend/editor-ui/src/features/shared/envFeatureFlag/EnvFeatureFlag.vue
similarity index 91%
rename from packages/frontend/editor-ui/src/features/env-feature-flag/EnvFeatureFlag.vue
rename to packages/frontend/editor-ui/src/features/shared/envFeatureFlag/EnvFeatureFlag.vue
index c33e69bda13..92a99726e1c 100644
--- a/packages/frontend/editor-ui/src/features/env-feature-flag/EnvFeatureFlag.vue
+++ b/packages/frontend/editor-ui/src/features/shared/envFeatureFlag/EnvFeatureFlag.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent, computed } from 'vue';
-import { useEnvFeatureFlag } from '@/features/env-feature-flag/useEnvFeatureFlag';
+import { useEnvFeatureFlag } from './useEnvFeatureFlag';
 
 /*
   EnvFeatureFlag conditionally renders content based on environment variable based feature flags
diff --git a/packages/frontend/editor-ui/src/features/env-feature-flag/useEnvFeatureFlag.ts b/packages/frontend/editor-ui/src/features/shared/envFeatureFlag/useEnvFeatureFlag.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/env-feature-flag/useEnvFeatureFlag.ts
rename to packages/frontend/editor-ui/src/features/shared/envFeatureFlag/useEnvFeatureFlag.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/__tests__/utils.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/__tests__/utils.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/canvas/__tests__/utils.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/__tests__/utils.ts
index 0a17b727001..4ff5516ef58 100644
--- a/packages/frontend/editor-ui/src/features/canvas/__tests__/utils.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/__tests__/utils.ts
@@ -9,8 +9,11 @@ import type {
 	CanvasNodeInjectionData,
 	ConnectStartEvent,
 	ExecutionOutputMapData,
-} from '@/features/canvas/canvas.types';
-import { CanvasConnectionMode, CanvasNodeRenderType } from '@/features/canvas/canvas.types';
+} from '@/features/workflows/canvas/canvas.types';
+import {
+	CanvasConnectionMode,
+	CanvasNodeRenderType,
+} from '@/features/workflows/canvas/canvas.types';
 import type { NodeConnectionType } from 'n8n-workflow';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import type { GraphEdge, GraphNode, ViewportTransform } from '@vue-flow/core';
diff --git a/packages/frontend/editor-ui/src/features/canvas/canvas.eventBus.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/canvas.eventBus.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/canvas.eventBus.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/canvas.eventBus.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/canvas.types.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/canvas.types.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/canvas/canvas.types.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/canvas.types.ts
index 69632b4e041..065a2c7711f 100644
--- a/packages/frontend/editor-ui/src/features/canvas/canvas.types.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/canvas.types.ts
@@ -8,10 +8,10 @@ import type {
 	ViewportTransform,
 } from '@vue-flow/core';
 import type { INodeUi } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { ComputedRef, Ref } from 'vue';
 import type { EventBus } from '@n8n/utils/event-bus';
-import type { CanvasLayoutSource } from '@/features/canvas/composables/useCanvasLayout';
+import type { CanvasLayoutSource } from '@/features/workflows/canvas/composables/useCanvasLayout';
 import type { NodeIconSource } from '@/utils/nodeIcon';
 
 export const enum CanvasConnectionMode {
diff --git a/packages/frontend/editor-ui/src/features/canvas/canvas.utils.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/canvas.utils.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/canvas.utils.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/canvas.utils.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/canvas.utils.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/canvas.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/canvas.utils.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/canvas.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/Canvas.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/Canvas.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/canvas/components/Canvas.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/Canvas.test.ts
index 26e47334a67..6d16ba5dc59 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/Canvas.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/Canvas.test.ts
@@ -4,12 +4,15 @@ import { createComponentRenderer } from '@/__tests__/render';
 import Canvas from './Canvas.vue';
 import { createPinia, setActivePinia } from 'pinia';
 import type { CanvasConnection, CanvasNode } from '../canvas.types';
-import { createCanvasConnection, createCanvasNodeElement } from '@/features/canvas/__tests__/utils';
+import {
+	createCanvasConnection,
+	createCanvasNodeElement,
+} from '@/features/workflows/canvas/__tests__/utils';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import type { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useVueFlow } from '@vue-flow/core';
 import { SIMULATE_NODE_TYPE } from '@/constants';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
 
 const matchMedia = global.window.matchMedia;
 // @ts-expect-error Initialize window object
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/Canvas.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/Canvas.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/canvas/components/Canvas.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/Canvas.vue
index 97c62125deb..e43e16d8da7 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/Canvas.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/Canvas.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import ContextMenu from '@/features/ui/contextMenu/components/ContextMenu.vue';
-import type { ContextMenuTarget } from '@/features/ui/contextMenu/composables/useContextMenu';
-import { useContextMenu } from '@/features/ui/contextMenu/composables/useContextMenu';
+import ContextMenu from '@/features/shared/contextMenu/components/ContextMenu.vue';
+import type { ContextMenuTarget } from '@/features/shared/contextMenu/composables/useContextMenu';
+import { useContextMenu } from '@/features/shared/contextMenu/composables/useContextMenu';
 import type { CanvasLayoutEvent } from '../composables/useCanvasLayout';
 import { useCanvasLayout } from '../composables/useCanvasLayout';
 import { useCanvasNodeHover } from '../composables/useCanvasNodeHover';
@@ -58,7 +58,7 @@ import CanvasControlButtons from './elements/buttons/CanvasControlButtons.vue';
 import Edge from './elements/edges/CanvasEdge.vue';
 import Node from './elements/nodes/CanvasNode.vue';
 import { useExperimentalNdvStore } from '../experimental/experimentalNdv.store';
-import { type ContextMenuAction } from '@/features/ui/contextMenu/composables/useContextMenuItems';
+import { type ContextMenuAction } from '@/features/shared/contextMenu/composables/useContextMenuItems';
 
 const $style = useCssModule();
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/WorkflowCanvas.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/WorkflowCanvas.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/WorkflowCanvas.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/canvas/components/WorkflowCanvas.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.vue
index 31aa87798d5..8e90ecbd74a 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/WorkflowCanvas.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.vue
@@ -9,7 +9,7 @@ import { createEventBus } from '@n8n/utils/event-bus';
 import type { CanvasEventBusEvents } from '../canvas.types';
 import { useVueFlow } from '@vue-flow/core';
 import { throttledRef } from '@vueuse/core';
-import type { ContextMenuAction } from '@/features/ui/contextMenu/composables/useContextMenuItems';
+import type { ContextMenuAction } from '@/features/shared/contextMenu/composables/useContextMenuItems';
 
 defineOptions({
 	inheritAttrs: false,
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/background/CanvasBackground.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/CanvasBackground.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/background/CanvasBackground.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/CanvasBackground.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/background/CanvasBackground.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/CanvasBackground.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/background/CanvasBackground.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/CanvasBackground.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/background/CanvasBackgroundStripedPattern.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/CanvasBackgroundStripedPattern.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/background/CanvasBackgroundStripedPattern.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/CanvasBackgroundStripedPattern.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/background/__snapshots__/CanvasBackground.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/__snapshots__/CanvasBackground.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/background/__snapshots__/CanvasBackground.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/background/__snapshots__/CanvasBackground.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasChatButton.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasChatButton.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasChatButton.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasChatButton.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasChatButton.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasChatButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasChatButton.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasChatButton.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasClearExecutionDataButton.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasClearExecutionDataButton.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasClearExecutionDataButton.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasClearExecutionDataButton.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasClearExecutionDataButton.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasClearExecutionDataButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasClearExecutionDataButton.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasClearExecutionDataButton.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasControlButtons.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasControlButtons.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasControlButtons.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasControlButtons.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasControlButtons.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasControlButtons.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasControlButtons.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasControlButtons.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasRunWorkflowButton.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasRunWorkflowButton.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasRunWorkflowButton.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasRunWorkflowButton.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasArrowHeadMarker.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasArrowHeadMarker.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasArrowHeadMarker.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasArrowHeadMarker.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasConnectionLine.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasConnectionLine.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.test.ts
index 28773965916..a007bd0423f 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasConnectionLine.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.test.ts
@@ -4,7 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import type { ConnectionLineProps } from '@vue-flow/core';
 import { Position } from '@vue-flow/core';
-import { createCanvasProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasProvide } from '@/features/workflows/canvas/__tests__/utils';
 import { waitFor } from '@testing-library/vue';
 
 const DEFAULT_PROPS = {
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasConnectionLine.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasConnectionLine.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdge.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdge.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdge.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdge.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdgeToolbar.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdgeToolbar.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdgeToolbar.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/CanvasEdgeToolbar.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/utils/getEdgeRenderData.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/utils/getEdgeRenderData.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/utils/getEdgeRenderData.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/utils/getEdgeRenderData.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/edges/utils/index.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/utils/index.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/edges/utils/index.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/utils/index.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/CanvasHandleRenderer.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/CanvasHandleRenderer.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/CanvasHandleRenderer.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/CanvasHandleRenderer.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
similarity index 87%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
index 38b6c796a9a..9fca66ddb17 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
@@ -1,6 +1,6 @@
 import CanvasHandleMainInput from './CanvasHandleMainInput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandleMainInput);
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
index 7e8b47f03c4..dbd55838b8b 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
@@ -1,6 +1,6 @@
 import CanvasHandleMainOutput from './CanvasHandleMainOutput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandleMainOutput);
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
similarity index 87%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
index 3a34bb0de0a..71652d9bf52 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
@@ -1,6 +1,6 @@
 import CanvasHandleNonMainInput from './CanvasHandleNonMainInput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandleNonMainInput);
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
similarity index 87%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
index bf9badb148f..bce53daa80d 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
@@ -1,6 +1,6 @@
 import CanvasHandleNonMainOutput from './CanvasHandleNonMainOutput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandleNonMainOutput);
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
index dc2cad7b2d6..f5a04b21016 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
@@ -1,7 +1,7 @@
 import { fireEvent } from '@testing-library/vue';
 import CanvasHandlePlus from './CanvasHandlePlus.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandlePlus, {
 	global: {
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNode.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNode.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.test.ts
index c5cf5fc5531..71e0110beb7 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNode.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.test.ts
@@ -7,7 +7,7 @@ import {
 	createCanvasNodeData,
 	createCanvasNodeProps,
 	createCanvasProvide,
-} from '@/features/canvas/__tests__/utils';
+} from '@/features/workflows/canvas/__tests__/utils';
 import { CanvasNodeRenderType } from '../../../canvas.types';
 
 vi.mock('@/stores/nodeTypes.store', () => ({
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNode.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNode.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.vue
index a5e403f132f..b92db31c667 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNode.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.vue
@@ -22,7 +22,7 @@ import CanvasNodeRenderer from './CanvasNodeRenderer.vue';
 import CanvasHandleRenderer from '../handles/CanvasHandleRenderer.vue';
 import { useNodeConnections } from '@/composables/useNodeConnections';
 import { CanvasNodeKey } from '@/constants';
-import { useContextMenu } from '@/features/ui/contextMenu/composables/useContextMenu';
+import { useContextMenu } from '@/features/shared/contextMenu/composables/useContextMenu';
 import type { NodeProps, XYPosition } from '@vue-flow/core';
 import { Position } from '@vue-flow/core';
 import { useCanvas } from '../../../composables/useCanvas';
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeRenderer.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeRenderer.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeRenderer.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeRenderer.test.ts
index 77ae9781ab7..742dbd6005a 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeRenderer.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeRenderer.test.ts
@@ -1,6 +1,9 @@
 import CanvasNodeRenderer from './CanvasNodeRenderer.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasNodeProvide, createCanvasProvide } from '@/features/canvas/__tests__/utils';
+import {
+	createCanvasNodeProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { CanvasNodeRenderType } from '../../../canvas.types';
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeRenderer.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeRenderer.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeRenderer.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeRenderer.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeToolbar.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeToolbar.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeToolbar.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeToolbar.test.ts
index 91e0b8a6357..321c2be395b 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeToolbar.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeToolbar.test.ts
@@ -2,7 +2,10 @@ import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import CanvasNodeToolbar from './CanvasNodeToolbar.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasNodeProvide, createCanvasProvide } from '@/features/canvas/__tests__/utils';
+import {
+	createCanvasNodeProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 import { CanvasNodeRenderType } from '../../../canvas.types';
 import { createPinia, setActivePinia, type Pinia } from 'pinia';
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeToolbar.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeToolbar.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/CanvasNodeToolbar.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNodeToolbar.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.test.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.test.ts
index 43d1179c96f..4688149c3f2 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.test.ts
@@ -1,4 +1,7 @@
-import { createCanvasNodeProvide, createCanvasProvide } from '@/features/canvas/__tests__/utils';
+import {
+	createCanvasNodeProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 import { createComponentRenderer } from '@/__tests__/render';
 import { TEMPLATES_URLS } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.vue
index 3b215e14fbf..0115f841809 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeAddNodes.vue
@@ -8,7 +8,7 @@ import {
 } from '@/utils/experiments';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useI18n } from '@n8n/i18n';
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeChoicePrompt.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeChoicePrompt.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeChoicePrompt.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeChoicePrompt.vue
index a0731decdd3..e570fbc80d8 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeChoicePrompt.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeChoicePrompt.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { NODE_CREATOR_OPEN_SOURCES } from '@/constants';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
-import { useChatPanelStore } from '@/features/assistant/chatPanel.store';
+import { useChatPanelStore } from '@/features/ai/assistant/chatPanel.store';
 import { useI18n } from '@n8n/i18n';
 import { computed } from 'vue';
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeDefault.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeDefault.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.test.ts
index 0211729bc63..1e9ad83c27b 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeDefault.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.test.ts
@@ -2,7 +2,10 @@ import { createTestWorkflowObject } from '@/__tests__/mocks';
 import { createComponentRenderer } from '@/__tests__/render';
 import { type MockedStore, mockedStore } from '@/__tests__/utils';
 import { VIEWS } from '@/constants';
-import { createCanvasNodeProvide, createCanvasProvide } from '@/features/canvas/__tests__/utils';
+import {
+	createCanvasNodeProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createTestingPinia } from '@pinia/testing';
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
index ec1e8dfa523..4a975f925e9 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
@@ -1,6 +1,6 @@
 import CanvasNodeStickyNote from './CanvasNodeStickyNote.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasNodeProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasNodeProvide } from '@/features/workflows/canvas/__tests__/utils';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { fireEvent } from '@testing-library/vue';
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeStickyNote.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeAddNodes.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeAddNodes.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeAddNodes.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeAddNodes.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeSettingsIcons.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeSettingsIcons.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeSettingsIcons.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeSettingsIcons.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
index 137287853c2..304643696e7 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
@@ -1,4 +1,7 @@
-import { createCanvasNodeProvide, createCanvasProvide } from '@/features/canvas/__tests__/utils';
+import {
+	createCanvasNodeProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore, type MockedStore } from '@/__tests__/utils';
 import { VIEWS } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
index f14da031c0b..563b23ceb5e 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
@@ -5,7 +5,7 @@ import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useCanvasNode } from '../../../../../composables/useCanvasNode';
 import { useI18n } from '@n8n/i18n';
 import { CanvasNodeDirtiness, CanvasNodeRenderType } from '../../../../../canvas.types';
-import { useCanvas } from '@/features/canvas/composables/useCanvas';
+import { useCanvas } from '@/features/workflows/canvas/composables/useCanvas';
 import { useRoute } from 'vue-router';
 import { VIEWS } from '@/constants';
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
index 9d79a5254f2..d337d83b66c 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
@@ -1,7 +1,7 @@
 import CanvasNodeTooltip from './CanvasNodeTooltip.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import type { CanvasNodeDefaultRender } from '../../../../../canvas.types';
-import { createCanvasNodeProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasNodeProvide } from '@/features/workflows/canvas/__tests__/utils';
 import { waitFor } from '@testing-library/vue';
 
 const renderComponent = createComponentRenderer(CanvasNodeTooltip);
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeTrigger.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
similarity index 93%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
index cd22621b51d..e5e84248323 100644
--- a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
@@ -1,7 +1,7 @@
 import { fireEvent } from '@testing-library/vue';
 import CanvasNodeStickyColorSelector from './CanvasNodeStickyColorSelector.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasNodeProvide } from '@/features/canvas/__tests__/utils';
+import { createCanvasNodeProvide } from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasNodeStickyColorSelector);
 
diff --git a/packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/__snapshots__/useCanvasLayout.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/__snapshots__/useCanvasLayout.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/__snapshots__/useCanvasLayout.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/__snapshots__/useCanvasLayout.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvas.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvas.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvas.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvas.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasLayout.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasLayout.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasLayout.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasLayout.test.ts
index 2ec14f5b401..2138feea0a9 100644
--- a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasLayout.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasLayout.test.ts
@@ -1,6 +1,9 @@
 import { useVueFlow, type GraphNode, type VueFlowStore } from '@vue-flow/core';
 import { computed, ref } from 'vue';
-import { createCanvasGraphEdge, createCanvasGraphNode } from '@/features/canvas/__tests__/utils';
+import {
+	createCanvasGraphEdge,
+	createCanvasGraphNode,
+} from '@/features/workflows/canvas/__tests__/utils';
 import { CanvasNodeRenderType, type CanvasNodeData } from '../canvas.types';
 import { useCanvasLayout, type CanvasLayoutResult } from './useCanvasLayout';
 import { STICKY_NODE_TYPE } from '@/constants';
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasLayout.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasLayout.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasLayout.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasLayout.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasMapping.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasMapping.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.test.ts
index dfb3651928e..40adcbf8d33 100644
--- a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasMapping.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.test.ts
@@ -12,7 +12,7 @@ import {
 	mockNodeTypeDescription,
 } from '@/__tests__/mocks';
 import { mockedStore } from '@/__tests__/utils';
-import { useCanvasMapping } from '@/features/canvas/composables/useCanvasMapping';
+import { useCanvasMapping } from '@/features/workflows/canvas/composables/useCanvasMapping';
 import {
 	FORM_TRIGGER_NODE_TYPE,
 	MANUAL_TRIGGER_NODE_TYPE,
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasMapping.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasMapping.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNode.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNode.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNode.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNode.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNode.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNode.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNode.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNode.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNodeHandle.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNodeHandle.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNodeHandle.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNodeHandle.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNodeHover.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNodeHover.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNodeHover.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNodeHover.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNodeHover.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNodeHover.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasNodeHover.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasNodeHover.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasTraversal.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasTraversal.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasTraversal.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasTraversal.test.ts
index 51ad132b0b4..6af412423c4 100644
--- a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasTraversal.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasTraversal.test.ts
@@ -1,4 +1,4 @@
-import { useCanvasTraversal } from '@/features/canvas/composables/useCanvasTraversal';
+import { useCanvasTraversal } from '@/features/workflows/canvas/composables/useCanvasTraversal';
 import type { CanvasNode } from '../canvas.types';
 import type { VueFlowStore } from '@vue-flow/core';
 import { mock } from 'vitest-mock-extended';
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useCanvasTraversal.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasTraversal.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useCanvasTraversal.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasTraversal.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useViewportAutoAdjust.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useViewportAutoAdjust.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useViewportAutoAdjust.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useViewportAutoAdjust.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/composables/useViewportAutoAdjust.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useViewportAutoAdjust.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/composables/useViewportAutoAdjust.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/composables/useViewportAutoAdjust.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvActions.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvActions.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvActions.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvActions.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNodeDetails.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNodeDetails.vue
similarity index 93%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNodeDetails.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNodeDetails.vue
index c2f6cfb646d..4edba8b7a61 100644
--- a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalEmbeddedNodeDetails.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNodeDetails.vue
@@ -10,10 +10,10 @@ import { useExperimentalNdvStore } from '../experimentalNdv.store';
 import ExperimentalCanvasNodeSettings from './ExperimentalCanvasNodeSettings.vue';
 import { useI18n } from '@n8n/i18n';
 import NodeIcon from '@/components/NodeIcon.vue';
-import { getNodeSubTitleText } from '@/features/canvas/experimental/experimentalNdv.utils';
-import ExperimentalEmbeddedNdvActions from '@/features/canvas/experimental/components/ExperimentalEmbeddedNdvActions.vue';
-import { useCanvas } from '@/features/canvas/composables/useCanvas';
-import { useExpressionResolveCtx } from '@/features/canvas/experimental/composables/useExpressionResolveCtx';
+import { getNodeSubTitleText } from '@/features/workflows/canvas/experimental/experimentalNdv.utils';
+import ExperimentalEmbeddedNdvActions from '@/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvActions.vue';
+import { useCanvas } from '@/features/workflows/canvas/composables/useCanvas';
+import { useExpressionResolveCtx } from '@/features/workflows/canvas/experimental/composables/useExpressionResolveCtx';
 import { useTelemetryContext } from '@/composables/useTelemetryContext';
 
 import { N8nText } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalFocusPanelHeader.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalFocusPanelHeader.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalFocusPanelHeader.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalFocusPanelHeader.vue
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalNodeDetailsDrawer.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalNodeDetailsDrawer.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalNodeDetailsDrawer.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalNodeDetailsDrawer.test.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue
index 37a1d3df767..2e34b472e4a 100644
--- a/packages/frontend/editor-ui/src/features/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalNodeDetailsDrawer.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { useExpressionResolveCtx } from '@/features/canvas/experimental/composables/useExpressionResolveCtx';
+import { useExpressionResolveCtx } from '@/features/workflows/canvas/experimental/composables/useExpressionResolveCtx';
 import {
 	type ContextMenuAction,
 	useContextMenuItems,
-} from '@/features/ui/contextMenu/composables/useContextMenuItems';
+} from '@/features/shared/contextMenu/composables/useContextMenuItems';
 import { ExpressionLocalResolveContextSymbol } from '@/constants';
 import { type INodeUi } from '@/Interface';
 import { computed, provide, ref, watch } from 'vue';
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/composables/useExpressionResolveCtx.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/composables/useExpressionResolveCtx.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/composables/useExpressionResolveCtx.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/composables/useExpressionResolveCtx.ts
index f7928c3ddec..05edbf60fc6 100644
--- a/packages/frontend/editor-ui/src/features/canvas/experimental/composables/useExpressionResolveCtx.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/composables/useExpressionResolveCtx.ts
@@ -1,5 +1,5 @@
 import type { INodeUi } from '@/Interface';
-import useEnvironmentsStore from '@/features/environments.ee/environments.store';
+import useEnvironmentsStore from '@/features/settings/environments.ee/environments.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { ExpressionLocalResolveContext } from '@/types/expressions';
 import type { Workflow } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/composables/useIsInExperimentalNdv.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/composables/useIsInExperimentalNdv.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/composables/useIsInExperimentalNdv.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/composables/useIsInExperimentalNdv.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/experimentalNdv.store.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/experimentalNdv.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/experimentalNdv.store.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/experimentalNdv.store.ts
diff --git a/packages/frontend/editor-ui/src/features/canvas/experimental/experimentalNdv.utils.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/experimentalNdv.utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/canvas/experimental/experimentalNdv.utils.ts
rename to packages/frontend/editor-ui/src/features/workflows/canvas/experimental/experimentalNdv.utils.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/__tests__/setupTemplate.store.testData.ts b/packages/frontend/editor-ui/src/features/workflows/templates/__tests__/setupTemplate.store.testData.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/__tests__/setupTemplate.store.testData.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/__tests__/setupTemplate.store.testData.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/components/AppsRequiringCredsNotice.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/AppsRequiringCredsNotice.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/AppsRequiringCredsNotice.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/AppsRequiringCredsNotice.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/IconSuccess.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/IconSuccess.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/IconSuccess.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/IconSuccess.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/SetupTemplateFormStep.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupTemplateFormStep.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/SetupTemplateFormStep.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/SetupTemplateFormStep.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/SetupWorkflowCredentialsButton.test.ts b/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/SetupWorkflowCredentialsButton.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.test.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/components/SetupWorkflowCredentialsButton.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/SetupWorkflowCredentialsButton.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/SetupWorkflowCredentialsModal.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/SetupWorkflowCredentialsModal.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsModal.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplateCard.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateCard.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplateCard.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateCard.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplateDetails.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateDetails.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplateDetails.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateDetails.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplateDetailsBlock.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateDetailsBlock.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplateDetailsBlock.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateDetailsBlock.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplateFilters.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateFilters.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplateFilters.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateFilters.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplateList.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateList.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplateList.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplateList.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplatesInfoCard.test.ts b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplatesInfoCard.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplatesInfoCard.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplatesInfoCard.test.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplatesInfoCard.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplatesInfoCard.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplatesInfoCard.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplatesInfoCard.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/components/TemplatesInfoCarousel.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/TemplatesInfoCarousel.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/components/TemplatesInfoCarousel.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/components/TemplatesInfoCarousel.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/composables/useCredentialSetupState.test.ts b/packages/frontend/editor-ui/src/features/workflows/templates/composables/useCredentialSetupState.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/composables/useCredentialSetupState.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/composables/useCredentialSetupState.test.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/composables/useCredentialSetupState.ts b/packages/frontend/editor-ui/src/features/workflows/templates/composables/useCredentialSetupState.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/composables/useCredentialSetupState.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/composables/useCredentialSetupState.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/composables/useSetupWorkflowCredentialsModalState.ts b/packages/frontend/editor-ui/src/features/workflows/templates/composables/useSetupWorkflowCredentialsModalState.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/composables/useSetupWorkflowCredentialsModalState.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/composables/useSetupWorkflowCredentialsModalState.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/setupTemplate.store.test.ts b/packages/frontend/editor-ui/src/features/workflows/templates/setupTemplate.store.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/templates/setupTemplate.store.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/setupTemplate.store.test.ts
index b903e0eb1c9..6ea7c2f9ea2 100644
--- a/packages/frontend/editor-ui/src/features/templates/setupTemplate.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/setupTemplate.store.test.ts
@@ -8,7 +8,7 @@ import type {
 	ITemplatesWorkflowFull,
 	IWorkflowTemplateNode,
 } from '@n8n/rest-api-client/api/templates';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { keyFromCredentialTypeAndName } from './utils/templateTransforms';
 import { useSetupTemplateStore } from './setupTemplate.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
diff --git a/packages/frontend/editor-ui/src/features/templates/setupTemplate.store.ts b/packages/frontend/editor-ui/src/features/workflows/templates/setupTemplate.store.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/templates/setupTemplate.store.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/setupTemplate.store.ts
index 521043c60f4..7f40cc6c2f4 100644
--- a/packages/frontend/editor-ui/src/features/templates/setupTemplate.store.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/setupTemplate.store.ts
@@ -4,7 +4,7 @@ import type { Router } from 'vue-router';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import type { INodeUi } from '@/Interface';
diff --git a/packages/frontend/editor-ui/src/features/templates/templates.store.ts b/packages/frontend/editor-ui/src/features/workflows/templates/templates.store.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/features/templates/templates.store.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/templates.store.ts
index 23416b44372..b382223e10f 100644
--- a/packages/frontend/editor-ui/src/features/templates/templates.store.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/templates.store.ts
@@ -18,7 +18,7 @@ import { useRootStore } from '@n8n/stores/useRootStore';
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 
 export interface ITemplateState {
diff --git a/packages/frontend/editor-ui/src/features/templates/templates.types.ts b/packages/frontend/editor-ui/src/features/workflows/templates/templates.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/templates.types.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/templates.types.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/agents/calendar-agent.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/calendar-agent.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/agents/calendar-agent.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/calendar-agent.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/agents/email_triage_agent_with_gmail.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/email_triage_agent_with_gmail.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/agents/email_triage_agent_with_gmail.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/email_triage_agent_with_gmail.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/agents/joke_agent_with_http_tool.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/joke_agent_with_http_tool.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/agents/joke_agent_with_http_tool.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/joke_agent_with_http_tool.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/agents/knowledge_store_agent_with_google_drive.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/knowledge_store_agent_with_google_drive.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/agents/knowledge_store_agent_with_google_drive.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/knowledge_store_agent_with_google_drive.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/agents/task_management_agent_with_google_sheets.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/task_management_agent_with_google_sheets.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/agents/task_management_agent_with_google_sheets.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/task_management_agent_with_google_sheets.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/agents/voice-agent.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/voice-agent.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/agents/voice-agent.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/agents/voice-agent.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/easy_ai_starter.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/easy_ai_starter.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/easy_ai_starter.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/easy_ai_starter.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/rag_starter.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/rag_starter.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/rag_starter.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/rag_starter.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/api_fundamentals.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/api_fundamentals.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/api_fundamentals.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/api_fundamentals.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/build_your_first_ai_agent.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/build_your_first_ai_agent.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/build_your_first_ai_agent.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/build_your_first_ai_agent.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/expressions_tutorial.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/expressions_tutorial.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/expressions_tutorial.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/expressions_tutorial.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/json_basics.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/json_basics.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/json_basics.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/json_basics.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/workflow_logic.json b/packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/workflow_logic.json
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/samples/tutorial/workflow_logic.json
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/samples/tutorial/workflow_logic.json
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/templateActions.test.ts b/packages/frontend/editor-ui/src/features/workflows/templates/utils/templateActions.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/templates/utils/templateActions.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/templateActions.test.ts
index 4339628bf43..62af59e77e3 100644
--- a/packages/frontend/editor-ui/src/features/templates/utils/templateActions.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/utils/templateActions.test.ts
@@ -9,8 +9,8 @@ import type { ITemplatesWorkflowFull } from '@n8n/rest-api-client/api/templates'
 import { Telemetry } from '@/plugins/telemetry';
 import type { NodeTypesStore } from '@/stores/nodeTypes.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import type { TemplatesStore } from '@/features/templates/templates.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import type { TemplatesStore } from '@/features/workflows/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useTemplateWorkflow } from './templateActions';
 import { nodeTypeTelegram } from '@/utils/testData/nodeTypeTestData';
 
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/templateActions.ts b/packages/frontend/editor-ui/src/features/workflows/templates/utils/templateActions.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/templates/utils/templateActions.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/templateActions.ts
index ecd5125677e..b14538e49ba 100644
--- a/packages/frontend/editor-ui/src/features/templates/utils/templateActions.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/utils/templateActions.ts
@@ -11,7 +11,7 @@ import type { TemplateCredentialKey } from './templateTransforms';
 import { replaceAllTemplateNodeCredentials } from './templateTransforms';
 import type { INodeCredentialsDetails } from 'n8n-workflow';
 import type { RouteLocationRaw, Router } from 'vue-router';
-import type { TemplatesStore } from '@/features/templates/templates.store';
+import type { TemplatesStore } from '@/features/workflows/templates/templates.store';
 import type { NodeTypesStore } from '@/stores/nodeTypes.store';
 import type { Telemetry } from '@/plugins/telemetry';
 import type { useExternalHooks } from '@/composables/useExternalHooks';
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/templateTransforms.test.ts b/packages/frontend/editor-ui/src/features/workflows/templates/utils/templateTransforms.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/templateTransforms.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/templateTransforms.test.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/templateTransforms.ts b/packages/frontend/editor-ui/src/features/workflows/templates/utils/templateTransforms.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/templateTransforms.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/templateTransforms.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/typeGuards.ts b/packages/frontend/editor-ui/src/features/workflows/templates/utils/typeGuards.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/typeGuards.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/typeGuards.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/utils/workflowSamples.ts b/packages/frontend/editor-ui/src/features/workflows/templates/utils/workflowSamples.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/utils/workflowSamples.ts
rename to packages/frontend/editor-ui/src/features/workflows/templates/utils/workflowSamples.ts
diff --git a/packages/frontend/editor-ui/src/features/templates/views/SetupWorkflowFromTemplateView.vue b/packages/frontend/editor-ui/src/features/workflows/templates/views/SetupWorkflowFromTemplateView.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/templates/views/SetupWorkflowFromTemplateView.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/views/SetupWorkflowFromTemplateView.vue
index 36467e93ce1..3479557da06 100644
--- a/packages/frontend/editor-ui/src/features/templates/views/SetupWorkflowFromTemplateView.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/views/SetupWorkflowFromTemplateView.vue
@@ -4,7 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useSetupTemplateStore } from '../setupTemplate.store';
 import AppsRequiringCredsNotice from '../components/AppsRequiringCredsNotice.vue';
 import SetupTemplateFormStep from '../components/SetupTemplateFormStep.vue';
-import TemplatesView from '@/features/templates/views/TemplatesView.vue';
+import TemplatesView from '@/features/workflows/templates/views/TemplatesView.vue';
 import { VIEWS } from '@/constants';
 import { useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/features/templates/views/TemplatesCollectionView.vue b/packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesCollectionView.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/features/templates/views/TemplatesCollectionView.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesCollectionView.vue
index cc857009a14..01901fe9cd8 100644
--- a/packages/frontend/editor-ui/src/features/templates/views/TemplatesCollectionView.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesCollectionView.vue
@@ -5,11 +5,11 @@ import TemplateList from '../components/TemplateList.vue';
 import TemplatesView from './TemplatesView.vue';
 import type { ITemplatesWorkflow } from '@n8n/rest-api-client/api/templates';
 import { VIEWS } from '@/constants';
-import { useTemplatesStore } from '@/features/templates/templates.store';
-import { useTemplateWorkflow } from '@/features/templates/utils/templateActions';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
+import { useTemplateWorkflow } from '@/features/workflows/templates/utils/templateActions';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { isFullTemplatesCollection } from '@/features/templates/utils/typeGuards';
+import { isFullTemplatesCollection } from '@/features/workflows/templates/utils/typeGuards';
 import { useRoute, useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
diff --git a/packages/frontend/editor-ui/src/features/templates/views/TemplatesSearchView.vue b/packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesSearchView.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/templates/views/TemplatesSearchView.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesSearchView.vue
index 872c4fcc0cb..f099c5a4776 100644
--- a/packages/frontend/editor-ui/src/features/templates/views/TemplatesSearchView.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesSearchView.vue
@@ -9,8 +9,8 @@ import type { ITemplatesCategory } from '@n8n/rest-api-client/api/templates';
 import type { IDataObject } from 'n8n-workflow';
 import { CREATOR_HUB_URL, VIEWS } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/features/users/users.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useToast } from '@/composables/useToast';
 import { useDebounce } from '@/composables/useDebounce';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
diff --git a/packages/frontend/editor-ui/src/features/templates/views/TemplatesView.vue b/packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesView.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/templates/views/TemplatesView.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesView.vue
diff --git a/packages/frontend/editor-ui/src/features/templates/views/TemplatesWorkflowView.vue b/packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesWorkflowView.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/features/templates/views/TemplatesWorkflowView.vue
rename to packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesWorkflowView.vue
index 2eee02767f3..b9dfa8d8f38 100644
--- a/packages/frontend/editor-ui/src/features/templates/views/TemplatesWorkflowView.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/views/TemplatesWorkflowView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, ref, watch } from 'vue';
-import { useTemplatesStore } from '@/features/templates/templates.store';
-import { useTemplateWorkflow } from '@/features/templates/utils/templateActions';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
+import { useTemplateWorkflow } from '@/features/workflows/templates/utils/templateActions';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRoute, useRouter } from 'vue-router';
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/DiffBadge.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/DiffBadge.test.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/features/workflow-diff/DiffBadge.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/DiffBadge.test.ts
index e43b5ab02b0..79205862010 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/DiffBadge.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/DiffBadge.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import { createComponentRenderer } from '@/__tests__/render';
-import DiffBadge from '@/features/workflow-diff/DiffBadge.vue';
-import { NodeDiffStatus } from '@/features/workflow-diff/useWorkflowDiff';
+import DiffBadge from '@/features/workflows/workflowDiff/DiffBadge.vue';
+import { NodeDiffStatus } from '@/features/workflows/workflowDiff/useWorkflowDiff';
 
 const renderComponent = createComponentRenderer(DiffBadge);
 
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/DiffBadge.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/DiffBadge.vue
similarity index 92%
rename from packages/frontend/editor-ui/src/features/workflow-diff/DiffBadge.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/DiffBadge.vue
index bbe97dab3de..142b3292634 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/DiffBadge.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/DiffBadge.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { NodeDiffStatus } from '@/features/workflow-diff/useWorkflowDiff';
+import { NodeDiffStatus } from '@/features/workflows/workflowDiff/useWorkflowDiff';
 import { computed } from 'vue';
 const props = defineProps<{
 	type: NodeDiffStatus;
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/HighlightedEdge.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/HighlightedEdge.test.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/features/workflow-diff/HighlightedEdge.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/HighlightedEdge.test.ts
index b04198c7173..f1f0e2adcdd 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/HighlightedEdge.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/HighlightedEdge.test.ts
@@ -1,12 +1,12 @@
 import { describe, it, expect, vi } from 'vitest';
 import { createComponentRenderer } from '@/__tests__/render';
-import HighlightedEdge from '@/features/workflow-diff/HighlightedEdge.vue';
-import type { CanvasEdgeProps } from '@/features/canvas/components/elements/edges/CanvasEdge.vue';
+import HighlightedEdge from '@/features/workflows/workflowDiff/HighlightedEdge.vue';
+import type { CanvasEdgeProps } from '@/features/workflows/canvas/components/elements/edges/CanvasEdge.vue';
 import { Position } from '@vue-flow/core';
 import { NodeConnectionTypes } from 'n8n-workflow';
 
 // Mock the Edge component
-vi.mock('@/features/canvas/components/elements/edges/CanvasEdge.vue', () => ({
+vi.mock('@/features/workflows/canvas/components/elements/edges/CanvasEdge.vue', () => ({
 	default: {
 		name: 'CanvasEdge',
 		template:
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/HighlightedEdge.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/HighlightedEdge.vue
similarity index 71%
rename from packages/frontend/editor-ui/src/features/workflow-diff/HighlightedEdge.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/HighlightedEdge.vue
index 8c3593847d1..ca1aff14618 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/HighlightedEdge.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/HighlightedEdge.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { CanvasEdgeProps } from '@/features/canvas/components/elements/edges/CanvasEdge.vue';
-import Edge from '@/features/canvas/components/elements/edges/CanvasEdge.vue';
+import type { CanvasEdgeProps } from '@/features/workflows/canvas/components/elements/edges/CanvasEdge.vue';
+import Edge from '@/features/workflows/canvas/components/elements/edges/CanvasEdge.vue';
 import { BaseEdge } from '@vue-flow/core';
 
 const props = defineProps<CanvasEdgeProps>();
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/NodeDiff.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/NodeDiff.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/workflow-diff/NodeDiff.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/NodeDiff.test.ts
index cb4dc505ce1..e840f96def6 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/NodeDiff.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/NodeDiff.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from 'vitest';
 import { createComponentRenderer } from '@/__tests__/render';
-import NodeDiff from '@/features/workflow-diff/NodeDiff.vue';
+import NodeDiff from '@/features/workflows/workflowDiff/NodeDiff.vue';
 import { createTestingPinia } from '@pinia/testing';
 
 // Mock the v-code-diff library
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/NodeDiff.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/NodeDiff.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflow-diff/NodeDiff.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/NodeDiff.vue
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/SyncedWorkflowCanvas.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/SyncedWorkflowCanvas.vue
similarity index 86%
rename from packages/frontend/editor-ui/src/features/workflow-diff/SyncedWorkflowCanvas.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/SyncedWorkflowCanvas.vue
index 406093b3741..845dd4509d9 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/SyncedWorkflowCanvas.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/SyncedWorkflowCanvas.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import CanvasBackground from '@/features/canvas/components/elements/background/CanvasBackground.vue';
-import { useInjectViewportSync } from '@/features/workflow-diff/useViewportSync';
-import type { CanvasConnection, CanvasNode } from '@/features/canvas/canvas.types';
+import CanvasBackground from '@/features/workflows/canvas/components/elements/background/CanvasBackground.vue';
+import { useInjectViewportSync } from '@/features/workflows/workflowDiff/useViewportSync';
+import type { CanvasConnection, CanvasNode } from '@/features/workflows/canvas/canvas.types';
 import { useVueFlow } from '@vue-flow/core';
 import { watch } from 'vue';
-import Canvas from '@/features/canvas/components/Canvas.vue';
+import Canvas from '@/features/workflows/canvas/components/Canvas.vue';
 
 const props = defineProps<{
 	id: string;
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffAside.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffAside.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffAside.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffAside.vue
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.test.ts
index b387d73d118..23bd5ce76f1 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.test.ts
@@ -1,11 +1,11 @@
 import { waitFor } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
-import WorkflowDiffModal from '@/features/workflow-diff/WorkflowDiffModal.vue';
+import WorkflowDiffModal from '@/features/workflows/workflowDiff/WorkflowDiffModal.vue';
 import { createTestingPinia } from '@pinia/testing';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { mockedStore, type MockedStore } from '@/__tests__/utils';
 import { reactive, ref } from 'vue';
@@ -39,7 +39,7 @@ vi.mock('vue-router', () => ({
 	}),
 }));
 
-vi.mock('@/features/workflow-diff/useViewportSync', () => ({
+vi.mock('@/features/workflows/workflowDiff/useViewportSync', () => ({
 	useProvideViewportSync: () => ({
 		selectedDetailId: ref(undefined),
 		onNodeClick: vi.fn(),
@@ -52,7 +52,7 @@ vi.mock('@/features/workflow-diff/useViewportSync', () => ({
 	}),
 }));
 
-vi.mock('@/features/workflow-diff/useWorkflowDiff', () => ({
+vi.mock('@/features/workflows/workflowDiff/useWorkflowDiff', () => ({
 	useWorkflowDiff: () => ({
 		source: { nodes: [], connections: [] },
 		target: { nodes: [], connections: [] },
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
index 69b1cdb5665..a8259aef446 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
@@ -1,18 +1,18 @@
 <script setup lang="ts">
-import Node from '@/features/canvas/components/elements/nodes/CanvasNode.vue';
+import Node from '@/features/workflows/canvas/components/elements/nodes/CanvasNode.vue';
 import Modal from '@/components/Modal.vue';
 import NodeIcon from '@/components/NodeIcon.vue';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { STICKY_NODE_TYPE, WORKFLOW_DIFF_MODAL_KEY } from '@/constants';
-import DiffBadge from '@/features/workflow-diff/DiffBadge.vue';
-import NodeDiff from '@/features/workflow-diff/NodeDiff.vue';
-import SyncedWorkflowCanvas from '@/features/workflow-diff/SyncedWorkflowCanvas.vue';
-import { useProvideViewportSync } from '@/features/workflow-diff/useViewportSync';
-import { NodeDiffStatus, useWorkflowDiff } from '@/features/workflow-diff/useWorkflowDiff';
+import DiffBadge from '@/features/workflows/workflowDiff/DiffBadge.vue';
+import NodeDiff from '@/features/workflows/workflowDiff/NodeDiff.vue';
+import SyncedWorkflowCanvas from '@/features/workflows/workflowDiff/SyncedWorkflowCanvas.vue';
+import { useProvideViewportSync } from '@/features/workflows/workflowDiff/useViewportSync';
+import { NodeDiffStatus, useWorkflowDiff } from '@/features/workflows/workflowDiff/useWorkflowDiff';
 import type { IWorkflowDb } from '@/Interface';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { removeWorkflowExecutionData } from '@/utils/workflowUtils';
 import type { BaseTextKey } from '@n8n/i18n';
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/useViewportSync.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/useViewportSync.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflow-diff/useViewportSync.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/useViewportSync.test.ts
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/useViewportSync.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/useViewportSync.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflow-diff/useViewportSync.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/useViewportSync.ts
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/useWorkflowDiff.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/useWorkflowDiff.test.ts
index 85423fa179d..f7741bab0ec 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/useWorkflowDiff.test.ts
@@ -11,10 +11,10 @@ import type {
 	CanvasConnection,
 	CanvasNode,
 	ExecutionOutputMap,
-} from '@/features/canvas/canvas.types';
+} from '@/features/workflows/canvas/canvas.types';
 import type { INodeUi, IWorkflowDb } from '@/Interface';
 import type { IConnections } from 'n8n-workflow';
-import { useCanvasMapping } from '@/features/canvas/composables/useCanvasMapping';
+import { useCanvasMapping } from '@/features/workflows/canvas/composables/useCanvasMapping';
 
 // Mock modules at top level
 vi.mock('@/stores/workflows.store', () => ({
@@ -36,7 +36,7 @@ vi.mock('@/stores/nodeTypes.store', () => ({
 	}),
 }));
 
-vi.mock('@/features/canvas/composables/useCanvasMapping', () => ({
+vi.mock('@/features/workflows/canvas/composables/useCanvasMapping', () => ({
 	useCanvasMapping: vi.fn().mockReturnValue({
 		additionalNodePropertiesById: computed(() => ({})),
 		nodeExecutionRunDataOutputMapById: computed(() => ({})),
diff --git a/packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/useWorkflowDiff.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowDiff/useWorkflowDiff.ts
index 3f5fade5df2..94965ab2cb4 100644
--- a/packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/useWorkflowDiff.ts
@@ -1,11 +1,11 @@
 import _pick from 'lodash-es/pick';
 import _isEqual from 'lodash-es/isEqual';
-import type { CanvasConnection, CanvasNode } from '@/features/canvas/canvas.types';
+import type { CanvasConnection, CanvasNode } from '@/features/workflows/canvas/canvas.types';
 import type { INodeUi, IWorkflowDb } from '@/Interface';
 import type { MaybeRefOrGetter, Ref, ComputedRef } from 'vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { toValue, computed, ref, watchEffect, shallowRef } from 'vue';
-import { useCanvasMapping } from '@/features/canvas/composables/useCanvasMapping';
+import { useCanvasMapping } from '@/features/workflows/canvas/composables/useCanvasMapping';
 import type { Workflow, IConnections, INodeTypeDescription } from 'n8n-workflow';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/__tests__/utils.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/__tests__/utils.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/__tests__/utils.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/__tests__/utils.ts
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryButton.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryButton.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryButton.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryButton.test.ts
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryButton.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryButton.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryButton.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryButton.vue
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryContent.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryContent.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.test.ts
index 6757ea3e8d1..afe9d9812fb 100644
--- a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryContent.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.test.ts
@@ -10,7 +10,7 @@ import type { WorkflowHistoryActionTypes } from '@n8n/rest-api-client/api/workfl
 import { workflowVersionDataFactory } from '../__tests__/utils';
 import type { IWorkflowDb } from '@/Interface';
 import type { IUser } from 'n8n-workflow';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 
 const actionTypes: WorkflowHistoryActionTypes = ['restore', 'clone', 'open', 'download'];
 const actions: Array<UserAction<IUser>> = actionTypes.map((value) => ({
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryContent.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryContent.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.vue
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryList.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryList.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.test.ts
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryList.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryList.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.vue
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryListItem.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryListItem.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.test.ts
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryListItem.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryListItem.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.vue
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/components/__snapshots__/WorkflowHistoryButton.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/__snapshots__/WorkflowHistoryButton.test.ts.snap
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/components/__snapshots__/WorkflowHistoryButton.test.ts.snap
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/__snapshots__/WorkflowHistoryButton.test.ts.snap
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/views/WorkflowHistory.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/views/WorkflowHistory.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.test.ts
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/views/WorkflowHistory.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/views/WorkflowHistory.vue
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.vue
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/workflowHistory.store.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/workflowHistory.store.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/workflowHistory.store.test.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/workflowHistory.store.test.ts
diff --git a/packages/frontend/editor-ui/src/features/workflowHistory/workflowHistory.store.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/workflowHistory.store.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/features/workflowHistory/workflowHistory.store.ts
rename to packages/frontend/editor-ui/src/features/workflows/workflowHistory/workflowHistory.store.ts
diff --git a/packages/frontend/editor-ui/src/init.test.ts b/packages/frontend/editor-ui/src/init.test.ts
index 45b06440933..9fa9b9eec19 100644
--- a/packages/frontend/editor-ui/src/init.test.ts
+++ b/packages/frontend/editor-ui/src/init.test.ts
@@ -5,10 +5,10 @@ import { UserManagementAuthenticationMethod } from '@/Interface';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useVersionsStore } from '@/stores/versions.store';
 import type { Cloud, CurrentUserResponse } from '@n8n/rest-api-client';
 import type { IUser } from '@n8n/rest-api-client/api/users';
@@ -28,7 +28,7 @@ vi.mock('@/composables/useToast', () => ({
 	useToast: () => ({ showMessage, showToast }),
 }));
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn().mockReturnValue({
 		initialize: vi.fn(),
 		registerLoginHook: vi.fn(),
diff --git a/packages/frontend/editor-ui/src/init.ts b/packages/frontend/editor-ui/src/init.ts
index 84f7a73a02e..69385b48d99 100644
--- a/packages/frontend/editor-ui/src/init.ts
+++ b/packages/frontend/editor-ui/src/init.ts
@@ -1,9 +1,9 @@
-import SourceControlInitializationErrorMessage from '@/features/sourceControl.ee/components/SourceControlInitializationErrorMessage.vue';
+import SourceControlInitializationErrorMessage from '@/features/integrations/sourceControl.ee/components/SourceControlInitializationErrorMessage.vue';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { EnterpriseEditionFeature, VIEWS } from '@/constants';
-import { useInsightsStore } from '@/features/insights/insights.store';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 import type { UserManagementAuthenticationMethod } from '@/Interface';
 import {
 	registerModuleModals,
@@ -15,20 +15,20 @@ import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { usePostHog } from '@/stores/posthog.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useRBACStore } from '@/stores/rbac.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useVersionsStore } from '@/stores/versions.store';
 import type { BannerName } from '@n8n/api-types';
 import { useI18n } from '@n8n/i18n';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { h } from 'vue';
 import { useRolesStore } from './stores/roles.store';
-import { useDataTableStore } from '@/features/dataTable/dataTable.store';
+import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
 
 export const state = {
 	initialized: false,
diff --git a/packages/frontend/editor-ui/src/moduleInitializer/moduleInitializer.ts b/packages/frontend/editor-ui/src/moduleInitializer/moduleInitializer.ts
index 7fafaa1e80d..ae6ea8d4c7c 100644
--- a/packages/frontend/editor-ui/src/moduleInitializer/moduleInitializer.ts
+++ b/packages/frontend/editor-ui/src/moduleInitializer/moduleInitializer.ts
@@ -1,12 +1,12 @@
 import { type Router } from 'vue-router';
 import { VIEWS } from '@/constants';
-import { DataTableModule } from '@/features/dataTable/module.descriptor';
+import { DataTableModule } from '@/features/core/dataTable/module.descriptor';
 import { registerResource } from '@/moduleInitializer/resourceRegistry';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { InsightsModule } from '../features/insights/module.descriptor';
-import { MCPModule } from '../features/mcpAccess/module.descriptor';
-import { ChatModule } from '@/features/chatHub/module.descriptor';
+import { InsightsModule } from '@/features/execution/insights/module.descriptor';
+import { MCPModule } from '@/features/ai/mcpAccess/module.descriptor';
+import { ChatModule } from '@/features/ai/chatHub/module.descriptor';
 import type { FrontendModuleDescription } from '@/moduleInitializer/module.types';
 import * as modalRegistry from '@/moduleInitializer/modalRegistry';
 
diff --git a/packages/frontend/editor-ui/src/router.ts b/packages/frontend/editor-ui/src/router.ts
index 9318bd49fe2..88bf16fd964 100644
--- a/packages/frontend/editor-ui/src/router.ts
+++ b/packages/frontend/editor-ui/src/router.ts
@@ -8,79 +8,86 @@ import type {
 import { createRouter, createWebHistory, isNavigationFailure } from 'vue-router';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useSSOStore } from '@/features/sso/sso.store';
+import { useSSOStore } from '@/features/settings/sso/sso.store';
 import { EnterpriseEditionFeature, VIEWS, EDITABLE_CANVAS_VIEWS } from '@/constants';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { middleware } from '@/utils/rbac/middleware';
 import type { RouterMiddleware } from '@/types/router';
 import { initializeAuthenticatedFeatures, initializeCore } from '@/init';
 import { tryToParseNumber } from '@/utils/typesUtils';
-import { projectsRoutes } from '@/features/projects/projects.routes';
+import { projectsRoutes } from '@/features/collaboration/projects/projects.routes';
 import { MfaRequiredError } from '@n8n/rest-api-client';
 import { useCalloutHelpers } from './composables/useCalloutHelpers';
-import { useRecentResources } from '@/features/ui/commandBar/composables/useRecentResources';
+import { useRecentResources } from '@/features/shared/commandBar/composables/useRecentResources';
 
-const ChangePasswordView = async () => await import('@/features/auth/views/ChangePasswordView.vue');
+const ChangePasswordView = async () =>
+	await import('@/features/core/auth/views/ChangePasswordView.vue');
 const ErrorView = async () => await import('./views/ErrorView.vue');
 const EntityNotFound = async () => await import('./views/EntityNotFound.vue');
 const EntityUnAuthorised = async () => await import('./views/EntityUnAuthorised.vue');
 const ForgotMyPasswordView = async () =>
-	await import('@/features/auth/views/ForgotMyPasswordView.vue');
+	await import('@/features/core/auth/views/ForgotMyPasswordView.vue');
 const MainHeader = async () => await import('@/components/MainHeader/MainHeader.vue');
 const MainSidebar = async () => await import('@/components/MainSidebar.vue');
-const LogsPanel = async () => await import('@/features/logs/components/LogsPanel.vue');
-const DemoFooter = async () => await import('@/features/logs/components/DemoFooter.vue');
+const LogsPanel = async () => await import('@/features/execution/logs/components/LogsPanel.vue');
+const DemoFooter = async () => await import('@/features/execution/logs/components/DemoFooter.vue');
 const NodeView = async () => await import('@/views/NodeView.vue');
 const WorkflowExecutionsView = async () =>
-	await import('@/features/executions/views/WorkflowExecutionsView.vue');
+	await import('@/features/execution/executions/views/WorkflowExecutionsView.vue');
 const WorkflowExecutionsLandingPage = async () =>
-	await import('@/features/executions/components/workflow/WorkflowExecutionsLandingPage.vue');
+	await import(
+		'@/features/execution/executions/components/workflow/WorkflowExecutionsLandingPage.vue'
+	);
 const WorkflowExecutionsPreview = async () =>
-	await import('@/features/executions/components/workflow/WorkflowExecutionsPreview.vue');
+	await import('@/features/execution/executions/components/workflow/WorkflowExecutionsPreview.vue');
 const SettingsView = async () => await import('./views/SettingsView.vue');
-const SettingsLdapView = async () => await import('@/features/sso/views/SettingsLdapView.vue');
+const SettingsLdapView = async () =>
+	await import('@/features/settings/sso/views/SettingsLdapView.vue');
 const SettingsPersonalView = async () =>
-	await import('@/features/auth/views/SettingsPersonalView.vue');
-const SettingsUsersView = async () => await import('@/features/users/views/SettingsUsersView.vue');
+	await import('@/features/core/auth/views/SettingsPersonalView.vue');
+const SettingsUsersView = async () =>
+	await import('@/features/settings/users/views/SettingsUsersView.vue');
 const SettingsCommunityNodesView = async () =>
-	await import('@/features/communityNodes/views/SettingsCommunityNodesView.vue');
-const SettingsApiView = async () => await import('@/features/apiKeys/views/SettingsApiView.vue');
+	await import('@/features/settings/communityNodes/views/SettingsCommunityNodesView.vue');
+const SettingsApiView = async () =>
+	await import('@/features/settings/apiKeys/views/SettingsApiView.vue');
 const SettingsLogStreamingView = async () =>
-	await import('@/features/logStreaming.ee/views/SettingsLogStreamingView.vue');
-const SetupView = async () => await import('@/features/auth/views/SetupView.vue');
-const SigninView = async () => await import('@/features/auth/views/SigninView.vue');
-const SignupView = async () => await import('@/features/auth/views/SignupView.vue');
+	await import('@/features/integrations/logStreaming.ee/views/SettingsLogStreamingView.vue');
+const SetupView = async () => await import('@/features/core/auth/views/SetupView.vue');
+const SigninView = async () => await import('@/features/core/auth/views/SigninView.vue');
+const SignupView = async () => await import('@/features/core/auth/views/SignupView.vue');
 const TemplatesCollectionView = async () =>
-	await import('@/features/templates/views/TemplatesCollectionView.vue');
+	await import('@/features/workflows/templates/views/TemplatesCollectionView.vue');
 const TemplatesWorkflowView = async () =>
-	await import('@/features/templates/views/TemplatesWorkflowView.vue');
+	await import('@/features/workflows/templates/views/TemplatesWorkflowView.vue');
 const SetupWorkflowFromTemplateView = async () =>
-	await import('@/features/templates/views/SetupWorkflowFromTemplateView.vue');
+	await import('@/features/workflows/templates/views/SetupWorkflowFromTemplateView.vue');
 const TemplatesSearchView = async () =>
-	await import('@/features/templates/views/TemplatesSearchView.vue');
+	await import('@/features/workflows/templates/views/TemplatesSearchView.vue');
 const VariablesView = async () =>
-	await import('@/features/environments.ee/views/VariablesView.vue');
+	await import('@/features/settings/environments.ee/views/VariablesView.vue');
 const SettingsUsageAndPlan = async () =>
-	await import('@/features/usage/views/SettingsUsageAndPlan.vue');
-const SettingsSso = async () => await import('@/features/sso/views/SettingsSso.vue');
-const SignoutView = async () => await import('@/features/auth/views/SignoutView.vue');
-const SamlOnboarding = async () => await import('@/features/sso/views/SamlOnboarding.vue');
+	await import('@/features/settings/usage/views/SettingsUsageAndPlan.vue');
+const SettingsSso = async () => await import('@/features/settings/sso/views/SettingsSso.vue');
+const SignoutView = async () => await import('@/features/core/auth/views/SignoutView.vue');
+const SamlOnboarding = async () => await import('@/features/settings/sso/views/SamlOnboarding.vue');
 const SettingsSourceControl = async () =>
-	await import('@/features/sourceControl.ee/views/SettingsSourceControl.vue');
+	await import('@/features/integrations/sourceControl.ee/views/SettingsSourceControl.vue');
 const SettingsExternalSecrets = async () =>
-	await import('@/features/externalSecrets/views/SettingsExternalSecrets.vue');
-const WorkerView = async () => await import('@/features/orchestration.ee/views/WorkerView.vue');
+	await import('@/features/integrations/externalSecrets.ee/views/SettingsExternalSecrets.vue');
+const WorkerView = async () =>
+	await import('@/features/settings/orchestration.ee/views/WorkerView.vue');
 const WorkflowHistory = async () =>
-	await import('@/features/workflowHistory/views/WorkflowHistory.vue');
+	await import('@/features/workflows/workflowHistory/views/WorkflowHistory.vue');
 const WorkflowOnboardingView = async () => await import('@/views/WorkflowOnboardingView.vue');
 const EvaluationsView = async () =>
-	await import('@/features/evaluation.ee/views/EvaluationsView.vue');
+	await import('@/features/ai/evaluation.ee/views/EvaluationsView.vue');
 const TestRunDetailView = async () =>
-	await import('@/features/evaluation.ee/views/TestRunDetailView.vue');
+	await import('@/features/ai/evaluation.ee/views/TestRunDetailView.vue');
 const EvaluationRootView = async () =>
-	await import('@/features/evaluation.ee/views/EvaluationsRootView.vue');
+	await import('@/features/ai/evaluation.ee/views/EvaluationsRootView.vue');
 const PrebuiltAgentTemplatesView = async () =>
 	await import('@/views/PrebuiltAgentTemplatesView.vue');
 
diff --git a/packages/frontend/editor-ui/src/stores/logs.store.test.ts b/packages/frontend/editor-ui/src/stores/logs.store.test.ts
index 6306f659684..f40ffb89dfb 100644
--- a/packages/frontend/editor-ui/src/stores/logs.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/logs.store.test.ts
@@ -1,7 +1,7 @@
 import { setActivePinia } from 'pinia';
 import { useLogsStore } from './logs.store';
 import { createTestingPinia } from '@pinia/testing';
-import { LOG_DETAILS_PANEL_STATE } from '@/features/logs/logs.constants';
+import { LOG_DETAILS_PANEL_STATE } from '@/features/execution/logs/logs.constants';
 
 describe('logs.store', () => {
 	beforeEach(() => {
diff --git a/packages/frontend/editor-ui/src/stores/logs.store.ts b/packages/frontend/editor-ui/src/stores/logs.store.ts
index 6ed0a861e95..e557fde8194 100644
--- a/packages/frontend/editor-ui/src/stores/logs.store.ts
+++ b/packages/frontend/editor-ui/src/stores/logs.store.ts
@@ -1,4 +1,4 @@
-import { type LogDetailsPanelState } from '@/features/logs/logs.types';
+import { type LogDetailsPanelState } from '@/features/execution/logs/logs.types';
 import { useTelemetry } from '@/composables/useTelemetry';
 import {
 	LOCAL_STORAGE_LOGS_PANEL_DETAILS_PANEL,
@@ -9,7 +9,10 @@ import {
 import { useLocalStorage } from '@vueuse/core';
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
-import { LOG_DETAILS_PANEL_STATE, LOGS_PANEL_STATE } from '@/features/logs/logs.constants';
+import {
+	LOG_DETAILS_PANEL_STATE,
+	LOGS_PANEL_STATE,
+} from '@/features/execution/logs/logs.constants';
 import type { ChatMessage } from '@n8n/chat/types';
 import { v4 as uuid } from 'uuid';
 
diff --git a/packages/frontend/editor-ui/src/stores/nodeCreator.store.test.ts b/packages/frontend/editor-ui/src/stores/nodeCreator.store.test.ts
index a1342ac4758..f94ca4967b1 100644
--- a/packages/frontend/editor-ui/src/stores/nodeCreator.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/nodeCreator.store.test.ts
@@ -8,8 +8,8 @@ import {
 	REGULAR_NODE_CREATOR_VIEW,
 } from '@/constants';
 import type { ActionsRecord, INodeCreateElement, INodeUi, SimplifiedNodeType } from '@/Interface';
-import { CanvasConnectionMode } from '@/features/canvas/canvas.types';
-import { parseCanvasConnectionHandleString } from '@/features/canvas/canvas.utils';
+import { CanvasConnectionMode } from '@/features/workflows/canvas/canvas.types';
+import { parseCanvasConnectionHandleString } from '@/features/workflows/canvas/canvas.utils';
 import { getNodeIconSource } from '@/utils/nodeIcon';
 import type { CommunityNodeType } from '@n8n/api-types';
 import { createTestingPinia } from '@pinia/testing';
@@ -44,7 +44,7 @@ vi.mock('@/composables/useTelemetry', () => {
 	};
 });
 
-vi.mock('@/features/canvas/canvas.utils', () => {
+vi.mock('@/features/workflows/canvas/canvas.utils', () => {
 	return {
 		parseCanvasConnectionHandleString: vi.fn(),
 	};
diff --git a/packages/frontend/editor-ui/src/stores/nodeCreator.store.ts b/packages/frontend/editor-ui/src/stores/nodeCreator.store.ts
index 08affff3355..b09d6b0ee7e 100644
--- a/packages/frontend/editor-ui/src/stores/nodeCreator.store.ts
+++ b/packages/frontend/editor-ui/src/stores/nodeCreator.store.ts
@@ -39,9 +39,9 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import {
 	createCanvasConnectionHandleString,
 	parseCanvasConnectionHandleString,
-} from '@/features/canvas/canvas.utils';
+} from '@/features/workflows/canvas/canvas.utils';
 import type { Connection } from '@vue-flow/core';
-import { CanvasConnectionMode } from '@/features/canvas/canvas.types';
+import { CanvasConnectionMode } from '@/features/workflows/canvas/canvas.types';
 import { isVueFlowConnection } from '@/utils/typeGuards';
 import type { PartialBy } from '@/utils/typeHelpers';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/frontend/editor-ui/src/stores/posthog.store.test.ts b/packages/frontend/editor-ui/src/stores/posthog.store.test.ts
index 1429c158738..890b45b0520 100644
--- a/packages/frontend/editor-ui/src/stores/posthog.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/posthog.store.test.ts
@@ -1,6 +1,6 @@
 import { createPinia, setActivePinia } from 'pinia';
 import { usePostHog } from '@/stores/posthog.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import type { FrontendSettings } from '@n8n/api-types';
diff --git a/packages/frontend/editor-ui/src/stores/posthog.store.ts b/packages/frontend/editor-ui/src/stores/posthog.store.ts
index 610065e1454..f6ef39e4249 100644
--- a/packages/frontend/editor-ui/src/stores/posthog.store.ts
+++ b/packages/frontend/editor-ui/src/stores/posthog.store.ts
@@ -2,7 +2,7 @@ import type { Ref } from 'vue';
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 import { useStorage } from '@/composables/useStorage';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { FeatureFlags, IDataObject } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/stores/ui.store.ts b/packages/frontend/editor-ui/src/stores/ui.store.ts
index c11cb676692..bcf167cc20e 100644
--- a/packages/frontend/editor-ui/src/stores/ui.store.ts
+++ b/packages/frontend/editor-ui/src/stores/ui.store.ts
@@ -33,9 +33,9 @@ import {
 	CONFIRM_PASSWORD_MODAL_KEY,
 	EXPERIMENT_TEMPLATE_RECO_V3_KEY,
 } from '@/constants';
-import { DEBUG_PAYWALL_MODAL_KEY } from '@/features/executions/executions.constants';
-import { VARIABLE_MODAL_KEY } from '@/features/environments.ee/environments.constants';
-import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/usage/usage.constants';
+import { DEBUG_PAYWALL_MODAL_KEY } from '@/features/execution/executions/executions.constants';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/settings/usage/usage.constants';
+import { VARIABLE_MODAL_KEY } from '@/features/settings/environments.ee/environments.constants';
 import {
 	CREDENTIAL_EDIT_MODAL_KEY,
 	CREDENTIAL_SELECT_MODAL_KEY,
@@ -44,22 +44,22 @@ import {
 	DELETE_USER_MODAL_KEY,
 	INVITE_USER_MODAL_KEY,
 	PERSONALIZATION_MODAL_KEY,
-} from '@/features/users/users.constants';
+} from '@/features/settings/users/users.constants';
 import {
 	DELETE_FOLDER_MODAL_KEY,
 	MOVE_FOLDER_MODAL_KEY,
-} from '@/features/folders/folders.constants';
+} from '@/features/core/folders/folders.constants';
 import {
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
 	SOURCE_CONTROL_PULL_MODAL_KEY,
-} from '@/features/sourceControl.ee/sourceControl.constants';
-import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/projects/projects.constants';
+} from '@/features/integrations/sourceControl.ee/sourceControl.constants';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
 import {
 	COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY,
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
 	COMMUNITY_PACKAGE_MANAGE_ACTIONS,
-} from '@/features/communityNodes/communityNodes.constants';
-import { API_KEY_CREATE_OR_EDIT_MODAL_KEY } from '@/features/apiKeys/apiKeys.constants';
+} from '@/features/settings/communityNodes/communityNodes.constants';
+import { API_KEY_CREATE_OR_EDIT_MODAL_KEY } from '@/features/settings/apiKeys/apiKeys.constants';
 import { STORES } from '@n8n/stores';
 import type {
 	XYPosition,
@@ -84,7 +84,7 @@ import type { IMenuItem } from '@n8n/design-system';
 import type { Connection } from '@vue-flow/core';
 import { useLocalStorage, useMediaQuery } from '@vueuse/core';
 import type { EventBus } from '@n8n/utils/event-bus';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
 import identity from 'lodash/identity';
 import * as modalRegistry from '@/moduleInitializer/modalRegistry';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/frontend/editor-ui/src/stores/versions.store.test.ts b/packages/frontend/editor-ui/src/stores/versions.store.test.ts
index 4a296c15870..adabf708437 100644
--- a/packages/frontend/editor-ui/src/stores/versions.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/versions.store.test.ts
@@ -1,6 +1,6 @@
 import { createPinia, setActivePinia } from 'pinia';
 import { useVersionsStore } from './versions.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import * as versionsApi from '@n8n/rest-api-client/api/versions';
 import type { IVersionNotificationSettings } from '@n8n/api-types';
 import type { Version, WhatsNewArticle, WhatsNewSection } from '@n8n/rest-api-client/api/versions';
@@ -25,7 +25,7 @@ vi.mock('@/composables/useToast', () => {
 	};
 });
 
-vi.mock('@/features/users/users.store');
+vi.mock('@/features/settings/users/users.store');
 
 const settings: IVersionNotificationSettings = {
 	enabled: true,
diff --git a/packages/frontend/editor-ui/src/stores/versions.store.ts b/packages/frontend/editor-ui/src/stores/versions.store.ts
index 6ffa2b1422d..788005fcf7e 100644
--- a/packages/frontend/editor-ui/src/stores/versions.store.ts
+++ b/packages/frontend/editor-ui/src/stores/versions.store.ts
@@ -15,7 +15,7 @@ import { useToast } from '@/composables/useToast';
 import { useUIStore } from '@/stores/ui.store';
 import { computed, ref } from 'vue';
 import { useSettingsStore } from './settings.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useStorage } from '@/composables/useStorage';
 import { jsonParse } from 'n8n-workflow';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/frontend/editor-ui/src/stores/webhooks.store.ts b/packages/frontend/editor-ui/src/stores/webhooks.store.ts
index e27c1834081..1f3a711d0c2 100644
--- a/packages/frontend/editor-ui/src/stores/webhooks.store.ts
+++ b/packages/frontend/editor-ui/src/stores/webhooks.store.ts
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useNDVStore } from './ndv.store';
 import { useUIStore } from './ui.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from './workflows.store';
 import { useSettingsStore } from './settings.store';
 
diff --git a/packages/frontend/editor-ui/src/stores/workflows.ee.store.ts b/packages/frontend/editor-ui/src/stores/workflows.ee.store.ts
index 5755a2d8b77..af7e484f27d 100644
--- a/packages/frontend/editor-ui/src/stores/workflows.ee.store.ts
+++ b/packages/frontend/editor-ui/src/stores/workflows.ee.store.ts
@@ -6,8 +6,8 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { defineStore } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { i18n } from '@n8n/i18n';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import { splitName } from '@/features/projects/projects.utils';
+import type { ProjectSharingData } from '@/features/collaboration/projects/projects.types';
+import { splitName } from '@/features/collaboration/projects/projects.utils';
 import { computed } from 'vue';
 
 export const useWorkflowsEEStore = defineStore(STORES.WORKFLOWS_EE, () => {
diff --git a/packages/frontend/editor-ui/src/stores/workflows.store.test.ts b/packages/frontend/editor-ui/src/stores/workflows.store.test.ts
index 5f56238f5ca..e052ade44b8 100644
--- a/packages/frontend/editor-ui/src/stores/workflows.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/workflows.store.test.ts
@@ -10,7 +10,7 @@ import {
 } from '@/constants';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { INodeUi, IWorkflowDb, IWorkflowSettings } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 
 import { deepCopy, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 import type {
diff --git a/packages/frontend/editor-ui/src/stores/workflows.store.ts b/packages/frontend/editor-ui/src/stores/workflows.store.ts
index 4840732d7fc..9704dd94400 100644
--- a/packages/frontend/editor-ui/src/stores/workflows.store.ts
+++ b/packages/frontend/editor-ui/src/stores/workflows.store.ts
@@ -26,7 +26,7 @@ import type {
 	IExecutionResponse,
 	IExecutionsListResponse,
 	IExecutionFlattedResponse,
-} from '@/features/executions/executions.types';
+} from '@/features/execution/executions/executions.types';
 import type { IUsedCredential } from '@/features/credentials/credentials.types';
 import type { IWorkflowTemplateNode } from '@n8n/rest-api-client/api/templates';
 import type {
@@ -73,20 +73,20 @@ import {
 	unflattenExecutionData,
 	findTriggerNodeToAutoSelect,
 	openFormPopupWindow,
-} from '@/features/executions/executions.utils';
+} from '@/features/execution/executions/executions.utils';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { getCredentialOnlyNodeTypeName } from '@/utils/credentialOnlyNodes';
 import { i18n } from '@n8n/i18n';
 
 import { computed, ref, watch } from 'vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import type { PushPayload } from '@n8n/api-types';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useSettingsStore } from './settings.store';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { updateCurrentUserSettings } from '@n8n/rest-api-client/api/users';
 import type { NodeExecuteBefore } from '@n8n/api-types/push/execution';
 import { isChatNode } from '@/utils/aiUtils';
diff --git a/packages/frontend/editor-ui/src/types/expressions.ts b/packages/frontend/editor-ui/src/types/expressions.ts
index ff646490b81..2017bb21bcf 100644
--- a/packages/frontend/editor-ui/src/types/expressions.ts
+++ b/packages/frontend/editor-ui/src/types/expressions.ts
@@ -1,5 +1,5 @@
 import type { Basic } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { IConnections, IWorkflowDataProxyAdditionalKeys, Workflow } from 'n8n-workflow';
 
 type Range = { from: number; to: number };
diff --git a/packages/frontend/editor-ui/src/utils/expressions.test.ts b/packages/frontend/editor-ui/src/utils/expressions.test.ts
index 5f7eef5bf2b..53cc01a7f02 100644
--- a/packages/frontend/editor-ui/src/utils/expressions.test.ts
+++ b/packages/frontend/editor-ui/src/utils/expressions.test.ts
@@ -6,7 +6,7 @@ import {
 	stringifyExpressionResult,
 	unwrapExpression,
 } from './expressions';
-import { executionRetryMessage } from '@/features/executions/executions.utils';
+import { executionRetryMessage } from '@/features/execution/executions/executions.utils';
 
 describe('Utils: Expressions', () => {
 	describe('stringifyExpressionResult()', () => {
diff --git a/packages/frontend/editor-ui/src/utils/nodeViewUtils.ts b/packages/frontend/editor-ui/src/utils/nodeViewUtils.ts
index 267f0d02021..3d71fb5a607 100644
--- a/packages/frontend/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/frontend/editor-ui/src/utils/nodeViewUtils.ts
@@ -20,7 +20,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeHelpers, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 import type { RouteLocation } from 'vue-router';
-import type { ViewportBoundaries } from '@/features/canvas/canvas.types';
+import type { ViewportBoundaries } from '@/features/workflows/canvas/canvas.types';
 import {
 	getRectOfNodes,
 	type Dimensions,
diff --git a/packages/frontend/editor-ui/src/utils/pairedItemUtils.test.ts b/packages/frontend/editor-ui/src/utils/pairedItemUtils.test.ts
index 2506a616408..f3bfca5a288 100644
--- a/packages/frontend/editor-ui/src/utils/pairedItemUtils.test.ts
+++ b/packages/frontend/editor-ui/src/utils/pairedItemUtils.test.ts
@@ -1,5 +1,5 @@
 import type { TargetItem } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import {
 	getPairedItemId,
 	getSourceItems,
diff --git a/packages/frontend/editor-ui/src/utils/pairedItemUtils.ts b/packages/frontend/editor-ui/src/utils/pairedItemUtils.ts
index d55cfdf035c..85d7c8971c5 100644
--- a/packages/frontend/editor-ui/src/utils/pairedItemUtils.ts
+++ b/packages/frontend/editor-ui/src/utils/pairedItemUtils.ts
@@ -1,6 +1,6 @@
 import { type IPairedItemData, type IRunData, type ITaskData } from 'n8n-workflow';
 import type { TargetItem } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import { isNotNull } from '@/utils/typeGuards';
 
 export const MAX_ITEM_COUNT_FOR_PAIRING = 1000;
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.test.ts
index 28360a2d00f..f50f7e990d2 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.test.ts
@@ -1,8 +1,8 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { hasRole } from '@/utils/rbac/checks';
 import { ROLE } from '@n8n/api-types';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.ts
index ad0b080bc4f..5dd61547348 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { RBACPermissionCheck, RolePermissionOptions } from '@/types/rbac';
 import { ROLE, type Role } from '@n8n/api-types';
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
index 2fa9cd17cbb..e89cfcac822 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
@@ -1,8 +1,8 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { isAuthenticated } from '@/utils/rbac/checks/isAuthenticated';
 import type { IUser } from '@n8n/rest-api-client/api/users';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
index 07418fca94a..4db0d820caa 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { RBACPermissionCheck, AuthenticatedPermissionOptions } from '@/types/rbac';
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
index 887bb2f75f2..495d81dd23a 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
@@ -1,7 +1,7 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { isDefaultUser } from '@/utils/rbac/checks/isDefaultUser';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
index d506bf9433e..e41af997875 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { DefaultUserMiddlewareOptions, RBACPermissionCheck } from '@/types/rbac';
 
 export const isDefaultUser: RBACPermissionCheck<DefaultUserMiddlewareOptions> = () => {
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.test.ts
index d5b12da1cf1..b464511a3ce 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.test.ts
@@ -1,7 +1,7 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { isGuest } from '@/utils/rbac/checks/isGuest';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.ts
index 8dfb72c55f1..64734d51b20 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { RBACPermissionCheck, GuestPermissionOptions } from '@/types/rbac';
 
 export const isGuest: RBACPermissionCheck<GuestPermissionOptions> = () => {
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
index 0a765e9be2e..acb49185af2 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
@@ -1,7 +1,7 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { isInstanceOwner } from '@/utils/rbac/checks/isInstanceOwner';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
index 3af76cd4e86..e9f8d492828 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
@@ -1,4 +1,4 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { DefaultUserMiddlewareOptions, RBACPermissionCheck } from '@/types/rbac';
 
 export const isInstanceOwner: RBACPermissionCheck<DefaultUserMiddlewareOptions> = () =>
diff --git a/packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
index aa242f9f2ff..5e8bc4eb023 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
@@ -1,10 +1,10 @@
 import { authenticatedMiddleware } from '@/utils/rbac/middleware/authenticated';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { VIEWS } from '@/constants';
 import type { RouteLocationNormalized } from 'vue-router';
 import { createPinia, setActivePinia } from 'pinia';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
index 163e77f5364..2497f456340 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
@@ -1,9 +1,9 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { VIEWS } from '@/constants';
 import { defaultUserMiddleware } from '@/utils/rbac/middleware/defaultUser';
 import type { RouteLocationNormalized } from 'vue-router';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/middleware/guest.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/guest.test.ts
index 15765ec34f6..d247cc35c61 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/middleware/guest.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/middleware/guest.test.ts
@@ -1,9 +1,9 @@
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { VIEWS } from '@/constants';
 import { guestMiddleware } from '@/utils/rbac/middleware/guest';
 import type { RouteLocationNormalized } from 'vue-router';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/rbac/middleware/role.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/role.test.ts
index fc685008326..94b6341a03b 100644
--- a/packages/frontend/editor-ui/src/utils/rbac/middleware/role.test.ts
+++ b/packages/frontend/editor-ui/src/utils/rbac/middleware/role.test.ts
@@ -1,11 +1,11 @@
 import { roleMiddleware } from '@/utils/rbac/middleware/role';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import type { IUser } from '@n8n/rest-api-client/api/users';
 import type { RouteLocationNormalized } from 'vue-router';
 import { ROLE } from '@n8n/api-types';
 import { VIEWS } from '@/constants';
 
-vi.mock('@/features/users/users.store', () => ({
+vi.mock('@/features/settings/users/users.store', () => ({
 	useUsersStore: vi.fn(),
 }));
 
diff --git a/packages/frontend/editor-ui/src/utils/typeGuards.ts b/packages/frontend/editor-ui/src/utils/typeGuards.ts
index 041ac3ff147..13ba20bad7f 100644
--- a/packages/frontend/editor-ui/src/utils/typeGuards.ts
+++ b/packages/frontend/editor-ui/src/utils/typeGuards.ts
@@ -15,12 +15,12 @@ import type {
 	WorkflowListItem,
 	WorkflowListResource,
 } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { ICredentialsResponse } from '@/features/credentials/credentials.types';
 import type { Connection as VueFlowConnection } from '@vue-flow/core';
 import type { RouteLocationRaw } from 'vue-router';
-import type { CanvasConnectionMode } from '@/features/canvas/canvas.types';
-import { canvasConnectionModes } from '@/features/canvas/canvas.types';
+import type { CanvasConnectionMode } from '@/features/workflows/canvas/canvas.types';
+import { canvasConnectionModes } from '@/features/workflows/canvas/canvas.types';
 import type { ComponentPublicInstance } from 'vue';
 import { type BaseTextKey, useI18n } from '@n8n/i18n';
 
diff --git a/packages/frontend/editor-ui/src/views/NodeView.vue b/packages/frontend/editor-ui/src/views/NodeView.vue
index 31c0ce732d7..7acbbfe4561 100644
--- a/packages/frontend/editor-ui/src/views/NodeView.vue
+++ b/packages/frontend/editor-ui/src/views/NodeView.vue
@@ -16,11 +16,11 @@ import {
 	provide,
 } from 'vue';
 import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router';
-import WorkflowCanvas from '@/features/canvas/components/WorkflowCanvas.vue';
+import WorkflowCanvas from '@/features/workflows/canvas/components/WorkflowCanvas.vue';
 import FocusPanel from '@/components/FocusPanel.vue';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
-import CanvasRunWorkflowButton from '@/features/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue';
+import CanvasRunWorkflowButton from '@/features/workflows/canvas/components/elements/buttons/CanvasRunWorkflowButton.vue';
 import { useI18n } from '@n8n/i18n';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
@@ -34,7 +34,7 @@ import type {
 	ToggleNodeCreatorOptions,
 	XYPosition,
 } from '@/Interface';
-import type { IExecutionResponse } from '@/features/executions/executions.types';
+import type { IExecutionResponse } from '@/features/execution/executions/executions.types';
 import type { WorkflowDataUpdate } from '@n8n/rest-api-client/api/workflows';
 import type {
 	Connection,
@@ -47,8 +47,8 @@ import type {
 	CanvasNodeMoveEvent,
 	ConnectStartEvent,
 	ViewportBoundaries,
-} from '@/features/canvas/canvas.types';
-import { CanvasNodeRenderType } from '@/features/canvas/canvas.types';
+} from '@/features/workflows/canvas/canvas.types';
+import { CanvasNodeRenderType } from '@/features/workflows/canvas/canvas.types';
 import {
 	CHAT_TRIGGER_NODE_TYPE,
 	DRAG_EVENT_DATA_KEY,
@@ -69,7 +69,7 @@ import {
 	ABOUT_MODAL_KEY,
 	WorkflowStateKey,
 } from '@/constants';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import {
@@ -89,56 +89,56 @@ import type {
 import { useToast } from '@/composables/useToast';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useEnvironmentsStore } from '@/features/environments.ee/environments.store';
-import { useExternalSecretsStore } from '@/features/externalSecrets/externalSecrets.ee.store';
+import { useEnvironmentsStore } from '@/features/settings/environments.ee/environments.store';
+import { useExternalSecretsStore } from '@/features/integrations/externalSecrets.ee/externalSecrets.ee.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { historyBus } from '@/models/history';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
-import { useExecutionsStore } from '@/features/executions/executions.store';
+import { useExecutionsStore } from '@/features/execution/executions/executions.store';
 import { useCanvasStore } from '@/stores/canvas.store';
 import { useMessage } from '@/composables/useMessage';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useHistoryStore } from '@/stores/history.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
-import { useExecutionDebugging } from '@/features/executions/composables/useExecutionDebugging';
-import { useUsersStore } from '@/features/users/users.store';
-import { sourceControlEventBus } from '@/features/sourceControl.ee/sourceControl.eventBus';
+import { useExecutionDebugging } from '@/features/execution/executions/composables/useExecutionDebugging';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import { sourceControlEventBus } from '@/features/integrations/sourceControl.ee/sourceControl.eventBus';
 import { useTagsStore } from '@/stores/tags.store';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { getBounds, getNodesWithNormalizedPosition, getNodeViewTab } from '@/utils/nodeViewUtils';
-import CanvasStopCurrentExecutionButton from '@/features/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.vue';
-import CanvasStopWaitingForWebhookButton from '@/features/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.vue';
+import CanvasStopCurrentExecutionButton from '@/features/workflows/canvas/components/elements/buttons/CanvasStopCurrentExecutionButton.vue';
+import CanvasStopWaitingForWebhookButton from '@/features/workflows/canvas/components/elements/buttons/CanvasStopWaitingForWebhookButton.vue';
 import { nodeViewEventBus } from '@/event-bus';
 import type { PinDataSource } from '@/composables/usePinnedData';
 import { useClipboard } from '@/composables/useClipboard';
 import { useBeforeUnload } from '@/composables/useBeforeUnload';
 import { getResourcePermissions } from '@n8n/permissions';
 import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';
-import { shouldIgnoreCanvasShortcut } from '@/features/canvas/canvas.utils';
-import { getSampleWorkflowByTemplateId } from '@/features/templates/utils/workflowSamples';
-import type { CanvasLayoutEvent } from '@/features/canvas/composables/useCanvasLayout';
+import { shouldIgnoreCanvasShortcut } from '@/features/workflows/canvas/canvas.utils';
+import { getSampleWorkflowByTemplateId } from '@/features/workflows/templates/utils/workflowSamples';
+import type { CanvasLayoutEvent } from '@/features/workflows/canvas/composables/useCanvasLayout';
 import { useWorkflowSaving } from '@/composables/useWorkflowSaving';
-import { useBuilderStore } from '@/features/assistant/builder.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 import { usePostHog } from '@/stores/posthog.store';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 import { useWorkflowExtraction } from '@/composables/useWorkflowExtraction';
 import { useAgentRequestStore } from '@n8n/stores/useAgentRequestStore';
 import { needsAgentInput } from '@/utils/nodes/nodeTransforms';
 import { useLogsStore } from '@/stores/logs.store';
-import { canvasEventBus } from '@/features/canvas/canvas.eventBus';
-import CanvasChatButton from '@/features/canvas/components/elements/buttons/CanvasChatButton.vue';
+import { canvasEventBus } from '@/features/workflows/canvas/canvas.eventBus';
+import CanvasChatButton from '@/features/workflows/canvas/components/elements/buttons/CanvasChatButton.vue';
 import { useFocusPanelStore } from '@/stores/focusPanel.store';
 import { useAITemplatesStarterCollectionStore } from '@/experiments/aiTemplatesStarterCollection/stores/aiTemplatesStarterCollection.store';
 import { useReadyToRunWorkflowsStore } from '@/experiments/readyToRunWorkflows/stores/readyToRunWorkflows.store';
 import { useKeybindings } from '@/composables/useKeybindings';
-import { type ContextMenuAction } from '@/features/ui/contextMenu/composables/useContextMenuItems';
-import { useExperimentalNdvStore } from '@/features/canvas/experimental/experimentalNdv.store';
+import { type ContextMenuAction } from '@/features/shared/contextMenu/composables/useContextMenuItems';
+import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 import { useWorkflowState } from '@/composables/useWorkflowState';
-import { useParentFolder } from '@/features/folders/composables/useParentFolder';
+import { useParentFolder } from '@/features/core/folders/composables/useParentFolder';
 
 import { N8nCallout, N8nCanvasThinkingPill } from '@n8n/design-system';
 
@@ -158,7 +158,8 @@ const LazyNodeDetailsViewV2 = defineAsyncComponent(
 );
 
 const LazySetupWorkflowCredentialsButton = defineAsyncComponent(
-	async () => await import('@/features/templates/components/SetupWorkflowCredentialsButton.vue'),
+	async () =>
+		await import('@/features/workflows/templates/components/SetupWorkflowCredentialsButton.vue'),
 );
 
 const $style = useCssModule();
diff --git a/packages/frontend/editor-ui/src/views/WorkflowOnboardingView.vue b/packages/frontend/editor-ui/src/views/WorkflowOnboardingView.vue
index 0ad38682256..6dd84ad340b 100644
--- a/packages/frontend/editor-ui/src/views/WorkflowOnboardingView.vue
+++ b/packages/frontend/editor-ui/src/views/WorkflowOnboardingView.vue
@@ -2,7 +2,7 @@
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useI18n } from '@n8n/i18n';
 import { VIEWS } from '@/constants';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
diff --git a/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts b/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
index 596c19932eb..ddb9488c006 100644
--- a/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
+++ b/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
@@ -1,18 +1,18 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore, waitAllPromises } from '@/__tests__/utils';
 import * as usersApi from '@n8n/rest-api-client/api/users';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { VIEWS } from '@/constants';
 import type { WorkflowListResource } from '@/Interface';
 import type { IUser } from '@n8n/rest-api-client/api/users';
-import { useFoldersStore } from '@/features/folders/folders.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useTagsStore } from '@/stores/tags.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { Project } from '@/features/projects/projects.types';
+import type { Project } from '@/features/collaboration/projects/projects.types';
 import { TemplateClickSource } from '@/utils/experiments';
 import WorkflowsView from '@/views/WorkflowsView.vue';
 import { STORES } from '@n8n/stores';
@@ -21,15 +21,15 @@ import userEvent from '@testing-library/user-event';
 import { waitFor } from '@testing-library/vue';
 import { createRouter, createWebHistory } from 'vue-router';
 
-vi.mock('@/features/projects/projects.api');
+vi.mock('@/features/collaboration/projects/projects.api');
 vi.mock('@n8n/rest-api-client/api/users');
-vi.mock('@/features/sourceControl.ee/sourceControl.api');
+vi.mock('@/features/integrations/sourceControl.ee/sourceControl.api');
 vi.mock('@/composables/useGlobalEntityCreation', () => ({
 	useGlobalEntityCreation: () => ({
 		menu: [],
 	}),
 }));
-vi.mock('@/features/projects/composables/useProjectPages', () => ({
+vi.mock('@/features/collaboration/projects/composables/useProjectPages', () => ({
 	useProjectPages: vi.fn().mockReturnValue({
 		isOverviewSubPage: false,
 		isSharedSubPage: false,
diff --git a/packages/frontend/editor-ui/src/views/WorkflowsView.vue b/packages/frontend/editor-ui/src/views/WorkflowsView.vue
index 98a19df3feb..6ba58179c9b 100644
--- a/packages/frontend/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/frontend/editor-ui/src/views/WorkflowsView.vue
@@ -1,20 +1,20 @@
 <script lang="ts" setup>
 import Draggable from '@/components/Draggable.vue';
-import EmptySharedSectionActionBox from '@/features/folders/components/EmptySharedSectionActionBox.vue';
-import FolderBreadcrumbs from '@/features/folders/components/FolderBreadcrumbs.vue';
-import FolderCard from '@/features/folders/components/FolderCard.vue';
-import { FOLDER_LIST_ITEM_ACTIONS } from '@/features/folders/folders.constants';
+import EmptySharedSectionActionBox from '@/features/core/folders/components/EmptySharedSectionActionBox.vue';
+import FolderBreadcrumbs from '@/features/core/folders/components/FolderBreadcrumbs.vue';
+import FolderCard from '@/features/core/folders/components/FolderCard.vue';
+import { FOLDER_LIST_ITEM_ACTIONS } from '@/features/core/folders/folders.constants';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
-import ProjectHeader from '@/features/projects/components/ProjectHeader.vue';
+import ProjectHeader from '@/features/collaboration/projects/components/ProjectHeader.vue';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import WorkflowTagsDropdown from '@/components/WorkflowTagsDropdown.vue';
 import { useAutoScrollOnDrag } from '@/composables/useAutoScrollOnDrag';
 import { useDebounce } from '@/composables/useDebounce';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
-import type { DragTarget, DropTarget, FolderListItem } from '@/features/folders/folders.types';
-import { useFolders } from '@/features/folders/composables/useFolders';
+import type { DragTarget, DropTarget, FolderListItem } from '@/features/core/folders/folders.types';
+import { useFolders } from '@/features/core/folders/composables/useFolders';
 import { useMessage } from '@/composables/useMessage';
-import { useProjectPages } from '@/features/projects/composables/useProjectPages';
+import { useProjectPages } from '@/features/collaboration/projects/composables/useProjectPages';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useCalloutHelpers } from '@/composables/useCalloutHelpers';
@@ -24,7 +24,7 @@ import {
 	MODAL_CONFIRM,
 	VIEWS,
 } from '@/constants';
-import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/usage/usage.constants';
+import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/features/settings/usage/usage.constants';
 import { useAITemplatesStarterCollectionStore } from '@/experiments/aiTemplatesStarterCollection/stores/aiTemplatesStarterCollection.store';
 import SuggestedWorkflowCard from '@/experiments/personalizedTemplates/components/SuggestedWorkflowCard.vue';
 import SuggestedWorkflows from '@/experiments/personalizedTemplates/components/SuggestedWorkflows.vue';
@@ -36,8 +36,8 @@ import TemplateRecommendationV3 from '@/experiments/personalizedTemplatesV3/comp
 import { usePersonalizedTemplatesV2Store } from '@/experiments/templateRecoV2/stores/templateRecoV2.store';
 import { usePersonalizedTemplatesV3Store } from '@/experiments/personalizedTemplatesV3/stores/personalizedTemplatesV3.store';
 import SimplifiedEmptyLayout from '@/experiments/readyToRunWorkflowsV2/components/SimplifiedEmptyLayout.vue';
-import InsightsSummary from '@/features/insights/components/InsightsSummary.vue';
-import { useInsightsStore } from '@/features/insights/insights.store';
+import InsightsSummary from '@/features/execution/insights/components/InsightsSummary.vue';
+import { useInsightsStore } from '@/features/execution/insights/insights.store';
 import type {
 	BaseFilters,
 	FolderResource,
@@ -48,22 +48,22 @@ import type {
 	WorkflowListResource,
 	WorkflowResource,
 } from '@/Interface';
-import { useFoldersStore } from '@/features/folders/folders.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useFoldersStore } from '@/features/core/folders/folders.store';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useSourceControlStore } from '@/features/sourceControl.ee/sourceControl.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useTagsStore } from '@/stores/tags.store';
-import { useTemplatesStore } from '@/features/templates/templates.store';
+import { useTemplatesStore } from '@/features/workflows/templates/templates.store';
 import { useUIStore } from '@/stores/ui.store';
-import { useUsageStore } from '@/features/usage/usage.store';
-import { useUsersStore } from '@/features/users/users.store';
+import { useUsageStore } from '@/features/settings/usage/usage.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import {
 	type Project,
 	type ProjectSharingData,
 	ProjectTypes,
-} from '@/features/projects/projects.types';
-import { getEasyAiWorkflowJson } from '@/features/templates/utils/workflowSamples';
+} from '@/features/collaboration/projects/projects.types';
+import { getEasyAiWorkflowJson } from '@/features/workflows/templates/utils/workflowSamples';
 import {
 	isExtraTemplateLinksExperimentEnabled,
 	TemplateClickSource,