diff --git a/frontend-v2/src/context/OrgPermissionContext/OrgPermissionContext.tsx b/frontend-v2/src/context/OrgPermissionContext/OrgPermissionContext.tsx
index 15389d3f6..b58c0e1f5 100644
--- a/frontend-v2/src/context/OrgPermissionContext/OrgPermissionContext.tsx
+++ b/frontend-v2/src/context/OrgPermissionContext/OrgPermissionContext.tsx
@@ -13,7 +13,7 @@ import { OrgPermissionSet } from "./types";
 
 export const useOrgPermission = () => {
   const organizationId = useRouteContext({
-    from: "/_authenticate/_org_details",
+    from: "/_authenticate/_ctx-org-details",
     select: (el) => el.organizationId
   });
 
diff --git a/frontend-v2/src/context/OrganizationContext/OrganizationContext.tsx b/frontend-v2/src/context/OrganizationContext/OrganizationContext.tsx
index b1898d12a..47f0912e8 100644
--- a/frontend-v2/src/context/OrganizationContext/OrganizationContext.tsx
+++ b/frontend-v2/src/context/OrganizationContext/OrganizationContext.tsx
@@ -5,7 +5,7 @@ import { fetchOrganizationById, organizationKeys } from "@app/hooks/api/organiza
 
 export const useOrganization = () => {
   const organizationId = useRouteContext({
-    from: "/_authenticate/_org_details",
+    from: "/_authenticate/_ctx-org-details",
     select: (el) => el.organizationId
   });
 
diff --git a/frontend-v2/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx b/frontend-v2/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
index b0ee59960..eab321fe4 100644
--- a/frontend-v2/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
+++ b/frontend-v2/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
@@ -1,62 +1,76 @@
-import { createContext, ReactNode, useContext } from "react";
+import { useCallback } from "react";
+import { createMongoAbility, MongoAbility, RawRuleOf } from "@casl/ability";
+import { unpackRules } from "@casl/ability/extra";
+import { useSuspenseQuery } from "@tanstack/react-query";
+import { useParams } from "@tanstack/react-router";
 
-import { useGetUserProjectPermissions } from "@app/hooks/api";
-import { TProjectMembership } from "@app/hooks/api/users/types";
+import {
+  conditionsMatcher,
+  fetchUserProjectPermissions,
+  roleQueryKeys
+} from "@app/hooks/api/roles/queries";
+import { groupBy } from "@app/lib/fn/array";
+import { omit } from "@app/lib/fn/object";
 
-import { useWorkspace } from "../WorkspaceContext";
-import { TProjectPermission } from "./types";
-
-type Props = {
-  children: ReactNode;
-};
-
-const ProjectPermissionContext = createContext<null | {
-  permission: TProjectPermission;
-  membership: TProjectMembership;
-}>(null);
-
-export const ProjectPermissionProvider = ({ children }: Props): JSX.Element => {
-  const { currentWorkspace, isLoading: isWsLoading } = useWorkspace();
-  const workspaceId = currentWorkspace?.id || "";
-  const { data: permission, isLoading } = useGetUserProjectPermissions({ workspaceId });
-
-  if ((isLoading && currentWorkspace) || isWsLoading) {
-    return (
-      <div className="flex h-screen w-screen items-center justify-center bg-bunker-800">
-        <img
-          src="/images/loading/loading.gif"
-          height={70}
-          width={120}
-          decoding="async"
-          loading="lazy"
-          alt="infisical loading indicator"
-        />
-      </div>
-    );
-  }
-
-  if (!permission && currentWorkspace) {
-    return (
-      <div className="flex h-screen w-screen items-center justify-center bg-bunker-800">
-        Failed to load user permissions
-      </div>
-    );
-  }
-
-  return (
-    <ProjectPermissionContext.Provider value={permission!}>
-      {children}
-    </ProjectPermissionContext.Provider>
-  );
-};
+import { ProjectPermissionSet } from "./types";
 
 export const useProjectPermission = () => {
-  const ctx = useContext(ProjectPermissionContext);
-  if (!ctx) {
+  const projectId = useParams({
+    strict: false,
+    select: (el) => el?.projectId
+  });
+  if (!projectId) {
     throw new Error("useProjectPermission to be used within <ProjectPermissionContext>");
   }
 
-  const hasProjectRole = (role: string) => ctx?.membership?.roles?.includes(role) || false;
+  const {
+    data: { permission, membership }
+  } = useSuspenseQuery({
+    queryKey: roleQueryKeys.getUserProjectPermissions({ workspaceId: projectId }),
+    queryFn: () => fetchUserProjectPermissions({ workspaceId: projectId }),
+    select: (data) => {
+      const rule = unpackRules<RawRuleOf<MongoAbility<ProjectPermissionSet>>>(data.permissions);
+      const negatedRules = groupBy(
+        rule.filter((i) => i.inverted && i.conditions),
+        (i) => `${i.subject}-${JSON.stringify(i.conditions)}`
+      );
+      const ability = createMongoAbility<ProjectPermissionSet>(rule, {
+        // this allows in frontend to skip some rules using *
+        conditionsMatcher: (rules) => {
+          return (entity) => {
+            // skip validation if its negated rules
+            const isNegatedRule =
+              // eslint-disable-next-line no-underscore-dangle
+              negatedRules?.[`${entity.__caslSubjectType__}-${JSON.stringify(rules)}`];
+            if (isNegatedRule) {
+              const baseMatcher = conditionsMatcher(rules);
+              return baseMatcher(entity);
+            }
 
-  return { ...ctx, hasProjectRole };
+            const rulesStrippedOfWildcard = omit(
+              rules,
+              Object.keys(entity).filter((el) => entity[el]?.includes("*"))
+            );
+            const baseMatcher = conditionsMatcher(rulesStrippedOfWildcard);
+            return baseMatcher(entity);
+          };
+        }
+      });
+
+      return {
+        permission: ability,
+        membership: {
+          ...data.membership,
+          roles: data.membership.roles.map(({ role }) => role)
+        }
+      };
+    }
+  });
+
+  const hasProjectRole = useCallback(
+    (role: string) => membership?.roles?.includes(role) || false,
+    []
+  );
+
+  return { permission, membership, hasProjectRole };
 };
diff --git a/frontend-v2/src/context/ProjectPermissionContext/index.tsx b/frontend-v2/src/context/ProjectPermissionContext/index.tsx
index 4b04f5cb8..009bc9451 100644
--- a/frontend-v2/src/context/ProjectPermissionContext/index.tsx
+++ b/frontend-v2/src/context/ProjectPermissionContext/index.tsx
@@ -1,4 +1,4 @@
-export { ProjectPermissionProvider, useProjectPermission } from "./ProjectPermissionContext";
+export { useProjectPermission } from "./ProjectPermissionContext";
 export type { ProjectPermissionSet, TProjectPermission } from "./types";
 export {
   ProjectPermissionActions,
diff --git a/frontend-v2/src/context/SubscriptionContext/SubscriptionContext.tsx b/frontend-v2/src/context/SubscriptionContext/SubscriptionContext.tsx
index 447ac948c..8722ff4f8 100644
--- a/frontend-v2/src/context/SubscriptionContext/SubscriptionContext.tsx
+++ b/frontend-v2/src/context/SubscriptionContext/SubscriptionContext.tsx
@@ -5,7 +5,7 @@ import { fetchOrgSubscription, subscriptionQueryKeys } from "@app/hooks/api/subs
 
 export const useSubscription = () => {
   const organizationId = useRouteContext({
-    from: "/_authenticate/_org_details",
+    from: "/_authenticate/_ctx-org-details",
     select: (el) => el.organizationId
   });
 
diff --git a/frontend-v2/src/context/WorkspaceContext/WorkspaceContext.tsx b/frontend-v2/src/context/WorkspaceContext/WorkspaceContext.tsx
index 94a1d275d..8bef13b31 100644
--- a/frontend-v2/src/context/WorkspaceContext/WorkspaceContext.tsx
+++ b/frontend-v2/src/context/WorkspaceContext/WorkspaceContext.tsx
@@ -1,55 +1,22 @@
-import { createContext, ReactNode, useContext, useEffect, useMemo } from "react";
+import { useSuspenseQuery } from "@tanstack/react-query";
 import { useParams } from "@tanstack/react-router";
 
-import { createNotification } from "@app/components/notifications";
-import { useGetUserWorkspaces } from "@app/hooks/api";
-import { Workspace } from "@app/hooks/api/workspace/types";
-
-type TWorkspaceContext = {
-  workspaces: Workspace[];
-  currentWorkspace?: Workspace;
-  isLoading: boolean;
-};
-
-const WorkspaceContext = createContext<TWorkspaceContext | null>(null);
-
-type Props = {
-  children: ReactNode;
-};
-
-export const WorkspaceProvider = ({ children }: Props): JSX.Element => {
-  const { data: ws, isLoading } = useGetUserWorkspaces();
-  const params = useParams({ strict: false });
-  const workspaceId = params.id;
-
-  // memorize the workspace details for the context
-  const value = useMemo<TWorkspaceContext>(() => {
-    const wsId = workspaceId || localStorage.getItem("projectData.id");
-    return {
-      workspaces: ws || [],
-      currentWorkspace: (ws || []).find(({ id }) => id === wsId),
-      isLoading
-    };
-  }, [ws, workspaceId, isLoading]);
-
-  const shouldTriggerNoProjectAccess = !value.isLoading && !value.currentWorkspace;
-
-  if (shouldTriggerNoProjectAccess) {
-    return (
-      <div className="flex h-screen w-screen items-center justify-center bg-bunker-800 text-primary-50">
-        You do not have sufficient access to this project.
-      </div>
-    );
-  }
-
-  return <WorkspaceContext.Provider value={value}>{children}</WorkspaceContext.Provider>;
-};
+import { workspaceKeys } from "@app/hooks/api";
+import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
 
 export const useWorkspace = () => {
-  const ctx = useContext(WorkspaceContext);
-  if (!ctx) {
-    throw new Error("useWorkspace has to be used within <WorkspaceContext.Provider>");
+  const params = useParams({
+    strict: false
+  });
+  if (!params.projectId) {
+    throw new Error("Missing project id");
   }
 
-  return ctx;
+  const { data: currentWorkspace } = useSuspenseQuery({
+    queryKey: workspaceKeys.getWorkspaceById(params.projectId),
+    queryFn: () => fetchWorkspaceById(params.projectId as string),
+    staleTime: Infinity
+  });
+
+  return { currentWorkspace };
 };
diff --git a/frontend-v2/src/context/WorkspaceContext/index.tsx b/frontend-v2/src/context/WorkspaceContext/index.tsx
index 0ae8cb4c5..b0c25d4da 100644
--- a/frontend-v2/src/context/WorkspaceContext/index.tsx
+++ b/frontend-v2/src/context/WorkspaceContext/index.tsx
@@ -1 +1 @@
-export { useWorkspace, WorkspaceProvider } from "./WorkspaceContext";
+export { useWorkspace } from "./WorkspaceContext";
diff --git a/frontend-v2/src/context/index.tsx b/frontend-v2/src/context/index.tsx
index 4b273bcb7..6bf77a566 100644
--- a/frontend-v2/src/context/index.tsx
+++ b/frontend-v2/src/context/index.tsx
@@ -11,11 +11,10 @@ export {
   ProjectPermissionActions,
   ProjectPermissionCmekActions,
   ProjectPermissionDynamicSecretActions,
-  ProjectPermissionProvider,
   ProjectPermissionSub,
   useProjectPermission
 } from "./ProjectPermissionContext";
 export { useServerConfig } from "./ServerConfigContext";
 export { useSubscription } from "./SubscriptionContext";
 export { useUser } from "./UserContext";
-export { useWorkspace, WorkspaceProvider } from "./WorkspaceContext";
+export { useWorkspace } from "./WorkspaceContext";
diff --git a/frontend-v2/src/helpers/project.ts b/frontend-v2/src/helpers/project.ts
index cfd39a9c6..742cf2c99 100644
--- a/frontend-v2/src/helpers/project.ts
+++ b/frontend-v2/src/helpers/project.ts
@@ -62,7 +62,7 @@ export const initProjectHelper = async ({ projectName }: { projectName: string }
 };
 export const getProjectHomePage = (workspace: Workspace) => {
   if (workspace.type === ProjectType.SecretManager) {
-    return `/${workspace.type}/$projectId/secrets/overview` as const;
+    return `/${workspace.type}/$projectId/overview` as const;
   }
   if (workspace.type === ProjectType.CertificateManager) {
     return `/${workspace.type}/$projectId/certificates` as const;
diff --git a/frontend-v2/src/hooks/api/roles/queries.tsx b/frontend-v2/src/hooks/api/roles/queries.tsx
index c69b41309..3353a0e96 100644
--- a/frontend-v2/src/hooks/api/roles/queries.tsx
+++ b/frontend-v2/src/hooks/api/roles/queries.tsx
@@ -130,7 +130,9 @@ export const useGetUserOrgPermissions = ({ orgId }: TGetUserOrgPermissionsDTO) =
     }
   });
 
-const getUserProjectPermissions = async ({ workspaceId }: TGetUserProjectPermissionDTO) => {
+export const fetchUserProjectPermissions = async ({
+  workspaceId
+}: TGetUserProjectPermissionDTO) => {
   const { data } = await apiRequest.get<{
     data: {
       permissions: PackRule<RawRuleOf<MongoAbility<OrgPermissionSet>>>[];
@@ -144,7 +146,7 @@ const getUserProjectPermissions = async ({ workspaceId }: TGetUserProjectPermiss
 export const useGetUserProjectPermissions = ({ workspaceId }: TGetUserProjectPermissionDTO) =>
   useQuery({
     queryKey: roleQueryKeys.getUserProjectPermissions({ workspaceId }),
-    queryFn: () => getUserProjectPermissions({ workspaceId }),
+    queryFn: () => fetchUserProjectPermissions({ workspaceId }),
     enabled: Boolean(workspaceId),
     select: (data) => {
       const rule = unpackRules<RawRuleOf<MongoAbility<ProjectPermissionSet>>>(data.permissions);
diff --git a/frontend-v2/src/hooks/api/workspace/queries.tsx b/frontend-v2/src/hooks/api/workspace/queries.tsx
index 0c86a3e47..9fc2f9b71 100644
--- a/frontend-v2/src/hooks/api/workspace/queries.tsx
+++ b/frontend-v2/src/hooks/api/workspace/queries.tsx
@@ -39,7 +39,7 @@ import {
   Workspace
 } from "./types";
 
-const fetchWorkspaceById = async (workspaceId: string) => {
+export const fetchWorkspaceById = async (workspaceId: string) => {
   const { data } = await apiRequest.get<{ workspace: Workspace }>(
     `/api/v1/workspace/${workspaceId}`
   );
diff --git a/frontend-v2/src/layouts/ProjectLayout/ProjectLayout.tsx b/frontend-v2/src/layouts/ProjectLayout/ProjectLayout.tsx
new file mode 100644
index 000000000..bbc4d928b
--- /dev/null
+++ b/frontend-v2/src/layouts/ProjectLayout/ProjectLayout.tsx
@@ -0,0 +1,235 @@
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { faMobile } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { Link, Outlet } from "@tanstack/react-router";
+
+import { Mfa } from "@app/components/auth/Mfa";
+import SecurityClient from "@app/components/utilities/SecurityClient";
+import { Menu, MenuItem } from "@app/components/v2";
+import { useUser, useWorkspace } from "@app/context";
+import { useToggle } from "@app/hooks";
+import {
+  useGetAccessRequestsCount,
+  useGetSecretApprovalRequestCount,
+  useSelectOrganization
+} from "@app/hooks/api";
+import { MfaMethod } from "@app/hooks/api/auth/types";
+import { ProjectType } from "@app/hooks/api/workspace/types";
+
+import { InsecureConnectionBanner } from "../OrganizationLayout/components/InsecureConnectionBanner";
+import { SidebarFooter } from "../OrganizationLayout/components/SidebarFooter";
+import { SidebarHeader } from "./components/SidebarHeader";
+import { ProjectSelect } from "./components/ProjectSelect";
+
+// This is a generic layout shared by all types of projects.
+// If the product layout differs significantly, create a new layout as needed.
+export const ProjectLayout = () => {
+  const { currentWorkspace } = useWorkspace();
+
+  const [shouldShowMfa, toggleShowMfa] = useToggle(false);
+  const [requiredMfaMethod, setRequiredMfaMethod] = useState(MfaMethod.EMAIL);
+  const [mfaSuccessCallback, setMfaSuccessCallback] = useState<() => void>(() => {});
+
+  const { user } = useUser();
+
+  const { mutateAsync: selectOrganization } = useSelectOrganization();
+
+  const { t } = useTranslation();
+  const workspaceId = currentWorkspace?.id || "";
+  const projectSlug = currentWorkspace?.slug || "";
+
+  const { data: secretApprovalReqCount } = useGetSecretApprovalRequestCount({ workspaceId });
+  const { data: accessApprovalRequestCount } = useGetAccessRequestsCount({ projectSlug });
+
+  const pendingRequestsCount =
+    (secretApprovalReqCount?.open || 0) + (accessApprovalRequestCount?.pendingCount || 0);
+
+  const handleOrgChange = async (orgId: string) => {
+    const { token, isMfaEnabled, mfaMethod } = await selectOrganization({
+      organizationId: orgId
+    });
+
+    if (isMfaEnabled) {
+      SecurityClient.setMfaToken(token);
+      if (mfaMethod) {
+        setRequiredMfaMethod(mfaMethod);
+      }
+      toggleShowMfa.on();
+      setMfaSuccessCallback(() => () => handleOrgChange(orgId));
+    }
+
+    // await navigateUserToOrg(router, orgId);
+  };
+
+  if (shouldShowMfa) {
+    return (
+      <div className="flex max-h-screen min-h-screen flex-col items-center justify-center gap-2 overflow-y-auto bg-gradient-to-tr from-mineshaft-600 via-mineshaft-800 to-bunker-700">
+        <Mfa
+          email={user.email as string}
+          method={requiredMfaMethod}
+          successCallback={mfaSuccessCallback}
+          closeMfa={() => toggleShowMfa.off()}
+        />
+      </div>
+    );
+  }
+
+  const isSecretManager = currentWorkspace?.type === ProjectType.SecretManager;
+  const isCertManager = currentWorkspace?.type === ProjectType.CertificateManager;
+  const isCmek = currentWorkspace?.type === ProjectType.KMS;
+
+  return (
+    <>
+      <div className="dark hidden h-screen w-full flex-col overflow-x-hidden md:flex">
+        {!window.isSecureContext && <InsecureConnectionBanner />}
+        <div className="flex flex-grow flex-col overflow-y-hidden md:flex-row">
+          <aside className="dark w-full border-r border-mineshaft-600 bg-gradient-to-tr from-mineshaft-700 via-mineshaft-800 to-mineshaft-900 md:w-60">
+            <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
+              <div>
+                <SidebarHeader onChangeOrg={handleOrgChange} />
+                <ProjectSelect />
+                <div className="px-1">
+                  <Menu>
+                    {isSecretManager && (
+                      <Link
+                        to={`/${ProjectType.SecretManager}/$projectId/overview` as const}
+                        params={{
+                          projectId: currentWorkspace.id
+                        }}
+                      >
+                        {({ isActive }) => (
+                          <MenuItem isSelected={isActive} icon="system-outline-90-lock-closed">
+                            {t("nav.menu.secrets")}
+                          </MenuItem>
+                        )}
+                      </Link>
+                    )}
+                    {isCertManager && (
+                      <Link
+                        to={`/${ProjectType.CertificateManager}/$projectId/overview` as const}
+                        params={{
+                          projectId: currentWorkspace.id
+                        }}
+                      >
+                        {({ isActive }) => (
+                          <MenuItem isSelected={isActive} icon="system-outline-90-lock-closed">
+                            Overview
+                          </MenuItem>
+                        )}
+                      </Link>
+                    )}
+                    {isCmek && (
+                      <Link
+                        to={`/${ProjectType.KMS}/$projectId/overview` as const}
+                        params={{
+                          projectId: currentWorkspace.id
+                        }}
+                      >
+                        {({ isActive }) => (
+                          <MenuItem isSelected={isActive} icon="system-outline-90-lock-closed">
+                            Overview
+                          </MenuItem>
+                        )}
+                      </Link>
+                    )}
+                    <Link
+                      to={`/${currentWorkspace.type}/$projectId/members` as const}
+                      params={{
+                        projectId: currentWorkspace.id
+                      }}
+                    >
+                      {({ isActive }) => (
+                        <MenuItem isSelected={isActive} icon="system-outline-96-groups">
+                          Access Control
+                        </MenuItem>
+                      )}
+                    </Link>
+                    {isSecretManager && (
+                      <Link
+                        to={`/${ProjectType.SecretManager}/$projectId/integrations` as const}
+                        params={{
+                          projectId: currentWorkspace.id
+                        }}
+                      >
+                        {({ isActive }) => (
+                          <MenuItem isSelected={isActive} icon="system-outline-82-extension">
+                            {t("nav.menu.integrations")}
+                          </MenuItem>
+                        )}
+                      </Link>
+                    )}
+                    {isSecretManager && (
+                      <Link
+                        to={`/${ProjectType.SecretManager}/$projectId/secret-rotation` as const}
+                        params={{
+                          projectId: currentWorkspace.id
+                        }}
+                      >
+                        {({ isActive }) => (
+                          <MenuItem isSelected={isActive} icon="rotation">
+                            Secret Rotation
+                          </MenuItem>
+                        )}
+                      </Link>
+                    )}
+                    {isSecretManager && (
+                      <Link
+                        to={`/${ProjectType.SecretManager}/$projectId/approval` as const}
+                        params={{
+                          projectId: currentWorkspace.id
+                        }}
+                      >
+                        {({ isActive }) => (
+                          <MenuItem
+                            isSelected={isActive}
+                            icon="system-outline-189-domain-verification"
+                          >
+                            Approvals
+                            {Boolean(
+                              secretApprovalReqCount?.open ||
+                                accessApprovalRequestCount?.pendingCount
+                            ) && (
+                              <span className="ml-2 rounded border border-primary-400 bg-primary-600 px-1 py-0.5 text-xs font-semibold text-black">
+                                {pendingRequestsCount}
+                              </span>
+                            )}
+                          </MenuItem>
+                        )}
+                      </Link>
+                    )}
+                    <Link
+                      to={`/${currentWorkspace.type}/$projectId/settings` as const}
+                      params={{
+                        projectId: currentWorkspace.id
+                      }}
+                    >
+                      {({ isActive }) => (
+                        <MenuItem
+                          isSelected={isActive}
+                          icon="system-outline-109-slider-toggle-settings"
+                        >
+                          {t("nav.menu.project-settings")}
+                        </MenuItem>
+                      )}
+                    </Link>
+                  </Menu>
+                </div>
+              </div>
+              <SidebarFooter />
+            </nav>
+          </aside>
+          <main className="flex-1 overflow-y-auto overflow-x-hidden bg-bunker-800 dark:[color-scheme:dark]">
+            <Outlet />
+          </main>
+        </div>
+      </div>
+      <div className="z-[200] flex h-screen w-screen flex-col items-center justify-center bg-bunker-800 md:hidden">
+        <FontAwesomeIcon icon={faMobile} className="mb-8 text-7xl text-gray-300" />
+        <p className="max-w-sm px-6 text-center text-lg text-gray-200">
+          {` ${t("common.no-mobile")} `}
+        </p>
+      </div>
+    </>
+  );
+};
diff --git a/frontend-v2/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx b/frontend-v2/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx
new file mode 100644
index 000000000..c833588c3
--- /dev/null
+++ b/frontend-v2/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx
@@ -0,0 +1,219 @@
+import { useMemo } from "react";
+import { components, MenuProps, OptionProps } from "react-select";
+import { faStar } from "@fortawesome/free-regular-svg-icons";
+import { faChevronRight, faPlus, faStar as faSolidStar } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
+import { createNotification } from "@app/components/notifications";
+import { OrgPermissionCan } from "@app/components/permissions";
+import { NewProjectModal } from "@app/components/projects";
+import { Button, FilterableSelect } from "@app/components/v2";
+import {
+  OrgPermissionActions,
+  OrgPermissionSubjects,
+  useOrganization,
+  useSubscription,
+  useWorkspace
+} from "@app/context";
+import { getProjectHomePage, getProjectTitle } from "@app/helpers/project";
+import { usePopUp } from "@app/hooks";
+import { useGetUserWorkspaces } from "@app/hooks/api";
+import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";
+import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";
+import { ProjectType, Workspace } from "@app/hooks/api/workspace/types";
+
+type TWorkspaceWithFaveProp = Workspace & { isFavorite: boolean };
+
+const ProjectsMenu = ({ children, ...props }: MenuProps<TWorkspaceWithFaveProp>) => {
+  return (
+    <components.Menu {...props}>
+      {children}
+      <hr className="mb-2 h-px border-0 bg-mineshaft-500" />
+      <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Workspace}>
+        {(isAllowed) => (
+          <Button
+            className="w-full bg-mineshaft-700 pt-2 text-bunker-200"
+            colorSchema="primary"
+            variant="outline_bg"
+            size="xs"
+            isDisabled={!isAllowed}
+            onClick={() => props.clearValue()}
+            leftIcon={<FontAwesomeIcon icon={faPlus} />}
+          >
+            Add Project
+          </Button>
+        )}
+      </OrgPermissionCan>
+    </components.Menu>
+  );
+};
+
+const ProjectOption = ({
+  isSelected,
+  children,
+  data,
+  ...props
+}: OptionProps<TWorkspaceWithFaveProp>) => {
+  const { currentOrg } = useOrganization();
+  const { mutateAsync: updateUserProjectFavorites } = useUpdateUserProjectFavorites();
+  const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg.id);
+
+  const removeProjectFromFavorites = async (projectId: string) => {
+    try {
+      await updateUserProjectFavorites({
+        orgId: currentOrg!.id,
+        projectFavorites: [...(projectFavorites || []).filter((entry) => entry !== projectId)]
+      });
+    } catch {
+      createNotification({
+        text: "Failed to remove project from favorites.",
+        type: "error"
+      });
+    }
+  };
+
+  const addProjectToFavorites = async (projectId: string) => {
+    try {
+      await updateUserProjectFavorites({
+        orgId: currentOrg!.id,
+        projectFavorites: [...(projectFavorites || []), projectId]
+      });
+    } catch {
+      createNotification({
+        text: "Failed to add project to favorites.",
+        type: "error"
+      });
+    }
+  };
+  return (
+    <components.Option
+      isSelected={isSelected}
+      data={data}
+      {...props}
+      className={twMerge(props.className, isSelected && "bg-mineshaft-500")}
+    >
+      <div className="flex w-full items-center">
+        {isSelected && (
+          <FontAwesomeIcon className="mr-2 text-primary" icon={faChevronRight} size="xs" />
+        )}
+        <p className="truncate">{children}</p>
+        {data.isFavorite ? (
+          <FontAwesomeIcon
+            icon={faSolidStar}
+            className="ml-auto text-sm text-yellow-600 hover:text-mineshaft-400"
+            onClick={async (e) => {
+              e.stopPropagation();
+              await removeProjectFromFavorites(data.id);
+            }}
+          />
+        ) : (
+          <FontAwesomeIcon
+            icon={faStar}
+            className="ml-auto text-sm text-mineshaft-400 hover:text-mineshaft-300"
+            onClick={async (e) => {
+              e.stopPropagation();
+              await addProjectToFavorites(data.id);
+            }}
+          />
+        )}
+      </div>
+    </components.Option>
+  );
+};
+
+export const ProjectSelect = () => {
+  const { currentWorkspace } = useWorkspace();
+  const { currentOrg } = useOrganization();
+  const { data: workspaces = [] } = useGetUserWorkspaces({ type: currentWorkspace.type });
+  const { data: projectFavorites } = useGetUserProjectFavorites(currentOrg.id!);
+
+  const { subscription } = useSubscription();
+
+  const isAddingProjectsAllowed = subscription?.workspaceLimit
+    ? subscription.workspacesUsed < subscription.workspaceLimit
+    : true;
+
+  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
+    "addNewWs",
+    "upgradePlan"
+  ] as const);
+
+  const { options, value } = useMemo(() => {
+    const projectOptions = workspaces
+      .map((w): Workspace & { isFavorite: boolean } => ({
+        ...w,
+        isFavorite: Boolean(projectFavorites?.includes(w.id))
+      }))
+      .sort((a, b) => Number(b.isFavorite) - Number(a.isFavorite));
+
+    const currentOption = projectOptions.find((option) => option.id === currentWorkspace?.id);
+
+    if (!currentOption) {
+      return {
+        options: projectOptions,
+        value: null
+      };
+    }
+
+    return {
+      options: [
+        currentOption,
+        ...projectOptions.filter((option) => option.id !== currentOption.id)
+      ],
+      value: currentOption
+    };
+  }, [workspaces, projectFavorites, currentWorkspace]);
+
+  return (
+    <div className="mb-4 mt-5 w-full p-3">
+      <p className="mb-1 ml-1.5 text-xs font-semibold uppercase text-gray-400">
+        {currentWorkspace?.type ? getProjectTitle(currentWorkspace?.type) : "Project"}
+      </p>
+      <FilterableSelect
+        className="text-sm"
+        value={value}
+        filterOption={(option, inputValue) =>
+          option.data.name.toLowerCase().includes(inputValue.toLowerCase())
+        }
+        getOptionLabel={(option) => option.name}
+        getOptionValue={(option) => option.id}
+        onChange={(newValue) => {
+          // hacky use of null as indication to create project
+          if (!newValue) {
+            if (isAddingProjectsAllowed) {
+              handlePopUpOpen("addNewWs");
+            } else {
+              handlePopUpOpen("upgradePlan");
+            }
+            return;
+          }
+
+          const project = newValue as TWorkspaceWithFaveProp;
+          localStorage.setItem("projectData.id", project.id);
+          // todo(akhi): this is not using react query because react query in overview is throwing error when envs are not exact same count
+          // to reproduce change this back to router.push and switch between two projects with different env count
+          // look into this on dashboard revamp
+          window.location.assign(getProjectHomePage(project));
+        }}
+        options={options}
+        components={{
+          Option: ProjectOption,
+          Menu: ProjectsMenu
+        }}
+      />
+      <UpgradePlanModal
+        isOpen={popUp.upgradePlan.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
+        text="You have exceeded the number of projects allowed on the free plan."
+      />
+
+      <NewProjectModal
+        isOpen={popUp.addNewWs.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("addNewWs", isOpen)}
+        projectType={currentWorkspace?.type || ProjectType.SecretManager}
+      />
+    </div>
+  );
+};
diff --git a/frontend-v2/src/layouts/ProjectLayout/components/ProjectSelect/index.ts b/frontend-v2/src/layouts/ProjectLayout/components/ProjectSelect/index.ts
new file mode 100644
index 000000000..d0be7c203
--- /dev/null
+++ b/frontend-v2/src/layouts/ProjectLayout/components/ProjectSelect/index.ts
@@ -0,0 +1 @@
+export * from "./ProjectSelect";
diff --git a/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx b/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
new file mode 100644
index 000000000..9b24c73d4
--- /dev/null
+++ b/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
@@ -0,0 +1,180 @@
+import {
+  faAngleDown,
+  faArrowLeft,
+  faArrowUpRightFromSquare,
+  faCheck
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { Link, useNavigate } from "@tanstack/react-router";
+
+import {
+  Button,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger
+} from "@app/components/v2";
+import { useOrganization, useUser, useWorkspace } from "@app/context";
+import { useGetOrganizations, useLogoutUser } from "@app/hooks/api";
+import { AuthMethod } from "@app/hooks/api/users/types";
+
+type Prop = {
+  onChangeOrg: (orgId: string) => void;
+};
+
+export const SidebarHeader = ({ onChangeOrg }: Prop) => {
+  const { currentOrg } = useOrganization();
+  const { currentWorkspace } = useWorkspace();
+  const { user } = useUser();
+  const navigate = useNavigate();
+  const { data: orgs } = useGetOrganizations();
+
+  const logout = useLogoutUser();
+  const logOutUser = async () => {
+    try {
+      console.log("Logging out...");
+      await logout.mutateAsync();
+      navigate({ to: "/login" });
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+  return (
+    <div className="flex h-12 cursor-default items-center px-3 pt-6">
+      <Link to={`/organization/$organizationId/${currentWorkspace.type}/overview`} params={{}}>
+        <div className="pl-1 pr-2 text-mineshaft-400 duration-200 hover:text-mineshaft-100">
+          <FontAwesomeIcon icon={faArrowLeft} />
+        </div>
+      </Link>
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild className="max-w-[160px] data-[state=open]:bg-mineshaft-600">
+          <div className="mr-auto flex items-center rounded-md py-1.5 pl-1.5 pr-2 hover:bg-mineshaft-600">
+            <div className="flex h-5 w-5 min-w-[20px] items-center justify-center rounded-md bg-primary text-sm">
+              {currentOrg?.name.charAt(0)}
+            </div>
+            <div
+              className="overflow-hidden truncate text-ellipsis pl-2 text-sm text-mineshaft-100"
+              style={{ maxWidth: "140px" }}
+            >
+              {currentOrg?.name}
+            </div>
+            <FontAwesomeIcon icon={faAngleDown} className="pl-1 pt-1 text-xs text-mineshaft-300" />
+          </div>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="start" className="p-1">
+          <div className="px-2 py-1 text-xs text-mineshaft-400">{user?.username}</div>
+          {orgs?.map((org) => {
+            return (
+              <DropdownMenuItem key={org.id}>
+                <Button
+                  onClick={async () => {
+                    if (currentOrg?.id === org.id) return;
+
+                    if (org.authEnforced) {
+                      // org has an org-level auth method enabled (e.g. SAML)
+                      // -> logout + redirect to SAML SSO
+
+                      await logout.mutateAsync();
+                      if (org.orgAuthMethod === AuthMethod.OIDC) {
+                        window.open(`/api/v1/sso/oidc/login?orgSlug=${org.slug}`);
+                      } else {
+                        window.open(`/api/v1/sso/redirect/saml2/organizations/${org.slug}`);
+                      }
+                      window.close();
+                      return;
+                    }
+
+                    onChangeOrg(org?.id);
+                  }}
+                  variant="plain"
+                  colorSchema="secondary"
+                  size="xs"
+                  className="flex w-full items-center justify-start p-0 font-normal"
+                  leftIcon={
+                    currentOrg?.id === org.id && (
+                      <FontAwesomeIcon icon={faCheck} className="mr-3 text-primary" />
+                    )
+                  }
+                >
+                  <div className="flex w-full max-w-[150px] items-center justify-between truncate">
+                    {org.name}
+                  </div>
+                </Button>
+              </DropdownMenuItem>
+            );
+          })}
+
+          <div className="mt-1 h-1 border-t border-mineshaft-600" />
+          <button type="button" onClick={logOutUser} className="w-full">
+            <DropdownMenuItem>Log Out</DropdownMenuItem>
+          </button>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <DropdownMenu>
+        <DropdownMenuTrigger
+          asChild
+          className="p-1 hover:bg-primary-400 hover:text-black data-[state=open]:bg-primary-400 data-[state=open]:text-black"
+        >
+          <div
+            className="child flex items-center justify-center rounded-full bg-mineshaft pr-1 text-mineshaft-300 hover:bg-mineshaft-500"
+            style={{ fontSize: "11px", width: "26px", height: "26px" }}
+          >
+            {user?.firstName?.charAt(0)}
+            {user?.lastName && user?.lastName?.charAt(0)}
+          </div>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="start" className="p-1">
+          <div className="px-2 py-1 text-xs text-mineshaft-400">{user?.username}</div>
+          <Link to="/personal-settings">
+            <DropdownMenuItem>Personal Settings</DropdownMenuItem>
+          </Link>
+          <a
+            href="https://infisical.com/docs/documentation/getting-started/introduction"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="mt-3 w-full text-sm font-normal leading-[1.2rem] text-mineshaft-300 hover:text-mineshaft-100"
+          >
+            <DropdownMenuItem>
+              Documentation
+              <FontAwesomeIcon
+                icon={faArrowUpRightFromSquare}
+                className="mb-[0.06rem] pl-1.5 text-xxs"
+              />
+            </DropdownMenuItem>
+          </a>
+          <a
+            href="https://infisical.com/slack"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="mt-3 w-full text-sm font-normal leading-[1.2rem] text-mineshaft-300 hover:text-mineshaft-100"
+          >
+            <DropdownMenuItem>
+              Join Slack Community
+              <FontAwesomeIcon
+                icon={faArrowUpRightFromSquare}
+                className="mb-[0.06rem] pl-1.5 text-xxs"
+              />
+            </DropdownMenuItem>
+          </a>
+          {user?.superAdmin && (
+            <Link to="/admin">
+              <DropdownMenuItem className="mt-1 border-t border-mineshaft-600">
+                Server Admin Console
+              </DropdownMenuItem>
+            </Link>
+          )}
+          <Link to={`/org/${currentOrg?.id}/admin`}>
+            <DropdownMenuItem className="mt-1 border-t border-mineshaft-600">
+              Organization Admin Console
+            </DropdownMenuItem>
+          </Link>
+          <div className="mt-1 h-1 border-t border-mineshaft-600" />
+          <button type="button" onClick={logOutUser} className="w-full">
+            <DropdownMenuItem>Log Out</DropdownMenuItem>
+          </button>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </div>
+  );
+};
diff --git a/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/index.tsx b/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/index.tsx
new file mode 100644
index 000000000..bdc4db6ef
--- /dev/null
+++ b/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/index.tsx
@@ -0,0 +1 @@
+export { SidebarHeader } from "./SidebarHeader";
diff --git a/frontend-v2/src/layouts/ProjectLayout/index.tsx b/frontend-v2/src/layouts/ProjectLayout/index.tsx
new file mode 100644
index 000000000..ab759db95
--- /dev/null
+++ b/frontend-v2/src/layouts/ProjectLayout/index.tsx
@@ -0,0 +1 @@
+export { ProjectLayout } from "./ProjectLayout";
diff --git a/frontend-v2/src/routeTree.gen.ts b/frontend-v2/src/routeTree.gen.ts
index ce5de828f..6bfd5beb5 100644
--- a/frontend-v2/src/routeTree.gen.ts
+++ b/frontend-v2/src/routeTree.gen.ts
@@ -13,55 +13,63 @@ import { createFileRoute } from '@tanstack/react-router'
 // Import Routes
 
 import { Route as rootRoute } from './routes/__root'
-import { Route as RestrictloginsignupImport } from './routes/_restrict_login_signup'
+import { Route as RestrictLoginSignupImport } from './routes/_restrict-login-signup'
 import { Route as AuthenticateImport } from './routes/_authenticate'
 import { Route as IndexImport } from './routes/index'
-import { Route as RestrictloginsignupVerifyEmailImport } from './routes/_restrict_login_signup/verify-email'
-import { Route as RestrictloginsignupSignupinviteImport } from './routes/_restrict_login_signup/signupinvite'
-import { Route as RestrictloginsignupRequestnewinviteImport } from './routes/_restrict_login_signup/requestnewinvite'
-import { Route as RestrictloginsignupPasswordResetImport } from './routes/_restrict_login_signup/password-reset'
-import { Route as RestrictloginsignupEmailNotVerifiedImport } from './routes/_restrict_login_signup/email-not-verified'
+import { Route as RestrictLoginSignupVerifyEmailImport } from './routes/_restrict-login-signup/verify-email'
+import { Route as RestrictLoginSignupSignupinviteImport } from './routes/_restrict-login-signup/signupinvite'
+import { Route as RestrictLoginSignupRequestnewinviteImport } from './routes/_restrict-login-signup/requestnewinvite'
+import { Route as RestrictLoginSignupPasswordResetImport } from './routes/_restrict-login-signup/password-reset'
+import { Route as RestrictLoginSignupEmailNotVerifiedImport } from './routes/_restrict-login-signup/email-not-verified'
 import { Route as AuthenticateCliRedirectImport } from './routes/_authenticate/cli-redirect'
-import { Route as AuthenticateOrgdetailsImport } from './routes/_authenticate/_org_details'
-import { Route as RestrictloginsignupSignupIndexImport } from './routes/_restrict_login_signup/signup/index'
-import { Route as RestrictloginsignupLoginIndexImport } from './routes/_restrict_login_signup/login/index'
+import { Route as AuthenticateCtxOrgDetailsImport } from './routes/_authenticate/_ctx-org-details'
+import { Route as RestrictLoginSignupSignupIndexImport } from './routes/_restrict-login-signup/signup/index'
+import { Route as RestrictLoginSignupLoginIndexImport } from './routes/_restrict-login-signup/login/index'
 import { Route as authenticatePersonalSettingsLayoutImport } from './routes/_authenticate/personal-settings/layout'
-import { Route as authenticateOrgdetailsLayoutImport } from './routes/_authenticate/_org_details/layout'
-import { Route as RestrictloginsignupSignupSsoIndexImport } from './routes/_restrict_login_signup/signup/sso/index'
-import { Route as RestrictloginsignupLoginSsoIndexImport } from './routes/_restrict_login_signup/login/sso/index'
-import { Route as RestrictloginsignupLoginSelectOrganizationIndexImport } from './routes/_restrict_login_signup/login/select-organization/index'
-import { Route as RestrictloginsignupLoginLdapIndexImport } from './routes/_restrict_login_signup/login/ldap/index'
+import { Route as RestrictLoginSignupSignupSsoIndexImport } from './routes/_restrict-login-signup/signup/sso/index'
+import { Route as RestrictLoginSignupLoginSsoIndexImport } from './routes/_restrict-login-signup/login/sso/index'
+import { Route as RestrictLoginSignupLoginSelectOrganizationIndexImport } from './routes/_restrict-login-signup/login/select-organization/index'
+import { Route as RestrictLoginSignupLoginLdapIndexImport } from './routes/_restrict-login-signup/login/ldap/index'
 import { Route as authenticatePersonalSettingsIndexImport } from './routes/_authenticate/personal-settings/index'
-import { Route as RestrictloginsignupLoginProviderSuccessImport } from './routes/_restrict_login_signup/login/provider/success'
-import { Route as RestrictloginsignupLoginProviderErrorImport } from './routes/_restrict_login_signup/login/provider/error'
-import { Route as authenticateOrgdetailsOrganizationIndexImport } from './routes/_authenticate/_org_details/organization/index'
-import { Route as authenticateOrgdetailsOrganizationNoneIndexImport } from './routes/_authenticate/_org_details/organization/none/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/settings/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/overview/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdMembersIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/members/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdBillingIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/billing/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/audit-logs/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdAdminIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/admin/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewImport } from './routes/_authenticate/_org_details/organization/$organizationId/secret-manager/overview'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewImport } from './routes/_authenticate/_org_details/organization/$organizationId/kms/overview'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewImport } from './routes/_authenticate/_org_details/organization/$organizationId/cert-manager/overview'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/index'
-import { Route as authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexImport } from './routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/index'
+import { Route as RestrictLoginSignupLoginProviderSuccessImport } from './routes/_restrict-login-signup/login/provider/success'
+import { Route as RestrictLoginSignupLoginProviderErrorImport } from './routes/_restrict-login-signup/login/provider/error'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/index'
+import { Route as AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerImport } from './routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/none/index'
+import { Route as AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewImport } from './routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager/overview'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index'
 
 // Create Virtual Routes
 
 const AuthenticatePersonalSettingsImport = createFileRoute(
   '/_authenticate/personal-settings',
 )()
+const AuthenticateCtxOrgDetailsOrganizationImport = createFileRoute(
+  '/_authenticate/_ctx-org-details/organization',
+)()
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdImport = createFileRoute(
+  '/_authenticate/_ctx-org-details/secret-manager/$projectId',
+)()
 
 // Create/Update Routes
 
-const RestrictloginsignupRoute = RestrictloginsignupImport.update({
-  id: '/_restrict_login_signup',
+const RestrictLoginSignupRoute = RestrictLoginSignupImport.update({
+  id: '/_restrict-login-signup',
   getParentRoute: () => rootRoute,
 } as any)
 
@@ -83,39 +91,39 @@ const AuthenticatePersonalSettingsRoute =
     getParentRoute: () => AuthenticateRoute,
   } as any)
 
-const RestrictloginsignupVerifyEmailRoute =
-  RestrictloginsignupVerifyEmailImport.update({
+const RestrictLoginSignupVerifyEmailRoute =
+  RestrictLoginSignupVerifyEmailImport.update({
     id: '/verify-email',
     path: '/verify-email',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupSignupinviteRoute =
-  RestrictloginsignupSignupinviteImport.update({
+const RestrictLoginSignupSignupinviteRoute =
+  RestrictLoginSignupSignupinviteImport.update({
     id: '/signupinvite',
     path: '/signupinvite',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupRequestnewinviteRoute =
-  RestrictloginsignupRequestnewinviteImport.update({
+const RestrictLoginSignupRequestnewinviteRoute =
+  RestrictLoginSignupRequestnewinviteImport.update({
     id: '/requestnewinvite',
     path: '/requestnewinvite',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupPasswordResetRoute =
-  RestrictloginsignupPasswordResetImport.update({
+const RestrictLoginSignupPasswordResetRoute =
+  RestrictLoginSignupPasswordResetImport.update({
     id: '/password-reset',
     path: '/password-reset',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupEmailNotVerifiedRoute =
-  RestrictloginsignupEmailNotVerifiedImport.update({
+const RestrictLoginSignupEmailNotVerifiedRoute =
+  RestrictLoginSignupEmailNotVerifiedImport.update({
     id: '/email-not-verified',
     path: '/email-not-verified',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
 const AuthenticateCliRedirectRoute = AuthenticateCliRedirectImport.update({
@@ -124,23 +132,30 @@ const AuthenticateCliRedirectRoute = AuthenticateCliRedirectImport.update({
   getParentRoute: () => AuthenticateRoute,
 } as any)
 
-const AuthenticateOrgdetailsRoute = AuthenticateOrgdetailsImport.update({
-  id: '/_org_details',
+const AuthenticateCtxOrgDetailsRoute = AuthenticateCtxOrgDetailsImport.update({
+  id: '/_ctx-org-details',
   getParentRoute: () => AuthenticateRoute,
 } as any)
 
-const RestrictloginsignupSignupIndexRoute =
-  RestrictloginsignupSignupIndexImport.update({
-    id: '/signup/',
-    path: '/signup/',
-    getParentRoute: () => RestrictloginsignupRoute,
+const AuthenticateCtxOrgDetailsOrganizationRoute =
+  AuthenticateCtxOrgDetailsOrganizationImport.update({
+    id: '/organization',
+    path: '/organization',
+    getParentRoute: () => AuthenticateCtxOrgDetailsRoute,
   } as any)
 
-const RestrictloginsignupLoginIndexRoute =
-  RestrictloginsignupLoginIndexImport.update({
+const RestrictLoginSignupSignupIndexRoute =
+  RestrictLoginSignupSignupIndexImport.update({
+    id: '/signup/',
+    path: '/signup/',
+    getParentRoute: () => RestrictLoginSignupRoute,
+  } as any)
+
+const RestrictLoginSignupLoginIndexRoute =
+  RestrictLoginSignupLoginIndexImport.update({
     id: '/login/',
     path: '/login/',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
 const authenticatePersonalSettingsLayoutRoute =
@@ -149,38 +164,39 @@ const authenticatePersonalSettingsLayoutRoute =
     getParentRoute: () => AuthenticatePersonalSettingsRoute,
   } as any)
 
-const authenticateOrgdetailsLayoutRoute =
-  authenticateOrgdetailsLayoutImport.update({
-    id: '/_org-layout',
-    getParentRoute: () => AuthenticateOrgdetailsRoute,
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdRoute =
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdImport.update({
+    id: '/secret-manager/$projectId',
+    path: '/secret-manager/$projectId',
+    getParentRoute: () => AuthenticateCtxOrgDetailsRoute,
   } as any)
 
-const RestrictloginsignupSignupSsoIndexRoute =
-  RestrictloginsignupSignupSsoIndexImport.update({
+const RestrictLoginSignupSignupSsoIndexRoute =
+  RestrictLoginSignupSignupSsoIndexImport.update({
     id: '/signup/sso/',
     path: '/signup/sso/',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupLoginSsoIndexRoute =
-  RestrictloginsignupLoginSsoIndexImport.update({
+const RestrictLoginSignupLoginSsoIndexRoute =
+  RestrictLoginSignupLoginSsoIndexImport.update({
     id: '/login/sso/',
     path: '/login/sso/',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupLoginSelectOrganizationIndexRoute =
-  RestrictloginsignupLoginSelectOrganizationIndexImport.update({
+const RestrictLoginSignupLoginSelectOrganizationIndexRoute =
+  RestrictLoginSignupLoginSelectOrganizationIndexImport.update({
     id: '/login/select-organization/',
     path: '/login/select-organization/',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupLoginLdapIndexRoute =
-  RestrictloginsignupLoginLdapIndexImport.update({
+const RestrictLoginSignupLoginLdapIndexRoute =
+  RestrictLoginSignupLoginLdapIndexImport.update({
     id: '/login/ldap/',
     path: '/login/ldap/',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
 const authenticatePersonalSettingsIndexRoute =
@@ -190,152 +206,191 @@ const authenticatePersonalSettingsIndexRoute =
     getParentRoute: () => authenticatePersonalSettingsLayoutRoute,
   } as any)
 
-const RestrictloginsignupLoginProviderSuccessRoute =
-  RestrictloginsignupLoginProviderSuccessImport.update({
+const RestrictLoginSignupLoginProviderSuccessRoute =
+  RestrictLoginSignupLoginProviderSuccessImport.update({
     id: '/login/provider/success',
     path: '/login/provider/success',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const RestrictloginsignupLoginProviderErrorRoute =
-  RestrictloginsignupLoginProviderErrorImport.update({
+const RestrictLoginSignupLoginProviderErrorRoute =
+  RestrictLoginSignupLoginProviderErrorImport.update({
     id: '/login/provider/error',
     path: '/login/provider/error',
-    getParentRoute: () => RestrictloginsignupRoute,
+    getParentRoute: () => RestrictLoginSignupRoute,
   } as any)
 
-const authenticateOrgdetailsOrganizationIndexRoute =
-  authenticateOrgdetailsOrganizationIndexImport.update({
-    id: '/organization/',
-    path: '/organization/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport.update({
+    id: '/_layout-org',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationRoute,
   } as any)
 
-const authenticateOrgdetailsOrganizationNoneIndexRoute =
-  authenticateOrgdetailsOrganizationNoneIndexImport.update({
-    id: '/organization/none/',
-    path: '/organization/none/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexImport.update({
+    id: '/',
+    path: '/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
   } as any)
 
-const authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexImport.update({
-    id: '/organization/$organizationId/settings/',
-    path: '/organization/$organizationId/settings/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
-  } as any)
-
-const authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexImport.update(
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRoute =
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerImport.update(
     {
-      id: '/organization/$organizationId/secret-sharing/',
-      path: '/organization/$organizationId/secret-sharing/',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/_layout-secret-manager',
+      getParentRoute: () =>
+        AuthenticateCtxOrgDetailsSecretManagerProjectIdRoute,
     } as any,
   )
 
-const authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexImport.update({
+    id: '/none/',
+    path: '/none/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute =
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewImport.update(
     {
-      id: '/organization/$organizationId/secret-scanning/',
-      path: '/organization/$organizationId/secret-scanning/',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/overview',
+      path: '/overview',
+      getParentRoute: () =>
+        AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRoute,
     } as any,
   )
 
-const authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexImport.update({
-    id: '/organization/$organizationId/overview/',
-    path: '/organization/$organizationId/overview/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
-  } as any)
-
-const authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdMembersIndexImport.update({
-    id: '/organization/$organizationId/members/',
-    path: '/organization/$organizationId/members/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
-  } as any)
-
-const authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdBillingIndexImport.update({
-    id: '/organization/$organizationId/billing/',
-    path: '/organization/$organizationId/billing/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
-  } as any)
-
-const authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexImport.update({
-    id: '/organization/$organizationId/audit-logs/',
-    path: '/organization/$organizationId/audit-logs/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
-  } as any)
-
-const authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdAdminIndexImport.update({
-    id: '/organization/$organizationId/admin/',
-    path: '/organization/$organizationId/admin/',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
-  } as any)
-
-const authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexImport.update(
     {
-      id: '/organization/$organizationId/secret-manager/overview',
-      path: '/organization/$organizationId/secret-manager/overview',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/$organizationId/settings/',
+      path: '/$organizationId/settings/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewImport.update({
-    id: '/organization/$organizationId/kms/overview',
-    path: '/organization/$organizationId/kms/overview',
-    getParentRoute: () => authenticateOrgdetailsLayoutRoute,
-  } as any)
-
-const authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexImport.update(
     {
-      id: '/organization/$organizationId/cert-manager/overview',
-      path: '/organization/$organizationId/cert-manager/overview',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/$organizationId/secret-sharing/',
+      path: '/$organizationId/secret-sharing/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexImport.update(
     {
-      id: '/organization/$organizationId/roles/$roleId/',
-      path: '/organization/$organizationId/roles/$roleId/',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/$organizationId/secret-scanning/',
+      path: '/$organizationId/secret-scanning/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexImport.update(
     {
-      id: '/organization/$organizationId/memberships/$membershipId/',
-      path: '/organization/$organizationId/memberships/$membershipId/',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/$organizationId/overview/',
+      path: '/$organizationId/overview/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexImport.update(
     {
-      id: '/organization/$organizationId/identities/$identityId/',
-      path: '/organization/$organizationId/identities/$identityId/',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/$organizationId/members/',
+      path: '/$organizationId/members/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute =
-  authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexImport.update(
     {
-      id: '/organization/$organizationId/groups/$groupId/',
-      path: '/organization/$organizationId/groups/$groupId/',
-      getParentRoute: () => authenticateOrgdetailsLayoutRoute,
+      id: '/$organizationId/billing/',
+      path: '/$organizationId/billing/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexImport.update(
+    {
+      id: '/$organizationId/audit-logs/',
+      path: '/$organizationId/audit-logs/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexImport.update(
+    {
+      id: '/$organizationId/admin/',
+      path: '/$organizationId/admin/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewImport.update(
+    {
+      id: '/$organizationId/secret-manager/overview',
+      path: '/$organizationId/secret-manager/overview',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewImport.update(
+    {
+      id: '/$organizationId/kms/overview',
+      path: '/$organizationId/kms/overview',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewImport.update(
+    {
+      id: '/$organizationId/cert-manager/overview',
+      path: '/$organizationId/cert-manager/overview',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexImport.update(
+    {
+      id: '/$organizationId/roles/$roleId/',
+      path: '/$organizationId/roles/$roleId/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexImport.update(
+    {
+      id: '/$organizationId/memberships/$membershipId/',
+      path: '/$organizationId/memberships/$membershipId/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexImport.update(
+    {
+      id: '/$organizationId/identities/$identityId/',
+      path: '/$organizationId/identities/$identityId/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexImport.update(
+    {
+      id: '/$organizationId/groups/$groupId/',
+      path: '/$organizationId/groups/$groupId/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
@@ -357,18 +412,18 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthenticateImport
       parentRoute: typeof rootRoute
     }
-    '/_restrict_login_signup': {
-      id: '/_restrict_login_signup'
+    '/_restrict-login-signup': {
+      id: '/_restrict-login-signup'
       path: ''
       fullPath: ''
-      preLoaderRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupImport
       parentRoute: typeof rootRoute
     }
-    '/_authenticate/_org_details': {
-      id: '/_authenticate/_org_details'
+    '/_authenticate/_ctx-org-details': {
+      id: '/_authenticate/_ctx-org-details'
       path: ''
       fullPath: ''
-      preLoaderRoute: typeof AuthenticateOrgdetailsImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsImport
       parentRoute: typeof AuthenticateImport
     }
     '/_authenticate/cli-redirect': {
@@ -378,47 +433,40 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthenticateCliRedirectImport
       parentRoute: typeof AuthenticateImport
     }
-    '/_restrict_login_signup/email-not-verified': {
-      id: '/_restrict_login_signup/email-not-verified'
+    '/_restrict-login-signup/email-not-verified': {
+      id: '/_restrict-login-signup/email-not-verified'
       path: '/email-not-verified'
       fullPath: '/email-not-verified'
-      preLoaderRoute: typeof RestrictloginsignupEmailNotVerifiedImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupEmailNotVerifiedImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/password-reset': {
-      id: '/_restrict_login_signup/password-reset'
+    '/_restrict-login-signup/password-reset': {
+      id: '/_restrict-login-signup/password-reset'
       path: '/password-reset'
       fullPath: '/password-reset'
-      preLoaderRoute: typeof RestrictloginsignupPasswordResetImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupPasswordResetImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/requestnewinvite': {
-      id: '/_restrict_login_signup/requestnewinvite'
+    '/_restrict-login-signup/requestnewinvite': {
+      id: '/_restrict-login-signup/requestnewinvite'
       path: '/requestnewinvite'
       fullPath: '/requestnewinvite'
-      preLoaderRoute: typeof RestrictloginsignupRequestnewinviteImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupRequestnewinviteImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/signupinvite': {
-      id: '/_restrict_login_signup/signupinvite'
+    '/_restrict-login-signup/signupinvite': {
+      id: '/_restrict-login-signup/signupinvite'
       path: '/signupinvite'
       fullPath: '/signupinvite'
-      preLoaderRoute: typeof RestrictloginsignupSignupinviteImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupSignupinviteImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/verify-email': {
-      id: '/_restrict_login_signup/verify-email'
+    '/_restrict-login-signup/verify-email': {
+      id: '/_restrict-login-signup/verify-email'
       path: '/verify-email'
       fullPath: '/verify-email'
-      preLoaderRoute: typeof RestrictloginsignupVerifyEmailImport
-      parentRoute: typeof RestrictloginsignupImport
-    }
-    '/_authenticate/_org_details/_org-layout': {
-      id: '/_authenticate/_org_details/_org-layout'
-      path: ''
-      fullPath: ''
-      preLoaderRoute: typeof authenticateOrgdetailsLayoutImport
-      parentRoute: typeof AuthenticateOrgdetailsImport
+      preLoaderRoute: typeof RestrictLoginSignupVerifyEmailImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
     '/_authenticate/personal-settings': {
       id: '/_authenticate/personal-settings'
@@ -434,33 +482,47 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof authenticatePersonalSettingsLayoutImport
       parentRoute: typeof AuthenticatePersonalSettingsRoute
     }
-    '/_restrict_login_signup/login/': {
-      id: '/_restrict_login_signup/login/'
+    '/_restrict-login-signup/login/': {
+      id: '/_restrict-login-signup/login/'
       path: '/login'
       fullPath: '/login'
-      preLoaderRoute: typeof RestrictloginsignupLoginIndexImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupLoginIndexImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/signup/': {
-      id: '/_restrict_login_signup/signup/'
+    '/_restrict-login-signup/signup/': {
+      id: '/_restrict-login-signup/signup/'
       path: '/signup'
       fullPath: '/signup'
-      preLoaderRoute: typeof RestrictloginsignupSignupIndexImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupSignupIndexImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/login/provider/error': {
-      id: '/_restrict_login_signup/login/provider/error'
+    '/_authenticate/_ctx-org-details/organization': {
+      id: '/_authenticate/_ctx-org-details/organization'
+      path: '/organization'
+      fullPath: '/organization'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsImport
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org'
+      path: '/organization'
+      fullPath: '/organization'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationRoute
+    }
+    '/_restrict-login-signup/login/provider/error': {
+      id: '/_restrict-login-signup/login/provider/error'
       path: '/login/provider/error'
       fullPath: '/login/provider/error'
-      preLoaderRoute: typeof RestrictloginsignupLoginProviderErrorImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupLoginProviderErrorImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/login/provider/success': {
-      id: '/_restrict_login_signup/login/provider/success'
+    '/_restrict-login-signup/login/provider/success': {
+      id: '/_restrict-login-signup/login/provider/success'
       path: '/login/provider/success'
       fullPath: '/login/provider/success'
-      preLoaderRoute: typeof RestrictloginsignupLoginProviderSuccessImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupLoginProviderSuccessImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
     '/_authenticate/personal-settings/_personal-settings-layout/': {
       id: '/_authenticate/personal-settings/_personal-settings-layout/'
@@ -469,234 +531,303 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof authenticatePersonalSettingsIndexImport
       parentRoute: typeof authenticatePersonalSettingsLayoutImport
     }
-    '/_restrict_login_signup/login/ldap/': {
-      id: '/_restrict_login_signup/login/ldap/'
+    '/_restrict-login-signup/login/ldap/': {
+      id: '/_restrict-login-signup/login/ldap/'
       path: '/login/ldap'
       fullPath: '/login/ldap'
-      preLoaderRoute: typeof RestrictloginsignupLoginLdapIndexImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupLoginLdapIndexImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/login/select-organization/': {
-      id: '/_restrict_login_signup/login/select-organization/'
+    '/_restrict-login-signup/login/select-organization/': {
+      id: '/_restrict-login-signup/login/select-organization/'
       path: '/login/select-organization'
       fullPath: '/login/select-organization'
-      preLoaderRoute: typeof RestrictloginsignupLoginSelectOrganizationIndexImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupLoginSelectOrganizationIndexImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/login/sso/': {
-      id: '/_restrict_login_signup/login/sso/'
+    '/_restrict-login-signup/login/sso/': {
+      id: '/_restrict-login-signup/login/sso/'
       path: '/login/sso'
       fullPath: '/login/sso'
-      preLoaderRoute: typeof RestrictloginsignupLoginSsoIndexImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupLoginSsoIndexImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_restrict_login_signup/signup/sso/': {
-      id: '/_restrict_login_signup/signup/sso/'
+    '/_restrict-login-signup/signup/sso/': {
+      id: '/_restrict-login-signup/signup/sso/'
       path: '/signup/sso'
       fullPath: '/signup/sso'
-      preLoaderRoute: typeof RestrictloginsignupSignupSsoIndexImport
-      parentRoute: typeof RestrictloginsignupImport
+      preLoaderRoute: typeof RestrictLoginSignupSignupSsoIndexImport
+      parentRoute: typeof RestrictLoginSignupImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/'
-      path: '/organization'
-      fullPath: '/organization'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+    '/_authenticate/_ctx-org-details/secret-manager/$projectId': {
+      id: '/_authenticate/_ctx-org-details/secret-manager/$projectId'
+      path: '/secret-manager/$projectId'
+      fullPath: '/secret-manager/$projectId'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/none/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/none/'
-      path: '/organization/none'
+    '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager': {
+      id: '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager'
+      path: '/secret-manager/$projectId'
+      fullPath: '/secret-manager/$projectId'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdRoute
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/'
+      path: '/'
+      fullPath: '/organization/'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+    }
+    '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview': {
+      id: '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview'
+      path: '/overview'
+      fullPath: '/secret-manager/$projectId/overview'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerImport
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/none/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/none/'
+      path: '/none'
       fullPath: '/organization/none'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationNoneIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/cert-manager/overview': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/cert-manager/overview'
-      path: '/organization/$organizationId/cert-manager/overview'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview'
+      path: '/$organizationId/cert-manager/overview'
       fullPath: '/organization/$organizationId/cert-manager/overview'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/kms/overview': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/kms/overview'
-      path: '/organization/$organizationId/kms/overview'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview'
+      path: '/$organizationId/kms/overview'
       fullPath: '/organization/$organizationId/kms/overview'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-manager/overview': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-manager/overview'
-      path: '/organization/$organizationId/secret-manager/overview'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview'
+      path: '/$organizationId/secret-manager/overview'
       fullPath: '/organization/$organizationId/secret-manager/overview'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/admin/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/admin/'
-      path: '/organization/$organizationId/admin'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/'
+      path: '/$organizationId/admin'
       fullPath: '/organization/$organizationId/admin'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdAdminIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/audit-logs/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/audit-logs/'
-      path: '/organization/$organizationId/audit-logs'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/'
+      path: '/$organizationId/audit-logs'
       fullPath: '/organization/$organizationId/audit-logs'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/billing/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/billing/'
-      path: '/organization/$organizationId/billing'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/'
+      path: '/$organizationId/billing'
       fullPath: '/organization/$organizationId/billing'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdBillingIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/members/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/members/'
-      path: '/organization/$organizationId/members'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/'
+      path: '/$organizationId/members'
       fullPath: '/organization/$organizationId/members'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdMembersIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/overview/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/overview/'
-      path: '/organization/$organizationId/overview'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/'
+      path: '/$organizationId/overview'
       fullPath: '/organization/$organizationId/overview'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/'
-      path: '/organization/$organizationId/secret-scanning'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/'
+      path: '/$organizationId/secret-scanning'
       fullPath: '/organization/$organizationId/secret-scanning'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-sharing/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-sharing/'
-      path: '/organization/$organizationId/secret-sharing'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/'
+      path: '/$organizationId/secret-sharing'
       fullPath: '/organization/$organizationId/secret-sharing'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/'
-      path: '/organization/$organizationId/settings'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/'
+      path: '/$organizationId/settings'
       fullPath: '/organization/$organizationId/settings'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/'
-      path: '/organization/$organizationId/groups/$groupId'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/'
+      path: '/$organizationId/groups/$groupId'
       fullPath: '/organization/$organizationId/groups/$groupId'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/'
-      path: '/organization/$organizationId/identities/$identityId'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/'
+      path: '/$organizationId/identities/$identityId'
       fullPath: '/organization/$organizationId/identities/$identityId'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/'
-      path: '/organization/$organizationId/memberships/$membershipId'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/'
+      path: '/$organizationId/memberships/$membershipId'
       fullPath: '/organization/$organizationId/memberships/$membershipId'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/': {
-      id: '/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/'
-      path: '/organization/$organizationId/roles/$roleId'
+    '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/'
+      path: '/$organizationId/roles/$roleId'
       fullPath: '/organization/$organizationId/roles/$roleId'
-      preLoaderRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexImport
-      parentRoute: typeof authenticateOrgdetailsLayoutImport
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
   }
 }
 
 // Create and export the route tree
 
-interface authenticateOrgdetailsLayoutRouteChildren {
-  authenticateOrgdetailsOrganizationIndexRoute: typeof authenticateOrgdetailsOrganizationIndexRoute
-  authenticateOrgdetailsOrganizationNoneIndexRoute: typeof authenticateOrgdetailsOrganizationNoneIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute
-  authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute
-  authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute
-  authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute
-  authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute: typeof authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute
+interface AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteChildren {
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute
 }
 
-const authenticateOrgdetailsLayoutRouteChildren: authenticateOrgdetailsLayoutRouteChildren =
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteChildren: AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteChildren =
   {
-    authenticateOrgdetailsOrganizationIndexRoute:
-      authenticateOrgdetailsOrganizationIndexRoute,
-    authenticateOrgdetailsOrganizationNoneIndexRoute:
-      authenticateOrgdetailsOrganizationNoneIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute,
-    authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute:
-      authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute,
   }
 
-const authenticateOrgdetailsLayoutRouteWithChildren =
-  authenticateOrgdetailsLayoutRoute._addFileChildren(
-    authenticateOrgdetailsLayoutRouteChildren,
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteWithChildren =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute._addFileChildren(
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteChildren,
   )
 
-interface AuthenticateOrgdetailsRouteChildren {
-  authenticateOrgdetailsLayoutRoute: typeof authenticateOrgdetailsLayoutRouteWithChildren
+interface AuthenticateCtxOrgDetailsOrganizationRouteChildren {
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteWithChildren
 }
 
-const AuthenticateOrgdetailsRouteChildren: AuthenticateOrgdetailsRouteChildren =
+const AuthenticateCtxOrgDetailsOrganizationRouteChildren: AuthenticateCtxOrgDetailsOrganizationRouteChildren =
   {
-    authenticateOrgdetailsLayoutRoute:
-      authenticateOrgdetailsLayoutRouteWithChildren,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteWithChildren,
   }
 
-const AuthenticateOrgdetailsRouteWithChildren =
-  AuthenticateOrgdetailsRoute._addFileChildren(
-    AuthenticateOrgdetailsRouteChildren,
+const AuthenticateCtxOrgDetailsOrganizationRouteWithChildren =
+  AuthenticateCtxOrgDetailsOrganizationRoute._addFileChildren(
+    AuthenticateCtxOrgDetailsOrganizationRouteChildren,
+  )
+
+interface AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteChildren {
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute
+}
+
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteChildren: AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteChildren =
+  {
+    AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute:
+      AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute,
+  }
+
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren =
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRoute._addFileChildren(
+    AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteChildren,
+  )
+
+interface AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteChildren {
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren
+}
+
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteChildren: AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteChildren =
+  {
+    AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRoute:
+      AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren,
+  }
+
+const AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteWithChildren =
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdRoute._addFileChildren(
+    AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteChildren,
+  )
+
+interface AuthenticateCtxOrgDetailsRouteChildren {
+  AuthenticateCtxOrgDetailsOrganizationRoute: typeof AuthenticateCtxOrgDetailsOrganizationRouteWithChildren
+  AuthenticateCtxOrgDetailsSecretManagerProjectIdRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteWithChildren
+}
+
+const AuthenticateCtxOrgDetailsRouteChildren: AuthenticateCtxOrgDetailsRouteChildren =
+  {
+    AuthenticateCtxOrgDetailsOrganizationRoute:
+      AuthenticateCtxOrgDetailsOrganizationRouteWithChildren,
+    AuthenticateCtxOrgDetailsSecretManagerProjectIdRoute:
+      AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteWithChildren,
+  }
+
+const AuthenticateCtxOrgDetailsRouteWithChildren =
+  AuthenticateCtxOrgDetailsRoute._addFileChildren(
+    AuthenticateCtxOrgDetailsRouteChildren,
   )
 
 interface authenticatePersonalSettingsLayoutRouteChildren {
@@ -730,13 +861,13 @@ const AuthenticatePersonalSettingsRouteWithChildren =
   )
 
 interface AuthenticateRouteChildren {
-  AuthenticateOrgdetailsRoute: typeof AuthenticateOrgdetailsRouteWithChildren
+  AuthenticateCtxOrgDetailsRoute: typeof AuthenticateCtxOrgDetailsRouteWithChildren
   AuthenticateCliRedirectRoute: typeof AuthenticateCliRedirectRoute
   AuthenticatePersonalSettingsRoute: typeof AuthenticatePersonalSettingsRouteWithChildren
 }
 
 const AuthenticateRouteChildren: AuthenticateRouteChildren = {
-  AuthenticateOrgdetailsRoute: AuthenticateOrgdetailsRouteWithChildren,
+  AuthenticateCtxOrgDetailsRoute: AuthenticateCtxOrgDetailsRouteWithChildren,
   AuthenticateCliRedirectRoute: AuthenticateCliRedirectRoute,
   AuthenticatePersonalSettingsRoute:
     AuthenticatePersonalSettingsRouteWithChildren,
@@ -746,164 +877,173 @@ const AuthenticateRouteWithChildren = AuthenticateRoute._addFileChildren(
   AuthenticateRouteChildren,
 )
 
-interface RestrictloginsignupRouteChildren {
-  RestrictloginsignupEmailNotVerifiedRoute: typeof RestrictloginsignupEmailNotVerifiedRoute
-  RestrictloginsignupPasswordResetRoute: typeof RestrictloginsignupPasswordResetRoute
-  RestrictloginsignupRequestnewinviteRoute: typeof RestrictloginsignupRequestnewinviteRoute
-  RestrictloginsignupSignupinviteRoute: typeof RestrictloginsignupSignupinviteRoute
-  RestrictloginsignupVerifyEmailRoute: typeof RestrictloginsignupVerifyEmailRoute
-  RestrictloginsignupLoginIndexRoute: typeof RestrictloginsignupLoginIndexRoute
-  RestrictloginsignupSignupIndexRoute: typeof RestrictloginsignupSignupIndexRoute
-  RestrictloginsignupLoginProviderErrorRoute: typeof RestrictloginsignupLoginProviderErrorRoute
-  RestrictloginsignupLoginProviderSuccessRoute: typeof RestrictloginsignupLoginProviderSuccessRoute
-  RestrictloginsignupLoginLdapIndexRoute: typeof RestrictloginsignupLoginLdapIndexRoute
-  RestrictloginsignupLoginSelectOrganizationIndexRoute: typeof RestrictloginsignupLoginSelectOrganizationIndexRoute
-  RestrictloginsignupLoginSsoIndexRoute: typeof RestrictloginsignupLoginSsoIndexRoute
-  RestrictloginsignupSignupSsoIndexRoute: typeof RestrictloginsignupSignupSsoIndexRoute
+interface RestrictLoginSignupRouteChildren {
+  RestrictLoginSignupEmailNotVerifiedRoute: typeof RestrictLoginSignupEmailNotVerifiedRoute
+  RestrictLoginSignupPasswordResetRoute: typeof RestrictLoginSignupPasswordResetRoute
+  RestrictLoginSignupRequestnewinviteRoute: typeof RestrictLoginSignupRequestnewinviteRoute
+  RestrictLoginSignupSignupinviteRoute: typeof RestrictLoginSignupSignupinviteRoute
+  RestrictLoginSignupVerifyEmailRoute: typeof RestrictLoginSignupVerifyEmailRoute
+  RestrictLoginSignupLoginIndexRoute: typeof RestrictLoginSignupLoginIndexRoute
+  RestrictLoginSignupSignupIndexRoute: typeof RestrictLoginSignupSignupIndexRoute
+  RestrictLoginSignupLoginProviderErrorRoute: typeof RestrictLoginSignupLoginProviderErrorRoute
+  RestrictLoginSignupLoginProviderSuccessRoute: typeof RestrictLoginSignupLoginProviderSuccessRoute
+  RestrictLoginSignupLoginLdapIndexRoute: typeof RestrictLoginSignupLoginLdapIndexRoute
+  RestrictLoginSignupLoginSelectOrganizationIndexRoute: typeof RestrictLoginSignupLoginSelectOrganizationIndexRoute
+  RestrictLoginSignupLoginSsoIndexRoute: typeof RestrictLoginSignupLoginSsoIndexRoute
+  RestrictLoginSignupSignupSsoIndexRoute: typeof RestrictLoginSignupSignupSsoIndexRoute
 }
 
-const RestrictloginsignupRouteChildren: RestrictloginsignupRouteChildren = {
-  RestrictloginsignupEmailNotVerifiedRoute:
-    RestrictloginsignupEmailNotVerifiedRoute,
-  RestrictloginsignupPasswordResetRoute: RestrictloginsignupPasswordResetRoute,
-  RestrictloginsignupRequestnewinviteRoute:
-    RestrictloginsignupRequestnewinviteRoute,
-  RestrictloginsignupSignupinviteRoute: RestrictloginsignupSignupinviteRoute,
-  RestrictloginsignupVerifyEmailRoute: RestrictloginsignupVerifyEmailRoute,
-  RestrictloginsignupLoginIndexRoute: RestrictloginsignupLoginIndexRoute,
-  RestrictloginsignupSignupIndexRoute: RestrictloginsignupSignupIndexRoute,
-  RestrictloginsignupLoginProviderErrorRoute:
-    RestrictloginsignupLoginProviderErrorRoute,
-  RestrictloginsignupLoginProviderSuccessRoute:
-    RestrictloginsignupLoginProviderSuccessRoute,
-  RestrictloginsignupLoginLdapIndexRoute:
-    RestrictloginsignupLoginLdapIndexRoute,
-  RestrictloginsignupLoginSelectOrganizationIndexRoute:
-    RestrictloginsignupLoginSelectOrganizationIndexRoute,
-  RestrictloginsignupLoginSsoIndexRoute: RestrictloginsignupLoginSsoIndexRoute,
-  RestrictloginsignupSignupSsoIndexRoute:
-    RestrictloginsignupSignupSsoIndexRoute,
+const RestrictLoginSignupRouteChildren: RestrictLoginSignupRouteChildren = {
+  RestrictLoginSignupEmailNotVerifiedRoute:
+    RestrictLoginSignupEmailNotVerifiedRoute,
+  RestrictLoginSignupPasswordResetRoute: RestrictLoginSignupPasswordResetRoute,
+  RestrictLoginSignupRequestnewinviteRoute:
+    RestrictLoginSignupRequestnewinviteRoute,
+  RestrictLoginSignupSignupinviteRoute: RestrictLoginSignupSignupinviteRoute,
+  RestrictLoginSignupVerifyEmailRoute: RestrictLoginSignupVerifyEmailRoute,
+  RestrictLoginSignupLoginIndexRoute: RestrictLoginSignupLoginIndexRoute,
+  RestrictLoginSignupSignupIndexRoute: RestrictLoginSignupSignupIndexRoute,
+  RestrictLoginSignupLoginProviderErrorRoute:
+    RestrictLoginSignupLoginProviderErrorRoute,
+  RestrictLoginSignupLoginProviderSuccessRoute:
+    RestrictLoginSignupLoginProviderSuccessRoute,
+  RestrictLoginSignupLoginLdapIndexRoute:
+    RestrictLoginSignupLoginLdapIndexRoute,
+  RestrictLoginSignupLoginSelectOrganizationIndexRoute:
+    RestrictLoginSignupLoginSelectOrganizationIndexRoute,
+  RestrictLoginSignupLoginSsoIndexRoute: RestrictLoginSignupLoginSsoIndexRoute,
+  RestrictLoginSignupSignupSsoIndexRoute:
+    RestrictLoginSignupSignupSsoIndexRoute,
 }
 
-const RestrictloginsignupRouteWithChildren =
-  RestrictloginsignupRoute._addFileChildren(RestrictloginsignupRouteChildren)
+const RestrictLoginSignupRouteWithChildren =
+  RestrictLoginSignupRoute._addFileChildren(RestrictLoginSignupRouteChildren)
 
 export interface FileRoutesByFullPath {
   '/': typeof IndexRoute
-  '': typeof authenticateOrgdetailsLayoutRouteWithChildren
+  '': typeof AuthenticateCtxOrgDetailsRouteWithChildren
   '/cli-redirect': typeof AuthenticateCliRedirectRoute
-  '/email-not-verified': typeof RestrictloginsignupEmailNotVerifiedRoute
-  '/password-reset': typeof RestrictloginsignupPasswordResetRoute
-  '/requestnewinvite': typeof RestrictloginsignupRequestnewinviteRoute
-  '/signupinvite': typeof RestrictloginsignupSignupinviteRoute
-  '/verify-email': typeof RestrictloginsignupVerifyEmailRoute
+  '/email-not-verified': typeof RestrictLoginSignupEmailNotVerifiedRoute
+  '/password-reset': typeof RestrictLoginSignupPasswordResetRoute
+  '/requestnewinvite': typeof RestrictLoginSignupRequestnewinviteRoute
+  '/signupinvite': typeof RestrictLoginSignupSignupinviteRoute
+  '/verify-email': typeof RestrictLoginSignupVerifyEmailRoute
   '/personal-settings': typeof authenticatePersonalSettingsLayoutRouteWithChildren
-  '/login': typeof RestrictloginsignupLoginIndexRoute
-  '/signup': typeof RestrictloginsignupSignupIndexRoute
-  '/login/provider/error': typeof RestrictloginsignupLoginProviderErrorRoute
-  '/login/provider/success': typeof RestrictloginsignupLoginProviderSuccessRoute
+  '/login': typeof RestrictLoginSignupLoginIndexRoute
+  '/signup': typeof RestrictLoginSignupSignupIndexRoute
+  '/organization': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteWithChildren
+  '/login/provider/error': typeof RestrictLoginSignupLoginProviderErrorRoute
+  '/login/provider/success': typeof RestrictLoginSignupLoginProviderSuccessRoute
   '/personal-settings/': typeof authenticatePersonalSettingsIndexRoute
-  '/login/ldap': typeof RestrictloginsignupLoginLdapIndexRoute
-  '/login/select-organization': typeof RestrictloginsignupLoginSelectOrganizationIndexRoute
-  '/login/sso': typeof RestrictloginsignupLoginSsoIndexRoute
-  '/signup/sso': typeof RestrictloginsignupSignupSsoIndexRoute
-  '/organization': typeof authenticateOrgdetailsOrganizationIndexRoute
-  '/organization/none': typeof authenticateOrgdetailsOrganizationNoneIndexRoute
-  '/organization/$organizationId/cert-manager/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute
-  '/organization/$organizationId/kms/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute
-  '/organization/$organizationId/secret-manager/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute
-  '/organization/$organizationId/admin': typeof authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute
-  '/organization/$organizationId/audit-logs': typeof authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute
-  '/organization/$organizationId/billing': typeof authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute
-  '/organization/$organizationId/members': typeof authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute
-  '/organization/$organizationId/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute
-  '/organization/$organizationId/secret-scanning': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute
-  '/organization/$organizationId/secret-sharing': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute
-  '/organization/$organizationId/settings': typeof authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute
-  '/organization/$organizationId/groups/$groupId': typeof authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute
-  '/organization/$organizationId/identities/$identityId': typeof authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute
-  '/organization/$organizationId/memberships/$membershipId': typeof authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute
-  '/organization/$organizationId/roles/$roleId': typeof authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute
+  '/login/ldap': typeof RestrictLoginSignupLoginLdapIndexRoute
+  '/login/select-organization': typeof RestrictLoginSignupLoginSelectOrganizationIndexRoute
+  '/login/sso': typeof RestrictLoginSignupLoginSsoIndexRoute
+  '/signup/sso': typeof RestrictLoginSignupSignupSsoIndexRoute
+  '/secret-manager/$projectId': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren
+  '/organization/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute
+  '/secret-manager/$projectId/overview': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute
+  '/organization/none': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute
+  '/organization/$organizationId/cert-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute
+  '/organization/$organizationId/kms/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute
+  '/organization/$organizationId/secret-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute
+  '/organization/$organizationId/admin': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute
+  '/organization/$organizationId/audit-logs': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute
+  '/organization/$organizationId/billing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute
+  '/organization/$organizationId/members': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute
+  '/organization/$organizationId/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute
+  '/organization/$organizationId/secret-scanning': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute
+  '/organization/$organizationId/secret-sharing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute
+  '/organization/$organizationId/settings': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute
+  '/organization/$organizationId/groups/$groupId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute
+  '/organization/$organizationId/identities/$identityId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute
+  '/organization/$organizationId/memberships/$membershipId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute
+  '/organization/$organizationId/roles/$roleId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute
 }
 
 export interface FileRoutesByTo {
   '/': typeof IndexRoute
-  '': typeof authenticateOrgdetailsLayoutRouteWithChildren
+  '': typeof AuthenticateCtxOrgDetailsRouteWithChildren
   '/cli-redirect': typeof AuthenticateCliRedirectRoute
-  '/email-not-verified': typeof RestrictloginsignupEmailNotVerifiedRoute
-  '/password-reset': typeof RestrictloginsignupPasswordResetRoute
-  '/requestnewinvite': typeof RestrictloginsignupRequestnewinviteRoute
-  '/signupinvite': typeof RestrictloginsignupSignupinviteRoute
-  '/verify-email': typeof RestrictloginsignupVerifyEmailRoute
+  '/email-not-verified': typeof RestrictLoginSignupEmailNotVerifiedRoute
+  '/password-reset': typeof RestrictLoginSignupPasswordResetRoute
+  '/requestnewinvite': typeof RestrictLoginSignupRequestnewinviteRoute
+  '/signupinvite': typeof RestrictLoginSignupSignupinviteRoute
+  '/verify-email': typeof RestrictLoginSignupVerifyEmailRoute
   '/personal-settings': typeof authenticatePersonalSettingsIndexRoute
-  '/login': typeof RestrictloginsignupLoginIndexRoute
-  '/signup': typeof RestrictloginsignupSignupIndexRoute
-  '/login/provider/error': typeof RestrictloginsignupLoginProviderErrorRoute
-  '/login/provider/success': typeof RestrictloginsignupLoginProviderSuccessRoute
-  '/login/ldap': typeof RestrictloginsignupLoginLdapIndexRoute
-  '/login/select-organization': typeof RestrictloginsignupLoginSelectOrganizationIndexRoute
-  '/login/sso': typeof RestrictloginsignupLoginSsoIndexRoute
-  '/signup/sso': typeof RestrictloginsignupSignupSsoIndexRoute
-  '/organization': typeof authenticateOrgdetailsOrganizationIndexRoute
-  '/organization/none': typeof authenticateOrgdetailsOrganizationNoneIndexRoute
-  '/organization/$organizationId/cert-manager/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute
-  '/organization/$organizationId/kms/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute
-  '/organization/$organizationId/secret-manager/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute
-  '/organization/$organizationId/admin': typeof authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute
-  '/organization/$organizationId/audit-logs': typeof authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute
-  '/organization/$organizationId/billing': typeof authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute
-  '/organization/$organizationId/members': typeof authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute
-  '/organization/$organizationId/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute
-  '/organization/$organizationId/secret-scanning': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute
-  '/organization/$organizationId/secret-sharing': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute
-  '/organization/$organizationId/settings': typeof authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute
-  '/organization/$organizationId/groups/$groupId': typeof authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute
-  '/organization/$organizationId/identities/$identityId': typeof authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute
-  '/organization/$organizationId/memberships/$membershipId': typeof authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute
-  '/organization/$organizationId/roles/$roleId': typeof authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute
+  '/login': typeof RestrictLoginSignupLoginIndexRoute
+  '/signup': typeof RestrictLoginSignupSignupIndexRoute
+  '/organization': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute
+  '/login/provider/error': typeof RestrictLoginSignupLoginProviderErrorRoute
+  '/login/provider/success': typeof RestrictLoginSignupLoginProviderSuccessRoute
+  '/login/ldap': typeof RestrictLoginSignupLoginLdapIndexRoute
+  '/login/select-organization': typeof RestrictLoginSignupLoginSelectOrganizationIndexRoute
+  '/login/sso': typeof RestrictLoginSignupLoginSsoIndexRoute
+  '/signup/sso': typeof RestrictLoginSignupSignupSsoIndexRoute
+  '/secret-manager/$projectId': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren
+  '/secret-manager/$projectId/overview': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute
+  '/organization/none': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute
+  '/organization/$organizationId/cert-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute
+  '/organization/$organizationId/kms/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute
+  '/organization/$organizationId/secret-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute
+  '/organization/$organizationId/admin': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute
+  '/organization/$organizationId/audit-logs': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute
+  '/organization/$organizationId/billing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute
+  '/organization/$organizationId/members': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute
+  '/organization/$organizationId/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute
+  '/organization/$organizationId/secret-scanning': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute
+  '/organization/$organizationId/secret-sharing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute
+  '/organization/$organizationId/settings': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute
+  '/organization/$organizationId/groups/$groupId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute
+  '/organization/$organizationId/identities/$identityId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute
+  '/organization/$organizationId/memberships/$membershipId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute
+  '/organization/$organizationId/roles/$roleId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute
 }
 
 export interface FileRoutesById {
   __root__: typeof rootRoute
   '/': typeof IndexRoute
   '/_authenticate': typeof AuthenticateRouteWithChildren
-  '/_restrict_login_signup': typeof RestrictloginsignupRouteWithChildren
-  '/_authenticate/_org_details': typeof AuthenticateOrgdetailsRouteWithChildren
+  '/_restrict-login-signup': typeof RestrictLoginSignupRouteWithChildren
+  '/_authenticate/_ctx-org-details': typeof AuthenticateCtxOrgDetailsRouteWithChildren
   '/_authenticate/cli-redirect': typeof AuthenticateCliRedirectRoute
-  '/_restrict_login_signup/email-not-verified': typeof RestrictloginsignupEmailNotVerifiedRoute
-  '/_restrict_login_signup/password-reset': typeof RestrictloginsignupPasswordResetRoute
-  '/_restrict_login_signup/requestnewinvite': typeof RestrictloginsignupRequestnewinviteRoute
-  '/_restrict_login_signup/signupinvite': typeof RestrictloginsignupSignupinviteRoute
-  '/_restrict_login_signup/verify-email': typeof RestrictloginsignupVerifyEmailRoute
-  '/_authenticate/_org_details/_org-layout': typeof authenticateOrgdetailsLayoutRouteWithChildren
+  '/_restrict-login-signup/email-not-verified': typeof RestrictLoginSignupEmailNotVerifiedRoute
+  '/_restrict-login-signup/password-reset': typeof RestrictLoginSignupPasswordResetRoute
+  '/_restrict-login-signup/requestnewinvite': typeof RestrictLoginSignupRequestnewinviteRoute
+  '/_restrict-login-signup/signupinvite': typeof RestrictLoginSignupSignupinviteRoute
+  '/_restrict-login-signup/verify-email': typeof RestrictLoginSignupVerifyEmailRoute
   '/_authenticate/personal-settings': typeof AuthenticatePersonalSettingsRouteWithChildren
   '/_authenticate/personal-settings/_personal-settings-layout': typeof authenticatePersonalSettingsLayoutRouteWithChildren
-  '/_restrict_login_signup/login/': typeof RestrictloginsignupLoginIndexRoute
-  '/_restrict_login_signup/signup/': typeof RestrictloginsignupSignupIndexRoute
-  '/_restrict_login_signup/login/provider/error': typeof RestrictloginsignupLoginProviderErrorRoute
-  '/_restrict_login_signup/login/provider/success': typeof RestrictloginsignupLoginProviderSuccessRoute
+  '/_restrict-login-signup/login/': typeof RestrictLoginSignupLoginIndexRoute
+  '/_restrict-login-signup/signup/': typeof RestrictLoginSignupSignupIndexRoute
+  '/_authenticate/_ctx-org-details/organization': typeof AuthenticateCtxOrgDetailsOrganizationRouteWithChildren
+  '/_authenticate/_ctx-org-details/organization/_layout-org': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteWithChildren
+  '/_restrict-login-signup/login/provider/error': typeof RestrictLoginSignupLoginProviderErrorRoute
+  '/_restrict-login-signup/login/provider/success': typeof RestrictLoginSignupLoginProviderSuccessRoute
   '/_authenticate/personal-settings/_personal-settings-layout/': typeof authenticatePersonalSettingsIndexRoute
-  '/_restrict_login_signup/login/ldap/': typeof RestrictloginsignupLoginLdapIndexRoute
-  '/_restrict_login_signup/login/select-organization/': typeof RestrictloginsignupLoginSelectOrganizationIndexRoute
-  '/_restrict_login_signup/login/sso/': typeof RestrictloginsignupLoginSsoIndexRoute
-  '/_restrict_login_signup/signup/sso/': typeof RestrictloginsignupSignupSsoIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/': typeof authenticateOrgdetailsOrganizationIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/none/': typeof authenticateOrgdetailsOrganizationNoneIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/cert-manager/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdCertManagerOverviewRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/kms/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdKmsOverviewRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-manager/overview': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretManagerOverviewRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/admin/': typeof authenticateOrgdetailsOrganizationOrganizationIdAdminIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/audit-logs/': typeof authenticateOrgdetailsOrganizationOrganizationIdAuditLogsIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/billing/': typeof authenticateOrgdetailsOrganizationOrganizationIdBillingIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/members/': typeof authenticateOrgdetailsOrganizationOrganizationIdMembersIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/overview/': typeof authenticateOrgdetailsOrganizationOrganizationIdOverviewIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretScanningIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-sharing/': typeof authenticateOrgdetailsOrganizationOrganizationIdSecretSharingIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/': typeof authenticateOrgdetailsOrganizationOrganizationIdSettingsIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/': typeof authenticateOrgdetailsOrganizationOrganizationIdGroupsGroupIdIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/': typeof authenticateOrgdetailsOrganizationOrganizationIdIdentitiesIdentityIdIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/': typeof authenticateOrgdetailsOrganizationOrganizationIdMembershipsMembershipIdIndexRoute
-  '/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/': typeof authenticateOrgdetailsOrganizationOrganizationIdRolesRoleIdIndexRoute
+  '/_restrict-login-signup/login/ldap/': typeof RestrictLoginSignupLoginLdapIndexRoute
+  '/_restrict-login-signup/login/select-organization/': typeof RestrictLoginSignupLoginSelectOrganizationIndexRoute
+  '/_restrict-login-signup/login/sso/': typeof RestrictLoginSignupLoginSsoIndexRoute
+  '/_restrict-login-signup/signup/sso/': typeof RestrictLoginSignupSignupSsoIndexRoute
+  '/_authenticate/_ctx-org-details/secret-manager/$projectId': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdRouteWithChildren
+  '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren
+  '/_authenticate/_ctx-org-details/organization/_layout-org/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute
+  '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/none/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexRoute
 }
 
 export interface FileRouteTypes {
@@ -920,6 +1060,7 @@ export interface FileRouteTypes {
     | '/personal-settings'
     | '/login'
     | '/signup'
+    | '/organization'
     | '/login/provider/error'
     | '/login/provider/success'
     | '/personal-settings/'
@@ -927,7 +1068,9 @@ export interface FileRouteTypes {
     | '/login/select-organization'
     | '/login/sso'
     | '/signup/sso'
-    | '/organization'
+    | '/secret-manager/$projectId'
+    | '/organization/'
+    | '/secret-manager/$projectId/overview'
     | '/organization/none'
     | '/organization/$organizationId/cert-manager/overview'
     | '/organization/$organizationId/kms/overview'
@@ -957,13 +1100,15 @@ export interface FileRouteTypes {
     | '/personal-settings'
     | '/login'
     | '/signup'
+    | '/organization'
     | '/login/provider/error'
     | '/login/provider/success'
     | '/login/ldap'
     | '/login/select-organization'
     | '/login/sso'
     | '/signup/sso'
-    | '/organization'
+    | '/secret-manager/$projectId'
+    | '/secret-manager/$projectId/overview'
     | '/organization/none'
     | '/organization/$organizationId/cert-manager/overview'
     | '/organization/$organizationId/kms/overview'
@@ -984,56 +1129,60 @@ export interface FileRouteTypes {
     | '__root__'
     | '/'
     | '/_authenticate'
-    | '/_restrict_login_signup'
-    | '/_authenticate/_org_details'
+    | '/_restrict-login-signup'
+    | '/_authenticate/_ctx-org-details'
     | '/_authenticate/cli-redirect'
-    | '/_restrict_login_signup/email-not-verified'
-    | '/_restrict_login_signup/password-reset'
-    | '/_restrict_login_signup/requestnewinvite'
-    | '/_restrict_login_signup/signupinvite'
-    | '/_restrict_login_signup/verify-email'
-    | '/_authenticate/_org_details/_org-layout'
+    | '/_restrict-login-signup/email-not-verified'
+    | '/_restrict-login-signup/password-reset'
+    | '/_restrict-login-signup/requestnewinvite'
+    | '/_restrict-login-signup/signupinvite'
+    | '/_restrict-login-signup/verify-email'
     | '/_authenticate/personal-settings'
     | '/_authenticate/personal-settings/_personal-settings-layout'
-    | '/_restrict_login_signup/login/'
-    | '/_restrict_login_signup/signup/'
-    | '/_restrict_login_signup/login/provider/error'
-    | '/_restrict_login_signup/login/provider/success'
+    | '/_restrict-login-signup/login/'
+    | '/_restrict-login-signup/signup/'
+    | '/_authenticate/_ctx-org-details/organization'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org'
+    | '/_restrict-login-signup/login/provider/error'
+    | '/_restrict-login-signup/login/provider/success'
     | '/_authenticate/personal-settings/_personal-settings-layout/'
-    | '/_restrict_login_signup/login/ldap/'
-    | '/_restrict_login_signup/login/select-organization/'
-    | '/_restrict_login_signup/login/sso/'
-    | '/_restrict_login_signup/signup/sso/'
-    | '/_authenticate/_org_details/_org-layout/organization/'
-    | '/_authenticate/_org_details/_org-layout/organization/none/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/cert-manager/overview'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/kms/overview'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-manager/overview'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/admin/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/audit-logs/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/billing/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/members/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/overview/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-sharing/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/'
-    | '/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/'
+    | '/_restrict-login-signup/login/ldap/'
+    | '/_restrict-login-signup/login/select-organization/'
+    | '/_restrict-login-signup/login/sso/'
+    | '/_restrict-login-signup/signup/sso/'
+    | '/_authenticate/_ctx-org-details/secret-manager/$projectId'
+    | '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/'
+    | '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/none/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/'
   fileRoutesById: FileRoutesById
 }
 
 export interface RootRouteChildren {
   IndexRoute: typeof IndexRoute
   AuthenticateRoute: typeof AuthenticateRouteWithChildren
-  RestrictloginsignupRoute: typeof RestrictloginsignupRouteWithChildren
+  RestrictLoginSignupRoute: typeof RestrictLoginSignupRouteWithChildren
 }
 
 const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
   AuthenticateRoute: AuthenticateRouteWithChildren,
-  RestrictloginsignupRoute: RestrictloginsignupRouteWithChildren,
+  RestrictLoginSignupRoute: RestrictLoginSignupRouteWithChildren,
 }
 
 export const routeTree = rootRoute
@@ -1048,7 +1197,7 @@ export const routeTree = rootRoute
       "children": [
         "/",
         "/_authenticate",
-        "/_restrict_login_signup"
+        "/_restrict-login-signup"
       ]
     },
     "/": {
@@ -1057,82 +1206,60 @@ export const routeTree = rootRoute
     "/_authenticate": {
       "filePath": "_authenticate.tsx",
       "children": [
-        "/_authenticate/_org_details",
+        "/_authenticate/_ctx-org-details",
         "/_authenticate/cli-redirect",
         "/_authenticate/personal-settings"
       ]
     },
-    "/_restrict_login_signup": {
-      "filePath": "_restrict_login_signup.tsx",
+    "/_restrict-login-signup": {
+      "filePath": "_restrict-login-signup.tsx",
       "children": [
-        "/_restrict_login_signup/email-not-verified",
-        "/_restrict_login_signup/password-reset",
-        "/_restrict_login_signup/requestnewinvite",
-        "/_restrict_login_signup/signupinvite",
-        "/_restrict_login_signup/verify-email",
-        "/_restrict_login_signup/login/",
-        "/_restrict_login_signup/signup/",
-        "/_restrict_login_signup/login/provider/error",
-        "/_restrict_login_signup/login/provider/success",
-        "/_restrict_login_signup/login/ldap/",
-        "/_restrict_login_signup/login/select-organization/",
-        "/_restrict_login_signup/login/sso/",
-        "/_restrict_login_signup/signup/sso/"
+        "/_restrict-login-signup/email-not-verified",
+        "/_restrict-login-signup/password-reset",
+        "/_restrict-login-signup/requestnewinvite",
+        "/_restrict-login-signup/signupinvite",
+        "/_restrict-login-signup/verify-email",
+        "/_restrict-login-signup/login/",
+        "/_restrict-login-signup/signup/",
+        "/_restrict-login-signup/login/provider/error",
+        "/_restrict-login-signup/login/provider/success",
+        "/_restrict-login-signup/login/ldap/",
+        "/_restrict-login-signup/login/select-organization/",
+        "/_restrict-login-signup/login/sso/",
+        "/_restrict-login-signup/signup/sso/"
       ]
     },
-    "/_authenticate/_org_details": {
-      "filePath": "_authenticate/_org_details.tsx",
+    "/_authenticate/_ctx-org-details": {
+      "filePath": "_authenticate/_ctx-org-details.tsx",
       "parent": "/_authenticate",
       "children": [
-        "/_authenticate/_org_details/_org-layout"
+        "/_authenticate/_ctx-org-details/organization",
+        "/_authenticate/_ctx-org-details/secret-manager/$projectId"
       ]
     },
     "/_authenticate/cli-redirect": {
       "filePath": "_authenticate/cli-redirect.tsx",
       "parent": "/_authenticate"
     },
-    "/_restrict_login_signup/email-not-verified": {
-      "filePath": "_restrict_login_signup/email-not-verified.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/email-not-verified": {
+      "filePath": "_restrict-login-signup/email-not-verified.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/password-reset": {
-      "filePath": "_restrict_login_signup/password-reset.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/password-reset": {
+      "filePath": "_restrict-login-signup/password-reset.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/requestnewinvite": {
-      "filePath": "_restrict_login_signup/requestnewinvite.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/requestnewinvite": {
+      "filePath": "_restrict-login-signup/requestnewinvite.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/signupinvite": {
-      "filePath": "_restrict_login_signup/signupinvite.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/signupinvite": {
+      "filePath": "_restrict-login-signup/signupinvite.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/verify-email": {
-      "filePath": "_restrict_login_signup/verify-email.tsx",
-      "parent": "/_restrict_login_signup"
-    },
-    "/_authenticate/_org_details/_org-layout": {
-      "filePath": "_authenticate/_org_details/layout.tsx",
-      "parent": "/_authenticate/_org_details",
-      "children": [
-        "/_authenticate/_org_details/_org-layout/organization/",
-        "/_authenticate/_org_details/_org-layout/organization/none/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/cert-manager/overview",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/kms/overview",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-manager/overview",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/admin/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/audit-logs/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/billing/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/members/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/overview/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-sharing/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/",
-        "/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/"
-      ]
+    "/_restrict-login-signup/verify-email": {
+      "filePath": "_restrict-login-signup/verify-email.tsx",
+      "parent": "/_restrict-login-signup"
     },
     "/_authenticate/personal-settings": {
       "filePath": "_authenticate/personal-settings",
@@ -1148,109 +1275,157 @@ export const routeTree = rootRoute
         "/_authenticate/personal-settings/_personal-settings-layout/"
       ]
     },
-    "/_restrict_login_signup/login/": {
-      "filePath": "_restrict_login_signup/login/index.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/login/": {
+      "filePath": "_restrict-login-signup/login/index.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/signup/": {
-      "filePath": "_restrict_login_signup/signup/index.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/signup/": {
+      "filePath": "_restrict-login-signup/signup/index.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/login/provider/error": {
-      "filePath": "_restrict_login_signup/login/provider/error.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_authenticate/_ctx-org-details/organization": {
+      "filePath": "_authenticate/_ctx-org-details/organization",
+      "parent": "/_authenticate/_ctx-org-details",
+      "children": [
+        "/_authenticate/_ctx-org-details/organization/_layout-org"
+      ]
     },
-    "/_restrict_login_signup/login/provider/success": {
-      "filePath": "_restrict_login_signup/login/provider/success.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_authenticate/_ctx-org-details/organization/_layout-org": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization",
+      "children": [
+        "/_authenticate/_ctx-org-details/organization/_layout-org/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/none/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/"
+      ]
+    },
+    "/_restrict-login-signup/login/provider/error": {
+      "filePath": "_restrict-login-signup/login/provider/error.tsx",
+      "parent": "/_restrict-login-signup"
+    },
+    "/_restrict-login-signup/login/provider/success": {
+      "filePath": "_restrict-login-signup/login/provider/success.tsx",
+      "parent": "/_restrict-login-signup"
     },
     "/_authenticate/personal-settings/_personal-settings-layout/": {
       "filePath": "_authenticate/personal-settings/index.tsx",
       "parent": "/_authenticate/personal-settings/_personal-settings-layout"
     },
-    "/_restrict_login_signup/login/ldap/": {
-      "filePath": "_restrict_login_signup/login/ldap/index.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/login/ldap/": {
+      "filePath": "_restrict-login-signup/login/ldap/index.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/login/select-organization/": {
-      "filePath": "_restrict_login_signup/login/select-organization/index.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/login/select-organization/": {
+      "filePath": "_restrict-login-signup/login/select-organization/index.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/login/sso/": {
-      "filePath": "_restrict_login_signup/login/sso/index.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/login/sso/": {
+      "filePath": "_restrict-login-signup/login/sso/index.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_restrict_login_signup/signup/sso/": {
-      "filePath": "_restrict_login_signup/signup/sso/index.tsx",
-      "parent": "/_restrict_login_signup"
+    "/_restrict-login-signup/signup/sso/": {
+      "filePath": "_restrict-login-signup/signup/sso/index.tsx",
+      "parent": "/_restrict-login-signup"
     },
-    "/_authenticate/_org_details/_org-layout/organization/": {
-      "filePath": "_authenticate/_org_details/organization/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/secret-manager/$projectId": {
+      "filePath": "_authenticate/_ctx-org-details/secret-manager.$projectId",
+      "parent": "/_authenticate/_ctx-org-details",
+      "children": [
+        "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager"
+      ]
     },
-    "/_authenticate/_org_details/_org-layout/organization/none/": {
-      "filePath": "_authenticate/_org_details/organization/none/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager": {
+      "filePath": "_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager.tsx",
+      "parent": "/_authenticate/_ctx-org-details/secret-manager/$projectId",
+      "children": [
+        "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview"
+      ]
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/cert-manager/overview": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/cert-manager/overview.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/kms/overview": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/kms/overview.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview": {
+      "filePath": "_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager/overview.tsx",
+      "parent": "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-manager/overview": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/secret-manager/overview.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/none/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/none/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/admin/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/admin/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/audit-logs/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/audit-logs/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/billing/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/billing/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/members/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/members/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/overview/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/overview/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/secret-scanning/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-sharing/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/secret-sharing/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/settings/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/groups/$groupId/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/identities/$identityId/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/": {
-      "filePath": "_authenticate/_org_details/organization/$organizationId/roles/$roleId/index.tsx",
-      "parent": "/_authenticate/_org_details/_org-layout"
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     }
   }
 }
diff --git a/frontend-v2/src/routes/_authenticate/_org_details.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details.tsx
similarity index 87%
rename from frontend-v2/src/routes/_authenticate/_org_details.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details.tsx
index 0fa379502..cf8b07f83 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details.tsx
@@ -4,7 +4,8 @@ import { fetchOrganizationById, organizationKeys } from "@app/hooks/api/organiza
 import { fetchUserOrgPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
 import { fetchOrgSubscription, subscriptionQueryKeys } from "@app/hooks/api/subscriptions/queries";
 
-export const Route = createFileRoute("/_authenticate/_org_details")({
+// Route context to fill in organization's data like details, subscription etc
+export const Route = createFileRoute("/_authenticate/_ctx-org-details")({
   beforeLoad: async ({ context }) => {
     const organizationId = context.organizationId!;
     await context.queryClient.ensureQueryData({
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/layout.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org.tsx
similarity index 62%
rename from frontend-v2/src/routes/_authenticate/_org_details/layout.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org.tsx
index 452bc15de..22db715df 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/layout.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org.tsx
@@ -2,6 +2,6 @@ import { createFileRoute } from "@tanstack/react-router";
 
 import { OrganizationLayout } from "@app/layouts/OrganizationLayout";
 
-export const Route = createFileRoute("/_authenticate/_org_details/_org-layout")({
+export const Route = createFileRoute("/_authenticate/_ctx-org-details/organization/_layout-org")({
   component: OrganizationLayout
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/admin/-components/OrgAdminProjects/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/admin/-components/OrgAdminProjects/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/admin/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx
similarity index 94%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/admin/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx
index edef86c13..06742a1dc 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/admin/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx
@@ -40,7 +40,7 @@ const OrgAdminPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/admin/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/"
 )({
   component: OrgAdminPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsFilter.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsFilter.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsFilter.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsFilter.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsTableRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTableRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/LogsTableRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTableRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/types.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/types.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/-components/types.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/types.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx
similarity index 91%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx
index 229bb9717..a0f1ed03c 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/audit-logs/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx
@@ -25,7 +25,7 @@ const AuditLogsPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/audit-logs/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/"
 )({
   component: AuditLogsPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/BillingCloudTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/BillingCloudTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/BillingCloudTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/BillingCloudTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/CurrentPlanSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/CurrentPlanSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/CurrentPlanSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/CurrentPlanSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/ManagePlansModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/ManagePlansModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/ManagePlansTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/ManagePlansTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/PreviewSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/PreviewSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/PreviewSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/PreviewSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingCloudTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/CompanyNameSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/CompanyNameSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/CompanyNameSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/CompanyNameSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/TaxIDModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/TaxIDModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/TaxIDSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/TaxIDSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/TaxIDTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/TaxIDTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingDetailsTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingReceiptsTab/InvoicesTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/InvoicesTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingReceiptsTab/InvoicesTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/InvoicesTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingReceiptsTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingReceiptsTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingSelfHostedTab/LicensesSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/LicensesSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingSelfHostedTab/LicensesSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/LicensesSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingSelfHostedTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingSelfHostedTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingTabGroup/BillingTabGroup.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/BillingTabGroup.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingTabGroup/BillingTabGroup.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/BillingTabGroup.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingTabGroup/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/BillingTabGroup/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx
similarity index 93%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx
index 62b1b61f2..503ffe14d 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/billing/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx
@@ -44,7 +44,7 @@ const BillingRoute = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/billing/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/"
 )({
   component: BillingRoute
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/cert-manager/overview.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx
similarity index 78%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/cert-manager/overview.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx
index 5be0fdc59..ef0ba6a6a 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/cert-manager/overview.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx
@@ -7,7 +7,7 @@ import { ProductOverview } from "../secret-manager/overview";
 const CertManagerOverviewPage = () => <ProductOverview type={ProjectType.CertificateManager} />;
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/cert-manager/overview"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview"
 )({
   component: CertManagerOverviewPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/AddGroupMemberModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/AddGroupMemberModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/AddGroupMemberModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/AddGroupMemberModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupCreateUpdateModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupCreateUpdateModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupCreateUpdateModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupCreateUpdateModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/GroupMembersSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index.tsx
index 6473baf9e..c42505fab 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/groups/$groupId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index.tsx
@@ -39,7 +39,7 @@ const GroupPage = withPermission(
   () => {
     const navigate = useNavigate();
     const params = useParams({
-      from: "/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/"
     });
     const groupId = params.groupId as string;
     const { currentOrg } = useOrganization();
@@ -214,7 +214,7 @@ const GroupDetailPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/groups/$groupId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/"
 )({
   component: GroupDetailPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityClientSecretModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityClientSecretModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityClientSecretModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityClientSecretModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityProjectsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityTokenListModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenListModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityTokenListModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenListModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityTokenModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/IdentityTokenModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index.tsx
index 2b486d560..ef6660b04 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/identities/$identityId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index.tsx
@@ -48,7 +48,7 @@ export const IdentitySection = withPermission(
   () => {
     const navigate = useNavigate();
     const params = useParams({
-      from: "/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/"
     });
     const identityId = params.identityId as string;
     const { currentOrg } = useOrganization();
@@ -381,7 +381,7 @@ const IdentityDetailPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/identities/$identityId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/"
 )({
   component: IdentityDetailPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/kms/overview.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx
similarity index 79%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/kms/overview.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx
index 758d899de..3bda1ca22 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/kms/overview.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx
@@ -7,7 +7,7 @@ import { ProductOverview } from "../secret-manager/overview";
 const KeyManagerOverviewPage = () => <ProductOverview type={ProjectType.KMS} />;
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/kms/overview"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview"
 )({
   component: KeyManagerOverviewPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/OrgGroupsTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/OrgGroupsTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/OrgGroupsTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/OrgGroupsTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgGroupsTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/OrgIdentityTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/OrgIdentityTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/OrgIdentityTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/OrgIdentityTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgIdentityTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/OrgMembersTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/OrgMembersTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/OrgMembersTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/OrgMembersTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgMembersTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgRoleTabSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/OrgRoleTabSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx
similarity index 93%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx
index 27b2036e7..3f2393002 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/members/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx
@@ -17,7 +17,7 @@ export const MembersSection = withPermission(
       from: "/organization/$organizationId/members"
     });
     const selectedTab = useSearch({
-      from: "/_authenticate/_org_details/_org-layout/organization/$organizationId/members/",
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/",
       select: (el) => el.selectedTab,
       structuralSharing: true
     });
@@ -82,7 +82,7 @@ const MembersPageQuerySchema = z.object({
 });
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/members/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/"
 )({
   component: MembersPage,
   validateSearch: zodValidator(MembersPageQuerySchema)
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserOrgMembershipModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserOrgMembershipModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserOrgMembershipModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserOrgMembershipModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/UserProjectsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index.tsx
index 6b9be3e72..9b56aa779 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/memberships/$membershipId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index.tsx
@@ -40,7 +40,7 @@ export const OrgUserPage = withPermission(
   () => {
     const navigate = useNavigate();
     const search = useParams({
-      from: "/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/"
     });
     const membershipId = search.membershipId as string;
     const { user } = useUser();
@@ -332,7 +332,7 @@ export default function OrgUserRoute() {
 }
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/memberships/$membershipId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/"
 )({
   component: OrgUserRoute
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/overview/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index.tsx
similarity index 82%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/overview/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index.tsx
index 79fa78ac9..6264c3a10 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/overview/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index.tsx
@@ -3,7 +3,7 @@ import { createFileRoute, redirect } from "@tanstack/react-router";
 import { ProjectType } from "@app/hooks/api/workspace/types";
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/overview/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/"
 )({
   beforeLoad: ({ context }) => {
     throw redirect({
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/OrgRoleModifySection.utils.ts b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/OrgRoleModifySection.utils.ts
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/OrgRoleModifySection.utils.ts
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/OrgRoleModifySection.utils.ts
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RoleDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RoleDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RoleModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RoleModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/RolePermissionsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index.tsx
index 18745b1e1..6fbeadf40 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/roles/$roleId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index.tsx
@@ -28,7 +28,7 @@ export const RolePage = withPermission(
   () => {
     const navigate = useNavigate();
     const params = useParams({
-      from: "/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/"
     });
     const roleId = params.roleId as string;
     const { currentOrg } = useOrganization();
@@ -191,7 +191,7 @@ const OrgRoleRoute = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/roles/$roleId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/"
 )({
   component: OrgRoleRoute
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-manager/overview.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-manager/overview.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx
index 641382884..9cae3c8c0 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-manager/overview.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx
@@ -184,7 +184,10 @@ export const ProductOverview = ({ type }: Props) => {
       onClick={() => {
         // TODO(rbr): fix this
         navigate({
-          to: getProjectHomePage(workspace)
+          to: getProjectHomePage(workspace),
+          params: {
+            projectId: workspace.id
+          }
         });
         localStorage.setItem("projectData.id", workspace.id);
       }}
@@ -251,7 +254,10 @@ export const ProductOverview = ({ type }: Props) => {
       onClick={() => {
         // TODO(rbr): fix this
         navigate({
-          to: getProjectHomePage(workspace)
+          to: getProjectHomePage(workspace),
+          params: {
+            projectId: workspace.id
+          }
         });
         localStorage.setItem("projectData.id", workspace.id);
       }}
@@ -522,7 +528,7 @@ export const ProductOverview = ({ type }: Props) => {
 const SecretManagerOverviewPage = () => <ProductOverview type={ProjectType.SecretManager} />;
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-manager/overview"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview"
 )({
   component: SecretManagerOverviewPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/-components/RiskStatusSelection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/RiskStatusSelection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/-components/RiskStatusSelection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/RiskStatusSelection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/-components/SecretScanningLogsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/SecretScanningLogsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/-components/SecretScanningLogsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/SecretScanningLogsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index.tsx
similarity index 96%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index.tsx
index 2f8da1a42..b901b5728 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-scanning/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index.tsx
@@ -24,7 +24,7 @@ import { SecretScanningLogsTable } from "./-components";
 const SecretScanning = withPermission(
   () => {
     const queryParams = useSearch({
-      from: "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/"
     });
     const { config } = useServerConfig();
     const { currentOrg } = useOrganization();
@@ -151,7 +151,7 @@ const SecretScanningQueryParams = z.object({
 });
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-scanning/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/"
 )({
   component: SecretScanning,
   validateSearch: zodValidator(SecretScanningQueryParams)
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/AddShareSecretModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/AddShareSecretModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/AddShareSecretModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/AddShareSecretModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/ShareSecretSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/ShareSecretSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/ShareSecretsRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/ShareSecretsRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/ShareSecretsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/ShareSecretsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index.tsx
similarity index 95%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index.tsx
index d1028009a..c2f5ffd96 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/secret-sharing/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index.tsx
@@ -49,7 +49,7 @@ const SecretSharing = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/secret-sharing/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/"
 )({
   component: SecretSharing
 });
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/AuditLogStreamTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/AuditLogStreamTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/ImportTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/ImportTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/ImportTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/ImportTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ImportTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/LDAPModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/LDAPModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OIDCModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OIDCModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OIDCModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OIDCModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgAuthTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgAuthTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgAuthTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgAuthTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgLDAPSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgLDAPSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgLDAPSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgLDAPSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgOIDCSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgOIDCSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgOIDCSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgOIDCSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgSCIMSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSCIMSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgSCIMSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSCIMSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgSSOSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSSOSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/OrgSSOSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSSOSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/SSOModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/SSOModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/SSOModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/SSOModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/ScimTokenModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ScimTokenModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/ScimTokenModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ScimTokenModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgAuthTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgDeleteSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgDeleteSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgEncryptionTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgGeneralTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgGeneralTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgIncidentContactsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgNameChangeSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgNameChangeSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx
similarity index 95%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx
index 582d2f0d1..cf6fc57ab 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx
@@ -24,7 +24,7 @@ const tabs = [
 ];
 export const OrgTabGroup = () => {
   const search = useSearch({
-    from: "/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/"
+    from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/"
   });
   const [selectedTab, setSelectedTab] = useState(search.selectedTab || tabs[0].key);
 
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgTabGroup/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgTabGroup/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/ProjectTemplatesTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index.tsx
similarity index 94%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index.tsx
index f098121c8..6b6043cf5 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/$organizationId/settings/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index.tsx
@@ -39,7 +39,7 @@ export const SettingsOrgQueryParams = z.object({
 });
 
 export const Route = createFileRoute(
-  "/_authenticate/_org_details/_org-layout/organization/$organizationId/settings/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/"
 )({
   component: SettingsOrg,
   validateSearch: zodValidator(SettingsOrgQueryParams)
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/index.tsx
similarity index 79%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/index.tsx
index 6cad699a6..36ec3c102 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/index.tsx
@@ -2,7 +2,7 @@ import { createFileRoute, redirect } from "@tanstack/react-router";
 
 import { ProjectType } from "@app/hooks/api/workspace/types";
 
-export const Route = createFileRoute("/_authenticate/_org_details/_org-layout/organization/")({
+export const Route = createFileRoute("/_authenticate/_ctx-org-details/organization/_layout-org/")({
   beforeLoad: ({ context }) => {
     redirect({
       throw: true,
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/organization/none/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/none/index.tsx
similarity index 90%
rename from frontend-v2/src/routes/_authenticate/_org_details/organization/none/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/none/index.tsx
index daaa4c125..3602a7eb5 100644
--- a/frontend-v2/src/routes/_authenticate/_org_details/organization/none/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/none/index.tsx
@@ -31,6 +31,8 @@ const NoneOrganization = () => {
   );
 };
 
-export const Route = createFileRoute("/_authenticate/_org_details/_org-layout/organization/none/")({
+export const Route = createFileRoute(
+  "/_authenticate/_ctx-org-details/organization/_layout-org/none/"
+)({
   component: NoneOrganization
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager.tsx
new file mode 100644
index 000000000..eda8f59df
--- /dev/null
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager.tsx
@@ -0,0 +1,23 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { workspaceKeys } from "@app/hooks/api";
+import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
+import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
+import { ProjectLayout } from "@app/layouts/ProjectLayout";
+
+export const Route = createFileRoute(
+  "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager"
+)({
+  component: ProjectLayout,
+  beforeLoad: async ({ params, context }) => {
+    await context.queryClient.ensureQueryData({
+      queryKey: workspaceKeys.getWorkspaceById(params.projectId),
+      queryFn: () => fetchWorkspaceById(params.projectId)
+    });
+
+    await context.queryClient.ensureQueryData({
+      queryKey: roleQueryKeys.getUserProjectPermissions({ workspaceId: params.projectId }),
+      queryFn: () => fetchUserProjectPermissions({ workspaceId: params.projectId })
+    });
+  }
+});
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager/overview.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager/overview.tsx
new file mode 100644
index 000000000..1071cab12
--- /dev/null
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/secret-manager.$projectId/_layout-secret-manager/overview.tsx
@@ -0,0 +1,16 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+export const Route = createFileRoute(
+  "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview"
+)({
+  component: RouteComponent
+});
+
+function RouteComponent() {
+  return (
+    <div>
+      Hello
+      "/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview"!
+    </div>
+  );
+}
diff --git a/frontend-v2/src/routes/_authenticate/_org_details/__virtual.ts b/frontend-v2/src/routes/_authenticate/_org_details/__virtual.ts
deleted file mode 100644
index 3ac2c9d71..000000000
--- a/frontend-v2/src/routes/_authenticate/_org_details/__virtual.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { defineVirtualSubtreeConfig, layout, physical } from "@tanstack/virtual-file-routes";
-
-export default defineVirtualSubtreeConfig([
-  layout("org-layout", "layout.tsx", [physical("/organization", "organization")])
-]);
diff --git a/frontend-v2/src/routes/_restrict_login_signup.tsx b/frontend-v2/src/routes/_restrict-login-signup.tsx
similarity index 92%
rename from frontend-v2/src/routes/_restrict_login_signup.tsx
rename to frontend-v2/src/routes/_restrict-login-signup.tsx
index 56295db2c..7f16b7818 100644
--- a/frontend-v2/src/routes/_restrict_login_signup.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup.tsx
@@ -4,7 +4,7 @@ import { authKeys, fetchAuthToken } from "@app/hooks/api/auth/queries";
 import { setAuthToken } from "@app/hooks/api/reactQuery";
 import { ProjectType } from "@app/hooks/api/workspace/types";
 
-export const Route = createFileRoute("/_restrict_login_signup")({
+export const Route = createFileRoute("/_restrict-login-signup")({
   beforeLoad: async ({ context }) => {
     const data = await context.queryClient
       .fetchQuery({
diff --git a/frontend-v2/src/routes/_restrict_login_signup/email-not-verified.tsx b/frontend-v2/src/routes/_restrict-login-signup/email-not-verified.tsx
similarity index 93%
rename from frontend-v2/src/routes/_restrict_login_signup/email-not-verified.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/email-not-verified.tsx
index 2918e9e92..78c902097 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/email-not-verified.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/email-not-verified.tsx
@@ -20,6 +20,6 @@ const EmailNotVerifiedPage = () => {
   );
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/email-not-verified")({
+export const Route = createFileRoute("/_restrict-login-signup/email-not-verified")({
   component: EmailNotVerifiedPage
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/InitialStep/InitialStep.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/InitialStep/InitialStep.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/InitialStep/InitialStep.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/InitialStep/InitialStep.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/InitialStep/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/InitialStep/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/InitialStep/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/InitialStep/index.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/Login.utils.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/Login.utils.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/Login.utils.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/Login.utils.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/LoginSSO.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/LoginSSO.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/LoginSSO.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/LoginSSO.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/PasswordStep/PasswordStep.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/PasswordStep/PasswordStep.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/PasswordStep/PasswordStep.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/PasswordStep/PasswordStep.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/PasswordStep/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/PasswordStep/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/PasswordStep/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/PasswordStep/index.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/SSOStep/SSOStep.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/SSOStep/SSOStep.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/SSOStep/SSOStep.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/SSOStep/SSOStep.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/SSOStep/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/SSOStep/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/SSOStep/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/SSOStep/index.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/-components/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/login/-components/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/-components/index.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/index.tsx
similarity index 97%
rename from frontend-v2/src/routes/_restrict_login_signup/login/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/index.tsx
index 36a1a0ab2..6296df4a9 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/login/index.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/login/index.tsx
@@ -76,6 +76,6 @@ const LoginPage = () => {
   );
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/login/")({
+export const Route = createFileRoute("/_restrict-login-signup/login/")({
   component: LoginPage
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/ldap/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/ldap/index.tsx
similarity index 98%
rename from frontend-v2/src/routes/_restrict_login_signup/login/ldap/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/ldap/index.tsx
index a004cff7d..078b6f3fd 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/login/ldap/index.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/login/ldap/index.tsx
@@ -153,6 +153,6 @@ const LoginLDAPPage = () => {
   );
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/login/ldap/")({
+export const Route = createFileRoute("/_restrict-login-signup/login/ldap/")({
   component: LoginLDAPPage
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/provider/error.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/provider/error.tsx
similarity index 83%
rename from frontend-v2/src/routes/_restrict_login_signup/login/provider/error.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/provider/error.tsx
index 37212eb07..edd9c8c5a 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/login/provider/error.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/login/provider/error.tsx
@@ -10,6 +10,6 @@ const LoginProviderError = () => {
   return <div />;
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/login/provider/error")({
+export const Route = createFileRoute("/_restrict-login-signup/login/provider/error")({
   component: LoginProviderError
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/provider/success.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/provider/success.tsx
similarity index 79%
rename from frontend-v2/src/routes/_restrict_login_signup/login/provider/success.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/provider/success.tsx
index 8a0e4b62f..799b40f31 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/login/provider/success.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/login/provider/success.tsx
@@ -6,7 +6,9 @@ import { z } from "zod";
 import SecurityClient from "@app/components/utilities/SecurityClient";
 
 const LoginProviderSuccess = () => {
-  const search = useSearch({ from: "/_restrict_login_signup/login/provider/success" });
+  const search = useSearch({
+    from: "/_restrict_login_signup/login/provider/success"
+  });
 
   useEffect(() => {
     SecurityClient.setProviderAuthToken(search.token);
@@ -20,7 +22,7 @@ const LoginProviderSuccessQuerySchema = z.object({
   token: z.string()
 });
 
-export const Route = createFileRoute("/_restrict_login_signup/login/provider/success")({
+export const Route = createFileRoute("/_restrict-login-signup/login/provider/success")({
   component: LoginProviderSuccess,
   validateSearch: zodValidator(LoginProviderSuccessQuerySchema)
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/select-organization/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/select-organization/index.tsx
similarity index 99%
rename from frontend-v2/src/routes/_restrict_login_signup/login/select-organization/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/select-organization/index.tsx
index 63df0b1c5..81c1111a2 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/login/select-organization/index.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/login/select-organization/index.tsx
@@ -277,6 +277,6 @@ const SelectOrganizationPage = () => {
   );
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/login/select-organization/")({
+export const Route = createFileRoute("/_restrict-login-signup/login/select-organization/")({
   component: SelectOrganizationPage
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/login/sso/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/login/sso/index.tsx
similarity index 97%
rename from frontend-v2/src/routes/_restrict_login_signup/login/sso/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/login/sso/index.tsx
index 0cdcc2de1..d3dfcebe1 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/login/sso/index.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/login/sso/index.tsx
@@ -64,7 +64,7 @@ const LoginSSOQueryParamsSchema = z.object({
   token: z.string()
 });
 
-export const Route = createFileRoute("/_restrict_login_signup/login/sso/")({
+export const Route = createFileRoute("/_restrict-login-signup/login/sso/")({
   component: LoginSSOPage,
   validateSearch: zodValidator(LoginSSOQueryParamsSchema)
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/password-reset.tsx b/frontend-v2/src/routes/_restrict-login-signup/password-reset.tsx
similarity index 99%
rename from frontend-v2/src/routes/_restrict_login_signup/password-reset.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/password-reset.tsx
index 86dfe2b3a..e2f7a5fc7 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/password-reset.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/password-reset.tsx
@@ -396,7 +396,7 @@ const PasswordResetPageQueryParamsSchema = z.object({
   to: z.string()
 });
 
-export const Route = createFileRoute("/_restrict_login_signup/password-reset")({
+export const Route = createFileRoute("/_restrict-login-signup/password-reset")({
   component: PasswordResetPage,
   validateSearch: zodValidator(PasswordResetPageQueryParamsSchema)
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/requestnewinvite.tsx b/frontend-v2/src/routes/_restrict-login-signup/requestnewinvite.tsx
similarity index 95%
rename from frontend-v2/src/routes/_restrict_login_signup/requestnewinvite.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/requestnewinvite.tsx
index 62e8dfa05..db2b76a11 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/requestnewinvite.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/requestnewinvite.tsx
@@ -32,6 +32,6 @@ const RequestNewInvitePage = () => {
   );
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/requestnewinvite")({
+export const Route = createFileRoute("/_restrict-login-signup/requestnewinvite")({
   component: RequestNewInvitePage
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/index.tsx
similarity index 98%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/index.tsx
index 94c28c372..0dbc401c7 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/signup/index.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/signup/index.tsx
@@ -173,7 +173,7 @@ const SignUpPage = () => {
   );
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/signup/")({
+export const Route = createFileRoute("/_restrict-login-signup/signup/")({
   component: SignUpPage,
   loader: ({ context }) => {
     console.log(context);
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/BackupPDFStep/BackupPDFStep.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/BackupPDFStep/BackupPDFStep.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/BackupPDFStep/BackupPDFStep.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/BackupPDFStep/BackupPDFStep.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/BackupPDFStep/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/BackupPDFStep/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/BackupPDFStep/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/BackupPDFStep/index.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/EmailConfirmationStep/EmailConfirmationStep.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/EmailConfirmationStep/EmailConfirmationStep.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/EmailConfirmationStep/EmailConfirmationStep.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/EmailConfirmationStep/EmailConfirmationStep.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/EmailConfirmationStep/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/EmailConfirmationStep/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/EmailConfirmationStep/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/EmailConfirmationStep/index.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/UserInfoSSOStep/UserInfoSSOStep.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/UserInfoSSOStep/UserInfoSSOStep.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/UserInfoSSOStep/UserInfoSSOStep.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/UserInfoSSOStep/UserInfoSSOStep.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/UserInfoSSOStep/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/UserInfoSSOStep/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/sso/-components/UserInfoSSOStep/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/sso/-components/UserInfoSSOStep/index.tsx
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/index.tsx b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/index.tsx
similarity index 97%
rename from frontend-v2/src/routes/_restrict_login_signup/signup/sso/index.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signup/sso/index.tsx
index 8694facc6..89cdecac0 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/signup/sso/index.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/signup/sso/index.tsx
@@ -91,7 +91,7 @@ const SignupSSOPageQueryParamsSchema = z.object({
   token: z.string()
 });
 
-export const Route = createFileRoute("/_restrict_login_signup/signup/sso/")({
+export const Route = createFileRoute("/_restrict-login-signup/signup/sso/")({
   component: SignupSSOPage,
   validateSearch: zodValidator(SignupSSOPageQueryParamsSchema)
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/signupinvite.tsx b/frontend-v2/src/routes/_restrict-login-signup/signupinvite.tsx
similarity index 99%
rename from frontend-v2/src/routes/_restrict_login_signup/signupinvite.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/signupinvite.tsx
index 82d1eb2b5..902827125 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/signupinvite.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/signupinvite.tsx
@@ -435,7 +435,7 @@ const SignupInvitePageQueryParamsSchema = z.object({
   organization_id: z.string()
 });
 
-export const Route = createFileRoute("/_restrict_login_signup/signupinvite")({
+export const Route = createFileRoute("/_restrict-login-signup/signupinvite")({
   component: SignupInvitePage,
   validateSearch: zodValidator(SignupInvitePageQueryParamsSchema)
 });
diff --git a/frontend-v2/src/routes/_restrict_login_signup/verify-email.tsx b/frontend-v2/src/routes/_restrict-login-signup/verify-email.tsx
similarity index 98%
rename from frontend-v2/src/routes/_restrict_login_signup/verify-email.tsx
rename to frontend-v2/src/routes/_restrict-login-signup/verify-email.tsx
index c79d28d13..ba86f6d12 100644
--- a/frontend-v2/src/routes/_restrict_login_signup/verify-email.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/verify-email.tsx
@@ -110,6 +110,6 @@ const VerifyEmailPage = () => {
   );
 };
 
-export const Route = createFileRoute("/_restrict_login_signup/verify-email")({
+export const Route = createFileRoute("/_restrict-login-signup/verify-email")({
   component: VerifyEmailPage
 });