From ed963011c9905e529879829273f6f2ac524ad9d2 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 6 Jun 2024 15:30:17 +0200
Subject: [PATCH] fix(editor): Move projects and rbac files (no-changelog)
 (#9651)

---
 packages/editor-ui/src/Interface.ts           |  2 +-
 .../editor-ui/src/__tests__/data/projects.ts  |  8 +--
 packages/editor-ui/src/__tests__/mocks.ts     |  2 +-
 .../src/__tests__/permissions.spec.ts         |  2 +-
 .../projects => api}/projects.api.ts          |  2 +-
 .../src/components/CredentialCard.vue         |  6 +--
 .../CredentialEdit/CredentialEdit.vue         |  4 +-
 .../CredentialEdit/CredentialSharing.ee.vue   | 12 ++---
 .../src/components/DeleteUserModal.vue        |  6 +--
 .../components/MainHeader/WorkflowDetails.vue |  4 +-
 .../editor-ui/src/components/MainSidebar.vue  |  4 +-
 .../components/MainSidebarSourceControl.vue   |  2 +-
 .../Projects}/ProjectCardBadge.test.ts        |  2 +-
 .../Projects}/ProjectCardBadge.vue            |  5 +-
 .../Projects}/ProjectDeleteDialog.vue         |  8 +--
 .../Projects}/ProjectNavigation.vue           |  4 +-
 .../Projects}/ProjectRoleUpgradeDialog.vue    |  0
 .../Projects}/ProjectSettings.test.ts         |  8 +--
 .../Projects}/ProjectSettings.vue             | 10 ++--
 .../Projects}/ProjectSharing.test.ts          |  2 +-
 .../Projects}/ProjectSharing.vue              |  4 +-
 .../Projects}/ProjectSharingInfo.vue          |  4 +-
 .../Projects}/ProjectTabs.test.ts             | 50 +++++++++----------
 .../Projects}/ProjectTabs.vue                 |  2 +-
 .../EventDestinationSettingsModal.ee.vue      |  2 +-
 .../src/components/SettingsSidebar.vue        |  2 +-
 .../editor-ui/src/components/Telemetry.vue    |  2 +-
 .../editor-ui/src/components/WorkflowCard.vue |  6 +--
 .../src/components/WorkflowSettings.vue       |  2 +-
 .../src/components/WorkflowShareModal.ee.vue  | 12 ++---
 .../__tests__/CredentialCard.test.ts          |  2 +-
 .../src/components/banners/V1Banner.vue       |  2 +-
 .../forms/ResourceFiltersDropdown.vue         |  6 +--
 .../layouts/ResourcesListLayout.vue           |  2 +-
 .../src/composables/useNodeHelpers.ts         |  2 +-
 .../src/composables/useWorkflowHelpers.ts     |  2 +-
 .../projects/__tests__/projects.utils.test.ts | 21 --------
 packages/editor-ui/src/init.ts                |  2 +-
 packages/editor-ui/src/mixins/userHelpers.ts  |  2 +-
 packages/editor-ui/src/permissions.ts         |  2 +-
 packages/editor-ui/src/rbac/middleware.ts     | 22 --------
 packages/editor-ui/src/router.ts              |  4 +-
 .../projects => routes}/projects.routes.ts    |  3 +-
 .../editor-ui/src/stores/cloudPlan.store.ts   |  2 +-
 .../editor-ui/src/stores/credentials.store.ts |  4 +-
 .../projects => stores}/projects.store.ts     |  8 +--
 packages/editor-ui/src/stores/ui.store.ts     |  2 +-
 .../src/stores/workflows.ee.store.ts          |  4 +-
 .../editor-ui/src/stores/workflows.store.ts   |  2 +-
 .../projects => types}/projects.types.ts      |  7 ++-
 .../projects.utils.test.ts                    |  2 +-
 .../projects => utils}/projects.utils.ts      |  6 ---
 .../rbac/checks}/hasRole.test.ts              |  2 +-
 .../src/{ => utils}/rbac/checks/hasRole.ts    |  0
 .../rbac/checks}/hasScope.test.ts             |  2 +-
 .../src/{ => utils}/rbac/checks/hasScope.ts   |  0
 .../src/{ => utils}/rbac/checks/index.ts      |  0
 .../rbac/checks}/isAuthenticated.test.ts      |  2 +-
 .../rbac/checks/isAuthenticated.ts            |  0
 .../rbac/checks}/isDefaultUser.test.ts        |  2 +-
 .../{ => utils}/rbac/checks/isDefaultUser.ts  |  0
 .../isEnterpriseFeatureEnabled.test.ts        |  2 +-
 .../rbac/checks/isEnterpriseFeatureEnabled.ts |  0
 .../rbac/checks}/isGuest.test.ts              |  2 +-
 .../src/{ => utils}/rbac/checks/isGuest.ts    |  0
 .../rbac/checks}/isInstanceOwner.test.ts      |  2 +-
 .../rbac/checks/isInstanceOwner.ts            |  0
 .../rbac/checks}/isValid.test.ts              |  2 +-
 .../src/{ => utils}/rbac/checks/isValid.ts    |  0
 .../editor-ui/src/utils/rbac/middleware.ts    | 22 ++++++++
 .../rbac/middleware}/authenticated.test.ts    |  2 +-
 .../rbac/middleware/authenticated.ts          |  2 +-
 .../rbac/middleware}/custom.test.ts           |  2 +-
 .../src/{ => utils}/rbac/middleware/custom.ts |  0
 .../rbac/middleware}/defaultUser.test.ts      |  2 +-
 .../rbac/middleware/defaultUser.ts            |  2 +-
 .../rbac/middleware}/enterprise.test.ts       |  2 +-
 .../{ => utils}/rbac/middleware/enterprise.ts |  2 +-
 .../rbac/middleware}/guest.test.ts            |  2 +-
 .../src/{ => utils}/rbac/middleware/guest.ts  |  2 +-
 .../rbac/middleware}/rbac.test.ts             |  2 +-
 .../src/{ => utils}/rbac/middleware/rbac.ts   |  2 +-
 .../rbac/middleware}/role.test.ts             |  2 +-
 .../src/{ => utils}/rbac/middleware/role.ts   |  2 +-
 .../rbac}/permissions.test.ts                 |  6 +--
 .../src/{ => utils}/rbac/permissions.ts       |  2 +-
 .../editor-ui/src/views/CredentialsView.vue   |  4 +-
 packages/editor-ui/src/views/NodeView.vue     |  6 +--
 .../src/views/SettingsLogStreamingView.vue    |  2 +-
 .../src/views/SettingsUsageAndPlan.vue        |  2 +-
 .../editor-ui/src/views/SettingsUsersView.vue |  2 +-
 .../editor-ui/src/views/WorkflowsView.vue     |  4 +-
 .../views/__tests__/SettingsUsersView.test.ts |  2 +-
 .../src/views/__tests__/WorkflowsView.test.ts |  2 +-
 94 files changed, 172 insertions(+), 212 deletions(-)
 rename packages/editor-ui/src/{features/projects => api}/projects.api.ts (97%)
 rename packages/editor-ui/src/{features/projects/components/__tests__ => components/Projects}/ProjectCardBadge.test.ts (94%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectCardBadge.vue (89%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectDeleteDialog.vue (94%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectNavigation.vue (97%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectRoleUpgradeDialog.vue (100%)
 rename packages/editor-ui/src/{features/projects/components/__tests__ => components/Projects}/ProjectSettings.test.ts (95%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectSettings.vue (96%)
 rename packages/editor-ui/src/{features/projects/components/__tests__ => components/Projects}/ProjectSharing.test.ts (98%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectSharing.vue (96%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectSharingInfo.vue (88%)
 rename packages/editor-ui/src/{features/projects/components/__tests__ => components/Projects}/ProjectTabs.test.ts (70%)
 rename packages/editor-ui/src/{features/projects/components => components/Projects}/ProjectTabs.vue (96%)
 delete mode 100644 packages/editor-ui/src/features/projects/__tests__/projects.utils.test.ts
 delete mode 100644 packages/editor-ui/src/rbac/middleware.ts
 rename packages/editor-ui/src/{features/projects => routes}/projects.routes.ts (95%)
 rename packages/editor-ui/src/{features/projects => stores}/projects.store.ts (96%)
 rename packages/editor-ui/src/{features/projects => types}/projects.types.ts (90%)
 rename packages/editor-ui/src/{features/projects/components/__tests__ => utils}/projects.utils.test.ts (94%)
 rename packages/editor-ui/src/{features/projects => utils}/projects.utils.ts (88%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/hasRole.test.ts (96%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/hasRole.ts (100%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/hasScope.test.ts (96%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/hasScope.ts (100%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/index.ts (100%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/isAuthenticated.test.ts (95%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/isAuthenticated.ts (100%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/isDefaultUser.test.ts (91%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/isDefaultUser.ts (100%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/isEnterpriseFeatureEnabled.test.ts (96%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/isEnterpriseFeatureEnabled.ts (100%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/isGuest.test.ts (92%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/isGuest.ts (100%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/isInstanceOwner.test.ts (90%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/isInstanceOwner.ts (100%)
 rename packages/editor-ui/src/{rbac/checks/__tests__ => utils/rbac/checks}/isValid.test.ts (89%)
 rename packages/editor-ui/src/{ => utils}/rbac/checks/isValid.ts (100%)
 create mode 100644 packages/editor-ui/src/utils/rbac/middleware.ts
 rename packages/editor-ui/src/{rbac/middleware/__tests__ => utils/rbac/middleware}/authenticated.test.ts (95%)
 rename packages/editor-ui/src/{ => utils}/rbac/middleware/authenticated.ts (90%)
 rename packages/editor-ui/src/{rbac/middleware/__tests__ => utils/rbac/middleware}/custom.test.ts (92%)
 rename packages/editor-ui/src/{ => utils}/rbac/middleware/custom.ts (100%)
 rename packages/editor-ui/src/{rbac/middleware/__tests__ => utils/rbac/middleware}/defaultUser.test.ts (95%)
 rename packages/editor-ui/src/{ => utils}/rbac/middleware/defaultUser.ts (87%)
 rename packages/editor-ui/src/{rbac/middleware/__tests__ => utils/rbac/middleware}/enterprise.test.ts (97%)
 rename packages/editor-ui/src/{ => utils}/rbac/middleware/enterprise.ts (85%)
 rename packages/editor-ui/src/{rbac/middleware/__tests__ => utils/rbac/middleware}/guest.test.ts (96%)
 rename packages/editor-ui/src/{ => utils}/rbac/middleware/guest.ts (91%)
 rename packages/editor-ui/src/{rbac/middleware/__tests__ => utils/rbac/middleware}/rbac.test.ts (96%)
 rename packages/editor-ui/src/{ => utils}/rbac/middleware/rbac.ts (93%)
 rename packages/editor-ui/src/{rbac/middleware/__tests__ => utils/rbac/middleware}/role.test.ts (96%)
 rename packages/editor-ui/src/{ => utils}/rbac/middleware/role.ts (88%)
 rename packages/editor-ui/src/{rbac/__tests__ => utils/rbac}/permissions.test.ts (93%)
 rename packages/editor-ui/src/{ => utils}/rbac/permissions.ts (97%)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index b08d3ab4a5..ab2afde49d 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -55,7 +55,7 @@ import type { PartialBy, TupleToUnion } from '@/utils/typeHelpers';
 import type { Component } from 'vue';
 import type { Scope } from '@n8n/permissions';
 import type { NotificationOptions as ElementNotificationOptions } from 'element-plus';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/types/projects.types';
 import type { Connection } from '@jsplumb/core';
 import type { BaseTextKey } from './plugins/i18n';
 
diff --git a/packages/editor-ui/src/__tests__/data/projects.ts b/packages/editor-ui/src/__tests__/data/projects.ts
index 9f87d7f781..620a396925 100644
--- a/packages/editor-ui/src/__tests__/data/projects.ts
+++ b/packages/editor-ui/src/__tests__/data/projects.ts
@@ -1,10 +1,6 @@
 import { faker } from '@faker-js/faker';
-import type {
-	ProjectListItem,
-	ProjectSharingData,
-	ProjectType,
-} from '@/features/projects/projects.types';
-import { ProjectTypes } from '@/features/projects/projects.utils';
+import type { ProjectListItem, ProjectSharingData, ProjectType } from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
 
 export const createProjectSharingData = (projectType?: ProjectType): ProjectSharingData => ({
 	id: faker.string.uuid(),
diff --git a/packages/editor-ui/src/__tests__/mocks.ts b/packages/editor-ui/src/__tests__/mocks.ts
index e3a02698c2..6b7e31a3a0 100644
--- a/packages/editor-ui/src/__tests__/mocks.ts
+++ b/packages/editor-ui/src/__tests__/mocks.ts
@@ -13,7 +13,7 @@ import { NodeHelpers, Workflow } from 'n8n-workflow';
 import { uuid } from '@jsplumb/util';
 import { defaultMockNodeTypes } from '@/__tests__/defaults';
 import type { INodeUi, ITag, IUsedCredential, IWorkflowDb, WorkflowMetadata } from '@/Interface';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/types/projects.types';
 import type { RouteLocationNormalized } from 'vue-router';
 
 export function createTestNodeTypes(data: INodeTypeData = {}): INodeTypes {
diff --git a/packages/editor-ui/src/__tests__/permissions.spec.ts b/packages/editor-ui/src/__tests__/permissions.spec.ts
index 4d20c98ed4..e126b76741 100644
--- a/packages/editor-ui/src/__tests__/permissions.spec.ts
+++ b/packages/editor-ui/src/__tests__/permissions.spec.ts
@@ -5,7 +5,7 @@ import {
 	getWorkflowPermissions,
 } from '@/permissions';
 import type { ICredentialsResponse, IUser, IWorkflowDb } from '@/Interface';
-import type { Project } from '@/features/projects/projects.types';
+import type { Project } from '@/types/projects.types';
 
 describe('permissions', () => {
 	it('getVariablesPermissions', () => {
diff --git a/packages/editor-ui/src/features/projects/projects.api.ts b/packages/editor-ui/src/api/projects.api.ts
similarity index 97%
rename from packages/editor-ui/src/features/projects/projects.api.ts
rename to packages/editor-ui/src/api/projects.api.ts
index f85d466a80..b3bae3fbf1 100644
--- a/packages/editor-ui/src/features/projects/projects.api.ts
+++ b/packages/editor-ui/src/api/projects.api.ts
@@ -6,7 +6,7 @@ import type {
 	ProjectListItem,
 	ProjectUpdateRequest,
 	ProjectsCount,
-} from '@/features/projects/projects.types';
+} from '@/types/projects.types';
 
 export const getAllProjects = async (context: IRestApiContext): Promise<ProjectListItem[]> => {
 	return await makeRestApiRequest(context, 'GET', '/projects');
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index b85f80c5af..04425af7d3 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -44,10 +44,10 @@ import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import TimeAgo from '@/components/TimeAgo.vue';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import type { ProjectSharingData } from '@/types/projects.types';
+import { useProjectsStore } from '@/stores/projects.store';
 import type { CredentialScope } from '@n8n/permissions';
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import ProjectCardBadge from '@/components/Projects/ProjectCardBadge.vue';
 
 export const CREDENTIAL_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index f9c5a5e1be..7f852767e9 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -157,7 +157,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/types/projects.types';
 import { assert } from '@/utils/assert';
 
 import {
@@ -168,7 +168,7 @@ import {
 import { isValidCredentialResponse, isCredentialModalState } from '@/utils/typeGuards';
 import { isExpression, isTestableExpression } from '@/utils/expressions';
 import { useExternalHooks } from '@/composables/useExternalHooks';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 import type { CredentialScope } from '@n8n/permissions';
 
 export default defineComponent({
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 38eb0f55a6..1a526164ba 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -83,20 +83,16 @@ import { useUIStore } from '@/stores/ui.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { EnterpriseEditionFeature } from '@/constants';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type {
-	ProjectListItem,
-	ProjectSharingData,
-	Project,
-} from '@/features/projects/projects.types';
+import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
+import { useProjectsStore } from '@/stores/projects.store';
+import type { ProjectListItem, ProjectSharingData, Project } from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import type { PermissionsMap } from '@/permissions';
 import type { CredentialScope } from '@n8n/permissions';
 import type { EventBus } from 'n8n-design-system/utils';
 import { useRolesStore } from '@/stores/roles.store';
 import type { RoleMap } from '@/types/roles.types';
-import { ProjectTypes } from '@/features/projects/projects.utils';
 
 export default defineComponent({
 	name: 'CredentialSharing',
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index b344f91d7d..311392521c 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -83,9 +83,9 @@ import type { IUser } from '@/Interface';
 import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectListItem, ProjectSharingData } from '@/features/projects/projects.types';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import { useProjectsStore } from '@/stores/projects.store';
+import type { ProjectListItem, ProjectSharingData } from '@/types/projects.types';
+import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 
 export default defineComponent({
 	name: 'DeleteUserModal',
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 5ad4b88c44..ff9570de18 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -31,7 +31,7 @@ import { useTagsStore } from '@/stores/tags.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 
 import { saveAs } from 'file-saver';
 import { useTitleChange } from '@/composables/useTitleChange';
@@ -41,7 +41,7 @@ import { useToast } from '@/composables/useToast';
 import { getWorkflowPermissions } from '@/permissions';
 import { createEventBus } from 'n8n-design-system/utils';
 import { nodeViewEventBus } from '@/event-bus';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { useCanvasStore } from '@/stores/canvas.store';
 import { useRoute, useRouter } from 'vue-router';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index fae341cdc7..9b9635928a 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -126,11 +126,11 @@ import { useTemplatesStore } from '@/stores/templates.store';
 import ExecutionsUsage from '@/components/executions/ExecutionsUsage.vue';
 import BecomeTemplateCreatorCta from '@/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue';
 import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useDebounce } from '@/composables/useDebounce';
 import { useBecomeTemplateCreatorStore } from '@/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore';
-import ProjectNavigation from '@/features/projects/components/ProjectNavigation.vue';
+import ProjectNavigation from '@/components/Projects/ProjectNavigation.vue';
 
 export default defineComponent({
 	name: 'MainSidebar',
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index b3a4b424d5..5a863a9d46 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -3,7 +3,7 @@ import { computed, nextTick, ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useI18n } from '@/composables/useI18n';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { useToast } from '@/composables/useToast';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useUIStore } from '@/stores/ui.store';
diff --git a/packages/editor-ui/src/features/projects/components/__tests__/ProjectCardBadge.test.ts b/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
similarity index 94%
rename from packages/editor-ui/src/features/projects/components/__tests__/ProjectCardBadge.test.ts
rename to packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
index 20fcb938cc..1482b68038 100644
--- a/packages/editor-ui/src/features/projects/components/__tests__/ProjectCardBadge.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
@@ -1,5 +1,5 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import ProjectCardBadge from '@/components/Projects/ProjectCardBadge.vue';
 
 const renderComponent = createComponentRenderer(ProjectCardBadge);
 
diff --git a/packages/editor-ui/src/features/projects/components/ProjectCardBadge.vue b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
similarity index 89%
rename from packages/editor-ui/src/features/projects/components/ProjectCardBadge.vue
rename to packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
index 54560963ee..2c6b67753f 100644
--- a/packages/editor-ui/src/features/projects/components/ProjectCardBadge.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
-import { ProjectTypes, splitName } from '@/features/projects/projects.utils';
+import { splitName } from '@/utils/projects.utils';
 import type { ICredentialsResponse, IWorkflowDb } from '@/Interface';
-import type { Project } from '@/features/projects/projects.types';
+import type { Project } from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
 
 type Props = {
 	resource: IWorkflowDb | ICredentialsResponse;
diff --git a/packages/editor-ui/src/features/projects/components/ProjectDeleteDialog.vue b/packages/editor-ui/src/components/Projects/ProjectDeleteDialog.vue
similarity index 94%
rename from packages/editor-ui/src/features/projects/components/ProjectDeleteDialog.vue
rename to packages/editor-ui/src/components/Projects/ProjectDeleteDialog.vue
index 4df4d912d4..4961eee5ca 100644
--- a/packages/editor-ui/src/features/projects/components/ProjectDeleteDialog.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectDeleteDialog.vue
@@ -1,11 +1,7 @@
 <script lang="ts" setup>
 import { ref, computed } from 'vue';
-import type {
-	Project,
-	ProjectListItem,
-	ProjectSharingData,
-} from '@/features/projects/projects.types';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import type { Project, ProjectListItem, ProjectSharingData } from '@/types/projects.types';
+import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 import { useI18n } from '@/composables/useI18n';
 
 type Props = {
diff --git a/packages/editor-ui/src/features/projects/components/ProjectNavigation.vue b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
similarity index 97%
rename from packages/editor-ui/src/features/projects/components/ProjectNavigation.vue
rename to packages/editor-ui/src/components/Projects/ProjectNavigation.vue
index deb8cd91f6..03b6331be4 100644
--- a/packages/editor-ui/src/features/projects/components/ProjectNavigation.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
@@ -4,8 +4,8 @@ import { useRouter } from 'vue-router';
 import type { IMenuItem } from 'n8n-design-system/types';
 import { useI18n } from '@/composables/useI18n';
 import { VIEWS } from '@/constants';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectListItem } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/stores/projects.store';
+import type { ProjectListItem } from '@/types/projects.types';
 import { useToast } from '@/composables/useToast';
 import { useUIStore } from '@/stores/ui.store';
 
diff --git a/packages/editor-ui/src/features/projects/components/ProjectRoleUpgradeDialog.vue b/packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
similarity index 100%
rename from packages/editor-ui/src/features/projects/components/ProjectRoleUpgradeDialog.vue
rename to packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
diff --git a/packages/editor-ui/src/features/projects/components/__tests__/ProjectSettings.test.ts b/packages/editor-ui/src/components/Projects/ProjectSettings.test.ts
similarity index 95%
rename from packages/editor-ui/src/features/projects/components/__tests__/ProjectSettings.test.ts
rename to packages/editor-ui/src/components/Projects/ProjectSettings.test.ts
index 64a8aab630..97020d40d5 100644
--- a/packages/editor-ui/src/features/projects/components/__tests__/ProjectSettings.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectSettings.test.ts
@@ -4,8 +4,8 @@ import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
 import { getDropdownItems } from '@/__tests__/utils';
 import { useRoute, useRouter } from 'vue-router';
-import ProjectSettings from '@/features/projects/components/ProjectSettings.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import ProjectSettings from '@/components/Projects/ProjectSettings.vue';
+import { useProjectsStore } from '@/stores/projects.store';
 import { VIEWS } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { createProjectListItem } from '@/__tests__/data/projects';
@@ -81,7 +81,7 @@ describe('ProjectSettings', () => {
 
 		await userEvent.click(deleteButton);
 		expect(deleteProjectSpy).not.toHaveBeenCalled();
-		let modal = getByRole('dialog');
+		const modal = getByRole('dialog');
 		expect(modal).toBeVisible();
 		const confirmButton = getByTestId('project-settings-delete-confirm-button');
 		expect(confirmButton).toBeDisabled();
@@ -107,7 +107,7 @@ describe('ProjectSettings', () => {
 
 		await userEvent.click(deleteButton);
 		expect(deleteProjectSpy).not.toHaveBeenCalled();
-		let modal = getByRole('dialog');
+		const modal = getByRole('dialog');
 		expect(modal).toBeVisible();
 		const confirmButton = getByTestId('project-settings-delete-confirm-button');
 		expect(confirmButton).toBeDisabled();
diff --git a/packages/editor-ui/src/features/projects/components/ProjectSettings.vue b/packages/editor-ui/src/components/Projects/ProjectSettings.vue
similarity index 96%
rename from packages/editor-ui/src/features/projects/components/ProjectSettings.vue
rename to packages/editor-ui/src/components/Projects/ProjectSettings.vue
index 2676c8c14d..514ab2e27c 100644
--- a/packages/editor-ui/src/features/projects/components/ProjectSettings.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectSettings.vue
@@ -5,13 +5,13 @@ import { deepCopy } from 'n8n-workflow';
 import { useUsersStore } from '@/stores/users.store';
 import type { IUser } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import ProjectTabs from '@/features/projects/components/ProjectTabs.vue';
-import type { Project, ProjectRelation } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/stores/projects.store';
+import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
+import type { Project, ProjectRelation } from '@/types/projects.types';
 import { useToast } from '@/composables/useToast';
 import { VIEWS } from '@/constants';
-import ProjectDeleteDialog from '@/features/projects/components/ProjectDeleteDialog.vue';
-import ProjectRoleUpgradeDialog from '@/features/projects/components/ProjectRoleUpgradeDialog.vue';
+import ProjectDeleteDialog from '@/components/Projects/ProjectDeleteDialog.vue';
+import ProjectRoleUpgradeDialog from '@/components/Projects/ProjectRoleUpgradeDialog.vue';
 import { useRolesStore } from '@/stores/roles.store';
 import type { ProjectRole } from '@/types/roles.types';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
diff --git a/packages/editor-ui/src/features/projects/components/__tests__/ProjectSharing.test.ts b/packages/editor-ui/src/components/Projects/ProjectSharing.test.ts
similarity index 98%
rename from packages/editor-ui/src/features/projects/components/__tests__/ProjectSharing.test.ts
rename to packages/editor-ui/src/components/Projects/ProjectSharing.test.ts
index f149015f73..98a3f57e43 100644
--- a/packages/editor-ui/src/features/projects/components/__tests__/ProjectSharing.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectSharing.test.ts
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
 import { getDropdownItems } from '@/__tests__/utils';
 import { createProjectListItem, createProjectSharingData } from '@/__tests__/data/projects';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 
 const renderComponent = createComponentRenderer(ProjectSharing);
 
diff --git a/packages/editor-ui/src/features/projects/components/ProjectSharing.vue b/packages/editor-ui/src/components/Projects/ProjectSharing.vue
similarity index 96%
rename from packages/editor-ui/src/features/projects/components/ProjectSharing.vue
rename to packages/editor-ui/src/components/Projects/ProjectSharing.vue
index f7cf2c6168..2d35bdc7aa 100644
--- a/packages/editor-ui/src/features/projects/components/ProjectSharing.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectSharing.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
 import { computed, ref, watch } from 'vue';
 import { useI18n } from '@/composables/useI18n';
-import type { ProjectListItem, ProjectSharingData } from '@/features/projects/projects.types';
-import ProjectSharingInfo from '@/features/projects/components/ProjectSharingInfo.vue';
+import type { ProjectListItem, ProjectSharingData } from '@/types/projects.types';
+import ProjectSharingInfo from '@/components/Projects/ProjectSharingInfo.vue';
 import type { RoleMap } from '@/types/roles.types';
 
 const locale = useI18n();
diff --git a/packages/editor-ui/src/features/projects/components/ProjectSharingInfo.vue b/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
similarity index 88%
rename from packages/editor-ui/src/features/projects/components/ProjectSharingInfo.vue
rename to packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
index d68af3539d..bf4133f7dd 100644
--- a/packages/editor-ui/src/features/projects/components/ProjectSharingInfo.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
-import type { ProjectListItem, ProjectSharingData } from '@/features/projects/projects.types';
-import { splitName } from '@/features/projects/projects.utils';
+import type { ProjectListItem, ProjectSharingData } from '@/types/projects.types';
+import { splitName } from '@/utils/projects.utils';
 
 type Props = {
 	project: ProjectListItem | ProjectSharingData;
diff --git a/packages/editor-ui/src/features/projects/components/__tests__/ProjectTabs.test.ts b/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
similarity index 70%
rename from packages/editor-ui/src/features/projects/components/__tests__/ProjectTabs.test.ts
rename to packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
index bda9743037..036b866812 100644
--- a/packages/editor-ui/src/features/projects/components/__tests__/ProjectTabs.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
@@ -1,7 +1,7 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import ProjectTabs from '@/features/projects/components/ProjectTabs.vue';
+import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import { useRoute, useRouter } from 'vue-router';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 
 vi.mock('vue-router', () => {
 	const params = {};
@@ -23,11 +23,11 @@ vi.mock('@/stores/users.store', () => ({
 	})),
 }));
 
-vi.mock('@/features/projects/projects.store', () => ({
+vi.mock('@/stores/projects.store', () => ({
 	useProjectsStore: vi.fn().mockReturnValue({}),
 }));
 
-vi.mock('@/rbac/permissions', () => ({
+vi.mock('@/utils/rbac/permissions', () => ({
 	hasPermission: vi.fn().mockReturnValue(false),
 }));
 
@@ -35,11 +35,13 @@ const renderComponent = createComponentRenderer(ProjectTabs);
 
 let router: ReturnType<typeof useRouter>;
 let route: ReturnType<typeof useRoute>;
+let projectsStore: ReturnType<typeof useProjectsStore>;
 
 describe('ProjectTabs', () => {
 	beforeEach(() => {
 		route = useRoute();
 		router = useRouter();
+		projectsStore = useProjectsStore();
 	});
 
 	it('should render home tabs', async () => {
@@ -52,17 +54,15 @@ describe('ProjectTabs', () => {
 
 	it('should render project tabs if use has permissions', () => {
 		route.params.projectId = '123';
-		vi.mocked(useProjectsStore).mockImplementationOnce(() => ({
-			currentProject: {
-				id: '123',
-				type: 'team',
-				name: 'Project',
-				relations: [],
-				scopes: ['project:update'],
-				createdAt: '',
-				updatedAt: '',
-			},
-		}));
+		projectsStore.currentProject = {
+			id: '123',
+			type: 'team',
+			name: 'Project',
+			relations: [],
+			scopes: ['project:update'],
+			createdAt: '',
+			updatedAt: '',
+		};
 		const { getByText } = renderComponent();
 
 		expect(getByText('Workflows')).toBeInTheDocument();
@@ -72,17 +72,15 @@ describe('ProjectTabs', () => {
 
 	it('should render project tabs', () => {
 		route.params.projectId = '123';
-		vi.mocked(useProjectsStore).mockImplementationOnce(() => ({
-			currentProject: {
-				id: '123',
-				type: 'team',
-				name: 'Project',
-				relations: [],
-				scopes: ['project:read'],
-				createdAt: '',
-				updatedAt: '',
-			},
-		}));
+		projectsStore.currentProject = {
+			id: '123',
+			type: 'team',
+			name: 'Project',
+			relations: [],
+			scopes: ['project:read'],
+			createdAt: '',
+			updatedAt: '',
+		};
 		const { queryByText, getByText } = renderComponent();
 
 		expect(getByText('Workflows')).toBeInTheDocument();
diff --git a/packages/editor-ui/src/features/projects/components/ProjectTabs.vue b/packages/editor-ui/src/components/Projects/ProjectTabs.vue
similarity index 96%
rename from packages/editor-ui/src/features/projects/components/ProjectTabs.vue
rename to packages/editor-ui/src/components/Projects/ProjectTabs.vue
index b64810ba4e..f7c0d275df 100644
--- a/packages/editor-ui/src/features/projects/components/ProjectTabs.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectTabs.vue
@@ -4,7 +4,7 @@ import type { RouteRecordName } from 'vue-router';
 import { useRoute } from 'vue-router';
 import { VIEWS } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
-import { useProjectsStore } from '../projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 import { getProjectPermissions } from '@/permissions';
 
 const locale = useI18n();
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 4cf0871189..5d16df7893 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -194,7 +194,7 @@ import { LOG_STREAM_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import Modal from '@/components/Modal.vue';
 import { useMessage } from '@/composables/useMessage';
 import { useUIStore } from '@/stores/ui.store';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { destinationToFakeINodeUi } from '@/components/SettingsLogStreaming/Helpers.ee';
 import {
 	webhookModalDescription,
diff --git a/packages/editor-ui/src/components/SettingsSidebar.vue b/packages/editor-ui/src/components/SettingsSidebar.vue
index a9ff876d2a..ccf6ad54b9 100644
--- a/packages/editor-ui/src/components/SettingsSidebar.vue
+++ b/packages/editor-ui/src/components/SettingsSidebar.vue
@@ -31,7 +31,7 @@ import type { BaseTextKey } from '@/plugins/i18n';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/n8nRoot.store';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 
 export default defineComponent({
 	name: 'SettingsSidebar',
diff --git a/packages/editor-ui/src/components/Telemetry.vue b/packages/editor-ui/src/components/Telemetry.vue
index 2d94f7f545..a2bd7590ff 100644
--- a/packages/editor-ui/src/components/Telemetry.vue
+++ b/packages/editor-ui/src/components/Telemetry.vue
@@ -9,7 +9,7 @@ import { useRootStore } from '@/stores/n8nRoot.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import type { ITelemetrySettings } from 'n8n-workflow';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 
 export default defineComponent({
 	name: 'Telemetry',
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index 250a782f60..d9d2e85efc 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -68,9 +68,9 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import TimeAgo from '@/components/TimeAgo.vue';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import ProjectCardBadge from '@/features/projects/components/ProjectCardBadge.vue';
+import type { ProjectSharingData } from '@/types/projects.types';
+import { useProjectsStore } from '@/stores/projects.store';
+import ProjectCardBadge from '@/components/Projects/ProjectCardBadge.vue';
 
 export const WORKFLOW_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index 72a7b168a5..d1a8e787e7 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -384,7 +384,7 @@ import type { WorkflowScope } from '@n8n/permissions';
 import { getWorkflowPermissions } from '@/permissions';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { ProjectTypes } from '@/features/projects/projects.utils';
+import { ProjectTypes } from '@/types/projects.types';
 
 export default defineComponent({
 	name: 'WorkflowSettings',
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 6557492c59..d738d3de14 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -143,16 +143,12 @@ import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { isNavigationFailure } from 'vue-router';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type {
-	ProjectListItem,
-	ProjectSharingData,
-	Project,
-} from '@/features/projects/projects.types';
+import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
+import { useProjectsStore } from '@/stores/projects.store';
+import type { ProjectListItem, ProjectSharingData, Project } from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
 import { useRolesStore } from '@/stores/roles.store';
 import type { RoleMap } from '@/types/roles.types';
-import { ProjectTypes } from '@/features/projects/projects.utils';
 
 export default defineComponent({
 	name: 'WorkflowShareModal',
diff --git a/packages/editor-ui/src/components/__tests__/CredentialCard.test.ts b/packages/editor-ui/src/components/__tests__/CredentialCard.test.ts
index ce8022ffef..2b64b4b6fc 100644
--- a/packages/editor-ui/src/components/__tests__/CredentialCard.test.ts
+++ b/packages/editor-ui/src/components/__tests__/CredentialCard.test.ts
@@ -6,7 +6,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import type { ICredentialsResponse } from '@/Interface';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/types/projects.types';
 
 const renderComponent = createComponentRenderer(CredentialCard);
 
diff --git a/packages/editor-ui/src/components/banners/V1Banner.vue b/packages/editor-ui/src/components/banners/V1Banner.vue
index c335b2129f..72077f1a3c 100644
--- a/packages/editor-ui/src/components/banners/V1Banner.vue
+++ b/packages/editor-ui/src/components/banners/V1Banner.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import BaseBanner from '@/components/banners/BaseBanner.vue';
 import { i18n as locale } from '@/plugins/i18n';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { useUIStore } from '@/stores/ui.store';
 
 const uiStore = useUIStore();
diff --git a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index 851230bd71..97aee45d38 100644
--- a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -49,10 +49,10 @@
 import { defineComponent } from 'vue';
 import { EnterpriseEditionFeature } from '@/constants';
 import { mapStores } from 'pinia';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 import type { PropType } from 'vue';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import ProjectSharing from '@/features/projects/components/ProjectSharing.vue';
+import type { ProjectSharingData } from '@/types/projects.types';
+import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 
 export type IResourceFiltersType = Record<string, boolean | string | string[]>;
 
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index f2453b8de1..0150a84c22 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -146,7 +146,7 @@
 import { computed, defineComponent, nextTick, ref, onMounted, watch } from 'vue';
 import type { PropType } from 'vue';
 
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import type { ProjectSharingData } from '@/types/projects.types';
 import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index fe15b153a0..cf4fd31f47 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -45,7 +45,7 @@ import { get } from 'lodash-es';
 import { useI18n } from './useI18n';
 import { EnableNodeToggleCommand } from '@/models/history';
 import { useTelemetry } from './useTelemetry';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import type { N8nPlusEndpoint } from '@/plugins/jsplumb/N8nPlusEndpointType';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
 import { useCanvasStore } from '@/stores/canvas.store';
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
index bf7cf04a18..44c34083fe 100644
--- a/packages/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -68,7 +68,7 @@ import { tryToParseNumber } from '@/utils/typesUtils';
 import { useI18n } from '@/composables/useI18n';
 import type { useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 
 export function resolveParameter<T = IDataObject>(
 	parameter: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
diff --git a/packages/editor-ui/src/features/projects/__tests__/projects.utils.test.ts b/packages/editor-ui/src/features/projects/__tests__/projects.utils.test.ts
deleted file mode 100644
index 13e6263986..0000000000
--- a/packages/editor-ui/src/features/projects/__tests__/projects.utils.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { splitName } from '@/features/projects/projects.utils';
-
-describe('splitName', () => {
-	it('should return name as firstName if it is only one word', () => {
-		const name = 'Projectname';
-		const result = splitName(name);
-		expect(result).toEqual({ firstName: name });
-	});
-
-	it('should return name as is when it does not contain email', () => {
-		const name = 'First Last';
-		const result = splitName(name);
-		expect(result).toEqual({ firstName: 'First', lastName: 'Last' });
-	});
-
-	it('should return firstName, lastName and email when name is in the proper format', () => {
-		const name = 'First Last <email@domain.com>';
-		const result = splitName(name);
-		expect(result).toEqual({ firstName: 'First', lastName: 'Last', email: 'email@domain.com' });
-	});
-});
diff --git a/packages/editor-ui/src/init.ts b/packages/editor-ui/src/init.ts
index e5a0522d9f..c55ffce539 100644
--- a/packages/editor-ui/src/init.ts
+++ b/packages/editor-ui/src/init.ts
@@ -6,7 +6,7 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUsersStore } from '@/stores/users.store';
 import { initializeCloudHooks } from '@/hooks/register';
 import { useVersionsStore } from '@/stores/versions.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 import { useRolesStore } from './stores/roles.store';
 
 let coreInitialized = false;
diff --git a/packages/editor-ui/src/mixins/userHelpers.ts b/packages/editor-ui/src/mixins/userHelpers.ts
index b45bd676b1..eba9375a5a 100644
--- a/packages/editor-ui/src/mixins/userHelpers.ts
+++ b/packages/editor-ui/src/mixins/userHelpers.ts
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 import type { RouteLocation } from 'vue-router';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import type { RouteConfig } from '@/types/router';
 import type { PermissionTypeOptions } from '@/types/rbac';
 
diff --git a/packages/editor-ui/src/permissions.ts b/packages/editor-ui/src/permissions.ts
index 266d5611ff..30dafc8fdc 100644
--- a/packages/editor-ui/src/permissions.ts
+++ b/packages/editor-ui/src/permissions.ts
@@ -6,7 +6,7 @@ import type {
 	WorkflowScope,
 	VariableScope,
 } from '@n8n/permissions';
-import type { Project } from './features/projects/projects.types';
+import type { Project } from '@/types/projects.types';
 
 type ExtractAfterColon<T> = T extends `${infer _Prefix}:${infer Suffix}` ? Suffix : never;
 export type PermissionsMap<T> = {
diff --git a/packages/editor-ui/src/rbac/middleware.ts b/packages/editor-ui/src/rbac/middleware.ts
deleted file mode 100644
index e6805b3813..0000000000
--- a/packages/editor-ui/src/rbac/middleware.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { RouterMiddleware, RouterMiddlewareType, MiddlewareOptions } from '@/types/router';
-import { authenticatedMiddleware } from '@/rbac/middleware/authenticated';
-import { enterpriseMiddleware } from '@/rbac/middleware/enterprise';
-import { guestMiddleware } from '@/rbac/middleware/guest';
-import { rbacMiddleware } from '@/rbac/middleware/rbac';
-import { roleMiddleware } from '@/rbac/middleware/role';
-import { customMiddleware } from '@/rbac/middleware/custom';
-import { defaultUserMiddleware } from '@/rbac/middleware/defaultUser';
-
-type Middleware = {
-	[key in RouterMiddlewareType]: RouterMiddleware<MiddlewareOptions[key]>;
-};
-
-export const middleware: Middleware = {
-	authenticated: authenticatedMiddleware,
-	custom: customMiddleware,
-	defaultUser: defaultUserMiddleware,
-	enterprise: enterpriseMiddleware,
-	guest: guestMiddleware,
-	rbac: rbacMiddleware,
-	role: roleMiddleware,
-};
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index a3ccaa3e7e..3b91acafea 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -13,11 +13,11 @@ import { useUIStore } from '@/stores/ui.store';
 import { useSSOStore } from '@/stores/sso.store';
 import { EnterpriseEditionFeature, VIEWS, EDITABLE_CANVAS_VIEWS } from '@/constants';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { middleware } from '@/rbac/middleware';
+import { middleware } from '@/utils/rbac/middleware';
 import type { RouteConfig, RouterMiddleware } from '@/types/router';
 import { initializeCore } from '@/init';
 import { tryToParseNumber } from '@/utils/typesUtils';
-import { projectsRoutes } from '@/features/projects/projects.routes';
+import { projectsRoutes } from '@/routes/projects.routes';
 
 const ChangePasswordView = async () => await import('./views/ChangePasswordView.vue');
 const ErrorView = async () => await import('./views/ErrorView.vue');
diff --git a/packages/editor-ui/src/features/projects/projects.routes.ts b/packages/editor-ui/src/routes/projects.routes.ts
similarity index 95%
rename from packages/editor-ui/src/features/projects/projects.routes.ts
rename to packages/editor-ui/src/routes/projects.routes.ts
index e7491c98a4..0bb9300fec 100644
--- a/packages/editor-ui/src/features/projects/projects.routes.ts
+++ b/packages/editor-ui/src/routes/projects.routes.ts
@@ -4,8 +4,7 @@ import { VIEWS } from '@/constants';
 const MainSidebar = async () => await import('@/components/MainSidebar.vue');
 const WorkflowsView = async () => await import('@/views/WorkflowsView.vue');
 const CredentialsView = async () => await import('@/views/CredentialsView.vue');
-const ProjectSettings = async () =>
-	await import('@/features/projects/components/ProjectSettings.vue');
+const ProjectSettings = async () => await import('@/components/Projects/ProjectSettings.vue');
 
 const commonChildRoutes: RouteRecordRaw[] = [
 	{
diff --git a/packages/editor-ui/src/stores/cloudPlan.store.ts b/packages/editor-ui/src/stores/cloudPlan.store.ts
index b1de40d9b6..042b65a43e 100644
--- a/packages/editor-ui/src/stores/cloudPlan.store.ts
+++ b/packages/editor-ui/src/stores/cloudPlan.store.ts
@@ -8,7 +8,7 @@ import { useUsersStore } from '@/stores/users.store';
 import { getAdminPanelLoginCode, getCurrentPlan, getCurrentUsage } from '@/api/cloudPlans';
 import { DateTime } from 'luxon';
 import { CLOUD_TRIAL_CHECK_INTERVAL, STORES } from '@/constants';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 
 const DEFAULT_STATE: CloudPlanState = {
 	initialized: false,
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
index 0bba70e544..aa3c4d747d 100644
--- a/packages/editor-ui/src/stores/credentials.store.ts
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -35,8 +35,8 @@ import { useRootStore } from './n8nRoot.store';
 import { useNodeTypesStore } from './nodeTypes.store';
 import { useSettingsStore } from './settings.store';
 import { isEmpty } from '@/utils/typesUtils';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import { splitName } from '@/features/projects/projects.utils';
+import type { ProjectSharingData } from '@/types/projects.types';
+import { splitName } from '@/utils/projects.utils';
 
 const DEFAULT_CREDENTIAL_NAME = 'Unnamed credential';
 const DEFAULT_CREDENTIAL_POSTFIX = 'account';
diff --git a/packages/editor-ui/src/features/projects/projects.store.ts b/packages/editor-ui/src/stores/projects.store.ts
similarity index 96%
rename from packages/editor-ui/src/features/projects/projects.store.ts
rename to packages/editor-ui/src/stores/projects.store.ts
index d28685c2e7..b05589af3a 100644
--- a/packages/editor-ui/src/features/projects/projects.store.ts
+++ b/packages/editor-ui/src/stores/projects.store.ts
@@ -2,17 +2,17 @@ import { defineStore } from 'pinia';
 import { ref, watch, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useRootStore } from '@/stores/n8nRoot.store';
-import * as projectsApi from '@/features/projects/projects.api';
+import * as projectsApi from '@/api/projects.api';
 import type {
 	Project,
 	ProjectCreateRequest,
 	ProjectListItem,
 	ProjectUpdateRequest,
 	ProjectsCount,
-} from '@/features/projects/projects.types';
+} from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
 import { useSettingsStore } from '@/stores/settings.store';
-import { hasPermission } from '@/rbac/permissions';
-import { ProjectTypes } from './projects.utils';
+import { hasPermission } from '@/utils/rbac/permissions';
 import type { IWorkflowDb } from '@/Interface';
 
 export const useProjectsStore = defineStore('projects', () => {
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index c6492bb385..d762d2f82f 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -62,7 +62,7 @@ import { getCurlToJson } from '@/api/curlHelper';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { useTelemetryStore } from '@/stores/telemetry.store';
 import { useUsersStore } from '@/stores/users.store';
 import { dismissBannerPermanently } from '@/api/ui';
diff --git a/packages/editor-ui/src/stores/workflows.ee.store.ts b/packages/editor-ui/src/stores/workflows.ee.store.ts
index 6eec4fcce8..30b2c43f9c 100644
--- a/packages/editor-ui/src/stores/workflows.ee.store.ts
+++ b/packages/editor-ui/src/stores/workflows.ee.store.ts
@@ -5,8 +5,8 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { defineStore } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { i18n } from '@/plugins/i18n';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
-import { splitName } from '@/features/projects/projects.utils';
+import type { ProjectSharingData } from '@/types/projects.types';
+import { splitName } from '@/utils/projects.utils';
 
 export const useWorkflowsEEStore = defineStore(STORES.WORKFLOWS_EE, {
 	state() {
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index e8af555f98..974b10129d 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -73,7 +73,7 @@ import { getCredentialOnlyNodeTypeName } from '@/utils/credentialOnlyNodes';
 import { i18n } from '@/plugins/i18n';
 
 import { computed, ref } from 'vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 import { useSettingsStore } from './settings.store';
 import { useUsersStore } from './users.store';
 
diff --git a/packages/editor-ui/src/features/projects/projects.types.ts b/packages/editor-ui/src/types/projects.types.ts
similarity index 90%
rename from packages/editor-ui/src/features/projects/projects.types.ts
rename to packages/editor-ui/src/types/projects.types.ts
index 63ade56fcd..df76edeb30 100644
--- a/packages/editor-ui/src/features/projects/projects.types.ts
+++ b/packages/editor-ui/src/types/projects.types.ts
@@ -1,7 +1,12 @@
 import type { Scope } from '@n8n/permissions';
 import type { IUserResponse } from '@/Interface';
 import type { ProjectRole } from '@/types/roles.types';
-import type { ProjectTypes } from '@/features/projects/projects.utils';
+
+export const ProjectTypes = {
+	Personal: 'personal',
+	Team: 'team',
+	Public: 'public',
+} as const;
 
 type ProjectTypeKeys = typeof ProjectTypes;
 
diff --git a/packages/editor-ui/src/features/projects/components/__tests__/projects.utils.test.ts b/packages/editor-ui/src/utils/projects.utils.test.ts
similarity index 94%
rename from packages/editor-ui/src/features/projects/components/__tests__/projects.utils.test.ts
rename to packages/editor-ui/src/utils/projects.utils.test.ts
index 0ccae7098e..d0e455b3c3 100644
--- a/packages/editor-ui/src/features/projects/components/__tests__/projects.utils.test.ts
+++ b/packages/editor-ui/src/utils/projects.utils.test.ts
@@ -1,4 +1,4 @@
-import { splitName } from '@/features/projects/projects.utils';
+import { splitName } from '@/utils/projects.utils';
 
 describe('splitName', () => {
 	test.each([
diff --git a/packages/editor-ui/src/features/projects/projects.utils.ts b/packages/editor-ui/src/utils/projects.utils.ts
similarity index 88%
rename from packages/editor-ui/src/features/projects/projects.utils.ts
rename to packages/editor-ui/src/utils/projects.utils.ts
index 824365f2ef..5e9537ddd9 100644
--- a/packages/editor-ui/src/features/projects/projects.utils.ts
+++ b/packages/editor-ui/src/utils/projects.utils.ts
@@ -26,9 +26,3 @@ export const splitName = (
 		}
 	}
 };
-
-export const ProjectTypes = {
-	Personal: 'personal',
-	Team: 'team',
-	Public: 'public',
-} as const;
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts b/packages/editor-ui/src/utils/rbac/checks/hasRole.test.ts
similarity index 96%
rename from packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/hasRole.test.ts
index 5e7ff0a415..2a3d4abc10 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/hasRole.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/hasRole.test.ts
@@ -1,5 +1,5 @@
 import { useUsersStore } from '@/stores/users.store';
-import { hasRole } from '@/rbac/checks';
+import { hasRole } from '@/utils/rbac/checks';
 import { ROLE } from '@/constants';
 
 vi.mock('@/stores/users.store', () => ({
diff --git a/packages/editor-ui/src/rbac/checks/hasRole.ts b/packages/editor-ui/src/utils/rbac/checks/hasRole.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/hasRole.ts
rename to packages/editor-ui/src/utils/rbac/checks/hasRole.ts
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/hasScope.test.ts b/packages/editor-ui/src/utils/rbac/checks/hasScope.test.ts
similarity index 96%
rename from packages/editor-ui/src/rbac/checks/__tests__/hasScope.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/hasScope.test.ts
index bf33c75e56..1672f62731 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/hasScope.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/hasScope.test.ts
@@ -1,5 +1,5 @@
 import { useRBACStore } from '@/stores/rbac.store';
-import { hasScope } from '@/rbac/checks/hasScope';
+import { hasScope } from '@/utils/rbac/checks/hasScope';
 import type { ScopeOptions } from '@n8n/permissions';
 
 vi.mock('@/stores/rbac.store', () => ({
diff --git a/packages/editor-ui/src/rbac/checks/hasScope.ts b/packages/editor-ui/src/utils/rbac/checks/hasScope.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/hasScope.ts
rename to packages/editor-ui/src/utils/rbac/checks/hasScope.ts
diff --git a/packages/editor-ui/src/rbac/checks/index.ts b/packages/editor-ui/src/utils/rbac/checks/index.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/index.ts
rename to packages/editor-ui/src/utils/rbac/checks/index.ts
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts b/packages/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
similarity index 95%
rename from packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
index 4afcbd2229..af54d9c999 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/isAuthenticated.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
@@ -1,5 +1,5 @@
 import { useUsersStore } from '@/stores/users.store';
-import { isAuthenticated } from '@/rbac/checks/isAuthenticated';
+import { isAuthenticated } from '@/utils/rbac/checks/isAuthenticated';
 import type { IUser } from '@/Interface';
 
 vi.mock('@/stores/users.store', () => ({
diff --git a/packages/editor-ui/src/rbac/checks/isAuthenticated.ts b/packages/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/isAuthenticated.ts
rename to packages/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isDefaultUser.test.ts b/packages/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
similarity index 91%
rename from packages/editor-ui/src/rbac/checks/__tests__/isDefaultUser.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
index 815c021768..923a99d407 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/isDefaultUser.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
@@ -1,5 +1,5 @@
 import { useUsersStore } from '@/stores/users.store';
-import { isDefaultUser } from '@/rbac/checks/isDefaultUser';
+import { isDefaultUser } from '@/utils/rbac/checks/isDefaultUser';
 
 vi.mock('@/stores/users.store', () => ({
 	useUsersStore: vi.fn(),
diff --git a/packages/editor-ui/src/rbac/checks/isDefaultUser.ts b/packages/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/isDefaultUser.ts
rename to packages/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isEnterpriseFeatureEnabled.test.ts b/packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts
similarity index 96%
rename from packages/editor-ui/src/rbac/checks/__tests__/isEnterpriseFeatureEnabled.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts
index 9de45f6bd6..c765343ed7 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/isEnterpriseFeatureEnabled.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts
@@ -1,5 +1,5 @@
 import { useSettingsStore } from '@/stores/settings.store';
-import { isEnterpriseFeatureEnabled } from '@/rbac/checks/isEnterpriseFeatureEnabled';
+import { isEnterpriseFeatureEnabled } from '@/utils/rbac/checks/isEnterpriseFeatureEnabled';
 import { EnterpriseEditionFeature } from '@/constants';
 
 vi.mock('@/stores/settings.store', () => ({
diff --git a/packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts b/packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/isEnterpriseFeatureEnabled.ts
rename to packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.ts
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isGuest.test.ts b/packages/editor-ui/src/utils/rbac/checks/isGuest.test.ts
similarity index 92%
rename from packages/editor-ui/src/rbac/checks/__tests__/isGuest.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/isGuest.test.ts
index 8f539ded62..8e57522b66 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/isGuest.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/isGuest.test.ts
@@ -1,5 +1,5 @@
 import { useUsersStore } from '@/stores/users.store';
-import { isGuest } from '@/rbac/checks/isGuest';
+import { isGuest } from '@/utils/rbac/checks/isGuest';
 
 vi.mock('@/stores/users.store', () => ({
 	useUsersStore: vi.fn(),
diff --git a/packages/editor-ui/src/rbac/checks/isGuest.ts b/packages/editor-ui/src/utils/rbac/checks/isGuest.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/isGuest.ts
rename to packages/editor-ui/src/utils/rbac/checks/isGuest.ts
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isInstanceOwner.test.ts b/packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
similarity index 90%
rename from packages/editor-ui/src/rbac/checks/__tests__/isInstanceOwner.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
index b63e55bb06..7257d59900 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/isInstanceOwner.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
@@ -1,5 +1,5 @@
 import { useUsersStore } from '@/stores/users.store';
-import { isInstanceOwner } from '@/rbac/checks/isInstanceOwner';
+import { isInstanceOwner } from '@/utils/rbac/checks/isInstanceOwner';
 
 vi.mock('@/stores/users.store', () => ({
 	useUsersStore: vi.fn(),
diff --git a/packages/editor-ui/src/rbac/checks/isInstanceOwner.ts b/packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/isInstanceOwner.ts
rename to packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
diff --git a/packages/editor-ui/src/rbac/checks/__tests__/isValid.test.ts b/packages/editor-ui/src/utils/rbac/checks/isValid.test.ts
similarity index 89%
rename from packages/editor-ui/src/rbac/checks/__tests__/isValid.test.ts
rename to packages/editor-ui/src/utils/rbac/checks/isValid.test.ts
index 644f816330..96e30c4dd3 100644
--- a/packages/editor-ui/src/rbac/checks/__tests__/isValid.test.ts
+++ b/packages/editor-ui/src/utils/rbac/checks/isValid.test.ts
@@ -1,4 +1,4 @@
-import { isValid } from '@/rbac/checks/isValid';
+import { isValid } from '@/utils/rbac/checks/isValid';
 
 describe('Checks', () => {
 	describe('isValid()', () => {
diff --git a/packages/editor-ui/src/rbac/checks/isValid.ts b/packages/editor-ui/src/utils/rbac/checks/isValid.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/checks/isValid.ts
rename to packages/editor-ui/src/utils/rbac/checks/isValid.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware.ts b/packages/editor-ui/src/utils/rbac/middleware.ts
new file mode 100644
index 0000000000..2e8591321c
--- /dev/null
+++ b/packages/editor-ui/src/utils/rbac/middleware.ts
@@ -0,0 +1,22 @@
+import type { RouterMiddleware, RouterMiddlewareType, MiddlewareOptions } from '@/types/router';
+import { authenticatedMiddleware } from '@/utils/rbac/middleware/authenticated';
+import { enterpriseMiddleware } from '@/utils/rbac/middleware/enterprise';
+import { guestMiddleware } from '@/utils/rbac/middleware/guest';
+import { rbacMiddleware } from '@/utils/rbac/middleware/rbac';
+import { roleMiddleware } from '@/utils/rbac/middleware/role';
+import { customMiddleware } from '@/utils/rbac/middleware/custom';
+import { defaultUserMiddleware } from '@/utils/rbac/middleware/defaultUser';
+
+type Middleware = {
+	[key in RouterMiddlewareType]: RouterMiddleware<MiddlewareOptions[key]>;
+};
+
+export const middleware: Middleware = {
+	authenticated: authenticatedMiddleware,
+	custom: customMiddleware,
+	defaultUser: defaultUserMiddleware,
+	enterprise: enterpriseMiddleware,
+	guest: guestMiddleware,
+	rbac: rbacMiddleware,
+	role: roleMiddleware,
+};
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/authenticated.test.ts b/packages/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
similarity index 95%
rename from packages/editor-ui/src/rbac/middleware/__tests__/authenticated.test.ts
rename to packages/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
index 50a9320c1c..191a2cbe3c 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/authenticated.test.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
@@ -1,4 +1,4 @@
-import { authenticatedMiddleware } from '@/rbac/middleware/authenticated';
+import { authenticatedMiddleware } from '@/utils/rbac/middleware/authenticated';
 import { useUsersStore } from '@/stores/users.store';
 import { VIEWS } from '@/constants';
 import type { RouteLocationNormalized } from 'vue-router';
diff --git a/packages/editor-ui/src/rbac/middleware/authenticated.ts b/packages/editor-ui/src/utils/rbac/middleware/authenticated.ts
similarity index 90%
rename from packages/editor-ui/src/rbac/middleware/authenticated.ts
rename to packages/editor-ui/src/utils/rbac/middleware/authenticated.ts
index 529c8f1165..bdb6afce77 100644
--- a/packages/editor-ui/src/rbac/middleware/authenticated.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/authenticated.ts
@@ -1,7 +1,7 @@
 import type { RouterMiddleware } from '@/types/router';
 import { VIEWS } from '@/constants';
 import type { AuthenticatedPermissionOptions } from '@/types/rbac';
-import { isAuthenticated } from '@/rbac/checks';
+import { isAuthenticated } from '@/utils/rbac/checks';
 
 export const authenticatedMiddleware: RouterMiddleware<AuthenticatedPermissionOptions> = async (
 	to,
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/custom.test.ts b/packages/editor-ui/src/utils/rbac/middleware/custom.test.ts
similarity index 92%
rename from packages/editor-ui/src/rbac/middleware/__tests__/custom.test.ts
rename to packages/editor-ui/src/utils/rbac/middleware/custom.test.ts
index 54960ba037..d0daf18913 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/custom.test.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/custom.test.ts
@@ -1,4 +1,4 @@
-import { customMiddleware } from '@/rbac/middleware/custom';
+import { customMiddleware } from '@/utils/rbac/middleware/custom';
 import type { RouteLocationNormalized } from 'vue-router';
 import { VIEWS } from '@/constants';
 
diff --git a/packages/editor-ui/src/rbac/middleware/custom.ts b/packages/editor-ui/src/utils/rbac/middleware/custom.ts
similarity index 100%
rename from packages/editor-ui/src/rbac/middleware/custom.ts
rename to packages/editor-ui/src/utils/rbac/middleware/custom.ts
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/defaultUser.test.ts b/packages/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
similarity index 95%
rename from packages/editor-ui/src/rbac/middleware/__tests__/defaultUser.test.ts
rename to packages/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
index d550dd9fe0..3f70a3cc60 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/defaultUser.test.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
@@ -1,6 +1,6 @@
 import { useUsersStore } from '@/stores/users.store';
 import { VIEWS } from '@/constants';
-import { defaultUserMiddleware } from '@/rbac/middleware/defaultUser';
+import { defaultUserMiddleware } from '@/utils/rbac/middleware/defaultUser';
 import type { RouteLocationNormalized } from 'vue-router';
 
 vi.mock('@/stores/users.store', () => ({
diff --git a/packages/editor-ui/src/rbac/middleware/defaultUser.ts b/packages/editor-ui/src/utils/rbac/middleware/defaultUser.ts
similarity index 87%
rename from packages/editor-ui/src/rbac/middleware/defaultUser.ts
rename to packages/editor-ui/src/utils/rbac/middleware/defaultUser.ts
index 704b307e52..ef8d7d3e7e 100644
--- a/packages/editor-ui/src/rbac/middleware/defaultUser.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/defaultUser.ts
@@ -1,7 +1,7 @@
 import type { RouterMiddleware } from '@/types/router';
 import { VIEWS } from '@/constants';
 import type { DefaultUserMiddlewareOptions } from '@/types/rbac';
-import { isDefaultUser } from '@/rbac/checks';
+import { isDefaultUser } from '@/utils/rbac/checks';
 
 export const defaultUserMiddleware: RouterMiddleware<DefaultUserMiddlewareOptions> = async (
 	_to,
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/enterprise.test.ts b/packages/editor-ui/src/utils/rbac/middleware/enterprise.test.ts
similarity index 97%
rename from packages/editor-ui/src/rbac/middleware/__tests__/enterprise.test.ts
rename to packages/editor-ui/src/utils/rbac/middleware/enterprise.test.ts
index 330e7aaa5e..ee887efb04 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/enterprise.test.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/enterprise.test.ts
@@ -1,6 +1,6 @@
 import { useSettingsStore } from '@/stores/settings.store';
 import { VIEWS, EnterpriseEditionFeature } from '@/constants';
-import { enterpriseMiddleware } from '@/rbac/middleware/enterprise';
+import { enterpriseMiddleware } from '@/utils/rbac/middleware/enterprise';
 import { type RouteLocationNormalized } from 'vue-router';
 import type { EnterprisePermissionOptions } from '@/types/rbac';
 
diff --git a/packages/editor-ui/src/rbac/middleware/enterprise.ts b/packages/editor-ui/src/utils/rbac/middleware/enterprise.ts
similarity index 85%
rename from packages/editor-ui/src/rbac/middleware/enterprise.ts
rename to packages/editor-ui/src/utils/rbac/middleware/enterprise.ts
index 993abde167..ca90616625 100644
--- a/packages/editor-ui/src/rbac/middleware/enterprise.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/enterprise.ts
@@ -1,7 +1,7 @@
 import type { RouterMiddleware } from '@/types/router';
 import { VIEWS } from '@/constants';
 import type { EnterprisePermissionOptions } from '@/types/rbac';
-import { isEnterpriseFeatureEnabled } from '@/rbac/checks';
+import { isEnterpriseFeatureEnabled } from '@/utils/rbac/checks';
 
 export const enterpriseMiddleware: RouterMiddleware<EnterprisePermissionOptions> = async (
 	_to,
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/guest.test.ts b/packages/editor-ui/src/utils/rbac/middleware/guest.test.ts
similarity index 96%
rename from packages/editor-ui/src/rbac/middleware/__tests__/guest.test.ts
rename to packages/editor-ui/src/utils/rbac/middleware/guest.test.ts
index 6b27a23283..067dc5fc39 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/guest.test.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/guest.test.ts
@@ -1,6 +1,6 @@
 import { useUsersStore } from '@/stores/users.store';
 import { VIEWS } from '@/constants';
-import { guestMiddleware } from '@/rbac/middleware/guest';
+import { guestMiddleware } from '@/utils/rbac/middleware/guest';
 import type { RouteLocationNormalized } from 'vue-router';
 
 vi.mock('@/stores/users.store', () => ({
diff --git a/packages/editor-ui/src/rbac/middleware/guest.ts b/packages/editor-ui/src/utils/rbac/middleware/guest.ts
similarity index 91%
rename from packages/editor-ui/src/rbac/middleware/guest.ts
rename to packages/editor-ui/src/utils/rbac/middleware/guest.ts
index 2dbefb3176..44d9aa9d27 100644
--- a/packages/editor-ui/src/rbac/middleware/guest.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/guest.ts
@@ -1,7 +1,7 @@
 import type { RouterMiddleware } from '@/types/router';
 import { VIEWS } from '@/constants';
 import type { GuestPermissionOptions } from '@/types/rbac';
-import { isGuest } from '@/rbac/checks';
+import { isGuest } from '@/utils/rbac/checks';
 
 export const guestMiddleware: RouterMiddleware<GuestPermissionOptions> = async (
 	to,
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/rbac.test.ts b/packages/editor-ui/src/utils/rbac/middleware/rbac.test.ts
similarity index 96%
rename from packages/editor-ui/src/rbac/middleware/__tests__/rbac.test.ts
rename to packages/editor-ui/src/utils/rbac/middleware/rbac.test.ts
index 0743936330..f9914da4a1 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/rbac.test.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/rbac.test.ts
@@ -1,5 +1,5 @@
 import { useRBACStore } from '@/stores/rbac.store';
-import { rbacMiddleware } from '@/rbac/middleware/rbac';
+import { rbacMiddleware } from '@/utils/rbac/middleware/rbac';
 import { VIEWS } from '@/constants';
 import {
 	inferProjectIdFromRoute,
diff --git a/packages/editor-ui/src/rbac/middleware/rbac.ts b/packages/editor-ui/src/utils/rbac/middleware/rbac.ts
similarity index 93%
rename from packages/editor-ui/src/rbac/middleware/rbac.ts
rename to packages/editor-ui/src/utils/rbac/middleware/rbac.ts
index abd5667d4e..fbd35eaa43 100644
--- a/packages/editor-ui/src/rbac/middleware/rbac.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/rbac.ts
@@ -6,7 +6,7 @@ import {
 	inferResourceTypeFromRoute,
 } from '@/utils/rbacUtils';
 import type { RBACPermissionOptions } from '@/types/rbac';
-import { hasScope } from '@/rbac/checks';
+import { hasScope } from '@/utils/rbac/checks';
 
 export const rbacMiddleware: RouterMiddleware<RBACPermissionOptions> = async (
 	to,
diff --git a/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts b/packages/editor-ui/src/utils/rbac/middleware/role.test.ts
similarity index 96%
rename from packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
rename to packages/editor-ui/src/utils/rbac/middleware/role.test.ts
index 17a87cf8d3..4a3c3a7e59 100644
--- a/packages/editor-ui/src/rbac/middleware/__tests__/role.test.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/role.test.ts
@@ -1,4 +1,4 @@
-import { roleMiddleware } from '@/rbac/middleware/role';
+import { roleMiddleware } from '@/utils/rbac/middleware/role';
 import { useUsersStore } from '@/stores/users.store';
 import type { IUser } from '@/Interface';
 import type { RouteLocationNormalized } from 'vue-router';
diff --git a/packages/editor-ui/src/rbac/middleware/role.ts b/packages/editor-ui/src/utils/rbac/middleware/role.ts
similarity index 88%
rename from packages/editor-ui/src/rbac/middleware/role.ts
rename to packages/editor-ui/src/utils/rbac/middleware/role.ts
index 366a97106f..03f2721185 100644
--- a/packages/editor-ui/src/rbac/middleware/role.ts
+++ b/packages/editor-ui/src/utils/rbac/middleware/role.ts
@@ -1,7 +1,7 @@
 import type { RouterMiddleware } from '@/types/router';
 import type { RolePermissionOptions } from '@/types/rbac';
 import { VIEWS } from '@/constants';
-import { hasRole } from '@/rbac/checks';
+import { hasRole } from '@/utils/rbac/checks';
 
 export const roleMiddleware: RouterMiddleware<RolePermissionOptions> = async (
 	_to,
diff --git a/packages/editor-ui/src/rbac/__tests__/permissions.test.ts b/packages/editor-ui/src/utils/rbac/permissions.test.ts
similarity index 93%
rename from packages/editor-ui/src/rbac/__tests__/permissions.test.ts
rename to packages/editor-ui/src/utils/rbac/permissions.test.ts
index 01ff6b9bf1..aeadee6a06 100644
--- a/packages/editor-ui/src/rbac/__tests__/permissions.test.ts
+++ b/packages/editor-ui/src/utils/rbac/permissions.test.ts
@@ -1,7 +1,7 @@
-import { hasPermission } from '@/rbac/permissions';
-import * as checks from '@/rbac/checks';
+import { hasPermission } from '@/utils/rbac/permissions';
+import * as checks from '@/utils/rbac/checks';
 
-vi.mock('@/rbac/checks', () => ({
+vi.mock('@/utils/rbac/checks', () => ({
 	hasRole: vi.fn(),
 	hasScope: vi.fn(),
 	isGuest: vi.fn(),
diff --git a/packages/editor-ui/src/rbac/permissions.ts b/packages/editor-ui/src/utils/rbac/permissions.ts
similarity index 97%
rename from packages/editor-ui/src/rbac/permissions.ts
rename to packages/editor-ui/src/utils/rbac/permissions.ts
index 3ceb244287..a2f7c72908 100644
--- a/packages/editor-ui/src/rbac/permissions.ts
+++ b/packages/editor-ui/src/utils/rbac/permissions.ts
@@ -7,7 +7,7 @@ import {
 	isEnterpriseFeatureEnabled,
 	isGuest,
 	isValid,
-} from '@/rbac/checks';
+} from '@/utils/rbac/checks';
 import type { PermissionType, PermissionTypeOptions, RBACPermissionCheck } from '@/types/rbac';
 
 type Permissions = {
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index 487f19bbc7..7f22979a04 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -73,8 +73,8 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import ProjectTabs from '@/features/projects/components/ProjectTabs.vue';
+import { useProjectsStore } from '@/stores/projects.store';
+import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import useEnvironmentsStore from '@/stores/environments.ee.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index a978e3c594..b8f068abdf 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -396,13 +396,13 @@ import { useCanvasPanning } from '@/composables/useCanvasPanning';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import type { ProjectSharingData } from '@/features/projects/projects.types';
+import { useProjectsStore } from '@/stores/projects.store';
+import type { ProjectSharingData } from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
 import { useAIStore } from '@/stores/ai.store';
 import { useStorage } from '@/composables/useStorage';
 import { isJSPlumbEndpointElement, isJSPlumbConnection } from '@/utils/typeGuards';
 import { usePostHog } from '@/stores/posthog.store';
-import { ProjectTypes } from '@/features/projects/projects.utils';
 
 interface AddNodeOptions {
 	position?: XYPosition;
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index 94f622ba82..f0695dd795 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -77,7 +77,7 @@ import { defineComponent, nextTick } from 'vue';
 import { mapStores } from 'pinia';
 import { v4 as uuid } from 'uuid';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useLogStreamingStore } from '@/stores/logStreaming.store';
 import { useSettingsStore } from '@/stores/settings.store';
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
index 2495d1fd29..ea8f8ebf88 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -8,7 +8,7 @@ import { i18n as locale } from '@/plugins/i18n';
 import { useUIStore } from '@/stores/ui.store';
 import { N8N_PRICING_PAGE_URL } from '@/constants';
 import { useToast } from '@/composables/useToast';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 
 const usageStore = useUsageStore();
 const route = useRoute();
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index ca7e711e95..8df0e92a84 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -91,7 +91,7 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useUsageStore } from '@/stores/usage.store';
 import { useSSOStore } from '@/stores/sso.store';
-import { hasPermission } from '@/rbac/permissions';
+import { hasPermission } from '@/utils/rbac/permissions';
 import { useClipboard } from '@/composables/useClipboard';
 import type { UpdateGlobalRolePayload } from '@/api/users';
 
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index b8ad772a79..d75987538d 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -158,8 +158,8 @@ import { useUsersStore } from '@/stores/users.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useTagsStore } from '@/stores/tags.store';
-import { useProjectsStore } from '@/features/projects/projects.store';
-import ProjectTabs from '@/features/projects/components/ProjectTabs.vue';
+import { useProjectsStore } from '@/stores/projects.store';
+import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import { useTemplatesStore } from '@/stores/templates.store';
 
 type IResourcesListLayoutInstance = InstanceType<typeof ResourcesListLayout>;
diff --git a/packages/editor-ui/src/views/__tests__/SettingsUsersView.test.ts b/packages/editor-ui/src/views/__tests__/SettingsUsersView.test.ts
index b2510b242c..39f07116cc 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsUsersView.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsUsersView.test.ts
@@ -6,7 +6,7 @@ import { getDropdownItems } from '@/__tests__/utils';
 import ModalRoot from '@/components/ModalRoot.vue';
 import DeleteUserModal from '@/components/DeleteUserModal.vue';
 import SettingsUsersView from '@/views/SettingsUsersView.vue';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 import { useUsersStore } from '@/stores/users.store';
 import { createUser } from '@/__tests__/data/users';
 import { createProjectListItem } from '@/__tests__/data/projects';
diff --git a/packages/editor-ui/src/views/__tests__/WorkflowsView.test.ts b/packages/editor-ui/src/views/__tests__/WorkflowsView.test.ts
index 7c0353b2d1..6688b5d002 100644
--- a/packages/editor-ui/src/views/__tests__/WorkflowsView.test.ts
+++ b/packages/editor-ui/src/views/__tests__/WorkflowsView.test.ts
@@ -7,7 +7,7 @@ import WorkflowsView from '@/views/WorkflowsView.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { createComponentRenderer } from '@/__tests__/render';
-import { useProjectsStore } from '@/features/projects/projects.store';
+import { useProjectsStore } from '@/stores/projects.store';
 
 const originalOffsetHeight = Object.getOwnPropertyDescriptor(
 	HTMLElement.prototype,