diff --git a/web/src/app/app/collections/[collectionId]/page.tsx b/web/src/app/app/(primary_layout)/collections/[collectionId]/page.tsx
similarity index 100%
rename from web/src/app/app/collections/[collectionId]/page.tsx
rename to web/src/app/app/(primary_layout)/collections/[collectionId]/page.tsx
diff --git a/web/src/app/app/collections/page.tsx b/web/src/app/app/(primary_layout)/collections/page.tsx
similarity index 100%
rename from web/src/app/app/collections/page.tsx
rename to web/src/app/app/(primary_layout)/collections/page.tsx
diff --git a/web/src/app/app/dashboards/page.tsx b/web/src/app/app/(primary_layout)/dashboards/page.tsx
similarity index 100%
rename from web/src/app/app/dashboards/page.tsx
rename to web/src/app/app/(primary_layout)/dashboards/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetPageContext.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetBreadcrumb.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetBreadcrumb.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetBreadcrumb.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetBreadcrumb.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetHeaderOptions.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetHeaderOptions.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetHeaderOptions.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetHeaderOptions.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetIndividualThreeDotMenu.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetsIndividualHeader.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetsIndividualHeader.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetsIndividualHeader.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/DatasetsIndividualHeader.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/index.ts b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/index.ts
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/index.ts
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsIndividualHeader/index.ts
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsLayout.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsLayout.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/DatasetsLayout.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/DatasetsLayout.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/config.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/config.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/config.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/config.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/_DatasetsLayout/index.ts b/web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/index.ts
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/_DatasetsLayout/index.ts
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/_DatasetsLayout/index.ts
diff --git a/web/src/app/app/datasets/[datasetId]/editor/EditorContainerSubHeader.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContainerSubHeader.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/editor/EditorContainerSubHeader.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContainerSubHeader.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/editor/EditorContent.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContent.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/editor/EditorContent.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/EditorContent.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/editor/MetadataContainer.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/MetadataContainer.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/editor/MetadataContainer.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/MetadataContainer.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/editor/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/editor/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/editor/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/layout.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/layout.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/layout.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/layout.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/overview/OverviewData.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewData.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/overview/OverviewData.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewData.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/overview/OverviewHeader.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewHeader.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/overview/OverviewHeader.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/OverviewHeader.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/overview/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/overview/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/overview/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/PermissionAppSegments.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionAppSegments.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/PermissionAppSegments.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionAppSegments.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/PermissionTitleCard.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionTitleCard.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/PermissionTitleCard.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionTitleCard.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/PermissionsAppContainer.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionsAppContainer.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/PermissionsAppContainer.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/PermissionsAppContainer.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/config.ts b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/config.ts
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/config.ts
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/config.ts
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroupSelectedPopup.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionDatasetGroups.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/index.ts b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/index.ts
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/index.ts
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/index.ts
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/dataset-groups/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/layout.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/layout.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/layout.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/layout.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionOverview.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionOverview.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionOverview.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionOverview.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/index.ts b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/index.ts
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/overview/_PermissionOverview/index.ts
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/index.ts
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/overview/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/overview/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionGroupSelectedPopup.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionPermissionGroup.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/index.ts b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/index.ts
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/index.ts
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/index.ts
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/permission-groups/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/permission-groups/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/page.tsx
diff --git a/web/src/app/app/datasets/[datasetId]/permissions/users/page.tsx b/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/users/page.tsx
similarity index 100%
rename from web/src/app/app/datasets/[datasetId]/permissions/users/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/users/page.tsx
diff --git a/web/src/app/app/datasets/page.tsx b/web/src/app/app/(primary_layout)/datasets/page.tsx
similarity index 80%
rename from web/src/app/app/datasets/page.tsx
rename to web/src/app/app/(primary_layout)/datasets/page.tsx
index feb02b7e0..1f3c85c46 100644
--- a/web/src/app/app/datasets/page.tsx
+++ b/web/src/app/app/(primary_layout)/datasets/page.tsx
@@ -1,5 +1,5 @@
 import { prefetchGetDatasets } from '@/api/buster_rest/datasets';
-import { DatasetsListController } from '../../../controllers/DatasetsListController';
+import { DatasetsListController } from '../../../../controllers/DatasetsListController';
 import { dehydrate, HydrationBoundary } from '@tanstack/react-query';
 
 export default async function DashboardPage() {
diff --git a/web/src/app/app/logs/page.tsx b/web/src/app/app/(primary_layout)/logs/page.tsx
similarity index 100%
rename from web/src/app/app/logs/page.tsx
rename to web/src/app/app/(primary_layout)/logs/page.tsx
diff --git a/web/src/app/app/metrics/page.tsx b/web/src/app/app/(primary_layout)/metrics/page.tsx
similarity index 100%
rename from web/src/app/app/metrics/page.tsx
rename to web/src/app/app/(primary_layout)/metrics/page.tsx
diff --git a/web/src/app/app/new-user/_NewUserController.tsx b/web/src/app/app/(primary_layout)/new-user/_NewUserController.tsx
similarity index 100%
rename from web/src/app/app/new-user/_NewUserController.tsx
rename to web/src/app/app/(primary_layout)/new-user/_NewUserController.tsx
diff --git a/web/src/app/app/new-user/layout.tsx b/web/src/app/app/(primary_layout)/new-user/layout.tsx
similarity index 100%
rename from web/src/app/app/new-user/layout.tsx
rename to web/src/app/app/(primary_layout)/new-user/layout.tsx
diff --git a/web/src/app/app/new-user/page.tsx b/web/src/app/app/(primary_layout)/new-user/page.tsx
similarity index 71%
rename from web/src/app/app/new-user/page.tsx
rename to web/src/app/app/(primary_layout)/new-user/page.tsx
index 085e99348..5ff587883 100644
--- a/web/src/app/app/new-user/page.tsx
+++ b/web/src/app/app/(primary_layout)/new-user/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { NewUserController } from './_NewUserController';
-import { LoginConfigProvider } from '../../auth/_LoginComponents/LoginConfigProvider';
+import { LoginConfigProvider } from '../../../auth/_LoginComponents/LoginConfigProvider';
 
 export default function NewUserPage() {
   return (
diff --git a/web/src/app/app/terms/[termId]/page.tsx b/web/src/app/app/(primary_layout)/terms/[termId]/page.tsx
similarity index 100%
rename from web/src/app/app/terms/[termId]/page.tsx
rename to web/src/app/app/(primary_layout)/terms/[termId]/page.tsx
diff --git a/web/src/app/app/terms/page.tsx b/web/src/app/app/(primary_layout)/terms/page.tsx
similarity index 100%
rename from web/src/app/app/terms/page.tsx
rename to web/src/app/app/(primary_layout)/terms/page.tsx