chore: fix routes geneartion

frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { CertAuthDetailsByIDPage } from './CertAuthDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/ca/$caId',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/ca/$caId',
 )({
   component: CertAuthDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/cert-manager/CertificatesPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { CertificatesPage } from './CertificatesPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/overview',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/overview',
 )({
   component: CertificatesPage,
 })

frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/routes.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { PkiCollectionDetailsByIDPage } from './PkiCollectionDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/pki-collections/$collectionId',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/pki-collections/$collectionId',
 )({
   component: PkiCollectionDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/cert-manager/SettingsPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { SettingsPage } from './SettingsPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/settings',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/settings',
 )({
   component: SettingsPage,
   beforeLoad: ({ context }) => {

frontend/src/pages/cert-manager/layout.tsx

@@ -9,7 +9,7 @@ import { fetchWorkspaceById } from '@app/hooks/api/workspace/queries'
 import { ProjectLayout } from '@app/layouts/ProjectLayout'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout',
 )({
   component: ProjectLayout,
   beforeLoad: async ({ params, context }) => {

frontend/src/pages/kms/OverviewPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { OverviewPage } from './OverviewPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/kms/$projectId/_kms-layout/overview',
+  '/_authenticate/_inject-org-details/_org-layout/kms/$projectId/_kms-layout/overview',
 )({
   component: OverviewPage,
 })

frontend/src/pages/kms/SettingsPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { SettingsPage } from './SettingsPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/kms/$projectId/_kms-layout/settings',
+  '/_authenticate/_inject-org-details/_org-layout/kms/$projectId/_kms-layout/settings',
 )({
   component: SettingsPage,
   beforeLoad: ({ context }) => {

frontend/src/pages/kms/layout.tsx

@@ -9,7 +9,7 @@ import { fetchWorkspaceById } from '@app/hooks/api/workspace/queries'
 import { ProjectLayout } from '@app/layouts/ProjectLayout'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/kms/$projectId/_kms-layout',
+  '/_authenticate/_inject-org-details/_org-layout/kms/$projectId/_kms-layout',
 )({
   component: ProjectLayout,
   beforeLoad: async ({ params, context }) => {

frontend/src/pages/organization/AccessManagementPage/route.tsx

@@ -18,7 +18,7 @@ const AccessControlPageQuerySchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/access-management',
+  '/_authenticate/_inject-org-details/_org-layout/organization/access-management',
 )({
   component: AccessManagementPage,
   validateSearch: zodValidator(AccessControlPageQuerySchema),

frontend/src/pages/organization/AdminPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { AdminPage } from './AdminPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/admin',
+  '/_authenticate/_inject-org-details/_org-layout/organization/admin',
 )({
   component: AdminPage,
   context: () => ({

frontend/src/pages/organization/AppConnections/GithubOauthCallbackPage/route.tsx

@@ -11,7 +11,7 @@ const GitHubOAuthCallbackPageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/app-connections/github/oauth/callback',
+  '/_authenticate/_inject-org-details/_org-layout/organization/app-connections/github/oauth/callback',
 )({
   component: GitHubOAuthCallbackPage,
   validateSearch: zodValidator(GitHubOAuthCallbackPageQueryParamsSchema),

frontend/src/pages/organization/AuditLogsPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { AuditLogsPage } from './AuditLogsPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/audit-logs',
+  '/_authenticate/_inject-org-details/_org-layout/organization/audit-logs',
 )({
   component: AuditLogsPage,
   context: () => ({

frontend/src/pages/organization/BillingPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { BillingPage } from './BillingPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/billing',
+  '/_authenticate/_inject-org-details/_org-layout/organization/billing',
 )({
   component: BillingPage,
 })

frontend/src/pages/organization/CertManagerOverviewPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { CertManagerOverviewPage } from './CertManagerOverviewPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/cert-manager/overview',
+  '/_authenticate/_inject-org-details/_org-layout/organization/cert-manager/overview',
 )({
   component: CertManagerOverviewPage,
   context: () => ({

frontend/src/pages/organization/GroupDetailsByIDPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { GroupDetailsByIDPage } from './GroupDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/groups/$groupId',
+  '/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId',
 )({
   component: GroupDetailsByIDPage,
   context: () => ({

frontend/src/pages/organization/IdentityDetailsByIDPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/identities/$identityId',
+  '/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId',
 )({
   component: IdentityDetailsByIDPage,
   context: () => ({

frontend/src/pages/organization/KmsOverviewPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { KmsOverviewPage } from './KmsOverviewPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/kms/overview',
+  '/_authenticate/_inject-org-details/_org-layout/organization/kms/overview',
 )({
   component: KmsOverviewPage,
   context: () => ({

frontend/src/pages/organization/NoOrgPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { NoOrgPage } from './NoOrgPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/none',
+  '/_authenticate/_inject-org-details/_org-layout/organization/none',
 )({
   component: NoOrgPage,
 })

frontend/src/pages/organization/RoleByIDPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { RoleByIDPage } from './RoleByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/roles/$roleId',
+  '/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId',
 )({
   component: RoleByIDPage,
   context: () => ({

frontend/src/pages/organization/SecretManagerOverviewPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { SecretManagerOverviewPage } from './SecretManagerOverviewPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/secret-manager/overview',
+  '/_authenticate/_inject-org-details/_org-layout/organization/secret-manager/overview',
 )({
   component: SecretManagerOverviewPage,
   context: () => ({

frontend/src/pages/organization/SecretScanningPage/route.tsx

@@ -16,7 +16,7 @@ const SecretScanningQueryParams = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/secret-scanning',
+  '/_authenticate/_inject-org-details/_org-layout/organization/secret-scanning',
 )({
   validateSearch: zodValidator(SecretScanningQueryParams),
   component: SecretScanningPage,

frontend/src/pages/organization/SecretSharingPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { SecretSharingPage } from './SecretSharingPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/secret-sharing',
+  '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing',
 )({
   component: SecretSharingPage,
   context: () => ({

frontend/src/pages/organization/SettingsPage/route.tsx

@@ -15,7 +15,7 @@ const SettingsPageQueryParams = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/settings',
+  '/_authenticate/_inject-org-details/_org-layout/organization/settings',
 )({
   component: SettingsPage,
   validateSearch: zodValidator(SettingsPageQueryParams),

frontend/src/pages/organization/SshOverviewPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { SshOverviewPage } from './SshOverviewPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/ssh/overview',
+  '/_authenticate/_inject-org-details/_org-layout/organization/ssh/overview',
 )({
   component: SshOverviewPage,
   context: () => ({

frontend/src/pages/organization/UserDetailsByIDPage/route.tsx

@@ -5,7 +5,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { UserDetailsByIDPage } from './UserDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout/members/$membershipId',
+  '/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId',
 )({
   component: UserDetailsByIDPage,
   context: () => ({

frontend/src/pages/organization/layout.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { OrganizationLayout } from '@app/layouts/OrganizationLayout'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/organization/_layout',
+  '/_authenticate/_inject-org-details/_org-layout',
 )({
   component: OrganizationLayout,
 })

frontend/src/pages/project/AccessControlPage/route-cert-manager.tsx

@@ -13,7 +13,7 @@ const AccessControlPageQuerySchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/access-management',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/access-management',
 )({
   component: AccessControlPage,
   validateSearch: zodValidator(AccessControlPageQuerySchema),

frontend/src/pages/project/AccessControlPage/route-kms.tsx

@@ -13,7 +13,7 @@ const AccessControlPageQuerySchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/kms/$projectId/_kms-layout/access-management',
+  '/_authenticate/_inject-org-details/_org-layout/kms/$projectId/_kms-layout/access-management',
 )({
   component: AccessControlPage,
   validateSearch: zodValidator(AccessControlPageQuerySchema),

frontend/src/pages/project/AccessControlPage/route-secret-manager.tsx

@@ -13,7 +13,7 @@ const AccessControlPageQuerySchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/access-management',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/access-management',
 )({
   component: AccessControlPage,
   validateSearch: zodValidator(AccessControlPageQuerySchema),

frontend/src/pages/project/AccessControlPage/route-ssh.tsx

@@ -13,7 +13,7 @@ const AccessControlPageQuerySchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/ssh/$projectId/_ssh-layout/access-management',
+  '/_authenticate/_inject-org-details/_org-layout/ssh/$projectId/_ssh-layout/access-management',
 )({
   component: AccessControlPage,
   validateSearch: zodValidator(AccessControlPageQuerySchema),

frontend/src/pages/project/IdentityDetailsByIDPage/route-cert-manager.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/identities/$identityId',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/identities/$identityId',
 )({
   component: IdentityDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/IdentityDetailsByIDPage/route-kms.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/kms/$projectId/_kms-layout/identities/$identityId',
+  '/_authenticate/_inject-org-details/_org-layout/kms/$projectId/_kms-layout/identities/$identityId',
 )({
   component: IdentityDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-manager.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/identities/$identityId',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/identities/$identityId',
 )({
   component: IdentityDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/IdentityDetailsByIDPage/route-ssh.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/ssh/$projectId/_ssh-layout/identities/$identityId',
+  '/_authenticate/_inject-org-details/_org-layout/ssh/$projectId/_ssh-layout/identities/$identityId',
 )({
   component: IdentityDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/MemberDetailsByIDPage/route-cert-manager.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/members/$membershipId',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/members/$membershipId',
 )({
   component: MemberDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/MemberDetailsByIDPage/route-kms.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/kms/$projectId/_kms-layout/members/$membershipId',
+  '/_authenticate/_inject-org-details/_org-layout/kms/$projectId/_kms-layout/members/$membershipId',
 )({
   component: MemberDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/MemberDetailsByIDPage/route-secret-manager.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/members/$membershipId',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/members/$membershipId',
 )({
   component: MemberDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/MemberDetailsByIDPage/route-ssh.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/ssh/$projectId/_ssh-layout/members/$membershipId',
+  '/_authenticate/_inject-org-details/_org-layout/ssh/$projectId/_ssh-layout/members/$membershipId',
 )({
   component: MemberDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/RoleDetailsBySlugPage/route-cert-manager.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/cert-manager/$projectId/_cert-manager-layout/roles/$roleSlug',
+  '/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/roles/$roleSlug',
 )({
   component: RoleDetailsBySlugPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/RoleDetailsBySlugPage/route-kms.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/kms/$projectId/_kms-layout/roles/$roleSlug',
+  '/_authenticate/_inject-org-details/_org-layout/kms/$projectId/_kms-layout/roles/$roleSlug',
 )({
   component: RoleDetailsBySlugPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-manager.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/roles/$roleSlug',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/roles/$roleSlug',
 )({
   component: RoleDetailsBySlugPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/project/RoleDetailsBySlugPage/route-ssh.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/ssh/$projectId/_ssh-layout/roles/$roleSlug',
+  '/_authenticate/_inject-org-details/_org-layout/ssh/$projectId/_ssh-layout/roles/$roleSlug',
 )({
   component: RoleDetailsBySlugPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/IPAllowlistPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { IPAllowListPage } from './IPAllowlistPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/allowlist',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/allowlist',
 )({
   component: () => IPAllowListPage,
 })

frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { IntegrationDetailsByIDPage } from './IntegrationsDetailsByIDPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/$integrationId',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/$integrationId',
 )({
   component: IntegrationDetailsByIDPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/IntegrationsListPage/route.tsx

@@ -13,7 +13,7 @@ const IntegrationsListPageQuerySchema = z.object({
 });
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/',
 )({
   component: IntegrationsListPage,
   validateSearch: zodValidator(IntegrationsListPageQuerySchema),

frontend/src/pages/secret-manager/OverviewPage/route.tsx

@@ -10,7 +10,7 @@ const SecretOverviewPageQuerySchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/overview',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/overview',
 )({
   component: OverviewPage,
   validateSearch: zodValidator(SecretOverviewPageQuerySchema),

frontend/src/pages/secret-manager/SecretApprovalsPage/route.tsx

@@ -9,7 +9,7 @@ const SecretApprovalPageQueryParams = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/approval',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/approval',
 )({
   component: SecretApprovalsPage,
   validateSearch: zodValidator(SecretApprovalPageQueryParams),

frontend/src/pages/secret-manager/SecretDashboardPage/route.tsx

@@ -17,7 +17,7 @@ const SecretDashboardPageQueryParamsSchema = z.object({
   tags: z.string().catch(''),
 })
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/secrets/$envSlug',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/secrets/$envSlug',
 )({
   component: SecretDashboardPage,
   validateSearch: zodValidator(SecretDashboardPageQueryParamsSchema),

frontend/src/pages/secret-manager/SecretRotationPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { SecretRotationPage } from './SecretRotationPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/secret-rotation',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/secret-rotation',
 )({
   component: SecretRotationPage,
   beforeLoad: ({ context }) => {

frontend/src/pages/secret-manager/SettingsPage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute } from '@tanstack/react-router'
 import { SettingsPage } from './SettingsPage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/settings',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/settings',
 )({
   component: SettingsPage,
   beforeLoad: ({ context }) => {

frontend/src/pages/secret-manager/integrations/AwsParameterStoreAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { AWSParameterStoreAuthorizeIntegrationPage } from './AwsParameterStoreAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/aws-parameter-store/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/aws-parameter-store/authorize',
 )({
   component: AWSParameterStoreAuthorizeIntegrationPage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/AwsParameterStoreConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const AwsParameterStoreConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/aws-parameter-store/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/aws-parameter-store/create',
 )({
   component: AWSParameterStoreConfigurePage,
   validateSearch: zodValidator(AwsParameterStoreConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/AwsSecretManagerAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { AWSSecretManagerAuthorizePage } from './AwsSecretManagerAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/aws-secret-manager/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/aws-secret-manager/authorize',
 )({
   component: AWSSecretManagerAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/AwsSecretManagerConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const AwsSecretManagerConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/aws-secret-manager/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/aws-secret-manager/create',
 )({
   component: AwsSecretManagerConfigurePage,
   validateSearch: zodValidator(AwsSecretManagerConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/AzureAppConfigurationConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const AzureAppConfigurationPageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/azure-app-configuration/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/azure-app-configuration/create',
 )({
   component: AzureAppConfigurationConfigurePage,
   validateSearch: zodValidator(AzureAppConfigurationPageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/AzureAppConfigurationOauthCallbackPage/route.tsx

@@ -12,7 +12,7 @@ export const AzureAppConfigurationOauthCallbackPageQueryParamsSchema = z.object(
 )
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/azure-app-configuration/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/azure-app-configuration/oauth2/callback',
 )({
   component: AzureAppConfigurationOauthCallbackPage,
   validateSearch: zodValidator(

frontend/src/pages/secret-manager/integrations/AzureDevopsAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { AzureDevopsAuthorizePage } from './AzureDevopsAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/azure-devops/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/azure-devops/authorize',
 )({
   component: AzureDevopsAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/AzureDevopsConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const AzureDevopsConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/azure-devops/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/azure-devops/create',
 )({
   component: AzureDevopsConfigurePage,
   validateSearch: zodValidator(AzureDevopsConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/AzureKeyVaultAuthorizePage/route.tsx

@@ -9,7 +9,7 @@ const PageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/azure-key-vault/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/azure-key-vault/authorize',
 )({
   component: AzureKeyVaultAuthorizePage,
   validateSearch: PageQueryParamsSchema,

frontend/src/pages/secret-manager/integrations/AzureKeyVaultConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const AzureKeyVaultConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/azure-key-vault/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/azure-key-vault/create',
 )({
   component: AzureKeyVaultConfigurePage,
   validateSearch: zodValidator(AzureKeyVaultConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/AzureKeyVaultOauthCallbackPage/route.tsx

@@ -10,7 +10,7 @@ export const AzureKeyVaultOauthCallbackQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/azure-key-vault/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/azure-key-vault/oauth2/callback',
 )({
   component: AzureKeyVaultOauthCallbackPage,
   validateSearch: zodValidator(AzureKeyVaultOauthCallbackQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/BitbucketConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const BitbucketConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/bitbucket/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/bitbucket/create',
 )({
   component: BitbucketConfigurePage,
   validateSearch: zodValidator(BitbucketConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/BitbucketOauthCallbackPage/route.tsx

@@ -10,7 +10,7 @@ export const BitbucketOauthCallbackQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/bitbucket/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/bitbucket/oauth2/callback',
 )({
   component: BitbucketOauthCallbackPage,
   validateSearch: zodValidator(BitbucketOauthCallbackQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/ChecklyAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { ChecklyAuthorizePage } from './ChecklyAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/checkly/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/checkly/authorize',
 )({
   component: ChecklyAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/ChecklyConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const ChecklyConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/checkly/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/checkly/create',
 )({
   component: ChecklyConfigurePage,
   validateSearch: zodValidator(ChecklyConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/CircleCIAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { CircleCIAuthorizePage } from './CircleCIAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/circleci/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/circleci/authorize',
 )({
   component: CircleCIAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/CircleCIConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const CircleCIConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/circleci/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/circleci/create',
 )({
   component: CircleCIConfigurePage,
   validateSearch: zodValidator(CircleCIConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/Cloud66AuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { Cloud66AuthorizePage } from './Cloud66AuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/cloud-66/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/cloud-66/authorize',
 )({
   component: Cloud66AuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/Cloud66ConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const Cloud66ConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/cloud-66/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/cloud-66/create',
 )({
   component: Cloud66ConfigurePage,
   validateSearch: zodValidator(Cloud66ConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/CloudflarePagesAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { CloudflarePagesAuthorizePage } from './CloudflarePagesAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-pages/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-pages/authorize',
 )({
   component: CloudflarePagesAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/CloudflarePagesConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const CloudflarePagesConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-pages/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-pages/create',
 )({
   component: CloudflarePagesConfigurePage,
   validateSearch: zodValidator(CloudflarePagesConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/CloudflareWorkersAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { CloudflareWorkersAuthorizePage } from './CloudflareWorkersAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-workers/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-workers/authorize',
 )({
   component: CloudflareWorkersAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/CloudflareWorkersConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const CloudflareWorkersConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-workers/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/cloudflare-workers/create',
 )({
   component: CloudflareWorkersConfigurePage,
   validateSearch: zodValidator(CloudflareWorkersConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/CodefreshAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { CodefreshAuthorizePage } from './CodefreshAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/codefresh/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/codefresh/authorize',
 )({
   component: CodefreshAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/CodefreshConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const CodefreshConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/codefresh/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/codefresh/create',
 )({
   component: CodefreshConfigurePage,
   validateSearch: zodValidator(CodefreshConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/DatabricksAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { DatabricksAuthorizePage } from './DatabricksAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/databricks/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/databricks/authorize',
 )({
   component: DatabricksAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/DatabricksConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const DatabricksConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/databricks/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/databricks/create',
 )({
   component: DatabricksConfigurePage,
   validateSearch: zodValidator(DatabricksConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/DigitalOceanAppPlatformAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { DigitalOceanAppPlatformAuthorizePage } from './DigitalOceanAppPlatformAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/digital-ocean-app-platform/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/digital-ocean-app-platform/authorize',
 )({
   component: DigitalOceanAppPlatformAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/DigitalOceanAppPlatformConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const DigitalOceanAppPlatformConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/digital-ocean-app-platform/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/digital-ocean-app-platform/create',
 )({
   component: DigitalOceanAppPlatformConfigurePage,
   validateSearch: zodValidator(

frontend/src/pages/secret-manager/integrations/FlyioAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { FlyioAuthorizePage } from './FlyioAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/flyio/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/flyio/authorize',
 )({
   component: FlyioAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/FlyioConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const FlyioConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/flyio/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/flyio/create',
 )({
   component: FlyioConfigurePage,
   validateSearch: zodValidator(FlyioConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/GcpSecretManagerAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { GcpSecretManagerAuthorizePage } from './GcpSecretManagerAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/authorize',
 )({
   component: GcpSecretManagerAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/GcpSecretManagerConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const GcpConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/create',
 )({
   component: GcpSecretManagerConfigurePage,
   validateSearch: zodValidator(GcpConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/GcpSecretManagerOauthCallbackPage/route.tsx

@@ -10,7 +10,7 @@ export const GcpSecretManagerOAuthCallbackPageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/oauth2/callback',
 )({
   component: GcpSecretManagerOauthCallbackPage,
   validateSearch: zodValidator(

frontend/src/pages/secret-manager/integrations/GithubAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { GithubAuthorizePage } from './GithubAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/github/auth-mode-selection',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/github/auth-mode-selection',
 )({
   component: GithubAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/GithubConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const GithubConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/github/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/github/create',
 )({
   component: GithubConfigurePage,
   validateSearch: zodValidator(GithubConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/GithubOauthCallbackPage/route.tsx

@@ -11,7 +11,7 @@ export const GithubOAuthCallbackPageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/github/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/github/oauth2/callback',
 )({
   component: GithubOauthCallbackPage,
   validateSearch: zodValidator(GithubOAuthCallbackPageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/GitlabAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { GitlabAuthorizePage } from './GitlabAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/gitlab/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/gitlab/authorize',
 )({
   component: GitlabAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/GitlabConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const GitlabConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/gitlab/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/gitlab/create',
 )({
   component: GitlabConfigurePage,
   validateSearch: zodValidator(GitlabConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/GitlabOauthCallbackPage/route.tsx

@@ -10,7 +10,7 @@ export const GitlabOAuthCallbackPageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/gitlab/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/gitlab/oauth2/callback',
 )({
   component: GitLabOAuthCallbackPage,
   validateSearch: zodValidator(GitlabOAuthCallbackPageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/HashicorpVaultAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { HashicorpVaultAuthorizePage } from './HashicorpVaultAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/hashicorp-vault/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/hashicorp-vault/authorize',
 )({
   component: HashicorpVaultAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/HashicorpVaultConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const HashicorpVaultConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/hashicorp-vault/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/hashicorp-vault/create',
 )({
   component: HashicorpVaultConfigurePage,
   validateSearch: zodValidator(HashicorpVaultConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/HasuraCloudAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { HasuraCloudAuthorizePage } from './HasuraCloudAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/hasura-cloud/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/hasura-cloud/authorize',
 )({
   component: HasuraCloudAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/HasuraCloudConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const HasuraCloudConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/hasura-cloud/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/hasura-cloud/create',
 )({
   component: HasuraCloudConfigurePage,
   validateSearch: zodValidator(HasuraCloudConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/HerokuConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const HerokuConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/heroku/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/heroku/create',
 )({
   component: HerokuConfigurePage,
   validateSearch: zodValidator(HerokuConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/HerokuOauthCallbackPage/route.tsx

@@ -10,7 +10,7 @@ export const HerokuOAuthCallbackPageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/heroku/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/heroku/oauth2/callback',
 )({
   component: HerokuOAuthCallbackPage,
   validateSearch: zodValidator(HerokuOAuthCallbackPageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/LaravelForgeAuthorizePage/route.tsx

@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from '@tanstack/react-router'
 import { LaravelForgeAuthorizePage } from './LaravelForgeAuthorizePage'
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/laravel-forge/authorize',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/laravel-forge/authorize',
 )({
   component: LaravelForgeAuthorizePage,
   beforeLoad: ({ context, params }) => {

frontend/src/pages/secret-manager/integrations/LaravelForgeConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const LaravelForgeConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/laravel-forge/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/laravel-forge/create',
 )({
   component: LaravelForgeConfigurePage,
   validateSearch: zodValidator(LaravelForgeConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/NetlifyConfigurePage/route.tsx

@@ -9,7 +9,7 @@ const NetlifyConfigurePageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/netlify/create',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/netlify/create',
 )({
   component: NetlifyConfigurePage,
   validateSearch: zodValidator(NetlifyConfigurePageQueryParamsSchema),

frontend/src/pages/secret-manager/integrations/NetlifyOauthCallbackPage/route.tsx

@@ -10,7 +10,7 @@ export const NetlifyOAuthCallbackPageQueryParamsSchema = z.object({
 })
 
 export const Route = createFileRoute(
-  '/_authenticate/_inject-org-details/secret-manager/$projectId/_secret-manager-layout/integrations/netlify/oauth2/callback',
+  '/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_secret-manager-layout/integrations/netlify/oauth2/callback',
 )({
   component: NetlifyOauthCallbackPage,
   validateSearch: zodValidator(NetlifyOAuthCallbackPageQueryParamsSchema),