diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/statusDictionary.ts b/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/statusDictionary.ts
deleted file mode 100644
index 4465e1808d5..00000000000
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/statusDictionary.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { TestRunRecord } from '@/api/evaluation.ee';
-import { type IconName } from '@n8n/design-system/components/N8nIcon/icons';
-import type { IconColor } from '@n8n/design-system/types/icon';
-
-export const statusDictionary: Record<
-	TestRunRecord['status'],
-	{ icon: IconName; color: IconColor }
-> = {
-	new: {
-		icon: 'status-new',
-		color: 'foreground-xdark',
-	},
-	running: {
-		icon: 'spinner',
-		color: 'secondary',
-	},
-	completed: {
-		icon: 'status-completed',
-		color: 'success',
-	},
-	error: {
-		icon: 'triangle-alert',
-		color: 'danger',
-	},
-	cancelled: {
-		icon: 'status-canceled',
-		color: 'foreground-xdark',
-	},
-	warning: {
-		icon: 'status-warning',
-		color: 'warning',
-	},
-	success: {
-		icon: 'status-completed',
-		color: 'success',
-	},
-};
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 c3e72f3312d..e6041f8e09c 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 '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '@/features/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/viewsData.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index ae81a5e0db0..401ffef7d64 100644
--- a/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -68,7 +68,7 @@ import { useTemplatesStore } from '@/features/templates/templates.store';
 import type { BaseTextKey } from '@n8n/i18n';
 import camelCase from 'lodash/camelCase';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '@/features/evaluation.ee/evaluation.store';
 import { getAiTemplatesCallout, getPreBuiltAgentsCalloutWithDivider } from './utils';
 import { useCalloutHelpers } from '@/composables/useCalloutHelpers';
 
diff --git a/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts b/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts
index 3a5c89a2de4..7d8553ac113 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.test.ts
@@ -2,7 +2,7 @@ import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import { ref } from 'vue';
 import WorkflowProductionChecklist from '@/components/WorkflowProductionChecklist.vue';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '@/features/evaluation.ee/evaluation.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowSettingsCache } from '@/composables/useWorkflowsCache';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.vue b/packages/frontend/editor-ui/src/components/WorkflowProductionChecklist.vue
index 81ae509a534..5beb6715478 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 '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '@/features/evaluation.ee/evaluation.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type { ActionType, WorkflowSettings } from '@/composables/useWorkflowsCache';
 import { useWorkflowSettingsCache } from '@/composables/useWorkflowsCache';
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/MetricsChart.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/MetricsChart.vue
similarity index 94%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/MetricsChart.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/MetricsChart.vue
index 79f9df6e2cb..42ee11a04cd 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/MetricsChart.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/MetricsChart.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { TestRunRecord } from '@/api/evaluation.ee';
+import type { TestRunRecord } from '../../evaluation.api';
 import { computed, watchEffect } from 'vue';
 import { Line } from 'vue-chartjs';
