diff --git a/packages/frontend/editor-ui/src/components/FocusPanel.vue b/packages/frontend/editor-ui/src/components/FocusPanel.vue
index d8c665cc504..3e40920428f 100644
--- a/packages/frontend/editor-ui/src/components/FocusPanel.vue
+++ b/packages/frontend/editor-ui/src/components/FocusPanel.vue
@@ -17,10 +17,10 @@ import {
 	getParameterTypeOption,
 	isValidParameterOption,
 	parseFromExpression,
-} from '@/utils/nodeSettingsUtils';
+} from '@/features/ndv/ndv.utils';
 import { isValueExpression } from '@/utils/nodeTypesUtils';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
-import { useNodeSettingsParameters } from '@/composables/useNodeSettingsParameters';
+import { useNodeSettingsParameters } from '@/features/ndv/composables/useNodeSettingsParameters';
 import { useResolvedExpression } from '@/composables/useResolvedExpression';
 import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import {
diff --git a/packages/frontend/editor-ui/src/components/ParameterInput.vue b/packages/frontend/editor-ui/src/components/ParameterInput.vue
index 58e26ef63f2..32dde624986 100644
--- a/packages/frontend/editor-ui/src/components/ParameterInput.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInput.vue
@@ -49,7 +49,7 @@ import {
 	isValidParameterOption,
 	parseFromExpression,
 	shouldSkipParamValidation,
-} from '@/utils/nodeSettingsUtils';
+} from '@/features/ndv/ndv.utils';
 import { hasExpressionMapping, isValueExpression } from '@/utils/nodeTypesUtils';
 
 import {
@@ -68,7 +68,7 @@ import { useI18n } from '@n8n/i18n';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { useNodeSettingsParameters } from '@/composables/useNodeSettingsParameters';
+import { useNodeSettingsParameters } from '@/features/ndv/composables/useNodeSettingsParameters';
 import { htmlEditorEventBus } from '@/event-bus';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useNDVStore } from '@/features/ndv/ndv.store';
diff --git a/packages/frontend/editor-ui/src/components/ParameterInputList.vue b/packages/frontend/editor-ui/src/components/ParameterInputList.vue
index f707d8ffb13..19ec68c0877 100644
--- a/packages/frontend/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInputList.vue
@@ -23,7 +23,7 @@ import MultipleParameter from '@/components/MultipleParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import { useI18n } from '@n8n/i18n';
-import { useNodeSettingsParameters } from '@/composables/useNodeSettingsParameters';
+import { useNodeSettingsParameters } from '@/features/ndv/composables/useNodeSettingsParameters';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useMessage } from '@/composables/useMessage';
 import {
@@ -41,7 +41,7 @@ import { computedWithControl } from '@vueuse/core';
 import get from 'lodash/get';
 import { storeToRefs } from 'pinia';
 import { useCalloutHelpers } from '@/composables/useCalloutHelpers';
-import { getParameterTypeOption } from '@/utils/nodeSettingsUtils';
+import { getParameterTypeOption } from '@/features/ndv/ndv.utils';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IconName } from '@n8n/design-system/components/N8nIcon/icons';
 
diff --git a/packages/frontend/editor-ui/src/components/ParameterOptions.vue b/packages/frontend/editor-ui/src/components/ParameterOptions.vue
index 354f97bd3d9..a222c03aec6 100644
--- a/packages/frontend/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterOptions.vue
@@ -9,7 +9,7 @@ import { isValueExpression } from '@/utils/nodeTypesUtils';
 import { computed } from 'vue';
 import { useNDVStore } from '@/features/ndv/ndv.store';
 import { AI_TRANSFORM_NODE_TYPE } from '@/constants';
-import { getParameterTypeOption } from '@/utils/nodeSettingsUtils';
+import { getParameterTypeOption } from '@/features/ndv/ndv.utils';
 import { useIsInExperimentalNdv } from '@/features/workflows/canvas/experimental/composables/useIsInExperimentalNdv';
 import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 
