diff --git a/.changeset/swingset-live-urls.md b/.changeset/swingset-live-urls.md
new file mode 100644
index 00000000000..a845151cc84
--- /dev/null
+++ b/.changeset/swingset-live-urls.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/swingset/src/app/(clerk)/live/api-keys-table/page.tsx b/packages/swingset/src/app/(clerk)/live/api-keys/api-keys-table/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/api-keys-table/page.tsx
rename to packages/swingset/src/app/(clerk)/live/api-keys/api-keys-table/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/organization-api-keys/page.tsx b/packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-api-keys-panel/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/organization-api-keys/page.tsx
rename to packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-api-keys-panel/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/organization-danger/page.tsx b/packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-danger-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/organization-danger/page.tsx
rename to packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-danger-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/organization-general/page.tsx b/packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-general-panel/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/organization-general/page.tsx
rename to packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-general-panel/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/organization-members/page.tsx b/packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-members-panel/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/organization-members/page.tsx
rename to packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-members-panel/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/organization-details/page.tsx b/packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-profile-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/organization-details/page.tsx
rename to packages/swingset/src/app/(clerk)/live/organization-profile/organization-profile-profile-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/reverification/page.tsx b/packages/swingset/src/app/(clerk)/live/reverification/reverification/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/reverification/page.tsx
rename to packages/swingset/src/app/(clerk)/live/reverification/reverification/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/active-devices/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-active-devices-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/active-devices/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-active-devices-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/api-keys/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-api-keys-panel/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/api-keys/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-api-keys-panel/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/connected-accounts/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-connected-accounts-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/connected-accounts/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-connected-accounts-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/user-danger/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-danger-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/user-danger/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-danger-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/email/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-email-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/email/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-email-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/enterprise-accounts/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-enterprise-accounts-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/enterprise-accounts/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-enterprise-accounts-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/mfa/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-mfa-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/mfa/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-mfa-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/passkeys/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-passkeys-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/passkeys/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-passkeys-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/password/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-password-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/password/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-password-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/phone/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-phone-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/phone/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-phone-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/account/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-profile-panel/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/account/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-profile-panel/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/profile/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-profile-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/profile/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-profile-section/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/security/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-security-panel/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/security/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-security-panel/page.tsx
diff --git a/packages/swingset/src/app/(clerk)/live/web3-wallets/page.tsx b/packages/swingset/src/app/(clerk)/live/user-profile/user-profile-web3wallets-section/page.tsx
similarity index 100%
rename from packages/swingset/src/app/(clerk)/live/web3-wallets/page.tsx
rename to packages/swingset/src/app/(clerk)/live/user-profile/user-profile-web3wallets-section/page.tsx
diff --git a/packages/swingset/src/lib/live-navigation.ts b/packages/swingset/src/lib/live-navigation.ts
index ff450aed57f..86a77be5638 100644
--- a/packages/swingset/src/lib/live-navigation.ts
+++ b/packages/swingset/src/lib/live-navigation.ts
@@ -9,28 +9,28 @@ type LiveSidebarGroup = {
   categories: Array<{ category: string; components: LiveSidebarEntry[] }>;
 };
 
-const liveRoutes = new Map([
-  ['/user-profile/user-profile-profile-panel', '/live/account'],
-  ['/user-profile/user-profile-security-panel', '/live/security'],
-  ['/user-profile/user-profile-api-keys-panel', '/live/api-keys'],
-  ['/user-profile/user-profile-profile-section', '/live/profile'],
-  ['/user-profile/user-profile-email-section', '/live/email'],
-  ['/user-profile/user-profile-phone-section', '/live/phone'],
-  ['/user-profile/user-profile-password-section', '/live/password'],
-  ['/user-profile/user-profile-active-devices-section', '/live/active-devices'],
-  ['/user-profile/user-profile-mfa-section', '/live/mfa'],
-  ['/user-profile/user-profile-connected-accounts-section', '/live/connected-accounts'],
-  ['/user-profile/user-profile-enterprise-accounts-section', '/live/enterprise-accounts'],
-  ['/user-profile/user-profile-danger-section', '/live/user-danger'],
-  ['/organization-profile/organization-profile-general-panel', '/live/organization-general'],
-  ['/organization-profile/organization-profile-members-panel', '/live/organization-members'],
-  ['/organization-profile/organization-profile-api-keys-panel', '/live/organization-api-keys'],
-  ['/organization-profile/organization-profile-profile-section', '/live/organization-details'],
-  ['/organization-profile/organization-profile-danger-section', '/live/organization-danger'],
-  ['/user-profile/user-profile-passkeys-section', '/live/passkeys'],
-  ['/user-profile/user-profile-web3wallets-section', '/live/web3-wallets'],
-  ['/api-keys/api-keys-table', '/live/api-keys-table'],
-  ['/reverification/reverification', '/live/reverification'],
+const livePages = new Set([
+  '/user-profile/user-profile-profile-panel',
+  '/user-profile/user-profile-security-panel',
+  '/user-profile/user-profile-api-keys-panel',
+  '/user-profile/user-profile-profile-section',
+  '/user-profile/user-profile-email-section',
+  '/user-profile/user-profile-phone-section',
+  '/user-profile/user-profile-password-section',
+  '/user-profile/user-profile-active-devices-section',
+  '/user-profile/user-profile-mfa-section',
+  '/user-profile/user-profile-connected-accounts-section',
+  '/user-profile/user-profile-enterprise-accounts-section',
+  '/user-profile/user-profile-danger-section',
+  '/organization-profile/organization-profile-general-panel',
+  '/organization-profile/organization-profile-members-panel',
+  '/organization-profile/organization-profile-api-keys-panel',
+  '/organization-profile/organization-profile-profile-section',
+  '/organization-profile/organization-profile-danger-section',
+  '/user-profile/user-profile-passkeys-section',
+  '/user-profile/user-profile-web3wallets-section',
+  '/api-keys/api-keys-table',
+  '/reverification/reverification',
 ]);
 
 export function getLiveSidebarGroups(): LiveSidebarGroup[] {
@@ -43,9 +43,9 @@ export function getLiveSidebarGroups(): LiveSidebarGroup[] {
       const liveComponents: LiveSidebarEntry[] = [];
 
       for (const component of categoryComponents) {
-        const href = liveRoutes.get(`/${groupSlug}/${component.componentSlug}`);
-        if (href) {
-          liveComponents.push({ ...component, href });
+        const path = `/${groupSlug}/${component.componentSlug}`;
+        if (livePages.has(path)) {
+          liveComponents.push({ ...component, href: `/live${path}` });
         }
       }