diff --git a/apps/web/src/app/(app)/dashboard/cards/views-count-chart.tsx b/apps/web/src/app/app/(dashboard)/cards/views-count-chart.tsx
similarity index 100%
rename from apps/web/src/app/(app)/dashboard/cards/views-count-chart.tsx
rename to apps/web/src/app/app/(dashboard)/cards/views-count-chart.tsx
diff --git a/apps/web/src/app/(app)/dashboard/cards/views-count.tsx b/apps/web/src/app/app/(dashboard)/cards/views-count.tsx
similarity index 96%
rename from apps/web/src/app/(app)/dashboard/cards/views-count.tsx
rename to apps/web/src/app/app/(dashboard)/cards/views-count.tsx
index 608e407..029516b 100644
--- a/apps/web/src/app/(app)/dashboard/cards/views-count.tsx
+++ b/apps/web/src/app/app/(dashboard)/cards/views-count.tsx
@@ -38,7 +38,7 @@ export async function ViewsCount() {
     return (
       <Card className="relative">
         <p className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 text-center text-sm leading-relaxed text-muted-foreground">
-          <Link href="/settings/organization" className="underline">
+          <Link href="/app/settings/organization" className="underline">
             Setup your Bunny account
           </Link>{' '}
           to see metrics
diff --git a/apps/web/src/app/(app)/dashboard/page.tsx b/apps/web/src/app/app/(dashboard)/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/dashboard/page.tsx
rename to apps/web/src/app/app/(dashboard)/page.tsx
diff --git a/apps/web/src/app/(app)/batches/[id]/batch-upload-list.tsx b/apps/web/src/app/app/batches/[id]/batch-upload-list.tsx
similarity index 99%
rename from apps/web/src/app/(app)/batches/[id]/batch-upload-list.tsx
rename to apps/web/src/app/app/batches/[id]/batch-upload-list.tsx
index 5ca7acc..3c50d94 100644
--- a/apps/web/src/app/(app)/batches/[id]/batch-upload-list.tsx
+++ b/apps/web/src/app/app/batches/[id]/batch-upload-list.tsx
@@ -98,7 +98,7 @@ export function BatchUploadList({ batchId }: BatchUploadListProps) {
                     <TableCell>
                       <div className="flex flex-col">
                         <Link
-                          href={`/videos/${video.id}`}
+                          href={`/app/videos/${video.id}`}
                           prefetch={false}
                           className="font-medium text-primary outline-none hover:underline"
                         >
diff --git a/apps/web/src/app/(app)/batches/[id]/batch-upload-skeleton-table.tsx b/apps/web/src/app/app/batches/[id]/batch-upload-skeleton-table.tsx
similarity index 100%
rename from apps/web/src/app/(app)/batches/[id]/batch-upload-skeleton-table.tsx
rename to apps/web/src/app/app/batches/[id]/batch-upload-skeleton-table.tsx
diff --git a/apps/web/src/app/(app)/batches/[id]/page.tsx b/apps/web/src/app/app/batches/[id]/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/batches/[id]/page.tsx
rename to apps/web/src/app/app/batches/[id]/page.tsx
diff --git a/apps/web/src/app/(app)/layout.tsx b/apps/web/src/app/app/layout.tsx
similarity index 100%
rename from apps/web/src/app/(app)/layout.tsx
rename to apps/web/src/app/app/layout.tsx
diff --git a/apps/web/src/app/(app)/settings/aside-link.tsx b/apps/web/src/app/app/settings/aside-link.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/aside-link.tsx
rename to apps/web/src/app/app/settings/aside-link.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/create-webhook.tsx b/apps/web/src/app/app/settings/developers/create-webhook.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/create-webhook.tsx
rename to apps/web/src/app/app/settings/developers/create-webhook.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/logs/[logId]/page.tsx b/apps/web/src/app/app/settings/developers/logs/[logId]/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/logs/[logId]/page.tsx
rename to apps/web/src/app/app/settings/developers/logs/[logId]/page.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/logs/layout.tsx b/apps/web/src/app/app/settings/developers/logs/layout.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/logs/layout.tsx
rename to apps/web/src/app/app/settings/developers/logs/layout.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/logs/page.tsx b/apps/web/src/app/app/settings/developers/logs/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/logs/page.tsx
rename to apps/web/src/app/app/settings/developers/logs/page.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/logs/webhook-logs-filters.tsx b/apps/web/src/app/app/settings/developers/logs/webhook-logs-filters.tsx
similarity index 95%
rename from apps/web/src/app/(app)/settings/developers/logs/webhook-logs-filters.tsx
rename to apps/web/src/app/app/settings/developers/logs/webhook-logs-filters.tsx
index 3a1b77f..04c45b0 100644
--- a/apps/web/src/app/(app)/settings/developers/logs/webhook-logs-filters.tsx
+++ b/apps/web/src/app/app/settings/developers/logs/webhook-logs-filters.tsx
@@ -45,7 +45,7 @@ export function WebhookLogsFilters() {
     }
 
     startTransition(() => {
-      router.push(`/settings/developers/logs?${params.toString()}`)
+      router.push(`/app/settings/developers/logs?${params.toString()}`)
     })
   }
 
@@ -58,7 +58,7 @@ export function WebhookLogsFilters() {
     params.delete('query')
     params.delete('trigger')
 
-    router.push(`/settings/developers/logs?${params.toString()}`)
+    router.push(`/app/settings/developers/logs?${params.toString()}`)
   }
 
   const hasFilters = trigger !== undefined || query !== ''
diff --git a/apps/web/src/app/(app)/settings/developers/logs/webhook-logs-list-date-range-picker.tsx b/apps/web/src/app/app/settings/developers/logs/webhook-logs-list-date-range-picker.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/logs/webhook-logs-list-date-range-picker.tsx
rename to apps/web/src/app/app/settings/developers/logs/webhook-logs-list-date-range-picker.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/logs/webhook-logs-list-loading.tsx b/apps/web/src/app/app/settings/developers/logs/webhook-logs-list-loading.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/logs/webhook-logs-list-loading.tsx
rename to apps/web/src/app/app/settings/developers/logs/webhook-logs-list-loading.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/logs/webhook-logs-list.tsx b/apps/web/src/app/app/settings/developers/logs/webhook-logs-list.tsx
similarity index 97%
rename from apps/web/src/app/(app)/settings/developers/logs/webhook-logs-list.tsx
rename to apps/web/src/app/app/settings/developers/logs/webhook-logs-list.tsx
index 14022d9..07f589b 100644
--- a/apps/web/src/app/(app)/settings/developers/logs/webhook-logs-list.tsx
+++ b/apps/web/src/app/app/settings/developers/logs/webhook-logs-list.tsx
@@ -79,7 +79,9 @@ export function WebhookLogsList() {
                     key={webhookLog.id}
                     className="cursor-pointer"
                     onClick={() =>
-                      router.push(`/settings/developers/logs/${webhookLog.id}`)
+                      router.push(
+                        `/app/settings/developers/logs/${webhookLog.id}`,
+                      )
                     }
                   >
                     <TableCell className="py-1.5">
diff --git a/apps/web/src/app/(app)/settings/developers/page.tsx b/apps/web/src/app/app/settings/developers/page.tsx
similarity index 97%
rename from apps/web/src/app/(app)/settings/developers/page.tsx
rename to apps/web/src/app/app/settings/developers/page.tsx
index 48f6d79..b82b76b 100644
--- a/apps/web/src/app/(app)/settings/developers/page.tsx
+++ b/apps/web/src/app/app/settings/developers/page.tsx
@@ -76,7 +76,7 @@ export default async function SettingsPage() {
 
           <div className="space-x-3">
             <Button size="default" variant="outline" asChild>
-              <Link href="/settings/developers/logs" prefetch={false}>
+              <Link href="/app/settings/developers/logs" prefetch={false}>
                 <Code2 className="mr-2 size-4" />
                 Webhook logs
               </Link>
diff --git a/apps/web/src/app/(app)/settings/developers/webhook-events-chart.tsx b/apps/web/src/app/app/settings/developers/webhook-events-chart.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/webhook-events-chart.tsx
rename to apps/web/src/app/app/settings/developers/webhook-events-chart.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/webhook-form.tsx b/apps/web/src/app/app/settings/developers/webhook-form.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/webhook-form.tsx
rename to apps/web/src/app/app/settings/developers/webhook-form.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/webhook-list-item-actions.tsx b/apps/web/src/app/app/settings/developers/webhook-list-item-actions.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/webhook-list-item-actions.tsx
rename to apps/web/src/app/app/settings/developers/webhook-list-item-actions.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/webhook-triggers-input.tsx b/apps/web/src/app/app/settings/developers/webhook-triggers-input.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/webhook-triggers-input.tsx
rename to apps/web/src/app/app/settings/developers/webhook-triggers-input.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/webhooks-docs-button.tsx b/apps/web/src/app/app/settings/developers/webhooks-docs-button.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/webhooks-docs-button.tsx
rename to apps/web/src/app/app/settings/developers/webhooks-docs-button.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/webhooks-list-loading.tsx b/apps/web/src/app/app/settings/developers/webhooks-list-loading.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/developers/webhooks-list-loading.tsx
rename to apps/web/src/app/app/settings/developers/webhooks-list-loading.tsx
diff --git a/apps/web/src/app/(app)/settings/developers/webhooks-list.tsx b/apps/web/src/app/app/settings/developers/webhooks-list.tsx
similarity index 98%
rename from apps/web/src/app/(app)/settings/developers/webhooks-list.tsx
rename to apps/web/src/app/app/settings/developers/webhooks-list.tsx
index 820bf12..91a4e44 100644
--- a/apps/web/src/app/(app)/settings/developers/webhooks-list.tsx
+++ b/apps/web/src/app/app/settings/developers/webhooks-list.tsx
@@ -59,7 +59,7 @@ export function WebhooksList() {
 
   function navigateToPage(pageIndex: number) {
     router.push(
-      `/settings/developers?${createQueryString('pageIndex', String(pageIndex))}`,
+      `/app/settings/developers?${createQueryString('pageIndex', String(pageIndex))}`,
     )
   }
 
diff --git a/apps/web/src/app/(app)/settings/layout.tsx b/apps/web/src/app/app/settings/layout.tsx
similarity index 86%
rename from apps/web/src/app/(app)/settings/layout.tsx
rename to apps/web/src/app/app/settings/layout.tsx
index e13a5b5..bbd1f0f 100644
--- a/apps/web/src/app/(app)/settings/layout.tsx
+++ b/apps/web/src/app/app/settings/layout.tsx
@@ -15,11 +15,11 @@ export default async function Layout({ children }: { children: ReactNode }) {
               <span className="mb-2 px-4 text-xxs font-semibold uppercase text-muted-foreground">
                 General
               </span>
-              <AsideLink href="/settings/profile">
+              <AsideLink href="/app/settings/profile">
                 <User2 className="mr-2 size-4" />
                 Profile
               </AsideLink>
-              <AsideLink href="/settings/organization">
+              <AsideLink href="/app/settings/organization">
                 <Building className="mr-2 size-4" />
                 Organization
               </AsideLink>
@@ -28,11 +28,11 @@ export default async function Layout({ children }: { children: ReactNode }) {
               <span className="mb-2 px-4 text-xxs font-semibold uppercase text-muted-foreground">
                 Developers
               </span>
-              <AsideLink href="/settings/developers">
+              <AsideLink href="/app/settings/developers">
                 <Code2 className="mr-2 size-4" />
                 API & Webhooks
               </AsideLink>
-              <AsideLink href="/settings/developers/logs">
+              <AsideLink href="/app/settings/developers/logs">
                 <SquareDashedBottomCode className="mr-2 size-4" />
                 Webhook Logs
               </AsideLink>
diff --git a/apps/web/src/app/(app)/settings/organization/actions.ts b/apps/web/src/app/app/settings/organization/actions.ts
similarity index 100%
rename from apps/web/src/app/(app)/settings/organization/actions.ts
rename to apps/web/src/app/app/settings/organization/actions.ts
diff --git a/apps/web/src/app/(app)/settings/organization/bunny-api-key-form.tsx b/apps/web/src/app/app/settings/organization/bunny-api-key-form.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/organization/bunny-api-key-form.tsx
rename to apps/web/src/app/app/settings/organization/bunny-api-key-form.tsx
diff --git a/apps/web/src/app/(app)/settings/organization/bunny-video-library-form.tsx b/apps/web/src/app/app/settings/organization/bunny-video-library-form.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/organization/bunny-video-library-form.tsx
rename to apps/web/src/app/app/settings/organization/bunny-video-library-form.tsx
diff --git a/apps/web/src/app/(app)/settings/organization/connect-bunny-account.tsx b/apps/web/src/app/app/settings/organization/connect-bunny-account.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/organization/connect-bunny-account.tsx
rename to apps/web/src/app/app/settings/organization/connect-bunny-account.tsx
diff --git a/apps/web/src/app/(app)/settings/organization/page.tsx b/apps/web/src/app/app/settings/organization/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/organization/page.tsx
rename to apps/web/src/app/app/settings/organization/page.tsx
diff --git a/apps/web/src/app/(app)/settings/page.tsx b/apps/web/src/app/app/settings/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/page.tsx
rename to apps/web/src/app/app/settings/page.tsx
diff --git a/apps/web/src/app/(app)/settings/profile/page.tsx b/apps/web/src/app/app/settings/profile/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/settings/profile/page.tsx
rename to apps/web/src/app/app/settings/profile/page.tsx
diff --git a/apps/web/src/app/(app)/upload/page.tsx b/apps/web/src/app/app/upload/page.tsx
similarity index 92%
rename from apps/web/src/app/(app)/upload/page.tsx
rename to apps/web/src/app/app/upload/page.tsx
index 8d18013..fa0d48c 100644
--- a/apps/web/src/app/(app)/upload/page.tsx
+++ b/apps/web/src/app/app/upload/page.tsx
@@ -21,7 +21,7 @@ export default async function Upload() {
           <AlertCircle className="mt-1.5 size-6 shrink-0 text-amber-400" />
           <p className="leading-relaxed text-muted-foreground">
             Setup your{' '}
-            <Link href="/settings/organization" className="underline">
+            <Link href="/app/settings/organization" className="underline">
               Bunny account integration
             </Link>{' '}
             before uploading videos on Nivo.
diff --git a/apps/web/src/app/(app)/upload/upload-list/columns/audio-conversion-progress-column.tsx b/apps/web/src/app/app/upload/upload-list/columns/audio-conversion-progress-column.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/columns/audio-conversion-progress-column.tsx
rename to apps/web/src/app/app/upload/upload-list/columns/audio-conversion-progress-column.tsx
diff --git a/apps/web/src/app/(app)/upload/upload-list/columns/audio-upload-progress-column.tsx b/apps/web/src/app/app/upload/upload-list/columns/audio-upload-progress-column.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/columns/audio-upload-progress-column.tsx
rename to apps/web/src/app/app/upload/upload-list/columns/audio-upload-progress-column.tsx
diff --git a/apps/web/src/app/(app)/upload/upload-list/columns/video-upload-progress-column.tsx b/apps/web/src/app/app/upload/upload-list/columns/video-upload-progress-column.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/columns/video-upload-progress-column.tsx
rename to apps/web/src/app/app/upload/upload-list/columns/video-upload-progress-column.tsx
diff --git a/apps/web/src/app/(app)/upload/upload-list/header.tsx b/apps/web/src/app/app/upload/upload-list/header.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/header.tsx
rename to apps/web/src/app/app/upload/upload-list/header.tsx
diff --git a/apps/web/src/app/(app)/upload/upload-list/index.tsx b/apps/web/src/app/app/upload/upload-list/index.tsx
similarity index 97%
rename from apps/web/src/app/(app)/upload/upload-list/index.tsx
rename to apps/web/src/app/app/upload/upload-list/index.tsx
index 9f5e542..a3d512c 100644
--- a/apps/web/src/app/(app)/upload/upload-list/index.tsx
+++ b/apps/web/src/app/app/upload/upload-list/index.tsx
@@ -45,7 +45,7 @@ export function UploadList() {
     try {
       const { batchId } = await createUploadBatch({ files })
 
-      router.push(`/batches/${batchId}`)
+      router.push(`/app/batches/${batchId}`)
     } catch {
       toast.error('Uh oh! Something went wrong.', {
         description:
diff --git a/apps/web/src/app/(app)/upload/upload-list/upload-drop-area.tsx b/apps/web/src/app/app/upload/upload-list/upload-drop-area.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/upload-drop-area.tsx
rename to apps/web/src/app/app/upload/upload-list/upload-drop-area.tsx
diff --git a/apps/web/src/app/(app)/upload/upload-list/upload-language-input.tsx b/apps/web/src/app/app/upload/upload-list/upload-language-input.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/upload-language-input.tsx
rename to apps/web/src/app/app/upload/upload-list/upload-language-input.tsx
diff --git a/apps/web/src/app/(app)/upload/upload-list/upload-table.tsx b/apps/web/src/app/app/upload/upload-list/upload-table.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/upload-table.tsx
rename to apps/web/src/app/app/upload/upload-list/upload-table.tsx
diff --git a/apps/web/src/app/(app)/upload/upload-list/upload-tag-input.tsx b/apps/web/src/app/app/upload/upload-list/upload-tag-input.tsx
similarity index 100%
rename from apps/web/src/app/(app)/upload/upload-list/upload-tag-input.tsx
rename to apps/web/src/app/app/upload/upload-list/upload-tag-input.tsx
diff --git a/apps/web/src/app/(app)/uploads/layout.tsx b/apps/web/src/app/app/uploads/layout.tsx
similarity index 100%
rename from apps/web/src/app/(app)/uploads/layout.tsx
rename to apps/web/src/app/app/uploads/layout.tsx
diff --git a/apps/web/src/app/(app)/uploads/loading.tsx b/apps/web/src/app/app/uploads/loading.tsx
similarity index 100%
rename from apps/web/src/app/(app)/uploads/loading.tsx
rename to apps/web/src/app/app/uploads/loading.tsx
diff --git a/apps/web/src/app/(app)/uploads/page.tsx b/apps/web/src/app/app/uploads/page.tsx
similarity index 99%
rename from apps/web/src/app/(app)/uploads/page.tsx
rename to apps/web/src/app/app/uploads/page.tsx
index 5846b2c..03e3546 100644
--- a/apps/web/src/app/(app)/uploads/page.tsx
+++ b/apps/web/src/app/app/uploads/page.tsx
@@ -93,7 +93,7 @@ export default async function UploadsPage({
                     <TableCell>
                       <div className="flex flex-col">
                         <Link
-                          href={`/videos/${video.id}`}
+                          href={`/app/videos/${video.id}`}
                           prefetch={false}
                           className="font-medium text-primary outline-none hover:underline"
                         >
diff --git a/apps/web/src/app/(app)/uploads/uploads-filters.tsx b/apps/web/src/app/app/uploads/uploads-filters.tsx
similarity index 95%
rename from apps/web/src/app/(app)/uploads/uploads-filters.tsx
rename to apps/web/src/app/app/uploads/uploads-filters.tsx
index 3eec258..f55de92 100644
--- a/apps/web/src/app/(app)/uploads/uploads-filters.tsx
+++ b/apps/web/src/app/app/uploads/uploads-filters.tsx
@@ -31,7 +31,7 @@ export function UploadsFilters() {
     tags.forEach((tag) => params.append('tagsFilter', tag))
 
     startTransition(() => {
-      router.push(`/uploads?${params.toString()}`)
+      router.push(`/app/uploads?${params.toString()}`)
     })
   }
 
@@ -44,7 +44,7 @@ export function UploadsFilters() {
     params.delete('titleFilter')
     params.delete('tagsFilter')
 
-    router.push(`/uploads?${params.toString()}`)
+    router.push(`/app/uploads?${params.toString()}`)
   }
 
   const hasFilters = title !== '' || tags.length > 0
diff --git a/apps/web/src/app/(app)/uploads/uploads-pagination.tsx b/apps/web/src/app/app/uploads/uploads-pagination.tsx
similarity index 95%
rename from apps/web/src/app/(app)/uploads/uploads-pagination.tsx
rename to apps/web/src/app/app/uploads/uploads-pagination.tsx
index 21655f2..949a69a 100644
--- a/apps/web/src/app/(app)/uploads/uploads-pagination.tsx
+++ b/apps/web/src/app/app/uploads/uploads-pagination.tsx
@@ -43,11 +43,13 @@ export function UploadsPagination({
   )
 
   function navigateToPage(pageIndex: number) {
-    router.push(`/uploads?${createQueryString('pageIndex', String(pageIndex))}`)
+    router.push(
+      `/app/uploads?${createQueryString('pageIndex', String(pageIndex))}`,
+    )
   }
 
   function setPageSize(pageSize: string) {
-    router.push(`/uploads?${createQueryString('pageSize', pageSize)}`)
+    router.push(`/app/uploads?${createQueryString('pageSize', pageSize)}`)
   }
 
   const page = pageIndex + 1
diff --git a/apps/web/src/app/(app)/videos/[id]/page.tsx b/apps/web/src/app/app/videos/[id]/page.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/page.tsx
rename to apps/web/src/app/app/videos/[id]/page.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/tabs/overview/index.tsx b/apps/web/src/app/app/videos/[id]/tabs/overview/index.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/tabs/overview/index.tsx
rename to apps/web/src/app/app/videos/[id]/tabs/overview/index.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/tabs/overview/video-description-input.tsx b/apps/web/src/app/app/videos/[id]/tabs/overview/video-description-input.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/tabs/overview/video-description-input.tsx
rename to apps/web/src/app/app/videos/[id]/tabs/overview/video-description-input.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/tabs/overview/video-form.tsx b/apps/web/src/app/app/videos/[id]/tabs/overview/video-form.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/tabs/overview/video-form.tsx
rename to apps/web/src/app/app/videos/[id]/tabs/overview/video-form.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/tabs/overview/video-tag-input.tsx b/apps/web/src/app/app/videos/[id]/tabs/overview/video-tag-input.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/tabs/overview/video-tag-input.tsx
rename to apps/web/src/app/app/videos/[id]/tabs/overview/video-tag-input.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/tabs/webhooks/index.tsx b/apps/web/src/app/app/videos/[id]/tabs/webhooks/index.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/tabs/webhooks/index.tsx
rename to apps/web/src/app/app/videos/[id]/tabs/webhooks/index.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/tabs/webhooks/metadata-tooltip.tsx b/apps/web/src/app/app/videos/[id]/tabs/webhooks/metadata-tooltip.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/tabs/webhooks/metadata-tooltip.tsx
rename to apps/web/src/app/app/videos/[id]/tabs/webhooks/metadata-tooltip.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/tabs/webhooks/webhooks-skeleton-table.tsx b/apps/web/src/app/app/videos/[id]/tabs/webhooks/webhooks-skeleton-table.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/tabs/webhooks/webhooks-skeleton-table.tsx
rename to apps/web/src/app/app/videos/[id]/tabs/webhooks/webhooks-skeleton-table.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/transcription-card/index.tsx b/apps/web/src/app/app/videos/[id]/transcription-card/index.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/transcription-card/index.tsx
rename to apps/web/src/app/app/videos/[id]/transcription-card/index.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/transcription-card/segment.tsx b/apps/web/src/app/app/videos/[id]/transcription-card/segment.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/transcription-card/segment.tsx
rename to apps/web/src/app/app/videos/[id]/transcription-card/segment.tsx
diff --git a/apps/web/src/app/(app)/videos/[id]/transcription-card/transcription-skeleton.tsx b/apps/web/src/app/app/videos/[id]/transcription-card/transcription-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/(app)/videos/[id]/transcription-card/transcription-skeleton.tsx
rename to apps/web/src/app/app/videos/[id]/transcription-card/transcription-skeleton.tsx
diff --git a/apps/web/src/app/auth/sign-in/actions.ts b/apps/web/src/app/auth/sign-in/actions.ts
index 673db14..5b15bc6 100644
--- a/apps/web/src/app/auth/sign-in/actions.ts
+++ b/apps/web/src/app/auth/sign-in/actions.ts
@@ -14,12 +14,12 @@ export async function signInWithEmail(data: FormData) {
   await signIn('credentials', {
     email,
     password,
-    redirectTo: '/dashboard',
+    redirectTo: '/app',
   })
 }
 
 export async function signInWithGithub() {
   await signIn('google', {
-    redirectTo: '/dashboard',
+    redirectTo: '/app',
   })
 }
diff --git a/apps/web/src/components/header/index.tsx b/apps/web/src/components/header/index.tsx
index e68e6f9..25296b8 100644
--- a/apps/web/src/components/header/index.tsx
+++ b/apps/web/src/components/header/index.tsx
@@ -27,8 +27,8 @@ export function Header() {
           <Separator orientation="vertical" className="h-6" />
 
           <nav className="flex items-center space-x-2 lg:space-x-3">
-            <MenuLink href="/dashboard">Dashboard</MenuLink>
-            <MenuLink href="/uploads">Uploads</MenuLink>
+            <MenuLink href="/app">Dashboard</MenuLink>
+            <MenuLink href="/app/uploads">Uploads</MenuLink>
           </nav>
         </div>
 
@@ -38,7 +38,7 @@ export function Header() {
           <Separator orientation="vertical" className="h-6" />
 
           <Button size="sm" asChild>
-            <Link href="/upload">
+            <Link href="/app/upload">
               <PlusCircle className="mr-2 size-4" />
               Upload video
             </Link>
diff --git a/apps/web/src/components/header/menu-link.tsx b/apps/web/src/components/header/menu-link.tsx
index 5a6200e..4b3fb63 100644
--- a/apps/web/src/components/header/menu-link.tsx
+++ b/apps/web/src/components/header/menu-link.tsx
@@ -1,11 +1,11 @@
-import Link from 'next/link'
 import { ComponentProps } from 'react'
 
 import { NavLink } from '../nav-link'
 
-export function MenuLink(props: ComponentProps<typeof Link>) {
+export function MenuLink(props: ComponentProps<typeof NavLink>) {
   return (
     <NavLink
+      shouldMatchExact
       className="flex h-14 items-center border-b-2 border-transparent px-3 py-1.5 text-sm font-medium text-muted-foreground transition-colors hover:border-border data-[current=true]:border-teal-400 data-[current=true]:text-accent-foreground"
       {...props}
     />
diff --git a/apps/web/src/components/header/search-item.tsx b/apps/web/src/components/header/search-item.tsx
index 8198fcb..b4f5e13 100644
--- a/apps/web/src/components/header/search-item.tsx
+++ b/apps/web/src/components/header/search-item.tsx
@@ -20,7 +20,7 @@ export function SearchItem({ video, onRequestClose }: SearchItemProps) {
 
   function handleNavigate() {
     startTransition(() => {
-      router.push(`/videos/${video.id}`)
+      router.push(`/app/videos/${video.id}`)
     })
   }
 
diff --git a/apps/web/src/components/header/user-profile-button.tsx b/apps/web/src/components/header/user-profile-button.tsx
index 5874281..b7a27c6 100644
--- a/apps/web/src/components/header/user-profile-button.tsx
+++ b/apps/web/src/components/header/user-profile-button.tsx
@@ -42,13 +42,13 @@ export async function UserProfileButton() {
       <DropdownMenuContent align="end" className="w-48">
         <DropdownMenuLabel>My Account</DropdownMenuLabel>
         <DropdownMenuItem className="flex items-center gap-2" asChild>
-          <Link href="/settings/profile" className="w-full">
+          <Link href="/app/settings/profile" className="w-full">
             <Cog className="size-4" />
             Settings
           </Link>
         </DropdownMenuItem>
         <DropdownMenuItem className="flex items-center gap-2" asChild>
-          <Link href="/settings/developers" className="w-full">
+          <Link href="/app/settings/developers" className="w-full">
             <Code className="size-4" />
             Developers
           </Link>
diff --git a/apps/web/src/components/transcription-preview.tsx b/apps/web/src/components/transcription-preview.tsx
index fd681b5..eada10a 100644
--- a/apps/web/src/components/transcription-preview.tsx
+++ b/apps/web/src/components/transcription-preview.tsx
@@ -74,7 +74,7 @@ export function TranscriptionPreview({ videoId }: TranscriptionPreviewProps) {
               autoFocus
             />
             <Button variant="secondary" asChild>
-              <Link href={`/videos/${data?.transcription?.uploadId}`}>
+              <Link href={`/app/videos/${data?.transcription?.uploadId}`}>
                 <Edit2 className="mr-2 h-3 w-3" />
                 Review
               </Link>
diff --git a/apps/web/src/components/upload-item-actions.tsx b/apps/web/src/components/upload-item-actions.tsx
index 05606b7..8626309 100644
--- a/apps/web/src/components/upload-item-actions.tsx
+++ b/apps/web/src/components/upload-item-actions.tsx
@@ -70,7 +70,7 @@ export function UploadItemActions({ videoId }: UploadItemActionsProps) {
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end" className="w-[160px]">
           <DropdownMenuItem asChild>
-            <Link href={`/videos/${videoId}`} prefetch={false}>
+            <Link href={`/app/videos/${videoId}`} prefetch={false}>
               <Pencil2Icon className="mr-2 h-4 w-4" />
               <span>Edit</span>
             </Link>
diff --git a/packages/auth/auth.config.ts b/packages/auth/auth.config.ts
index 74e71ca..5d98213 100644
--- a/packages/auth/auth.config.ts
+++ b/packages/auth/auth.config.ts
@@ -65,21 +65,18 @@ export const authConfig = {
     authorized({ auth, request: { nextUrl } }) {
       const isLoggedIn = !!auth?.user
 
-      const isOnPublicPages =
-        nextUrl.pathname.startsWith('/auth') ||
-        nextUrl.pathname === '/' ||
-        nextUrl.pathname === '/about'
       const isOnWebhooks = nextUrl.pathname.startsWith('/api/webhooks')
       const isOnPublicAPIRoutes = nextUrl.pathname.startsWith('/api/auth')
       const isOnAPIRoutes = nextUrl.pathname.startsWith('/api')
-      const isOnPrivatePages = !isOnPublicPages
+      const isOnPrivatePages = nextUrl.pathname.startsWith('/app')
+      const isOnPublicPages = !isOnPrivatePages
 
       if (isOnWebhooks || isOnPublicAPIRoutes) {
         return true
       }
 
-      if (isOnPublicPages && isLoggedIn) {
-        return Response.redirect(new URL('/dashboard', nextUrl))
+      if (isOnPublicPages && !isOnAPIRoutes && isLoggedIn) {
+        return Response.redirect(new URL('/app', nextUrl))
       }
 
       if (isOnAPIRoutes && !isLoggedIn) {
@@ -87,7 +84,6 @@ export const authConfig = {
       }
 
       if (isOnPrivatePages && !isLoggedIn) {
-        // Redirect user back to sign in
         return false
       }