diff --git a/packages/frontend/editor-ui/src/features/ndv/components/runData/RunData.vue b/packages/frontend/editor-ui/src/features/ndv/components/runData/RunData.vue
index ec3185817c1..ba745d75220 100644
--- a/packages/frontend/editor-ui/src/features/ndv/components/runData/RunData.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/components/runData/RunData.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useStorage } from '@/composables/useStorage';
 import { saveAs } from 'file-saver';
-import NodeSettingsHint from '@/components/NodeSettingsHint.vue';
+import NodeSettingsHint from '@/features/ndv/components/settings/NodeSettingsHint.vue';
 import type {
 	IBinaryData,
 	IConnectedNode,
diff --git a/packages/frontend/editor-ui/src/components/NodeSettings.vue b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettings.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/components/NodeSettings.vue
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettings.vue
index 316600ca9e7..494a66e59d4 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettings.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettings.vue
@@ -18,21 +18,21 @@ import { BASE_NODE_SURVEY_URL, VIEWS } from '@/constants';
 
 import NDVSubConnections from '@/features/ndv/components/panel/NDVSubConnections.vue';
 import NodeCredentials from '@/features/credentials/components/NodeCredentials.vue';
-import NodeSettingsHeader from '@/components/NodeSettingsHeader.vue';
-import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
-import NodeWebhooks from '@/components/NodeWebhooks.vue';
+import NodeSettingsHeader from './NodeSettingsHeader.vue';
+import NodeSettingsTabs from './NodeSettingsTabs.vue';
+import NodeWebhooks from './NodeWebhooks.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
 import get from 'lodash/get';
 
 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 NodeSettingsInvalidNodeWarning from './NodeSettingsInvalidNodeWarning.vue';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 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 { useNodeSettingsParameters } from '@/features/ndv/composables/useNodeSettingsParameters';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { importCurlEventBus } from '@/event-bus';
 import { ndvEventBus } from '@/features/ndv/ndv.eventBus';
@@ -53,13 +53,13 @@ import {
 	createCommonNodeSettings,
 	getNodeSettingsInitialValues,
 	nameIsParameter,
-} from '@/utils/nodeSettingsUtils';
+} from '../../ndv.utils';
 import { useI18n } from '@n8n/i18n';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { useResizeObserver } from '@vueuse/core';
 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 NodeExecuteButton from '@/components/NodeExecuteButton.vue';
 
 import { N8nBlockUi, N8nIcon, N8nNotice, N8nText } from '@n8n/design-system';
 import { useRoute } from 'vue-router';
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsHeader.vue b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsHeader.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/components/NodeSettingsHeader.vue
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsHeader.vue
index 14d952d0651..7c097218ceb 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettingsHeader.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsHeader.vue
@@ -2,7 +2,7 @@
 import type { IUpdateInformation } from '@/Interface';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import NodeSettingsTabs from './NodeSettingsTabs.vue';
-import NodeExecuteButton from './NodeExecuteButton.vue';
+import NodeExecuteButton from '@/components/NodeExecuteButton.vue';
 import type { NodeSettingsTab } from '@/types/nodeSettings';
 
 type Props = {
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsHint.vue b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsHint.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/NodeSettingsHint.vue
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsHint.vue
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.test.ts b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsInvalidNodeWarning.test.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.test.ts
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsInvalidNodeWarning.test.ts
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.vue b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsInvalidNodeWarning.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.vue
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsInvalidNodeWarning.vue
index 6f5e50bcbe9..23756340d3e 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettingsInvalidNodeWarning.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsInvalidNodeWarning.vue
@@ -15,7 +15,7 @@ import { isCommunityPackageName } from 'n8n-workflow';
 import { computed, watch } from 'vue';
 import { I18nT } from 'vue-i18n';
 import ContactAdministratorToInstall from '@/features/settings/communityNodes/components/ContactAdministratorToInstall.vue';
-import { removePreviewToken } from './Node/NodeCreator/utils';
+import { removePreviewToken } from '@/components/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/features/ndv/components/settings/NodeSettingsTabs.test.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/components/NodeSettingsTabs.test.ts
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsTabs.test.ts
index 3530b53e749..8b5fe5fc117 100644
--- a/packages/frontend/editor-ui/src/components/NodeSettingsTabs.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsTabs.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, vi } from 'vitest';
 import { mock } from 'vitest-mock-extended';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
