diff --git a/packages/frontend/editor-ui/src/App.vue b/packages/frontend/editor-ui/src/App.vue
index e434856e54a..81a825e6e83 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 '@/components/AskAssistant/AssistantsHub.vue';
-import AskAssistantFloatingButton from '@/components/AskAssistant/Chat/AskAssistantFloatingButton.vue';
+import AssistantsHub from '@/features/assistant/components/AssistantsHub.vue';
+import AskAssistantFloatingButton from '@/features/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,7 +15,7 @@ import {
 	HIRING_BANNER,
 	VIEWS,
 } from '@/constants';
-import { useAssistantStore } from '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
 import { useBuilderStore } from '@/stores/builder.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useSettingsStore } from '@/stores/settings.store';
diff --git a/packages/frontend/editor-ui/src/api/ai.test.ts b/packages/frontend/editor-ui/src/api/ai.test.ts
index bd5bbba1e50..e28f32c9d73 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 '@/types/assistant.types';
+import type { ChatRequest } from '@/features/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 ba5fd4e5b63..2543c85a763 100644
--- a/packages/frontend/editor-ui/src/api/ai.ts
+++ b/packages/frontend/editor-ui/src/api/ai.ts
@@ -1,8 +1,12 @@
-import { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
+import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
 import { AI_ASSISTANT_MAX_CONTENT_LENGTH } from '@/constants';
 import type { ICredentialsResponse } from '@/Interface';
 import type { IRestApiContext } from '@n8n/rest-api-client';
-import type { AskAiRequest, ChatRequest, ReplaceCodeRequest } from '@/types/assistant.types';
+import type {
+	AskAiRequest,
+	ChatRequest,
+	ReplaceCodeRequest,
+} from '@/features/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/components/ButtonParameter/utils.test.ts b/packages/frontend/editor-ui/src/components/ButtonParameter/utils.test.ts
index 10aca679492..d4a56ade5ad 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 '@/types/assistant.types';
+import type { AskAiRequest } from '@/features/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 6e3f7d957a9..bf4a6c19b53 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 '@/types/assistant.types';
+import { type AskAiRequest } from '@/features/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/CodeNodeEditor/AskAI/AskAI.vue b/packages/frontend/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index 669b85fbf76..d7b90c27406 100644
--- a/packages/frontend/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/frontend/editor-ui/src/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 '@/types/assistant.types';
+import type { AskAiRequest } from '@/features/assistant/assistant.types';
 const emit = defineEmits<{
 	submit: [code: string];
 	replaceCode: [code: string];
diff --git a/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index 6f9bc84a3e3..609e25610c7 100644
--- a/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -30,7 +30,7 @@ import CopyInput from '../CopyInput.vue';
 import CredentialInputs from './CredentialInputs.vue';
 import GoogleAuthButton from './GoogleAuthButton.vue';
 import OauthButton from './OauthButton.vue';
-import { useAssistantStore } from '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
 import FreeAiCreditsCallout from '@/components/FreeAiCreditsCallout.vue';
 
 import {
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 3382949c3f5..3cb1f3d0268 100644
--- a/packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts
+++ b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts
@@ -6,7 +6,7 @@ import { mockedStore } from '@/__tests__/utils';
 import { createComponentRenderer } from '@/__tests__/render';
 import type { IExecutionResponse } from '@/Interface';
 import NodeErrorView from '@/components/Error/NodeErrorView.vue';
-import { useAssistantStore } from '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.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 979c44ae1b6..f41433c4c7d 100644
--- a/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
@@ -20,11 +20,11 @@ import type {
 import { sanitizeHtml } from '@/utils/htmlUtils';
 import { MAX_DISPLAY_DATA_SIZE, NEW_ASSISTANT_SESSION_MODAL, VIEWS } from '@/constants';
 import type { BaseTextKey } from '@n8n/i18n';
-import { useAssistantStore } from '@/stores/assistant.store';
-import type { ChatRequest } from '@/types/assistant.types';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
+import type { ChatRequest } from '@/features/assistant/assistant.types';
 import { useUIStore } from '@/stores/ui.store';
 import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
-import { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
+import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
 import {
 	N8nInlineAskAssistantButton,
 	N8nButton,
diff --git a/packages/frontend/editor-ui/src/components/Modals.vue b/packages/frontend/editor-ui/src/components/Modals.vue
index 7b6cd692f0f..e5ec748cf68 100644
--- a/packages/frontend/editor-ui/src/components/Modals.vue
+++ b/packages/frontend/editor-ui/src/components/Modals.vue
@@ -52,7 +52,7 @@ import {
 import AboutModal from '@/components/AboutModal.vue';
 import ActivationModal from '@/components/ActivationModal.vue';
 import ApiKeyCreateOrEditModal from '@/components/ApiKeyCreateOrEditModal.vue';
-import NewAssistantSessionModal from '@/components/AskAssistant/Chat/NewAssistantSessionModal.vue';
+import NewAssistantSessionModal from '@/features/assistant/components/Chat/NewAssistantSessionModal.vue';
 import ChangePasswordModal from '@/components/ChangePasswordModal.vue';
 import ConfirmPasswordModal from '@/components/ConfirmPasswordModal/ConfirmPasswordModal.vue';
 import ChatEmbedModal from '@/components/ChatEmbedModal.vue';
diff --git a/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
index b3a20827242..8404653a723 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
@@ -19,7 +19,7 @@ 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 '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
 import { useBuilderStore } from '@/stores/builder.store';
 
 import { N8nAssistantIcon, N8nButton, N8nIconButton, N8nTooltip } 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 d2544f1e22c..8d8d5573633 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 '@/stores/credentials.store';
 import { useUIStore } from '@/stores/ui.store';
 import { DRAG_EVENT_DATA_KEY } from '@/constants';
-import { useAssistantStore } from '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
 import { useBuilderStore } from '@/stores/builder.store';
 import type { NodeTypeSelectedPayload } from '@/Interface';
 import { onClickOutside } from '@vueuse/core';
diff --git a/packages/frontend/editor-ui/src/composables/useBuilderMessages.test.ts b/packages/frontend/editor-ui/src/composables/useBuilderMessages.test.ts
index 26abf242e6a..aefa7142a82 100644
--- a/packages/frontend/editor-ui/src/composables/useBuilderMessages.test.ts
+++ b/packages/frontend/editor-ui/src/composables/useBuilderMessages.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { useBuilderMessages } from '@/composables/useBuilderMessages';
 import type { ChatUI } from '@n8n/design-system/types/assistant';
-import type { ChatRequest } from '@/types/assistant.types';
+import type { ChatRequest } from '@/features/assistant/assistant.types';
 
 // Mock useI18n to return the keys instead of translations
 vi.mock('@n8n/i18n', () => ({
diff --git a/packages/frontend/editor-ui/src/composables/useBuilderMessages.ts b/packages/frontend/editor-ui/src/composables/useBuilderMessages.ts
index 99b9a7462c3..38e1e8fe3ab 100644
--- a/packages/frontend/editor-ui/src/composables/useBuilderMessages.ts
+++ b/packages/frontend/editor-ui/src/composables/useBuilderMessages.ts
@@ -1,7 +1,11 @@
 import type { ChatUI } from '@n8n/design-system/types/assistant';
-import type { ChatRequest } from '@/types/assistant.types';
+import type { ChatRequest } from '@/features/assistant/assistant.types';
 import { useI18n } from '@n8n/i18n';
-import { isTextMessage, isWorkflowUpdatedMessage, isToolMessage } from '@/types/assistant.types';
+import {
+	isTextMessage,
+	isWorkflowUpdatedMessage,
+	isToolMessage,
+} from '@/features/assistant/assistant.types';
 
 export interface MessageProcessingResult {
 	messages: ChatUI.AssistantMessage[];
diff --git a/packages/frontend/editor-ui/src/composables/useFloatingUiOffsets.ts b/packages/frontend/editor-ui/src/composables/useFloatingUiOffsets.ts
index 43b83e67c2e..231c91d6e43 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 '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/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/usePushConnection/handlers/nodeExecuteAfter.test.ts b/packages/frontend/editor-ui/src/composables/usePushConnection/handlers/nodeExecuteAfter.test.ts
index 2a0bbd7cc54..c3eba72ae75 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 '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/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 45d5bb823c5..e7308bc78d9 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 '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/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/stores/assistant.store.test.ts b/packages/frontend/editor-ui/src/features/assistant/assistant.store.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/stores/assistant.store.test.ts
rename to packages/frontend/editor-ui/src/features/assistant/assistant.store.test.ts
index 24d23a3dbaf..235456ef2c1 100644
--- a/packages/frontend/editor-ui/src/stores/assistant.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/assistant/assistant.store.test.ts
@@ -6,14 +6,14 @@ import {
 	MAX_CHAT_WIDTH,
 	MIN_CHAT_WIDTH,
 	useAssistantStore,
-} from '@/stores/assistant.store';
-import { useWorkflowsStore } from './workflows.store';
-import type { ChatRequest } from '@/types/assistant.types';
-import { usePostHog } from './posthog.store';
+} from '@/features/assistant/assistant.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { ChatRequest } from '@/features/assistant/assistant.types';
+import { usePostHog } from '@/stores/posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { defaultSettings } from '../__tests__/defaults';
+import { defaultSettings } from '@/__tests__/defaults';
 import merge from 'lodash/merge';
-import { DEFAULT_POSTHOG_SETTINGS } from './posthog.store.test';
+import { DEFAULT_POSTHOG_SETTINGS } from '@/stores/posthog.store.test';
 import { VIEWS } from '@/constants';
 import { reactive } from 'vue';
 import * as chatAPI from '@/api/ai';
diff --git a/packages/frontend/editor-ui/src/stores/assistant.store.ts b/packages/frontend/editor-ui/src/features/assistant/assistant.store.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/stores/assistant.store.ts
rename to packages/frontend/editor-ui/src/features/assistant/assistant.store.ts
index 7deb1721bf9..d2a701c8cde 100644
--- a/packages/frontend/editor-ui/src/stores/assistant.store.ts
+++ b/packages/frontend/editor-ui/src/features/assistant/assistant.store.ts
@@ -7,29 +7,29 @@ import {
 	ASK_AI_SLIDE_OUT_DURATION_MS,
 } from '@/constants';
 import { STORES } from '@n8n/stores';
-import type { ChatRequest } from '@/types/assistant.types';
+import type { ChatRequest } from '@/features/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 './users.store';
+import { useUsersStore } from '@/stores/users.store';
 import { useRoute } from 'vue-router';
-import { useSettingsStore } from './settings.store';
+import { useSettingsStore } from '@/stores/settings.store';
 import { assert } from '@n8n/utils/assert';
-import { useWorkflowsStore } from './workflows.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { ICredentialType, INodeParameters, NodeError, INode } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 import { ndvEventBus, codeNodeEditorEventBus } from '@/event-bus';
-import { useNDVStore } from './ndv.store';
+import { useNDVStore } from '@/stores/ndv.store';
 import type { IUpdateInformation } from '@/Interface';
 import { useI18n } from '@n8n/i18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
-import { useUIStore } from './ui.store';
+import { useUIStore } from '@/stores/ui.store';
 import AiUpdatedCodeMessage from '@/components/AiUpdatedCodeMessage.vue';
-import { useCredentialsStore } from './credentials.store';
-import { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
 
 export const MAX_CHAT_WIDTH = 425;
 export const MIN_CHAT_WIDTH = 380;
diff --git a/packages/frontend/editor-ui/src/types/assistant.types.ts b/packages/frontend/editor-ui/src/features/assistant/assistant.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/types/assistant.types.ts
rename to packages/frontend/editor-ui/src/features/assistant/assistant.types.ts
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.test.ts b/packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.test.ts
rename to packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.test.ts
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.vue b/packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/Agent/AskAssistantBuild.vue
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/ExecuteMessage.test.ts b/packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Agent/ExecuteMessage.test.ts
rename to packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.test.ts
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/ExecuteMessage.vue b/packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Agent/ExecuteMessage.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/Agent/ExecuteMessage.vue
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/NodeIssueItem.test.ts b/packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Agent/NodeIssueItem.test.ts
rename to packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.test.ts
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Agent/NodeIssueItem.vue b/packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Agent/NodeIssueItem.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/Agent/NodeIssueItem.vue
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/AssistantsHub.vue b/packages/frontend/editor-ui/src/features/assistant/components/AssistantsHub.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/components/AskAssistant/AssistantsHub.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/AssistantsHub.vue
index f57bc534344..a73628d5bba 100644
--- a/packages/frontend/editor-ui/src/components/AskAssistant/AssistantsHub.vue
+++ b/packages/frontend/editor-ui/src/features/assistant/components/AssistantsHub.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useBuilderStore } from '@/stores/builder.store';
-import { useAssistantStore } from '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
 import { useDebounce } from '@/composables/useDebounce';
 import { computed, onBeforeUnmount, ref } from 'vue';
 import SlideTransition from '@/components/transitions/SlideTransition.vue';
@@ -8,7 +8,7 @@ import AskAssistantBuild from './Agent/AskAssistantBuild.vue';
 import AskAssistantChat from './Chat/AskAssistantChat.vue';
 
 import { N8nResizeWrapper } from '@n8n/design-system';
-import HubSwitcher from '@/components/AskAssistant/HubSwitcher.vue';
+import HubSwitcher from '@/features/assistant/components/HubSwitcher.vue';
 
 const builderStore = useBuilderStore();
 const assistantStore = useAssistantStore();
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Chat/AskAssistantChat.vue b/packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantChat.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Chat/AskAssistantChat.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantChat.vue
index edb50288606..96b32d51154 100644
--- a/packages/frontend/editor-ui/src/components/AskAssistant/Chat/AskAssistantChat.vue
+++ b/packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantChat.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useAssistantStore } from '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
 import { useUsersStore } from '@/stores/users.store';
 import { computed, ref } from 'vue';
 import { N8nAskAssistantChat } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Chat/AskAssistantFloatingButton.vue b/packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantFloatingButton.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Chat/AskAssistantFloatingButton.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/Chat/AskAssistantFloatingButton.vue
index ad2760bb48b..89a319ba478 100644
--- a/packages/frontend/editor-ui/src/components/AskAssistant/Chat/AskAssistantFloatingButton.vue
+++ b/packages/frontend/editor-ui/src/features/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 '@/stores/assistant.store';
+import { useAssistantStore } from '@/features/assistant/assistant.store';
 import { useBuilderStore } from '@/stores/builder.store';
 import { computed } from 'vue';
 
diff --git a/packages/frontend/editor-ui/src/components/AskAssistant/Chat/NewAssistantSessionModal.vue b/packages/frontend/editor-ui/src/features/assistant/components/Chat/NewAssistantSessionModal.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/components/AskAssistant/Chat/NewAssistantSessionModal.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/Chat/NewAssistantSessionModal.vue
index 67162bd2195..05a27402d59 100644
--- a/packages/frontend/editor-ui/src/components/AskAssistant/Chat/NewAssistantSessionModal.vue
+++ b/packages/frontend/editor-ui/src/features/assistant/components/Chat/NewAssistantSessionModal.vue
@@ -3,8 +3,8 @@ import { NEW_ASSISTANT_SESSION_MODAL } from '@/constants';
 import Modal from '@/components/Modal.vue';
 import { useI18n } from '@n8n/i18n';
 import { useUIStore } from '@/stores/ui.store';
-import type { ChatRequest } from '@/types/assistant.types';
-import { useAssistantStore } from '@/stores/assistant.store';
+import type { ChatRequest } from '@/features/assistant/assistant.types';
+import { useAssistantStore } from '@/features/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/components/AskAssistant/HubSwitcher.vue b/packages/frontend/editor-ui/src/features/assistant/components/HubSwitcher.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/AskAssistant/HubSwitcher.vue
rename to packages/frontend/editor-ui/src/features/assistant/components/HubSwitcher.vue
diff --git a/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts b/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.constants.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts
rename to packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.constants.ts
index 2cfc3af598f..6ada45c9d19 100644
--- a/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts
+++ b/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.constants.ts
@@ -1,5 +1,5 @@
 import { VIEWS } from '@/constants';
-import type { ChatRequest } from '@/types/assistant.types';
+import type { ChatRequest } from '../assistant.types';
 import { NodeConnectionTypes } from 'n8n-workflow';
 
 export const PAYLOAD_SIZE_FOR_1_PASS = 4;
diff --git a/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.ts b/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.ts
rename to packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.ts
index 9b077ee8f05..ac18d455b19 100644
--- a/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.ts
+++ b/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.test.ts
@@ -9,7 +9,7 @@ import { useAIAssistantHelpers } from './useAIAssistantHelpers';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import type { IWorkflowDb } from '@/Interface';
-import type { ChatRequest } from '@/types/assistant.types';
+import type { ChatRequest } from '../assistant.types';
 import {
 	ERROR_HELPER_TEST_PAYLOAD,
 	PAYLOAD_SIZE_FOR_1_PASS,
diff --git a/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.ts b/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.ts
rename to packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.ts
index 14d71feb8f6..7b874d32ba1 100644
--- a/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.ts
+++ b/packages/frontend/editor-ui/src/features/assistant/composables/useAIAssistantHelpers.ts
@@ -7,13 +7,13 @@ import type {
 	NodeOperationError,
 	INode,
 } from 'n8n-workflow';
-import { useWorkflowHelpers } from './useWorkflowHelpers';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { executionDataToJson, getMainAuthField, getNodeAuthOptions } from '@/utils/nodeTypesUtils';
-import type { ChatRequest } from '@/types/assistant.types';
+import type { ChatRequest } from '../assistant.types';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useDataSchema } from './useDataSchema';
+import { useDataSchema } from '@/composables/useDataSchema';
 import { AI_ASSISTANT_MAX_CONTENT_LENGTH, VIEWS } from '@/constants';
 import { useI18n } from '@n8n/i18n';
 import type { IWorkflowDb } from '@/Interface';
diff --git a/packages/frontend/editor-ui/src/helpers/builderHelpers.ts b/packages/frontend/editor-ui/src/helpers/builderHelpers.ts
index f37ab4a3280..977a6b5053f 100644
--- a/packages/frontend/editor-ui/src/helpers/builderHelpers.ts
+++ b/packages/frontend/editor-ui/src/helpers/builderHelpers.ts
@@ -1,5 +1,5 @@
-import type { ChatRequest } from '@/types/assistant.types';
-import { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
+import type { ChatRequest } from '@/features/assistant/assistant.types';
+import { useAIAssistantHelpers } from '@/features/assistant/composables/useAIAssistantHelpers';
 import type { IRunExecutionData, NodeExecutionSchema } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interface';
 
diff --git a/packages/frontend/editor-ui/src/stores/builder.store.test.ts b/packages/frontend/editor-ui/src/stores/builder.store.test.ts
index bca69af4bd3..35af2d7ff0a 100644
--- a/packages/frontend/editor-ui/src/stores/builder.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/builder.store.test.ts
@@ -25,7 +25,11 @@ import {
 } from '@/composables/useWorkflowState';
 import type { Telemetry } from '@/plugins/telemetry';
 import type { ChatUI } from '@n8n/design-system/types/assistant';
-import { DEFAULT_CHAT_WIDTH, MAX_CHAT_WIDTH, MIN_CHAT_WIDTH } from './assistant.store';
+import {
+	DEFAULT_CHAT_WIDTH,
+	MAX_CHAT_WIDTH,
+	MIN_CHAT_WIDTH,
+} from '@/features/assistant/assistant.store';
 import { type INodeTypeDescription } from 'n8n-workflow';
 import type {} from 'n8n-workflow';
 import { mockedStore } from '@/__tests__/utils';
diff --git a/packages/frontend/editor-ui/src/stores/builder.store.ts b/packages/frontend/editor-ui/src/stores/builder.store.ts
index 42bf85bbe09..3af7ddca41a 100644
--- a/packages/frontend/editor-ui/src/stores/builder.store.ts
+++ b/packages/frontend/editor-ui/src/stores/builder.store.ts
@@ -18,7 +18,11 @@ import { useI18n } from '@n8n/i18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useUIStore } from './ui.store';
 import { usePostHog } from './posthog.store';
-import { DEFAULT_CHAT_WIDTH, MAX_CHAT_WIDTH, MIN_CHAT_WIDTH } from './assistant.store';
+import {
+	DEFAULT_CHAT_WIDTH,
+	MAX_CHAT_WIDTH,
+	MIN_CHAT_WIDTH,
+} from '@/features/assistant/assistant.store';
 import { useWorkflowsStore } from './workflows.store';
 import { useBuilderMessages } from '@/composables/useBuilderMessages';
 import { chatWithBuilder, getAiSessions, getBuilderCredits } from '@/api/ai';