-import { useMetricsChart } from '../composables/useMetricsChart';
+import { useMetricsChart } from '../../composables/useMetricsChart';
 
 import { N8nOption, N8nSelect } from '@n8n/design-system';
 const emit = defineEmits<{
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/RunsSection.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/RunsSection.vue
similarity index 91%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/RunsSection.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/RunsSection.vue
index 2c14a49f7d0..70f1035a6e5 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/RunsSection.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/RunsSection.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import type { TestRunRecord } from '@/api/evaluation.ee';
-import MetricsChart from '@/components/Evaluations.ee/ListRuns/MetricsChart.vue';
-import TestRunsTable from '@/components/Evaluations.ee/ListRuns/TestRunsTable.vue';
+import type { TestRunRecord } from '../../evaluation.api';
+import MetricsChart from './MetricsChart.vue';
+import TestRunsTable from './TestRunsTable.vue';
 import { useI18n } from '@n8n/i18n';
 import { VIEWS } from '@/constants';
 import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/TestRunsTable.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/TestRunsTable.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/TestRunsTable.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/TestRunsTable.vue
index 59f469c6d99..7cbc177793a 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/ListRuns/TestRunsTable.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/components/ListRuns/TestRunsTable.vue
@@ -1,12 +1,11 @@
 <script setup lang="ts">
-import type { TestRunRecord } from '@/api/evaluation.ee';
+import type { TestRunRecord } from '../../evaluation.api';
 import { useI18n } from '@n8n/i18n';
 import { computed } from 'vue';
 import type { TestTableColumn } from '../shared/TestTableBase.vue';
 import type { BaseTextKey } from '@n8n/i18n';
 import TestTableBase from '../shared/TestTableBase.vue';
-import { statusDictionary } from '../shared/statusDictionary';
-import { getErrorBaseKey } from '@/components/Evaluations.ee/shared/errorCodes';
+import { statusDictionary, getErrorBaseKey } from '../../evaluation.constants';
 import { I18nT } from 'vue-i18n';
 import { N8nHeading, N8nIcon, N8nText, N8nTooltip } from '@n8n/design-system';
 import AnimatedSpinner from '@/components/AnimatedSpinner.vue';
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/Paywall/EvaluationsPaywall.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/Paywall/EvaluationsPaywall.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/Paywall/EvaluationsPaywall.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/Paywall/EvaluationsPaywall.vue
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/SetupWizard/SetupWizard.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/SetupWizard/SetupWizard.vue
similarity index 99%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/SetupWizard/SetupWizard.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/SetupWizard/SetupWizard.vue
index 4d6a04b4957..b5a84ecf9e7 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/SetupWizard/SetupWizard.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/components/SetupWizard/SetupWizard.vue
@@ -2,7 +2,7 @@
 import { useI18n } from '@n8n/i18n';
 import { ref, computed } from 'vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '../../evaluation.store';
 import { PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
 import StepHeader from '../shared/StepHeader.vue';
 import { useRouter } from 'vue-router';
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/StepHeader.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepHeader.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/shared/StepHeader.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepHeader.vue
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/StepIndicator.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepIndicator.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/shared/StepIndicator.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/StepIndicator.vue
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TableCell.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableCell.vue
similarity index 100%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TableCell.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableCell.vue
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TableStatusCell.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableStatusCell.vue
similarity index 97%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TableStatusCell.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableStatusCell.vue
index 2c86e17b515..cfcd5aa8e88 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TableStatusCell.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TableStatusCell.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" generic="T">
 import type { BaseTextKey } from '@n8n/i18n';
-import type { TestTableColumn } from '@/components/Evaluations.ee/shared/TestTableBase.vue';
+import type { TestTableColumn } from './TestTableBase.vue';
 import { useI18n } from '@n8n/i18n';
 import { useRouter } from 'vue-router';
 import type { BadgeTheme } from '@n8n/design-system';
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TestTableBase.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TestTableBase.vue
similarity index 98%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TestTableBase.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TestTableBase.vue
index 692a784abb7..ac2d8d4f921 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/TestTableBase.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/components/shared/TestTableBase.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts" generic="T extends object">
-import { SHORT_TABLE_CELL_MIN_WIDTH } from '@/views/Evaluations.ee/utils';
+import { SHORT_TABLE_CELL_MIN_WIDTH } from '../../evaluation.utils';
 import type { ColumnCls, TableInstance } from 'element-plus';
 import isEqual from 'lodash/isEqual';
 import { nextTick, ref, useCssModule, watch } from 'vue';
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/tests/useMetricsChart.test.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.test.ts
similarity index 92%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/tests/useMetricsChart.test.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.test.ts
index 2caa1cdf21e..2b88f5a2672 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/tests/useMetricsChart.test.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
-import { useMetricsChart } from '../composables/useMetricsChart';
-import type { TestRunRecord as Record } from '@/api/evaluation.ee';
+import { useMetricsChart } from './useMetricsChart';
+import type { TestRunRecord as Record } from '../evaluation.api';
 
 type TestRunRecord = Record & { index: number };
 describe('useMetricsChart', () => {
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/composables/useMetricsChart.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/composables/useMetricsChart.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.ts
index 73371200608..781ff631e86 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/composables/useMetricsChart.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/composables/useMetricsChart.ts
@@ -1,5 +1,5 @@
 import type { ChartData, ChartOptions } from 'chart.js';
-import type { TestRunRecord } from '@/api/evaluation.ee';
+import type { TestRunRecord } from '../evaluation.api';
 import dateFormat from 'dateformat';
 import { useCssVar } from '@vueuse/core';
 
diff --git a/packages/frontend/editor-ui/src/api/evaluation.ee.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.api.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/api/evaluation.ee.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.api.ts
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/errorCodes.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.constants.ts
similarity index 78%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/shared/errorCodes.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.constants.ts
index 95df0eb4d17..cf8c74e5c52 100644
--- a/packages/frontend/editor-ui/src/components/Evaluations.ee/shared/errorCodes.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.constants.ts
@@ -1,3 +1,7 @@
+import type { TestRunRecord } from './evaluation.api';
+import { type IconName } from '@n8n/design-system/components/N8nIcon/icons';
+import type { IconColor } from '@n8n/design-system/types/icon';
+
 import type { BaseTextKey } from '@n8n/i18n';
 
 const TEST_CASE_EXECUTION_ERROR_CODE = {
@@ -55,3 +59,37 @@ export const getErrorBaseKey = (errorCode?: string): string => {
 		''
 	);
 };
+
+export const statusDictionary: Record<
+	TestRunRecord['status'],
+	{ icon: IconName; color: IconColor }
+> = {
+	new: {
+		icon: 'status-new',
+		color: 'foreground-xdark',
+	},
+	running: {
+		icon: 'spinner',
+		color: 'secondary',
+	},
+	completed: {
+		icon: 'status-completed',
+		color: 'success',
+	},
+	error: {
+		icon: 'triangle-alert',
+		color: 'danger',
+	},
+	cancelled: {
+		icon: 'status-canceled',
+		color: 'foreground-xdark',
+	},
+	warning: {
+		icon: 'status-warning',
+		color: 'warning',
+	},
+	success: {
+		icon: 'status-completed',
+		color: 'success',
+	},
+};
diff --git a/packages/frontend/editor-ui/src/stores/evaluation.store.ee.test.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.test.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/stores/evaluation.store.ee.test.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.test.ts
index 0aface356e0..222000e7edd 100644
--- a/packages/frontend/editor-ui/src/stores/evaluation.store.ee.test.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.test.ts
@@ -1,8 +1,8 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee'; // Adjust the import path as necessary
+import { useEvaluationStore } from './evaluation.store'; // Adjust the import path as necessary
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useAnnotationTagsStore } from '@/stores/tags.store';
-import type { TestRunRecord } from '@/api/evaluation.ee';
+import type { TestRunRecord } from './evaluation.api';
 import { mockedStore } from '@/__tests__/utils';
 
 const { getTestRuns, getTestRun, startTestRun, deleteTestRun } = vi.hoisted(() => ({
@@ -12,7 +12,7 @@ const { getTestRuns, getTestRun, startTestRun, deleteTestRun } = vi.hoisted(() =
 	deleteTestRun: vi.fn(),
 }));
 
-vi.mock('@/api/evaluation.ee', () => ({
+vi.mock('./evaluation.api', () => ({
 	getTestRuns,
 	getTestRun,
 	startTestRun,
diff --git a/packages/frontend/editor-ui/src/stores/evaluation.store.ee.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.ts
similarity index 97%
rename from packages/frontend/editor-ui/src/stores/evaluation.store.ee.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.ts
index fbe777e54e5..5142b95fcde 100644
--- a/packages/frontend/editor-ui/src/stores/evaluation.store.ee.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.store.ts
@@ -1,8 +1,8 @@
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
 import { useRootStore } from '@n8n/stores/useRootStore';
-import * as evaluationsApi from '@/api/evaluation.ee';
-import type { TestCaseExecutionRecord, TestRunRecord } from '@/api/evaluation.ee';
+import * as evaluationsApi from './evaluation.api';
+import type { TestCaseExecutionRecord, TestRunRecord } from './evaluation.api';
 import { STORES } from '@n8n/stores';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { EVALUATION_NODE_TYPE, EVALUATION_TRIGGER_NODE_TYPE, NodeHelpers } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/components/Evaluations.ee/types.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.types.ts
similarity index 100%
rename from packages/frontend/editor-ui/src/components/Evaluations.ee/types.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.types.ts
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/utils.test.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.test.ts
similarity index 99%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/utils.test.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.test.ts
index 1b141b02a3e..eaea22b09ec 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/utils.test.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.test.ts
@@ -5,8 +5,8 @@ import {
 	getDefaultOrderedColumns,
 	getTestCasesColumns,
 	getTestTableHeaders,
-} from './utils';
-import type { TestCaseExecutionRecord } from '@/api/evaluation.ee';
+} from './evaluation.utils';
+import type { TestCaseExecutionRecord } from './evaluation.api';
 
 describe('utils', () => {
 	describe('applyCachedSortOrder', () => {
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/utils.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.ts
similarity index 96%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/utils.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.ts
index 490b575c4dd..459da1da036 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/utils.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/evaluation.utils.ts
@@ -1,6 +1,6 @@
 import type { JsonValue } from 'n8n-workflow';
-import type { TestCaseExecutionRecord, TestRunRecord } from '../../api/evaluation.ee';
-import type { Column, Header } from './TestRunDetailView.vue';
+import type { TestCaseExecutionRecord, TestRunRecord } from './evaluation.api';
+import type { Column, Header } from './views/TestRunDetailView.vue';
 
 export const SHORT_TABLE_CELL_MIN_WIDTH = 125;
 const LONG_TABLE_CELL_MIN_WIDTH = 250;
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/tests/EvaluationsRootView.test.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/tests/EvaluationsRootView.test.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.test.ts
index af6ad5e82db..746e85ea242 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/tests/EvaluationsRootView.test.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.test.ts
@@ -2,16 +2,16 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { mock } from 'vitest-mock-extended';
 import { createTestingPinia } from '@pinia/testing';
 import { createComponentRenderer } from '@/__tests__/render';
-import EvaluationRootView from '../EvaluationsRootView.vue';
+import EvaluationRootView from './EvaluationsRootView.vue';
 
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '../evaluation.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { mockedStore } from '@/__tests__/utils';
 import type { IWorkflowDb } from '@/Interface';
 import { waitFor } from '@testing-library/vue';
-import type { TestRunRecord } from '@/api/evaluation.ee';
+import type { TestRunRecord } from '../evaluation.api';
 import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { EVALUATION_NODE_TYPE, EVALUATION_TRIGGER_NODE_TYPE, NodeHelpers } from 'n8n-workflow';
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/EvaluationsRootView.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/EvaluationsRootView.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.vue
index 9e2b234ee81..d55d81bc3ee 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/EvaluationsRootView.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsRootView.vue
@@ -7,13 +7,13 @@ import { useCanvasOperations } from '@/composables/useCanvasOperations';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@n8n/i18n';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '../evaluation.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 
 import { computed, watch } from 'vue';
-import EvaluationsPaywall from '@/components/Evaluations.ee/Paywall/EvaluationsPaywall.vue';
-import SetupWizard from '@/components/Evaluations.ee/SetupWizard/SetupWizard.vue';
+import EvaluationsPaywall from '../components/Paywall/EvaluationsPaywall.vue';
+import SetupWizard from '../components/SetupWizard/SetupWizard.vue';
 
 import { N8nCallout, N8nLink, N8nText } from '@n8n/design-system';
 const props = defineProps<{
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/tests/EvaluationsView.test.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.test.ts
similarity index 95%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/tests/EvaluationsView.test.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.test.ts
index 44c922c025d..107c0d52174 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/tests/EvaluationsView.test.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.test.ts
@@ -1,12 +1,12 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { createTestingPinia } from '@pinia/testing';
 import { createComponentRenderer } from '@/__tests__/render';
-import EvaluationsView from '@/views/Evaluations.ee/EvaluationsView.vue';
+import EvaluationsView from './EvaluationsView.vue';
 
 import { mockedStore } from '@/__tests__/utils';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '../evaluation.store';
 import userEvent from '@testing-library/user-event';
-import type { TestRunRecord } from '@/api/evaluation.ee';
+import type { TestRunRecord } from '../evaluation.api';
 import { waitFor } from '@testing-library/vue';
 
 vi.mock('vue-router', () => {
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/EvaluationsView.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.vue
similarity index 95%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/EvaluationsView.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.vue
index 07ce6ee6d1d..1da502c0337 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/EvaluationsView.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/views/EvaluationsView.vue
@@ -2,8 +2,8 @@
 import { useI18n } from '@n8n/i18n';
 import { computed, ref, watch } from 'vue';
 
-import RunsSection from '@/components/Evaluations.ee/ListRuns/RunsSection.vue';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import RunsSection from '../components/ListRuns/RunsSection.vue';
+import { useEvaluationStore } from '../evaluation.store';
 import orderBy from 'lodash/orderBy';
 import { useToast } from '@/composables/useToast';
 
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/TestRunDetailView.test.ts b/packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.test.ts
similarity index 98%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/TestRunDetailView.test.ts
rename to packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.test.ts
index 54d113a4c9c..13ecebc537e 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/TestRunDetailView.test.ts
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.test.ts
@@ -2,9 +2,9 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import { waitFor } from '@testing-library/vue';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '../evaluation.store';
 import TestRunDetailView from './TestRunDetailView.vue';
-import type { TestCaseExecutionRecord, TestRunRecord } from '@/api/evaluation.ee';
+import type { TestCaseExecutionRecord, TestRunRecord } from '../evaluation.api';
 import type { IWorkflowDb } from '@/Interface';
 import { mock } from 'vitest-mock-extended';
 
diff --git a/packages/frontend/editor-ui/src/views/Evaluations.ee/TestRunDetailView.vue b/packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.vue
similarity index 96%
rename from packages/frontend/editor-ui/src/views/Evaluations.ee/TestRunDetailView.vue
rename to packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.vue
index d8b70cf4152..590f4b70c13 100644
--- a/packages/frontend/editor-ui/src/views/Evaluations.ee/TestRunDetailView.vue
+++ b/packages/frontend/editor-ui/src/features/evaluation.ee/views/TestRunDetailView.vue
@@ -1,19 +1,18 @@
 <script setup lang="ts">
-import type { TestCaseExecutionRecord } from '@/api/evaluation.ee';
-import type { TestTableColumn } from '@/components/Evaluations.ee/shared/TestTableBase.vue';
-import TestTableBase from '@/components/Evaluations.ee/shared/TestTableBase.vue';
+import type { TestCaseExecutionRecord } from '../evaluation.api';
+import type { TestTableColumn } from '../components/shared/TestTableBase.vue';
+import TestTableBase from '../components/shared/TestTableBase.vue';
 import { useI18n } from '@n8n/i18n';
 import { useToast } from '@/composables/useToast';
 import { VIEWS } from '@/constants';
 import type { BaseTextKey } from '@n8n/i18n';
-import { useEvaluationStore } from '@/stores/evaluation.store.ee';
+import { useEvaluationStore } from '../evaluation.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
 import { computed, onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import orderBy from 'lodash/orderBy';
-import { statusDictionary } from '@/components/Evaluations.ee/shared/statusDictionary';
-import { getErrorBaseKey } from '@/components/Evaluations.ee/shared/errorCodes';
+import { statusDictionary, getErrorBaseKey } from '../evaluation.constants';
 import { ElScrollbar } from 'element-plus';
 import {
 	N8nCallout,
@@ -32,7 +31,7 @@ import {
 	getDefaultOrderedColumns,
 	getTestCasesColumns,
 	getTestTableHeaders,
-} from './utils';
+} from '../evaluation.utils';
 import {
 	useWorkflowSettingsCache,
 	type UserEvaluationPreferences,
diff --git a/packages/frontend/editor-ui/src/router.ts b/packages/frontend/editor-ui/src/router.ts
index 6cf1ed3f3ef..f38f9cb2224 100644
--- a/packages/frontend/editor-ui/src/router.ts
+++ b/packages/frontend/editor-ui/src/router.ts
@@ -18,7 +18,6 @@ import type { RouterMiddleware } from '@/types/router';
 import { initializeAuthenticatedFeatures, initializeCore } from '@/init';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { projectsRoutes } from '@/routes/projects.routes';
-import TestRunDetailView from '@/views/Evaluations.ee/TestRunDetailView.vue';
 import { MfaRequiredError } from '@n8n/rest-api-client';
 import { useCalloutHelpers } from './composables/useCalloutHelpers';
 
@@ -67,9 +66,12 @@ const SettingsExternalSecrets = async () =>
 const WorkerView = async () => await import('./views/WorkerView.vue');
 const WorkflowHistory = async () => await import('@/views/WorkflowHistory.vue');
 const WorkflowOnboardingView = async () => await import('@/views/WorkflowOnboardingView.vue');
-const EvaluationsView = async () => await import('@/views/Evaluations.ee/EvaluationsView.vue');
+const EvaluationsView = async () =>
+	await import('@/features/evaluation.ee/views/EvaluationsView.vue');
+const TestRunDetailView = async () =>
+	await import('@/features/evaluation.ee/views/TestRunDetailView.vue');
 const EvaluationRootView = async () =>
-	await import('@/views/Evaluations.ee/EvaluationsRootView.vue');
+	await import('@/features/evaluation.ee/views/EvaluationsRootView.vue');
 const PrebuiltAgentTemplatesView = async () =>
 	await import('@/views/PrebuiltAgentTemplatesView.vue');