-import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
+import NodeSettingsTabs from './NodeSettingsTabs.vue';
 import { ref } from 'vue';
 import type { ExtendedPublicInstalledPackage } from '@/features/settings/communityNodes/communityNodes.utils';
 import { useInstalledCommunityPackage } from '@/features/settings/communityNodes/composables/useInstalledCommunityPackage';
diff --git a/packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsTabs.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeSettingsTabs.vue
diff --git a/packages/frontend/editor-ui/src/components/NodeWebhooks.vue b/packages/frontend/editor-ui/src/features/ndv/components/settings/NodeWebhooks.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/NodeWebhooks.vue
rename to packages/frontend/editor-ui/src/features/ndv/components/settings/NodeWebhooks.vue
diff --git a/packages/frontend/editor-ui/src/composables/useNodeSettingsParameters.test.ts b/packages/frontend/editor-ui/src/features/ndv/composables/useNodeSettingsParameters.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/composables/useNodeSettingsParameters.test.ts
rename to packages/frontend/editor-ui/src/features/ndv/composables/useNodeSettingsParameters.test.ts
index bcdf67bcba7..ec4dd1feb8d 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeSettingsParameters.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/composables/useNodeSettingsParameters.test.ts
@@ -6,7 +6,7 @@ import { useFocusPanelStore } from '@/stores/focusPanel.store';
 import { useNodeSettingsParameters } from './useNodeSettingsParameters';
 import * as nodeHelpers from '@/composables/useNodeHelpers';
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
-import * as nodeSettingsUtils from '@/utils/nodeSettingsUtils';
+import * as nodeSettingsUtils from '@/features/ndv/ndv.utils';
 import * as nodeTypesUtils from '@/utils/nodeTypesUtils';
 import type { INodeProperties, INodeTypeDescription } from 'n8n-workflow';
 import type { MockedStore } from '@/__tests__/utils';
diff --git a/packages/frontend/editor-ui/src/composables/useNodeSettingsParameters.ts b/packages/frontend/editor-ui/src/features/ndv/composables/useNodeSettingsParameters.ts
similarity index 94%
rename from packages/frontend/editor-ui/src/composables/useNodeSettingsParameters.ts
rename to packages/frontend/editor-ui/src/features/ndv/composables/useNodeSettingsParameters.ts
index d4956bc063d..c2bf285d384 100644
--- a/packages/frontend/editor-ui/src/composables/useNodeSettingsParameters.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/composables/useNodeSettingsParameters.ts
@@ -9,18 +9,18 @@ import {
 	NodeHelpers,
 	deepCopy,
 } from 'n8n-workflow';
-import { useTelemetry } from './useTelemetry';
-import { useNodeHelpers } from './useNodeHelpers';
-import { useWorkflowHelpers } from './useWorkflowHelpers';
-import { useCanvasOperations } from './useCanvasOperations';
-import { useExternalHooks } from './useExternalHooks';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useCanvasOperations } from '@/composables/useCanvasOperations';
+import { useExternalHooks } from '@/composables/useExternalHooks';
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 import {
 	mustHideDuringCustomApiCall,
 	setValue,
 	updateDynamicConnections,
 	updateParameterByPath,
-} from '@/utils/nodeSettingsUtils';
+} from '@/features/ndv/ndv.utils';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useFocusPanelStore } from '@/stores/focusPanel.store';
 import { useNDVStore } from '@/features/ndv/ndv.store';
@@ -31,7 +31,7 @@ import {
 	getNodeAuthFields,
 	isAuthRelatedParameter,
 } from '@/utils/nodeTypesUtils';
