diff --git a/frontend-v2/src/components/organization/CreateOrgModal/CreateOrgModal.tsx b/frontend-v2/src/components/organization/CreateOrgModal/CreateOrgModal.tsx
index 5341b7da5..b5712e596 100644
--- a/frontend-v2/src/components/organization/CreateOrgModal/CreateOrgModal.tsx
+++ b/frontend-v2/src/components/organization/CreateOrgModal/CreateOrgModal.tsx
@@ -58,7 +58,7 @@ export const CreateOrgModal: FC<CreateOrgModalProps> = ({ isOpen, onClose }) =>
       });
 
       navigate({
-        to: `/organization/$organizationId/${ProjectType.SecretManager}/overview` as const,
+        to: `/organization/${ProjectType.SecretManager}/overview` as const,
         params: {
           organizationId: organization.id
         }
diff --git a/frontend-v2/src/components/projects/NewProjectModal.tsx b/frontend-v2/src/components/projects/NewProjectModal.tsx
index 6906291bf..5ef17ec84 100644
--- a/frontend-v2/src/components/projects/NewProjectModal.tsx
+++ b/frontend-v2/src/components/projects/NewProjectModal.tsx
@@ -148,8 +148,7 @@ const NewProjectForm = ({ onOpenChange, projectType }: NewProjectFormProps) => {
       createNotification({ text: "Project created", type: "success" });
       reset();
       onOpenChange(false);
-      // TODO(rbr): make this return constant so this gets typed
-      navigate({ to: getProjectHomePage(project) });
+      navigate({ to: getProjectHomePage(project), params: { projectId: project.id } });
     } catch (err) {
       console.error(err);
       createNotification({ text: "Failed to create project", type: "error" });
diff --git a/frontend-v2/src/hooks/api/workspace/queries.tsx b/frontend-v2/src/hooks/api/workspace/queries.tsx
index 9fc2f9b71..be6821f99 100644
--- a/frontend-v2/src/hooks/api/workspace/queries.tsx
+++ b/frontend-v2/src/hooks/api/workspace/queries.tsx
@@ -150,7 +150,6 @@ export const useGetUserWorkspaces = ({
 } = {}) =>
   useQuery({
     queryKey: workspaceKeys.getAllUserWorkspace(type || ""),
-
     queryFn: () => fetchUserWorkspaces(includeRoles, type)
   });
 
diff --git a/frontend-v2/src/layouts/OrganizationLayout/OrganizationLayout.tsx b/frontend-v2/src/layouts/OrganizationLayout/OrganizationLayout.tsx
index ace362ba9..36f7d6177 100644
--- a/frontend-v2/src/layouts/OrganizationLayout/OrganizationLayout.tsx
+++ b/frontend-v2/src/layouts/OrganizationLayout/OrganizationLayout.tsx
@@ -8,7 +8,7 @@ import { Mfa } from "@app/components/auth/Mfa";
 import { CreateOrgModal } from "@app/components/organization/CreateOrgModal";
 import SecurityClient from "@app/components/utilities/SecurityClient";
 import { Menu, MenuItem } from "@app/components/v2";
-import { useOrganization, useUser } from "@app/context";
+import { useUser } from "@app/context";
 import { usePopUp, useToggle } from "@app/hooks";
 import { useSelectOrganization } from "@app/hooks/api";
 import { MfaMethod } from "@app/hooks/api/auth/types";
@@ -19,8 +19,6 @@ import { SidebarFooter } from "./components/SidebarFooter";
 import { SidebarHeader } from "./components/SidebarHeader";
 
 export const OrganizationLayout = () => {
-  const { currentOrg } = useOrganization();
-
   const [shouldShowMfa, toggleShowMfa] = useToggle(false);
   const [requiredMfaMethod, setRequiredMfaMethod] = useState(MfaMethod.EMAIL);
   const [mfaSuccessCallback, setMfaSuccessCallback] = useState<() => void>(() => {});
@@ -73,70 +71,42 @@ export const OrganizationLayout = () => {
                 <SidebarHeader onChangeOrg={handleOrgChange} />
                 <div className="px-1">
                   <Menu className="mt-4">
-                    <Link
-                      to={
-                        `/organization/$organizationId/${ProjectType.SecretManager}/overview` as const
-                      }
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to={`/organization/${ProjectType.SecretManager}/overview` as const}>
                       {({ isActive }) => (
                         <MenuItem isSelected={isActive} icon="system-outline-165-view-carousel">
                           Secret Management
                         </MenuItem>
                       )}
                     </Link>
-                    <Link
-                      to={
-                        `/organization/$organizationId/${ProjectType.CertificateManager}/overview` as const
-                      }
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to={`/organization/${ProjectType.CertificateManager}/overview` as const}>
                       {({ isActive }) => (
                         <MenuItem isSelected={isActive} icon="note">
                           Cert Management
                         </MenuItem>
                       )}
                     </Link>
-                    <Link
-                      to={`/organization/$organizationId/${ProjectType.KMS}/overview` as const}
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to={`/organization/${ProjectType.KMS}/overview` as const}>
                       {({ isActive }) => (
                         <MenuItem isSelected={isActive} icon="note">
                           Key Management
                         </MenuItem>
                       )}
                     </Link>
-                    <Link
-                      to="/organization/$organizationId/members"
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to="/organization/members">
                       {({ isActive }) => (
                         <MenuItem isSelected={isActive} icon="system-outline-96-groups">
                           Access Control
                         </MenuItem>
                       )}
                     </Link>
-                    <Link
-                      to="/organization/$organizationId/secret-scanning"
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to="/organization/secret-scanning">
                       {({ isActive }) => (
                         <MenuItem isSelected={isActive} icon="system-outline-69-document-scan">
                           Secret Scanning
                         </MenuItem>
                       )}
                     </Link>
-                    <Link
-                      to="/organization/$organizationId/secret-sharing"
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to="/organization/secret-sharing">
                       {({ isActive }) => (
                         <MenuItem isSelected={isActive} icon="system-outline-90-lock-closed">
                           Secret Sharing
@@ -146,11 +116,7 @@ export const OrganizationLayout = () => {
                     {(window.location.origin.includes("https://app.infisical.com") ||
                       window.location.origin.includes("https://eu.infisical.com") ||
                       window.location.origin.includes("https://gamma.infisical.com")) && (
-                      <Link
-                        to="/organization/$organizationId/billing"
-                        params={{ organizationId: currentOrg.id }}
-                        activeOptions={{ exact: true }}
-                      >
+                      <Link to="/organization/billing">
                         {({ isActive }) => (
                           <MenuItem
                             isSelected={isActive}
@@ -161,22 +127,14 @@ export const OrganizationLayout = () => {
                         )}
                       </Link>
                     )}
-                    <Link
-                      to="/organization/$organizationId/audit-logs"
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to="/organization/audit-logs">
                       {({ isActive }) => (
                         <MenuItem isSelected={isActive} icon="system-outline-168-view-headline">
                           Audit Logs
                         </MenuItem>
                       )}
                     </Link>
-                    <Link
-                      to="/organization/$organizationId/settings"
-                      params={{ organizationId: currentOrg.id }}
-                      activeOptions={{ exact: true }}
-                    >
+                    <Link to="/organization/settings">
                       {({ isActive }) => (
                         <MenuItem
                           isSelected={isActive}
diff --git a/frontend-v2/src/layouts/OrganizationLayout/components/SidebarFooter/SidebarFooter.tsx b/frontend-v2/src/layouts/OrganizationLayout/components/SidebarFooter/SidebarFooter.tsx
index cb113e66a..9c7d55fcf 100644
--- a/frontend-v2/src/layouts/OrganizationLayout/components/SidebarFooter/SidebarFooter.tsx
+++ b/frontend-v2/src/layouts/OrganizationLayout/components/SidebarFooter/SidebarFooter.tsx
@@ -62,10 +62,7 @@ export const SidebarFooter = () => {
       {(window.location.origin.includes("https://app.infisical.com") ||
         window.location.origin.includes("https://gamma.infisical.com")) && <WishForm />}
       <Link
-        to="/organization/$organizationId/members"
-        params={{
-          organizationId: currentOrg?.id
-        }}
+        to="/organization/members"
         search={{
           action: "invite"
         }}
diff --git a/frontend-v2/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx b/frontend-v2/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx
index 948df5a3f..f256dc2a2 100644
--- a/frontend-v2/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx
+++ b/frontend-v2/src/layouts/PersonalSettingsLayout/PersonalSettingsLayout.tsx
@@ -1,7 +1,7 @@
 import { useTranslation } from "react-i18next";
 import { faArrowLeft, faInfo, faMobile, faQuestion } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { Link, Outlet, useRouteContext } from "@tanstack/react-router";
+import { Link, Outlet } from "@tanstack/react-router";
 
 import { WishForm } from "@app/components/features/WishForm";
 import {
@@ -16,9 +16,6 @@ import { InsecureConnectionBanner } from "../OrganizationLayout/components/Insec
 import { INFISICAL_SUPPORT_OPTIONS } from "../OrganizationLayout/components/SidebarFooter/SidebarFooter";
 
 export const PersonalSettingsLayout = () => {
-  const { organizationId } = useRouteContext({
-    from: "/_authenticate/personal-settings/_personal-settings-layout"
-  });
   const { t } = useTranslation();
 
   const infisicalPlatformVersion = import.meta.env.VITE_INFISICAL_PLATFORM_VERSION;
@@ -31,12 +28,7 @@ export const PersonalSettingsLayout = () => {
           <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 className="flex-grow">
-                <Link
-                  to={
-                    `/organization/$organizationId/${ProjectType.SecretManager}/overview` as const
-                  }
-                  params={{ organizationId }}
-                >
+                <Link to={`/organization/${ProjectType.SecretManager}/overview` as const}>
                   <div className="my-6 flex cursor-default items-center justify-center pr-2 text-sm text-mineshaft-300 hover:text-mineshaft-100">
                     <FontAwesomeIcon icon={faArrowLeft} className="pr-3" />
                     Back to organization
diff --git a/frontend-v2/src/layouts/ProjectLayout/ProjectLayout.tsx b/frontend-v2/src/layouts/ProjectLayout/ProjectLayout.tsx
index bbc4d928b..cec706cae 100644
--- a/frontend-v2/src/layouts/ProjectLayout/ProjectLayout.tsx
+++ b/frontend-v2/src/layouts/ProjectLayout/ProjectLayout.tsx
@@ -19,8 +19,8 @@ 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";
+import { SidebarHeader } from "./components/SidebarHeader";
 
 // This is a generic layout shared by all types of projects.
 // If the product layout differs significantly, create a new layout as needed.
diff --git a/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx b/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
index 9b24c73d4..0b0049297 100644
--- a/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
+++ b/frontend-v2/src/layouts/ProjectLayout/components/SidebarHeader/SidebarHeader.tsx
@@ -42,7 +42,7 @@ export const SidebarHeader = ({ onChangeOrg }: Prop) => {
 
   return (
     <div className="flex h-12 cursor-default items-center px-3 pt-6">
-      <Link to={`/organization/$organizationId/${currentWorkspace.type}/overview`} params={{}}>
+      <Link to={`/organization/$${currentWorkspace.type}/overview` as const}>
         <div className="pl-1 pr-2 text-mineshaft-400 duration-200 hover:text-mineshaft-100">
           <FontAwesomeIcon icon={faArrowLeft} />
         </div>
diff --git a/frontend-v2/src/routeTree.gen.ts b/frontend-v2/src/routeTree.gen.ts
index 6bfd5beb5..5a86d54fb 100644
--- a/frontend-v2/src/routeTree.gen.ts
+++ b/frontend-v2/src/routeTree.gen.ts
@@ -36,23 +36,23 @@ import { Route as RestrictLoginSignupLoginProviderErrorImport } from './routes/_
 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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/overview/index'
 import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/none/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/members/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/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'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/index'
+import { Route as AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexImport } from './routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/index'
 
 // Create Virtual Routes
 
@@ -242,6 +242,38 @@ const AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRoute =
     } as any,
   )
 
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexImport.update({
+    id: '/settings/',
+    path: '/settings/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexImport.update(
+    {
+      id: '/secret-sharing/',
+      path: '/secret-sharing/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexImport.update(
+    {
+      id: '/secret-scanning/',
+      path: '/secret-scanning/',
+      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+    } as any,
+  )
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexImport.update({
+    id: '/overview/',
+    path: '/overview/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
 const AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute =
   AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexImport.update({
     id: '/none/',
@@ -249,6 +281,34 @@ const AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexRoute =
     getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
   } as any)
 
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexImport.update({
+    id: '/members/',
+    path: '/members/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexImport.update({
+    id: '/billing/',
+    path: '/billing/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexImport.update({
+    id: '/audit-logs/',
+    path: '/audit-logs/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexImport.update({
+    id: '/admin/',
+    path: '/admin/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
 const AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute =
   AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewImport.update(
     {
@@ -259,137 +319,61 @@ const AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverview
     } as any,
   )
 
-const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexRoute =
-  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewImport.update(
     {
-      id: '/$organizationId/settings/',
-      path: '/$organizationId/settings/',
+      id: '/secret-manager/overview',
+      path: '/secret-manager/overview',
       getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexRoute =
-  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewImport.update({
+    id: '/kms/overview',
+    path: '/kms/overview',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewImport.update(
     {
-      id: '/$organizationId/secret-sharing/',
-      path: '/$organizationId/secret-sharing/',
+      id: '/cert-manager/overview',
+      path: '/cert-manager/overview',
       getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexRoute =
-  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexImport.update({
+    id: '/roles/$roleId/',
+    path: '/roles/$roleId/',
+    getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
+  } as any)
+
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexImport.update(
     {
-      id: '/$organizationId/secret-scanning/',
-      path: '/$organizationId/secret-scanning/',
+      id: '/memberships/$membershipId/',
+      path: '/memberships/$membershipId/',
       getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexRoute =
-  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexImport.update(
     {
-      id: '/$organizationId/overview/',
-      path: '/$organizationId/overview/',
+      id: '/identities/$identityId/',
+      path: '/identities/$identityId/',
       getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
 
-const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexRoute =
-  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexImport.update(
+const AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute =
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexImport.update(
     {
-      id: '/$organizationId/members/',
-      path: '/$organizationId/members/',
-      getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
-    } as any,
-  )
-
-const AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexRoute =
-  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexImport.update(
-    {
-      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/',
+      id: '/groups/$groupId/',
+      path: '/groups/$groupId/',
       getParentRoute: () => AuthenticateCtxOrgDetailsOrganizationLayoutOrgRoute,
     } as any,
   )
@@ -580,6 +564,27 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview'
+      path: '/cert-manager/overview'
+      fullPath: '/organization/cert-manager/overview'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview'
+      path: '/kms/overview'
+      fullPath: '/organization/kms/overview'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview'
+      path: '/secret-manager/overview'
+      fullPath: '/organization/secret-manager/overview'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewImport
+      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'
@@ -587,6 +592,34 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewImport
       parentRoute: typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerImport
     }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/admin/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/admin/'
+      path: '/admin'
+      fullPath: '/organization/admin'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/'
+      path: '/audit-logs'
+      fullPath: '/organization/audit-logs'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/billing/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/billing/'
+      path: '/billing'
+      fullPath: '/organization/billing'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+    }
+    '/_authenticate/_ctx-org-details/organization/_layout-org/members/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/members/'
+      path: '/members'
+      fullPath: '/organization/members'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexImport
+      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
+    }
     '/_authenticate/_ctx-org-details/organization/_layout-org/none/': {
       id: '/_authenticate/_ctx-org-details/organization/_layout-org/none/'
       path: '/none'
@@ -594,109 +627,60 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgNoneIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdCertManagerOverviewImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/overview/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/overview/'
+      path: '/overview'
+      fullPath: '/organization/overview'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdKmsOverviewImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/'
+      path: '/secret-scanning'
+      fullPath: '/organization/secret-scanning'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretManagerOverviewImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/'
+      path: '/secret-sharing'
+      fullPath: '/organization/secret-sharing'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAdminIndexImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/settings/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/settings/'
+      path: '/settings'
+      fullPath: '/organization/settings'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdAuditLogsIndexImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/'
+      path: '/groups/$groupId'
+      fullPath: '/organization/groups/$groupId'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdBillingIndexImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/'
+      path: '/identities/$identityId'
+      fullPath: '/organization/identities/$identityId'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembersIndexImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/'
+      path: '/memberships/$membershipId'
+      fullPath: '/organization/memberships/$membershipId'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdOverviewIndexImport
-      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
-    }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretScanningIndexImport
-      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
-    }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSecretSharingIndexImport
-      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
-    }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdSettingsIndexImport
-      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
-    }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdGroupsGroupIdIndexImport
-      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
-    }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdIdentitiesIdentityIdIndexImport
-      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
-    }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdMembershipsMembershipIdIndexImport
-      parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
-    }
-    '/_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 AuthenticateCtxOrgDetailsOrganizationLayoutOrgOrganizationIdRolesRoleIdIndexImport
+    '/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/': {
+      id: '/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/'
+      path: '/roles/$roleId'
+      fullPath: '/organization/roles/$roleId'
+      preLoaderRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexImport
       parentRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgImport
     }
   }
@@ -706,60 +690,60 @@ declare module '@tanstack/react-router' {
 
 interface AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteChildren {
   AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute
   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
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute
+  AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute: typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute
 }
 
 const AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteChildren: AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteChildren =
   {
     AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute:
       AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute,
     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,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute,
+    AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute:
+      AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute,
   }
 
 const AuthenticateCtxOrgDetailsOrganizationLayoutOrgRouteWithChildren =
@@ -941,23 +925,23 @@ export interface FileRoutesByFullPath {
   '/signup/sso': typeof RestrictLoginSignupSignupSsoIndexRoute
   '/secret-manager/$projectId': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren
   '/organization/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIndexRoute
+  '/organization/cert-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute
+  '/organization/kms/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute
+  '/organization/secret-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute
   '/secret-manager/$projectId/overview': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute
+  '/organization/admin': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute
+  '/organization/audit-logs': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute
+  '/organization/billing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute
+  '/organization/members': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute
   '/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
+  '/organization/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute
+  '/organization/secret-scanning': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute
+  '/organization/secret-sharing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute
+  '/organization/settings': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute
+  '/organization/groups/$groupId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute
+  '/organization/identities/$identityId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute
+  '/organization/memberships/$membershipId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute
+  '/organization/roles/$roleId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute
 }
 
 export interface FileRoutesByTo {
@@ -980,23 +964,23 @@ export interface FileRoutesByTo {
   '/login/sso': typeof RestrictLoginSignupLoginSsoIndexRoute
   '/signup/sso': typeof RestrictLoginSignupSignupSsoIndexRoute
   '/secret-manager/$projectId': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerRouteWithChildren
+  '/organization/cert-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute
+  '/organization/kms/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute
+  '/organization/secret-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute
   '/secret-manager/$projectId/overview': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute
+  '/organization/admin': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute
+  '/organization/audit-logs': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute
+  '/organization/billing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute
+  '/organization/members': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute
   '/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
+  '/organization/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute
+  '/organization/secret-scanning': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute
+  '/organization/secret-sharing': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute
+  '/organization/settings': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute
+  '/organization/groups/$groupId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute
+  '/organization/identities/$identityId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute
+  '/organization/memberships/$membershipId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute
+  '/organization/roles/$roleId': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute
 }
 
 export interface FileRoutesById {
@@ -1027,23 +1011,23 @@ export interface FileRoutesById {
   '/_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/organization/_layout-org/cert-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgCertManagerOverviewRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgKmsOverviewRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretManagerOverviewRoute
   '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview': typeof AuthenticateCtxOrgDetailsSecretManagerProjectIdLayoutSecretManagerOverviewRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/admin/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAdminIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgAuditLogsIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/billing/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgBillingIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/members/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembersIndexRoute
   '/_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
+  '/_authenticate/_ctx-org-details/organization/_layout-org/overview/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgOverviewIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretScanningIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSecretSharingIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/settings/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgSettingsIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgGroupsGroupIdIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgIdentitiesIdentityIdIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgMembershipsMembershipIdIndexRoute
+  '/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/': typeof AuthenticateCtxOrgDetailsOrganizationLayoutOrgRolesRoleIdIndexRoute
 }
 
 export interface FileRouteTypes {
@@ -1070,23 +1054,23 @@ export interface FileRouteTypes {
     | '/signup/sso'
     | '/secret-manager/$projectId'
     | '/organization/'
+    | '/organization/cert-manager/overview'
+    | '/organization/kms/overview'
+    | '/organization/secret-manager/overview'
     | '/secret-manager/$projectId/overview'
+    | '/organization/admin'
+    | '/organization/audit-logs'
+    | '/organization/billing'
+    | '/organization/members'
     | '/organization/none'
-    | '/organization/$organizationId/cert-manager/overview'
-    | '/organization/$organizationId/kms/overview'
-    | '/organization/$organizationId/secret-manager/overview'
-    | '/organization/$organizationId/admin'
-    | '/organization/$organizationId/audit-logs'
-    | '/organization/$organizationId/billing'
-    | '/organization/$organizationId/members'
-    | '/organization/$organizationId/overview'
-    | '/organization/$organizationId/secret-scanning'
-    | '/organization/$organizationId/secret-sharing'
-    | '/organization/$organizationId/settings'
-    | '/organization/$organizationId/groups/$groupId'
-    | '/organization/$organizationId/identities/$identityId'
-    | '/organization/$organizationId/memberships/$membershipId'
-    | '/organization/$organizationId/roles/$roleId'
+    | '/organization/overview'
+    | '/organization/secret-scanning'
+    | '/organization/secret-sharing'
+    | '/organization/settings'
+    | '/organization/groups/$groupId'
+    | '/organization/identities/$identityId'
+    | '/organization/memberships/$membershipId'
+    | '/organization/roles/$roleId'
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/'
@@ -1108,23 +1092,23 @@ export interface FileRouteTypes {
     | '/login/sso'
     | '/signup/sso'
     | '/secret-manager/$projectId'
+    | '/organization/cert-manager/overview'
+    | '/organization/kms/overview'
+    | '/organization/secret-manager/overview'
     | '/secret-manager/$projectId/overview'
+    | '/organization/admin'
+    | '/organization/audit-logs'
+    | '/organization/billing'
+    | '/organization/members'
     | '/organization/none'
-    | '/organization/$organizationId/cert-manager/overview'
-    | '/organization/$organizationId/kms/overview'
-    | '/organization/$organizationId/secret-manager/overview'
-    | '/organization/$organizationId/admin'
-    | '/organization/$organizationId/audit-logs'
-    | '/organization/$organizationId/billing'
-    | '/organization/$organizationId/members'
-    | '/organization/$organizationId/overview'
-    | '/organization/$organizationId/secret-scanning'
-    | '/organization/$organizationId/secret-sharing'
-    | '/organization/$organizationId/settings'
-    | '/organization/$organizationId/groups/$groupId'
-    | '/organization/$organizationId/identities/$identityId'
-    | '/organization/$organizationId/memberships/$membershipId'
-    | '/organization/$organizationId/roles/$roleId'
+    | '/organization/overview'
+    | '/organization/secret-scanning'
+    | '/organization/secret-sharing'
+    | '/organization/settings'
+    | '/organization/groups/$groupId'
+    | '/organization/identities/$identityId'
+    | '/organization/memberships/$membershipId'
+    | '/organization/roles/$roleId'
   id:
     | '__root__'
     | '/'
@@ -1153,23 +1137,23 @@ export interface FileRouteTypes {
     | '/_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/organization/_layout-org/cert-manager/overview'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview'
     | '/_authenticate/_ctx-org-details/secret-manager/$projectId/_layout-secret-manager/overview'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/admin/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/billing/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/members/'
     | '/_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/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/overview/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/settings/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/'
+    | '/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/'
   fileRoutesById: FileRoutesById
 }
 
@@ -1295,22 +1279,22 @@ export const routeTree = rootRoute
       "parent": "/_authenticate/_ctx-org-details/organization",
       "children": [
         "/_authenticate/_ctx-org-details/organization/_layout-org/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/admin/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/billing/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/members/",
         "/_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/"
+        "/_authenticate/_ctx-org-details/organization/_layout-org/overview/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/settings/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/",
+        "/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/"
       ]
     },
     "/_restrict-login-signup/login/provider/error": {
@@ -1359,72 +1343,72 @@ export const routeTree = rootRoute
       "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/kms/overview.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
     "/_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/_ctx-org-details/organization/_layout-org/admin/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/admin/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/billing/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/billing/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
+    "/_authenticate/_ctx-org-details/organization/_layout-org/members/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/members/index.tsx",
+      "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
+    },
     "/_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/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview": {
-      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/overview/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/overview/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview": {
-      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview": {
-      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/": {
-      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/settings/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/settings/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/": {
-      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/": {
-      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/": {
-      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     },
-    "/_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/_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/_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/_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/_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",
+    "/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/": {
+      "filePath": "_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/index.tsx",
       "parent": "/_authenticate/_ctx-org-details/organization/_layout-org"
     }
   }
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/-components/OrgAdminProjects/OrgAdminProjects.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/-components/OrgAdminProjects/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/-components/OrgAdminProjects/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/-components/OrgAdminProjects/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/index.tsx
similarity index 94%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/index.tsx
index 06742a1dc..91c453bba 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/admin/index.tsx
@@ -40,7 +40,7 @@ const OrgAdminPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/admin/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/admin/"
 )({
   component: OrgAdminPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsFilter.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsFilter.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsFilter.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsFilter.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTableRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsTableRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/LogsTableRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/LogsTableRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/types.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/types.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/-components/types.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/-components/types.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/index.tsx
similarity index 91%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/index.tsx
index a0f1ed03c..17fb075d3 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/index.tsx
@@ -25,7 +25,7 @@ const AuditLogsPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/audit-logs/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/audit-logs/"
 )({
   component: AuditLogsPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/BillingCloudTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/BillingCloudTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/BillingCloudTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/BillingCloudTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/CurrentPlanSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/CurrentPlanSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/CurrentPlanSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/CurrentPlanSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/ManagePlansModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/ManagePlansModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/ManagePlansTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/ManagePlansTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/ManagePlansTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/PreviewSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/PreviewSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/PreviewSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/PreviewSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingCloudTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingCloudTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/BillingDetailsTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/CompanyNameSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/CompanyNameSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/CompanyNameSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/CompanyNameSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/InvoiceEmailSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/PmtMethodsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/PmtMethodsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/TaxIDModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/TaxIDModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/TaxIDSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/TaxIDSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/TaxIDTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/TaxIDTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/TaxIDTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingDetailsTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingDetailsTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingReceiptsTab/BillingReceiptsTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/InvoicesTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingReceiptsTab/InvoicesTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/InvoicesTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingReceiptsTab/InvoicesTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingReceiptsTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingReceiptsTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingReceiptsTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingSelfHostedTab/BillingSelfHostedTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/LicensesSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingSelfHostedTab/LicensesSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/LicensesSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingSelfHostedTab/LicensesSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingSelfHostedTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingSelfHostedTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingSelfHostedTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/BillingTabGroup.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingTabGroup/BillingTabGroup.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/BillingTabGroup.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingTabGroup/BillingTabGroup.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingTabGroup/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/BillingTabGroup/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/BillingTabGroup/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/index.tsx
similarity index 93%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/index.tsx
index 503ffe14d..584e020b0 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/billing/index.tsx
@@ -44,7 +44,7 @@ const BillingRoute = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/billing/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/billing/"
 )({
   component: BillingRoute
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview.tsx
similarity index 78%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview.tsx
index ef0ba6a6a..1aafd63fb 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/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/_ctx-org-details/organization/_layout-org/$organizationId/cert-manager/overview"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/cert-manager/overview"
 )({
   component: CertManagerOverviewPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/AddGroupMemberModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/AddGroupMemberModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/AddGroupMemberModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/AddGroupMemberModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupCreateUpdateModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupCreateUpdateModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupCreateUpdateModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupCreateUpdateModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/GroupMembersSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/GroupMembersTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/GroupMembershipRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/GroupMembersSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/GroupMembersSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/index.tsx
similarity index 92%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/index.tsx
index c42505fab..223321af0 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/index.tsx
@@ -18,7 +18,7 @@ import {
   Spinner,
   Tooltip
 } from "@app/components/v2";
-import { OrgPermissionActions, OrgPermissionSubjects, useOrganization } from "@app/context";
+import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
 import { withPermission } from "@app/hoc";
 import { useDeleteGroup } from "@app/hooks/api";
 import { useGetGroupById } from "@app/hooks/api/groups/queries";
@@ -39,10 +39,9 @@ const GroupPage = withPermission(
   () => {
     const navigate = useNavigate();
     const params = useParams({
-      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/"
     });
     const groupId = params.groupId as string;
-    const { currentOrg } = useOrganization();
 
     const { data, isPending } = useGetGroupById(groupId);
 
@@ -64,10 +63,7 @@ const GroupPage = withPermission(
           type: "success"
         });
         navigate({
-          to: "/organization/$organizationId/members" as const,
-          params: {
-            organizationId: currentOrg.id
-          },
+          to: "/organization/members" as const,
           search: {
             selectedTab: TabSections.Groups
           }
@@ -95,10 +91,7 @@ const GroupPage = withPermission(
               leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
               onClick={() => {
                 navigate({
-                  to: "/organization/$organizationId/members" as const,
-                  params: {
-                    organizationId: currentOrg.id
-                  },
+                  to: "/organization/members" as const,
                   search: {
                     selectedTab: TabSections.Groups
                   }
@@ -214,7 +207,7 @@ const GroupDetailPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/groups/$groupId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/groups/$groupId/"
 )({
   component: GroupDetailPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/IdentityAuthenticationSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/IdentityClientSecrets.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/IdentityTokens.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityAuthenticationSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityClientSecretModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityClientSecretModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityClientSecretModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityClientSecretModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
index aa6247f1f..e6d503e84 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityAddToProjectModal.tsx
@@ -12,11 +12,12 @@ import {
   ModalClose,
   ModalContent
 } from "@app/components/v2";
-import { useOrganization, useWorkspace } from "@app/context";
+import { useOrganization } from "@app/context";
 import {
   useAddIdentityToWorkspace,
   useGetIdentityProjectMemberships,
   useGetProjectRoles,
+  useGetUserWorkspaces,
   useGetWorkspaceById
 } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -43,7 +44,7 @@ type Props = {
 
 const Content = ({ identityId, handlePopUpToggle }: Omit<Props, "popUp">) => {
   const { currentOrg } = useOrganization();
-  const { workspaces } = useWorkspace();
+  const { data: workspaces = [] } = useGetUserWorkspaces({ type: "all" });
   const { mutateAsync: addIdentityToWorkspace } = useAddIdentityToWorkspace();
 
   const {
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
similarity index 96%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
index 0c892afcd..117a8e961 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectRow.tsx
@@ -6,10 +6,10 @@ import { format } from "date-fns";
 
 import { createNotification } from "@app/components/notifications";
 import { IconButton, Tag, Td, Tooltip, Tr } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
 import { IdentityMembership } from "@app/hooks/api/identities/types";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
+import { useGetUserWorkspaces } from "@app/hooks/api";
 
 export enum TabSections {
   Member = "members",
@@ -39,7 +39,7 @@ export const IdentityProjectRow = ({
   membership: { id, createdAt, identity, project, roles },
   handlePopUpOpen
 }: Props) => {
-  const { workspaces } = useWorkspace();
+  const { data: workspaces } = useGetUserWorkspaces();
   const navigate = useNavigate();
 
   const isAccessible = useMemo(() => {
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/IdentityProjectsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityProjectsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityProjectsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenListModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityTokenListModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenListModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityTokenListModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityTokenModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/IdentityTokenModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/IdentityTokenModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/index.tsx
similarity index 96%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/index.tsx
index ef6660b04..a63a1c2e4 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/index.tsx
@@ -48,7 +48,7 @@ export const IdentitySection = withPermission(
   () => {
     const navigate = useNavigate();
     const params = useParams({
-      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/"
     });
     const identityId = params.identityId as string;
     const { currentOrg } = useOrganization();
@@ -90,10 +90,7 @@ export const IdentitySection = withPermission(
 
         handlePopUpClose("deleteIdentity");
         navigate({
-          to: "/organization/$organizationId/members",
-          params: {
-            organizationId: orgId
-          },
+          to: "/organization/members",
           search: {
             selectedTab: TabSections.Identities
           }
@@ -177,10 +174,7 @@ export const IdentitySection = withPermission(
               leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
               onClick={() => {
                 navigate({
-                  to: "/organization/$organizationId/members",
-                  params: {
-                    organizationId: orgId
-                  },
+                  to: "/organization/members",
                   search: {
                     selectedTab: TabSections.Identities
                   }
@@ -381,7 +375,7 @@ const IdentityDetailPage = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/identities/$identityId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/identities/$identityId/"
 )({
   component: IdentityDetailPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/index.tsx
index 36ec3c102..0091bab47 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/index.tsx
@@ -3,13 +3,10 @@ import { createFileRoute, redirect } from "@tanstack/react-router";
 import { ProjectType } from "@app/hooks/api/workspace/types";
 
 export const Route = createFileRoute("/_authenticate/_ctx-org-details/organization/_layout-org/")({
-  beforeLoad: ({ context }) => {
+  beforeLoad: () => {
     redirect({
       throw: true,
-      to: `/organization/$organizationId/${ProjectType.SecretManager}/overview` as const,
-      params: {
-        organizationId: String(context.organizationId)
-      }
+      to: `/organization/${ProjectType.SecretManager}/overview` as const
     });
   }
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview.tsx
similarity index 79%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview.tsx
index 3bda1ca22..9c42905b3 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview.tsx
@@ -7,7 +7,7 @@ import { ProductOverview } from "../secret-manager/overview";
 const KeyManagerOverviewPage = () => <ProductOverview type={ProjectType.KMS} />;
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/kms/overview"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/kms/overview"
 )({
   component: KeyManagerOverviewPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/OrgGroupsTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/OrgGroupsTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/OrgGroupsTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/OrgGroupsTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
index 24b0b7a3f..a644269d7 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
@@ -228,9 +228,8 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                     <Tr
                       onClick={() =>
                         navigate({
-                          to: "/organization/$organizationId/groups/$groupId",
+                          to: "/organization/groups/$groupId",
                           params: {
-                            organizationId: currentOrg.id,
                             groupId: id
                           }
                         })
@@ -327,9 +326,8 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
                                   )}
                                   onClick={() =>
                                     navigate({
-                                      to: "/organization/$organizationId/groups/$groupId",
+                                      to: "/organization/groups/$groupId",
                                       params: {
-                                        organizationId: currentOrg.id,
                                         groupId: id
                                       }
                                     })
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/OrgGroupsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgGroupsTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgGroupsTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/OrgIdentityTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/OrgIdentityTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/OrgIdentityTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/OrgIdentityTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAuthMethodModalContent.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAwsAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityAzureAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityGcpAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityJwtAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityKubernetesAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
index 1ae4ff0bf..53d105513 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityModal.tsx
@@ -143,9 +143,8 @@ export const IdentityModal = ({ popUp, handlePopUpToggle }: Props) => {
 
         handlePopUpToggle("identity", false);
         navigate({
-          to: "/organization/$organizationId/identities/$identityId",
+          to: "/organization/identities/$identityId",
           params: {
-            organizationId: currentOrg.id,
             identityId: createdId
           }
         });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
index 34817174b..ed1420105 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
@@ -197,9 +197,8 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                     key={`identity-${id}`}
                     onClick={() =>
                       navigate({
-                        to: "/organization/$organizationId/identities/$identityId",
+                        to: "/organization/identities/$identityId",
                         params: {
-                          organizationId,
                           identityId: id
                         }
                       })
@@ -255,9 +254,8 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
                                 onClick={(e) => {
                                   e.stopPropagation();
                                   navigate({
-                                    to: "/organization/$organizationId/identities/$identityId",
+                                    to: "/organization/identities/$identityId",
                                     params: {
-                                      organizationId,
                                       identityId: id
                                     }
                                   });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityTokenAuthTokenModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthClientSecretModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/IdentitySection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgIdentityTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgIdentityTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/OrgMembersTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/OrgMembersTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/OrgMembersTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/OrgMembersTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/AddOrgMemberModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/OrgInviteLink.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
index 5fbf75203..eea58dc01 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -306,9 +306,8 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                         className="h-10 w-full cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
                         onClick={() =>
                           navigate({
-                            to: "/organization/$organizationId/memberships/$membershipId" as const,
+                            to: "/organization/memberships/$membershipId" as const,
                             params: {
-                              organizationId: orgId,
                               membershipId: orgMembershipId
                             }
                           })
@@ -402,9 +401,8 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLinks }: Pro
                                       onClick={(e) => {
                                         e.stopPropagation();
                                         navigate({
-                                          to: "/organization/$organizationId/memberships/$membershipId" as const,
+                                          to: "/organization/memberships/$membershipId" as const,
                                           params: {
-                                            organizationId: orgId,
                                             membershipId: orgMembershipId
                                           }
                                         });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/OrgMembersSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgMembersTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgMembersTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgRoleTabSection/OrgRoleTabSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
index 83b08ffea..a1668f023 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgRoleTabSection/OrgRoleTable.tsx
@@ -135,9 +135,8 @@ export const OrgRoleTable = () => {
                   className="h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
                   onClick={() =>
                     navigate({
-                      to: "/organization/$organizationId/roles/$roleId",
+                      to: "/organization/roles/$roleId",
                       params: {
-                        organizationId: orgId,
                         roleId: id
                       }
                     })
@@ -182,9 +181,8 @@ export const OrgRoleTable = () => {
                               onClick={(e) => {
                                 e.stopPropagation();
                                 navigate({
-                                  to: "/organization/$organizationId/roles/$roleId",
+                                  to: "/organization/roles/$roleId",
                                   params: {
-                                    organizationId: orgId,
                                     roleId: id
                                   }
                                 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgRoleTabSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/OrgRoleTabSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/OrgRoleTabSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/index.tsx
similarity index 94%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/index.tsx
index 3f2393002..cc7e7aa6c 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/members/index.tsx
@@ -14,10 +14,10 @@ import { OrgGroupsTab, OrgIdentityTab, OrgMembersTab, OrgRoleTabSection } from "
 export const MembersSection = withPermission(
   () => {
     const navigate = useNavigate({
-      from: "/organization/$organizationId/members"
+      from: "/organization/members"
     });
     const selectedTab = useSearch({
-      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/",
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/members/",
       select: (el) => el.selectedTab,
       structuralSharing: true
     });
@@ -82,7 +82,7 @@ const MembersPageQuerySchema = z.object({
 });
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/members/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/members/"
 )({
   component: MembersPage,
   validateSearch: zodValidator(MembersPageQuerySchema)
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserOrgMembershipModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserOrgMembershipModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserOrgMembershipModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserOrgMembershipModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
similarity index 60%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
index 713411ec2..bd19db761 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserAddToProjectModal.tsx
@@ -5,8 +5,12 @@ import { z } from "zod";
 
 import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Modal, ModalContent, Select, SelectItem } from "@app/components/v2";
-import { useOrganization, useWorkspace } from "@app/context";
-import { useAddUserToWsNonE2EE, useGetOrgMembershipProjectMemberships } from "@app/hooks/api";
+import { useOrganization } from "@app/context";
+import {
+  useAddUserToWsNonE2EE,
+  useGetOrgMembershipProjectMemberships,
+  useGetUserWorkspaces
+} from "@app/hooks/api";
 import { ProjectVersion } from "@app/hooks/api/workspace/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
@@ -27,10 +31,10 @@ type Props = {
   ) => void;
 };
 
-export const UserAddToProjectModal = ({ membershipId, popUp, handlePopUpToggle }: Props) => {
+const UserAddToProjectModalChild = ({ membershipId, popUp, handlePopUpToggle }: Props) => {
   const { currentOrg } = useOrganization();
   const orgId = currentOrg?.id || "";
-  const { workspaces } = useWorkspace();
+  const { data: workspaces = [] } = useGetUserWorkspaces();
 
   const { mutateAsync: addUserToWorkspaceNonE2EE } = useAddUserToWsNonE2EE();
 
@@ -89,56 +93,62 @@ export const UserAddToProjectModal = ({ membershipId, popUp, handlePopUpToggle }
     }
   };
 
+  return (
+    <form onSubmit={handleSubmit(onFormSubmit)}>
+      <Controller
+        control={control}
+        name="projectId"
+        defaultValue=""
+        render={({ field: { onChange, ...field }, fieldState: { error } }) => (
+          <FormControl label="Project" errorText={error?.message} isError={Boolean(error)}>
+            <Select
+              defaultValue={field.value}
+              {...field}
+              onValueChange={(e) => onChange(e)}
+              className="w-full"
+            >
+              {(filteredWorkspaces || []).map(({ id, name }) => (
+                <SelectItem value={id} key={`project-${id}`}>
+                  {name}
+                </SelectItem>
+              ))}
+            </Select>
+          </FormControl>
+        )}
+      />
+      <div className="flex items-center">
+        <Button
+          className="mr-4"
+          size="sm"
+          type="submit"
+          isLoading={isSubmitting}
+          isDisabled={isSubmitting}
+        >
+          Add
+        </Button>
+        <Button
+          colorSchema="secondary"
+          variant="plain"
+          onClick={() => handlePopUpToggle("addUserToProject", false)}
+        >
+          Cancel
+        </Button>
+      </div>
+    </form>
+  );
+};
+
+export const UserAddToProjectModal = (props: Props) => {
+  const { popUp, handlePopUpToggle } = props;
   return (
     <Modal
       isOpen={popUp?.addUserToProject?.isOpen}
       onOpenChange={(isOpen) => {
         handlePopUpToggle("addUserToProject", isOpen);
-        reset();
       }}
     >
       <ModalContent title="Add User to Project">
-        <form onSubmit={handleSubmit(onFormSubmit)}>
-          <Controller
-            control={control}
-            name="projectId"
-            defaultValue=""
-            render={({ field: { onChange, ...field }, fieldState: { error } }) => (
-              <FormControl label="Project" errorText={error?.message} isError={Boolean(error)}>
-                <Select
-                  defaultValue={field.value}
-                  {...field}
-                  onValueChange={(e) => onChange(e)}
-                  className="w-full"
-                >
-                  {(filteredWorkspaces || []).map(({ id, name }) => (
-                    <SelectItem value={id} key={`project-${id}`}>
-                      {name}
-                    </SelectItem>
-                  ))}
-                </Select>
-              </FormControl>
-            )}
-          />
-          <div className="flex items-center">
-            <Button
-              className="mr-4"
-              size="sm"
-              type="submit"
-              isLoading={isSubmitting}
-              isDisabled={isSubmitting}
-            >
-              Add
-            </Button>
-            <Button
-              colorSchema="secondary"
-              variant="plain"
-              onClick={() => handlePopUpToggle("addUserToProject", false)}
-            >
-              Cancel
-            </Button>
-          </div>
-        </form>
+        <UserAddToProjectModalChild {...props} />
       </ModalContent>
     </Modal>
   );
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserAuditLogsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserGroupsRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserGroupsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserGroupsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
similarity index 96%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
index 6ddb0ea46..59ad5f22c 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserProjectRow.tsx
@@ -5,11 +5,11 @@ import { useNavigate } from "@tanstack/react-router";
 
 import { createNotification } from "@app/components/notifications";
 import { IconButton, Tag, Td, Tooltip, Tr } from "@app/components/v2";
-import { useWorkspace } from "@app/context";
 import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
 import { TWorkspaceUser } from "@app/hooks/api/types";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 import { TabSections } from "@app/types/org";
+import { useGetUserWorkspaces } from "@app/hooks/api";
 
 type Props = {
   membership: TWorkspaceUser;
@@ -32,7 +32,7 @@ export const UserProjectRow = ({
   membership: { id, project, user, roles },
   handlePopUpOpen
 }: Props) => {
-  const { workspaces } = useWorkspace();
+  const { data: workspaces = [] } = useGetUserWorkspaces();
   const navigate = useNavigate();
 
   const isAccessible = useMemo(() => {
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserProjectsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/UserProjectsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/UserProjectsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/UserProjectsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/index.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/index.tsx
index 9b56aa779..3dc5c0fdc 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/index.tsx
@@ -40,7 +40,7 @@ export const OrgUserPage = withPermission(
   () => {
     const navigate = useNavigate();
     const search = useParams({
-      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/"
     });
     const membershipId = search.membershipId as string;
     const { user } = useUser();
@@ -332,7 +332,7 @@ export default function OrgUserRoute() {
 }
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/memberships/$membershipId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/memberships/$membershipId/"
 )({
   component: OrgUserRoute
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/overview/index.tsx
similarity index 64%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/overview/index.tsx
index 6264c3a10..4f589a714 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/overview/index.tsx
@@ -3,11 +3,11 @@ import { createFileRoute, redirect } from "@tanstack/react-router";
 import { ProjectType } from "@app/hooks/api/workspace/types";
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/overview/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/overview/"
 )({
   beforeLoad: ({ context }) => {
     throw redirect({
-      to: `/organization/$organizationId/${ProjectType.SecretManager}/overview` as const,
+      to: `/organization/${ProjectType.SecretManager}/overview` as const,
       params: {
         organizationId: context.organizationId
       }
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/OrgRoleModifySection.utils.ts b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/OrgRoleModifySection.utils.ts
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/OrgRoleModifySection.utils.ts
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/OrgRoleModifySection.utils.ts
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleDetailsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RoleDetailsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleDetailsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RoleDetailsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RoleModal.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RoleModal.tsx
index 855a15d4a..50e3a60aa 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RoleModal.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RoleModal.tsx
@@ -104,9 +104,8 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
 
         handlePopUpToggle("role", false);
         navigate({
-          to: "/organization/$organizationId/roles/$roleId",
+          to: "/organization/roles/$roleId",
           params: {
-            organizationId: orgId,
             roleId: newRole.id
           }
         });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/OrgPermissionAdminConsoleRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/OrgRoleWorkspaceRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/RolePermissionRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/RolePermissionsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/RolePermissionsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/RolePermissionsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/index.tsx
similarity index 93%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/index.tsx
index 6fbeadf40..c161a6808 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/index.tsx
@@ -28,7 +28,7 @@ export const RolePage = withPermission(
   () => {
     const navigate = useNavigate();
     const params = useParams({
-      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/"
     });
     const roleId = params.roleId as string;
     const { currentOrg } = useOrganization();
@@ -57,10 +57,7 @@ export const RolePage = withPermission(
 
         handlePopUpClose("deleteOrgRole");
         navigate({
-          to: "/organization/$organizationId/members" as const,
-          params: {
-            organizationId: currentOrg.id
-          },
+          to: "/organization/members" as const,
           search: {
             selectedTab: TabSections.Roles
           }
@@ -89,10 +86,7 @@ export const RolePage = withPermission(
               leftIcon={<FontAwesomeIcon icon={faChevronLeft} />}
               onClick={() => {
                 navigate({
-                  to: "/organization/$organizationId/members" as const,
-                  params: {
-                    organizationId: currentOrg.id
-                  },
+                  to: "/organization/members" as const,
                   search: {
                     selectedTab: TabSections.Roles
                   }
@@ -191,7 +185,7 @@ const OrgRoleRoute = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/roles/$roleId/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/roles/$roleId/"
 )({
   component: OrgRoleRoute
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview.tsx
similarity index 99%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview.tsx
index 9cae3c8c0..5c4037784 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview.tsx
@@ -528,7 +528,7 @@ export const ProductOverview = ({ type }: Props) => {
 const SecretManagerOverviewPage = () => <ProductOverview type={ProjectType.SecretManager} />;
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-manager/overview"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/secret-manager/overview"
 )({
   component: SecretManagerOverviewPage
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/RiskStatusSelection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/-components/RiskStatusSelection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/RiskStatusSelection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/-components/RiskStatusSelection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/SecretScanningLogsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/-components/SecretScanningLogsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/SecretScanningLogsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/-components/SecretScanningLogsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/index.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/index.tsx
index b901b5728..7aea8fa7b 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/index.tsx
@@ -24,7 +24,7 @@ import { SecretScanningLogsTable } from "./-components";
 const SecretScanning = withPermission(
   () => {
     const queryParams = useSearch({
-      from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/"
+      from: "/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/"
     });
     const { config } = useServerConfig();
     const { currentOrg } = useOrganization();
@@ -151,7 +151,7 @@ const SecretScanningQueryParams = z.object({
 });
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-scanning/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/secret-scanning/"
 )({
   component: SecretScanning,
   validateSearch: zodValidator(SecretScanningQueryParams)
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/AddShareSecretModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/AddShareSecretModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/AddShareSecretModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/AddShareSecretModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/ShareSecretSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/ShareSecretSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsRow.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/ShareSecretsRow.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsRow.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/ShareSecretsRow.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/ShareSecretsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/ShareSecretsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/ShareSecretsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/index.tsx
similarity index 95%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/index.tsx
index c2f5ffd96..7548cd936 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/index.tsx
@@ -49,7 +49,7 @@ const SecretSharing = () => {
 };
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/secret-sharing/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/secret-sharing/"
 )({
   component: SecretSharing
 });
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/AuditLogStreamTab/AuditLogStreamForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/AuditLogStreamTab/AuditLogStreamTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/AuditLogStreamTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/AuditLogStreamTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/AuditLogStreamTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/ImportTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/ImportTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/ImportTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/ImportTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/components/EnvKeyPlatformModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/components/SelectImportFromPlatformModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ImportTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ImportTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/ExternalGroupOrgRoleMappings.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
index b68c76d77..6f23ae245 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/LDAPGroupMapModal.tsx
@@ -279,10 +279,7 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
               size="sm"
               onClick={() =>
                 navigate({
-                  to: "/organization/$organizationId/members",
-                  params: {
-                    organizationId: currentOrg.id
-                  }
+                  to: "/organization/members"
                 })
               }
             >
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/LDAPModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/LDAPModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/LDAPModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OIDCModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OIDCModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OIDCModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OIDCModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgAuthTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgAuthTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgAuthTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgAuthTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgGeneralAuthSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgGenericAuthSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgLDAPSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgLDAPSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgLDAPSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgLDAPSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgOIDCSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgOIDCSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgOIDCSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgOIDCSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSCIMSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgSCIMSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSCIMSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgSCIMSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSSOSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgSSOSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/OrgSSOSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/OrgSSOSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/SSOModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/SSOModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/SSOModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/SSOModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ScimTokenModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/ScimTokenModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/ScimTokenModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/ScimTokenModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgAuthTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgAuthTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
similarity index 97%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
index e810a6a3a..0d5d63551 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgDeleteSection/OrgDeleteSection.tsx
@@ -5,7 +5,7 @@ import { Button, DeleteActionModal } from "@app/components/v2";
 import { useOrganization, useOrgPermission } from "@app/context";
 import { useDeleteOrgById } from "@app/hooks/api";
 import { usePopUp } from "@app/hooks/usePopUp";
-import { navigateUserToOrg } from "@app/routes/_restrict_login_signup/login/-components/Login.utils";
+import { navigateUserToOrg } from "@app/routes/_restrict-login-signup/login/-components/Login.utils";
 
 export const OrgDeleteSection = () => {
   const navigate = useNavigate();
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgDeleteSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgDeleteSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgDeleteSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/AddExternalKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/AwsKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/GcpKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/OrgEncryptionTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/UpdateExternalKmsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgEncryptionTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgEncryptionTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgGeneralTab/OrgGeneralTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgGeneralTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgGeneralTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgGeneralTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/AddOrgIncidentContactModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgIncidentContactsSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgIncidentContactsSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgNameChangeSection/OrgNameChangeSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgNameChangeSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgNameChangeSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgNameChangeSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgTabGroup/OrgTabGroup.tsx
similarity index 98%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgTabGroup/OrgTabGroup.tsx
index cf6fc57ab..a68e8ca47 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/OrgTabGroup.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgTabGroup/OrgTabGroup.tsx
@@ -24,7 +24,7 @@ const tabs = [
 ];
 export const OrgTabGroup = () => {
   const search = useSearch({
-    from: "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/"
+    from: "/_authenticate/_ctx-org-details/organization/_layout-org/settings/"
   });
   const [selectedTab, setSelectedTab] = useState(search.selectedTab || tabs[0].key);
 
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgTabGroup/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgTabGroup/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgTabGroup/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/ProjectTemplatesTab.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/EditProjectTemplateSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEditRoleForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateEnvironmentsForm.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/ProjectTemplateRolesSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/EditProjectTemplateSection/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/ProjectTemplateDetailsModal.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesSection.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/ProjectTemplatesTable.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/ProjectTemplatesTab/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/ProjectTemplatesTab/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/index.tsx
similarity index 100%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/-components/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/-components/index.tsx
diff --git a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index.tsx b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/index.tsx
similarity index 94%
rename from frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index.tsx
rename to frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/index.tsx
index 6b6043cf5..bbf84fc77 100644
--- a/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/index.tsx
+++ b/frontend-v2/src/routes/_authenticate/_ctx-org-details/organization/_layout-org/settings/index.tsx
@@ -39,7 +39,7 @@ export const SettingsOrgQueryParams = z.object({
 });
 
 export const Route = createFileRoute(
-  "/_authenticate/_ctx-org-details/organization/_layout-org/$organizationId/settings/"
+  "/_authenticate/_ctx-org-details/organization/_layout-org/settings/"
 )({
   component: SettingsOrg,
   validateSearch: zodValidator(SettingsOrgQueryParams)
diff --git a/frontend-v2/src/routes/_restrict-login-signup.tsx b/frontend-v2/src/routes/_restrict-login-signup.tsx
index 7f16b7818..946888142 100644
--- a/frontend-v2/src/routes/_restrict-login-signup.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup.tsx
@@ -21,10 +21,7 @@ export const Route = createFileRoute("/_restrict-login-signup")({
       throw redirect({ to: "/login/select-organization" });
     }
     throw redirect({
-      to: `/organization/$organizationId/${ProjectType.SecretManager}/overview` as const,
-      params: {
-        organizationId: data.organizationId
-      }
+      to: `/organization/${ProjectType.SecretManager}/overview` as const
     });
   }
 });
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
index 799b40f31..14fb7f0b3 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
@@ -7,7 +7,7 @@ import SecurityClient from "@app/components/utilities/SecurityClient";
 
 const LoginProviderSuccess = () => {
   const search = useSearch({
-    from: "/_restrict_login_signup/login/provider/success"
+    from: "/_restrict-login-signup/login/provider/success"
   });
 
   useEffect(() => {
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
index d3dfcebe1..b03b23df0 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
@@ -10,7 +10,7 @@ import { PasswordStep } from "../-components";
 
 const LoginSSOPage = () => {
   const { t } = useTranslation();
-  const search = useSearch({ from: "/_restrict_login_signup/login/sso/" });
+  const search = useSearch({ from: "/_restrict-login-signup/login/sso/" });
   const token = search.token as string;
   const [step, setStep] = useState(0);
   const [password, setPassword] = useState("");
diff --git a/frontend-v2/src/routes/_restrict-login-signup/password-reset.tsx b/frontend-v2/src/routes/_restrict-login-signup/password-reset.tsx
index e2f7a5fc7..b866dcdee 100644
--- a/frontend-v2/src/routes/_restrict-login-signup/password-reset.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/password-reset.tsx
@@ -37,7 +37,7 @@ const PasswordResetPage = () => {
   const [passwordErrorBreached, setPasswordErrorBreached] = useState(false);
 
   const navigate = useNavigate();
-  const search = useSearch({ from: "/_restrict_login_signup/password-reset" });
+  const search = useSearch({ from: "/_restrict-login-signup/password-reset" });
 
   const {
     mutateAsync: verifyPasswordResetCodeMutateAsync,
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
index 89cdecac0..df3a52696 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
@@ -12,7 +12,7 @@ import { UserInfoSSOStep } from "./-components/UserInfoSSOStep";
 
 const SignupSSOPage = () => {
   const { t } = useTranslation();
-  const search = useSearch({ from: "/_restrict_login_signup/signup/sso/" });
+  const search = useSearch({ from: "/_restrict-login-signup/signup/sso/" });
   const token = search.token as string;
 
   const [step, setStep] = useState(0);
diff --git a/frontend-v2/src/routes/_restrict-login-signup/signupinvite.tsx b/frontend-v2/src/routes/_restrict-login-signup/signupinvite.tsx
index 902827125..bffa244ea 100644
--- a/frontend-v2/src/routes/_restrict-login-signup/signupinvite.tsx
+++ b/frontend-v2/src/routes/_restrict-login-signup/signupinvite.tsx
@@ -64,7 +64,7 @@ const SignupInvitePage = () => {
   const [requiredMfaMethod, setRequiredMfaMethod] = useState(MfaMethod.EMAIL);
   const [mfaSuccessCallback, setMfaSuccessCallback] = useState<() => void>(() => {});
   const navigate = useNavigate();
-  const search = useSearch({ from: "/_restrict_login_signup/signupinvite" });
+  const search = useSearch({ from: "/_restrict-login-signup/signupinvite" });
   const parsedUrl = search;
   const token = parsedUrl.token as string;
   const organizationId = parsedUrl.organization_id as string;
@@ -388,10 +388,7 @@ const SignupInvitePage = () => {
               setBackupKeyIssued
             });
             navigate({
-              to: `/organization/$organizationId/${ProjectType.SecretManager}/overview` as const,
-              params: {
-                organizationId
-              }
+              to: `/organization/${ProjectType.SecretManager}/overview` as const
             });
           }}
           size="lg"
diff --git a/frontend-v2/src/routes/index.tsx b/frontend-v2/src/routes/index.tsx
index 203963d3c..900cad094 100644
--- a/frontend-v2/src/routes/index.tsx
+++ b/frontend-v2/src/routes/index.tsx
@@ -1,14 +1,9 @@
-import { createFileRoute } from "@tanstack/react-router";
-
-function Index() {
-  return (
-    <div className="p-2">
-      <h3>Welcome Home!</h3>
-    </div>
-  );
-}
+import { createFileRoute, redirect } from "@tanstack/react-router";
 
 export const Route = createFileRoute("/")({
-  component: Index,
-  pendingComponent: () => <div>Loading...</div>
+  beforeLoad: () => {
+    throw redirect({
+      to: "/login"
+    });
+  }
 });