-import { injectWorkflowState } from './useWorkflowState';
+import { injectWorkflowState } from '@/composables/useWorkflowState';
 
 export function useNodeSettingsParameters() {
 	const workflowsStore = useWorkflowsStore();
diff --git a/packages/frontend/editor-ui/src/utils/nodeSettingsUtils.test.ts b/packages/frontend/editor-ui/src/features/ndv/ndv.utils.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/utils/nodeSettingsUtils.test.ts
rename to packages/frontend/editor-ui/src/features/ndv/ndv.utils.test.ts
index 84a5ea37a05..9d326052d02 100644
--- a/packages/frontend/editor-ui/src/utils/nodeSettingsUtils.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/ndv.utils.test.ts
@@ -17,7 +17,7 @@ import {
 	parseFromExpression,
 	setValue,
 	shouldSkipParamValidation,
-} from './nodeSettingsUtils';
+} from './ndv.utils';
 import { CUSTOM_API_CALL_KEY, SWITCH_NODE_TYPE } from '@/constants';
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 import { type Ref, ref } from 'vue';
diff --git a/packages/frontend/editor-ui/src/utils/nodeSettingsUtils.ts b/packages/frontend/editor-ui/src/features/ndv/ndv.utils.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/utils/nodeSettingsUtils.ts
rename to packages/frontend/editor-ui/src/features/ndv/ndv.utils.ts
index 61db4da4a1b..b94c27e2390 100644
--- a/packages/frontend/editor-ui/src/utils/nodeSettingsUtils.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/ndv.utils.ts
@@ -27,9 +27,9 @@ import set from 'lodash/set';
 import unset from 'lodash/unset';
 
 import { captureException } from '@sentry/vue';
-import { isPresent } from './typesUtils';
+import { isPresent } from '@/utils/typesUtils';
 import type { Ref } from 'vue';
-import { omitKey } from './objectUtils';
+import { omitKey } from '@/utils/objectUtils';
 import type { BaseTextKey } from '@n8n/i18n';
 
 export function getNodeSettingsInitialValues(): INodeParameters {
diff --git a/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsView.vue b/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsView.vue
index 351ceea44fd..da3755669ae 100644
--- a/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsView.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsView.vue
@@ -6,7 +6,7 @@ import { jsonParse, NodeHelpers, NodeConnectionTypes } from 'n8n-workflow';
 import type { IRunDataDisplayMode, IUpdateInformation, TargetItem } from '@/Interface';
 import type { NodePanelType } from '@/features/ndv/ndv.types';
 
-import NodeSettings from '@/components/NodeSettings.vue';
+import NodeSettings from '@/features/ndv/components/settings/NodeSettings.vue';
 import NDVDraggablePanels from '../components/panel/NDVDraggablePanels.vue';
 
 import OutputPanel from '../components/panel/OutputPanel.vue';
diff --git a/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsViewV2.vue b/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsViewV2.vue
index cb645232912..b9166b67ebc 100644
--- a/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsViewV2.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/views/NodeDetailsViewV2.vue
@@ -7,7 +7,7 @@ import { jsonParse, NodeConnectionTypes, NodeHelpers } from 'n8n-workflow';
 import { computed, onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from 'vue';
 
 import NDVHeader from '../components/panel/NDVHeader.vue';
-import NodeSettings from '@/components/NodeSettings.vue';
+import NodeSettings from '@/features/ndv/components/settings/NodeSettings.vue';
 
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useKeybindings } from '@/composables/useKeybindings';
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue
index 441d4fb878a..1e7989652f9 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalCanvasNodeSettings.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import NodeSettings from '@/components/NodeSettings.vue';
+import NodeSettings from '@/features/ndv/components/settings/NodeSettings.vue';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { type IUpdateInformation } from '@/Interface';
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue
index bf800ecb827..d2a707af2fb 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/experimental/components/ExperimentalEmbeddedNdvHeader.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import NodeIcon from '@/components/NodeIcon.vue';
-import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
+import NodeSettingsTabs from '@/features/ndv/components/settings/NodeSettingsTabs.vue';
 import type { INode, INodeTypeDescription } from 'n8n-workflow';
 import type { NodeSettingsTab } from '@/types/nodeSettings';