diff --git a/.gitignore b/.gitignore
index ec4979cd0..c83f0cb42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ node_modules
 !.env.example
 test-results/
 playwright-report/
+vite.config.js.timestamp-*
+vite.config.ts.timestamp-*
 
 .DS_STORE
 .cache
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..f23974574
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,32 @@
+FROM node:20-alpine as build
+
+WORKDIR /app
+
+ADD ./build.js /app/build.js
+ADD ./tsconfig.json /app/tsconfig.json
+ADD ./svelte.config.js /app/svelte.config.js
+ADD ./vite.config.ts /app/vite.config.ts
+ADD ./package.json /app/package.json
+ADD ./package-lock.json /app/package-lock.json
+ADD ./src /app/src
+ADD ./static /app/static
+
+ARG VITE_CONSOLE_MODE
+ARG VITE_APPWRITE_ENDPOINT
+ARG VITE_APPWRITE_GROWTH_ENDPOINT
+ARG VITE_STRIPE_PUBLIC_KEY
+
+ENV VITE_APPWRITE_ENDPOINT=$VITE_APPWRITE_ENDPOINT
+ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
+ENV VITE_CONSOLE_MODE=$VITE_CONSOLE_MODE
+ENV VITE_STRIPE_PUBLIC_KEY=$VITE_STRIPE_PUBLIC_KEY
+
+RUN npm ci
+RUN npm run build
+
+FROM nginx:1.25-alpine
+
+EXPOSE 3000
+
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/build /usr/share/nginx/html/console
\ No newline at end of file
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 000000000..47a30e94c
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,16 @@
+services:
+    console:
+        build:
+            context: .
+            args:
+                VITE_CONSOLE_MODE: ${VITE_CONSOLE_MODE}
+                VITE_APPWRITE_ENDPOINT: ${VITE_APPWRITE_ENDPOINT}
+                VITE_APPWRITE_GROWTH_ENDPOINT: ${VITE_APPWRITE_GROWTH_ENDPOINT}
+                VITE_STRIPE_PUBLIC_KEY: ${VITE_STRIPE_PUBLIC_KEY}
+        environment:
+            - VITE_CONSOLE_MODE
+            - VITE_APPWRITE_ENDPOINT
+            - VITE_APPWRITE_GROWTH_ENDPOINT
+            - VITE_STRIPE_PUBLIC_KEY
+        ports:
+            - '3000:3000'
diff --git a/docker/nginx.conf b/docker/nginx.conf
new file mode 100644
index 000000000..18c7249c8
--- /dev/null
+++ b/docker/nginx.conf
@@ -0,0 +1,16 @@
+server {
+    listen 3000;
+    listen [::]:3000;
+    server_name localhost;
+
+    location /console {
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+        try_files $uri /console/index.html;
+    }
+
+    location / {
+        absolute_redirect off;
+        return 301 /console;
+    }
+}
\ No newline at end of file
diff --git a/playwright.config.ts b/playwright.config.ts
index 00bf89667..37738bc99 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -4,6 +4,9 @@ const config: PlaywrightTestConfig = {
     timeout: 120000,
     reportSlowTests: null,
     reporter: [['html', { open: 'never' }]],
+    use: {
+        baseURL: 'http://localhost:4173/console'
+    },
     webServer: {
         timeout: 120000,
         env: {
diff --git a/src/service-worker.ts b/src/_service-worker.ts
similarity index 100%
rename from src/service-worker.ts
rename to src/_service-worker.ts
diff --git a/src/app.html b/src/app.html
index 1be8a9cf9..f0dd566b3 100644
--- a/src/app.html
+++ b/src/app.html
@@ -4,42 +4,42 @@
         <meta charset="utf-8" />
         <meta name="description" content="" />
 
-        <link rel="icon" type="image/svg+xml" href="/logos/appwrite-icon.svg" />
+        <link rel="icon" type="image/svg+xml" href="/console/logos/appwrite-icon.svg" />
         <link rel="mask-icon" type="image/png" href="/logos/appwrite-icon.png" />
 
         <link
             rel="preload"
-            href="/fonts/inter/inter-v8-latin-600.woff2"
+            href="/console/fonts/inter/inter-v8-latin-600.woff2"
             as="font"
             type="font/woff2"
             crossorigin />
         <link
             rel="preload"
-            href="/fonts/inter/inter-v8-latin-regular.woff2"
+            href="/console/fonts/inter/inter-v8-latin-regular.woff2"
             as="font"
             type="font/woff2"
             crossorigin />
         <link
             rel="preload"
-            href="/fonts/poppins/poppins-v19-latin-500.woff2"
+            href="/console/fonts/poppins/poppins-v19-latin-500.woff2"
             as="font"
             type="font/woff2"
             crossorigin />
         <link
             rel="preload"
-            href="/fonts/poppins/poppins-v19-latin-600.woff2"
+            href="/console/fonts/poppins/poppins-v19-latin-600.woff2"
             as="font"
             type="font/woff2"
             crossorigin />
         <link
             rel="preload"
-            href="/fonts/poppins/poppins-v19-latin-700.woff2"
+            href="/console/fonts/poppins/poppins-v19-latin-700.woff2"
             as="font"
             type="font/woff2"
             crossorigin />
         <link
             rel="preload"
-            href="/fonts/source-code-pro/source-code-pro-v20-latin-regular.woff2"
+            href="/console/fonts/source-code-pro/source-code-pro-v20-latin-regular.woff2"
             as="font"
             type="font/woff2"
             crossorigin />
@@ -127,8 +127,8 @@
             as="font"
             type="font/woff2"
             crossorigin />
-        <link rel="preload" as="style" type="text/css" href="/fonts/main.css" />
-        <link rel="stylesheet" href="/fonts/main.css" />
+        <link rel="preload" as="style" type="text/css" href="/console/fonts/main.css" />
+        <link rel="stylesheet" href="/console/fonts/main.css" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <!-- {{CLOUD_OG}} -->
 
diff --git a/src/lib/commandCenter/panels/createAttribute.svelte b/src/lib/commandCenter/panels/createAttribute.svelte
index 9e4f02eff..9613d303b 100644
--- a/src/lib/commandCenter/panels/createAttribute.svelte
+++ b/src/lib/commandCenter/panels/createAttribute.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import { initCreateAttribute } from '$routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte';
-    import { attributeOptions } from '$routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store';
+    import { initCreateAttribute } from '$routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte';
+    import { attributeOptions } from '$routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store';
     import Template from './template.svelte';
 
     let search = '';
diff --git a/src/lib/commandCenter/panels/createMessage.svelte b/src/lib/commandCenter/panels/createMessage.svelte
index db1cd5437..19ea7f7d3 100644
--- a/src/lib/commandCenter/panels/createMessage.svelte
+++ b/src/lib/commandCenter/panels/createMessage.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-    import { providers } from '$routes/console/project-[project]/messaging/providers/store';
+    import { providers } from '$routes/(console)/project-[project]/messaging/providers/store';
     import {
         messageParams,
         providerType,
         targetsById
-    } from '$routes/console/project-[project]/messaging/wizard/store';
+    } from '$routes/(console)/project-[project]/messaging/wizard/store';
     import { MessagingProviderType } from '@appwrite.io/console';
     import Template from './template.svelte';
     import { wizard } from '$lib/stores/wizard';
-    import Create from '$routes/console/project-[project]/messaging/create.svelte';
-    import { topicsById } from '$routes/console/project-[project]/messaging/store';
+    import Create from '$routes/(console)/project-[project]/messaging/create.svelte';
+    import { topicsById } from '$routes/(console)/project-[project]/messaging/store';
 
     let search = '';
 
diff --git a/src/lib/commandCenter/panels/platforms.svelte b/src/lib/commandCenter/panels/platforms.svelte
index a71df544d..3822d54d9 100644
--- a/src/lib/commandCenter/panels/platforms.svelte
+++ b/src/lib/commandCenter/panels/platforms.svelte
@@ -2,7 +2,7 @@
     import {
         Platform,
         addPlatform
-    } from '$routes/console/project-[project]/overview/platforms/+page.svelte';
+    } from '$routes/(console)/project-[project]/overview/platforms/+page.svelte';
     import Template from './template.svelte';
 
     let search = '';
diff --git a/src/lib/commandCenter/searchers/buckets.ts b/src/lib/commandCenter/searchers/buckets.ts
index 8e4d45689..eecc30552 100644
--- a/src/lib/commandCenter/searchers/buckets.ts
+++ b/src/lib/commandCenter/searchers/buckets.ts
@@ -1,17 +1,18 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { Query, type Models } from '@appwrite.io/console';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import { addSubPanel } from '../subPanels';
 import { FilesPanel } from '../panels';
+import { base } from '$app/paths';
 
 const getBucketCommand = (bucket: Models.Bucket, projectId: string) => {
     return {
         label: `${bucket.name}`,
         callback() {
-            goto(`/console/project-${projectId}/storage/bucket-${bucket.$id}`);
+            goto(`${base}/project-${projectId}/storage/bucket-${bucket.$id}`);
         },
         group: 'buckets',
         icon: 'folder'
@@ -31,7 +32,7 @@ export const bucketSearcher = (async (query: string) => {
             {
                 label: 'Find files',
                 async callback() {
-                    await goto(`/console/project-${$project.$id}/storage/bucket-${bucket.$id}`);
+                    await goto(`${base}/project-${$project.$id}/storage/bucket-${bucket.$id}`);
                     addSubPanel(FilesPanel);
                 },
                 group: 'buckets',
@@ -43,7 +44,7 @@ export const bucketSearcher = (async (query: string) => {
                 label: 'Permissions',
                 async callback() {
                     await goto(
-                        `/console/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#permissions`
+                        `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#permissions`
                     );
                     scrollBy({ top: -100 });
                 },
@@ -55,7 +56,7 @@ export const bucketSearcher = (async (query: string) => {
                 label: 'Extensions',
                 async callback() {
                     await goto(
-                        `/console/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#extensions`
+                        `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#extensions`
                     );
                 },
                 group: 'buckets',
@@ -66,7 +67,7 @@ export const bucketSearcher = (async (query: string) => {
                 label: 'File Security',
                 async callback() {
                     await goto(
-                        `/console/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#file-security`
+                        `${base}/project-${$project.$id}/storage/bucket-${bucket.$id}/settings#file-security`
                     );
                     scrollBy({ top: -100 });
                 },
diff --git a/src/lib/commandCenter/searchers/collections.ts b/src/lib/commandCenter/searchers/collections.ts
index b04ad758a..8a3a9ed54 100644
--- a/src/lib/commandCenter/searchers/collections.ts
+++ b/src/lib/commandCenter/searchers/collections.ts
@@ -1,9 +1,10 @@
 import { goto } from '$app/navigation';
-import { database } from '$routes/console/project-[project]/databases/database-[database]/store';
-import { project } from '$routes/console/project-[project]/store';
+import { database } from '$routes/(console)/project-[project]/databases/database-[database]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
+import { base } from '$app/paths';
 
 export const collectionsSearcher = (async (query: string) => {
     const databaseId = get(database).$id;
@@ -19,7 +20,7 @@ export const collectionsSearcher = (async (query: string) => {
                     label: col.name,
                     callback: () => {
                         goto(
-                            `/console/project-${projectId}/databases/database-${databaseId}/collection-${col.$id}`
+                            `${base}/project-${projectId}/databases/database-${databaseId}/collection-${col.$id}`
                         );
                     }
                 }) as const
diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts
index 7acaa0038..e1153005c 100644
--- a/src/lib/commandCenter/searchers/databases.ts
+++ b/src/lib/commandCenter/searchers/databases.ts
@@ -1,8 +1,9 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
+import { base } from '$app/paths';
 
 export const dbSearcher = (async (query: string) => {
     const { databases } = await sdk.forProject.databases.list();
@@ -15,7 +16,7 @@ export const dbSearcher = (async (query: string) => {
                     group: 'databases',
                     label: db.name,
                     callback: () => {
-                        goto(`/console/project-${get(project).$id}/databases/database-${db.$id}`);
+                        goto(`${base}/project-${get(project).$id}/databases/database-${db.$id}`);
                     },
                     icon: 'database'
                 }) as const
diff --git a/src/lib/commandCenter/searchers/files.ts b/src/lib/commandCenter/searchers/files.ts
index a07ed3b32..bab3a35f8 100644
--- a/src/lib/commandCenter/searchers/files.ts
+++ b/src/lib/commandCenter/searchers/files.ts
@@ -1,10 +1,11 @@
 import { sdk } from '$lib/stores/sdk';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
-import { bucket } from '$routes/console/project-[project]/storage/bucket-[bucket]/store';
+import { bucket } from '$routes/(console)/project-[project]/storage/bucket-[bucket]/store';
 import { Query } from '@appwrite.io/console';
 import { goto } from '$app/navigation';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
+import { base } from '$app/paths';
 
 export const fileSearcher = (async (query: string) => {
     const $bucket = get(bucket);
@@ -19,7 +20,7 @@ export const fileSearcher = (async (query: string) => {
     return files.map((file) => ({
         label: file.name,
         callback: () => {
-            goto(`/console/project-${$project.$id}/storage/bucket-${$bucket.$id}/file-${file.$id}`);
+            goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/file-${file.$id}`);
         },
         icon: 'document',
         group: 'files'
diff --git a/src/lib/commandCenter/searchers/functions.ts b/src/lib/commandCenter/searchers/functions.ts
index cb5f23646..174df48aa 100644
--- a/src/lib/commandCenter/searchers/functions.ts
+++ b/src/lib/commandCenter/searchers/functions.ts
@@ -1,17 +1,18 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
 import { page } from '$app/stores';
-import { showCreateDeployment } from '$routes/console/project-[project]/functions/function-[function]/store';
+import { showCreateDeployment } from '$routes/(console)/project-[project]/functions/function-[function]/store';
+import { base } from '$app/paths';
 
 const getFunctionCommand = (fn: Models.Function, projectId: string) => {
     return {
         label: fn.name,
         callback: () => {
-            goto(`/console/project-${projectId}/functions/function-${fn.$id}`);
+            goto(`${base}/project-${projectId}/functions/function-${fn.$id}`);
         },
         group: 'functions',
         icon: 'lightning-bolt'
@@ -35,7 +36,7 @@ export const functionsSearcher = (async (query: string) => {
                 async callback() {
                     const $page = get(page);
                     if (!$page.url.pathname.endsWith(func.$id)) {
-                        await goto(`/console/project-${projectId}/functions/function-${func.$id}`);
+                        await goto(`${base}/project-${projectId}/functions/function-${func.$id}`);
                     }
                     showCreateDeployment.set(true);
                 },
@@ -46,7 +47,7 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to deployments',
                 nested: true,
                 callback() {
-                    goto(`/console/project-${projectId}/functions/function-${func.$id}`);
+                    goto(`${base}/project-${projectId}/functions/function-${func.$id}`);
                 },
                 group: 'functions'
             },
@@ -54,7 +55,7 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to usage',
                 nested: true,
                 callback() {
-                    goto(`/console/project-${projectId}/functions/function-${func.$id}/usage`);
+                    goto(`${base}/project-${projectId}/functions/function-${func.$id}/usage`);
                 },
                 group: 'functions'
             },
@@ -62,7 +63,7 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to executions',
                 nested: true,
                 callback() {
-                    goto(`/console/project-${projectId}/functions/function-${func.$id}/executions`);
+                    goto(`${base}/project-${projectId}/functions/function-${func.$id}/executions`);
                 },
                 group: 'functions'
             },
@@ -70,7 +71,7 @@ export const functionsSearcher = (async (query: string) => {
                 label: 'Go to settings',
                 nested: true,
                 callback() {
-                    goto(`/console/project-${projectId}/functions/function-${func.$id}/settings`);
+                    goto(`${base}/project-${projectId}/functions/function-${func.$id}/settings`);
                 },
                 group: 'functions'
             }
diff --git a/src/lib/commandCenter/searchers/messages.ts b/src/lib/commandCenter/searchers/messages.ts
index 5f498a951..0ce8e2d5e 100644
--- a/src/lib/commandCenter/searchers/messages.ts
+++ b/src/lib/commandCenter/searchers/messages.ts
@@ -1,9 +1,10 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import { type Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
 import { MessagingProviderType } from '@appwrite.io/console';
+import { base } from '$app/paths';
 
 const getLabel = (message) => {
     switch (message.providerType) {
@@ -44,7 +45,7 @@ export const messagesSearcher = (async (query: string) => {
                     group: 'messages',
                     label: getLabel(message),
                     callback: () => {
-                        goto(`/console/project-${projectId}/messaging/message-${message.$id}`);
+                        goto(`${base}/project-${projectId}/messaging/message-${message.$id}`);
                     },
                     icon: getIcon(message)
                 }) as const
diff --git a/src/lib/commandCenter/searchers/organizations.ts b/src/lib/commandCenter/searchers/organizations.ts
index df72d77b2..98302e96f 100644
--- a/src/lib/commandCenter/searchers/organizations.ts
+++ b/src/lib/commandCenter/searchers/organizations.ts
@@ -1,4 +1,5 @@
 import { goto } from '$app/navigation';
+import { base } from '$app/paths';
 import { sdk } from '$lib/stores/sdk';
 import type { Searcher } from '../commands';
 
@@ -10,7 +11,7 @@ export const orgSearcher = (async (query: string) => {
             return {
                 label: organization.name,
                 callback: () => {
-                    goto(`/console/organization-${organization.$id}`);
+                    goto(`${base}/organization-${organization.$id}`);
                 },
                 group: 'organizations'
             } as const;
diff --git a/src/lib/commandCenter/searchers/projects.ts b/src/lib/commandCenter/searchers/projects.ts
index c89c2e88f..a3f88c242 100644
--- a/src/lib/commandCenter/searchers/projects.ts
+++ b/src/lib/commandCenter/searchers/projects.ts
@@ -4,6 +4,7 @@ import { sdk } from '$lib/stores/sdk';
 import { Query } from '@appwrite.io/console';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
+import { base } from '$app/paths';
 
 export const projectsSearcher = (async (query: string) => {
     const { projects } = await sdk.forConsole.projects.list([
@@ -17,7 +18,7 @@ export const projectsSearcher = (async (query: string) => {
             return {
                 label: project.name,
                 callback: () => {
-                    goto(`/console/project-${project.$id}`);
+                    goto(`${base}/project-${project.$id}`);
                 },
                 group: 'projects'
             } as const;
diff --git a/src/lib/commandCenter/searchers/providers.ts b/src/lib/commandCenter/searchers/providers.ts
index b4df4f797..121125508 100644
--- a/src/lib/commandCenter/searchers/providers.ts
+++ b/src/lib/commandCenter/searchers/providers.ts
@@ -1,9 +1,10 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
-import { getProviderDisplayNameAndIcon } from '$routes/console/project-[project]/messaging/provider.svelte';
+import { getProviderDisplayNameAndIcon } from '$routes/(console)/project-[project]/messaging/provider.svelte';
+import { base } from '$app/paths';
 
 const getIcon = (provider: string) => {
     const { icon } = getProviderDisplayNameAndIcon(provider);
@@ -24,7 +25,7 @@ export const providersSearcher = (async (query: string) => {
                     label: provider.name,
                     callback: () => {
                         goto(
-                            `/console/project-${projectId}/messaging/providers/provider-${provider.$id}`
+                            `${base}/project-${projectId}/messaging/providers/provider-${provider.$id}`
                         );
                     },
                     image: getIcon(provider.provider)
diff --git a/src/lib/commandCenter/searchers/teams.ts b/src/lib/commandCenter/searchers/teams.ts
index 63cba78ad..57c91c9d1 100644
--- a/src/lib/commandCenter/searchers/teams.ts
+++ b/src/lib/commandCenter/searchers/teams.ts
@@ -1,15 +1,16 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
+import { base } from '$app/paths';
 
 const getTeamCommand = (team: Models.Team<Models.Preferences>, projectId: string) =>
     ({
         label: team.name,
         callback: () => {
-            goto(`/console/project-${projectId}/auth/teams/team-${team.$id}`);
+            goto(`${base}/project-${projectId}/auth/teams/team-${team.$id}`);
         },
         group: 'teams',
         icon: 'user-circle'
@@ -25,7 +26,7 @@ export const teamSearcher = (async (query: string) => {
             {
                 label: 'Go to members',
                 callback: () => {
-                    goto(`/console/project-${projectId}/auth/teams/team-${teams[0].$id}/members`);
+                    goto(`${base}/project-${projectId}/auth/teams/team-${teams[0].$id}/members`);
                 },
                 group: 'teams',
                 nested: true
@@ -34,7 +35,7 @@ export const teamSearcher = (async (query: string) => {
             {
                 label: 'Go to activity',
                 callback: () => {
-                    goto(`/console/project-${projectId}/auth/teams/team-${teams[0].$id}/activity`);
+                    goto(`${base}/project-${projectId}/auth/teams/team-${teams[0].$id}/activity`);
                 },
                 group: 'teams',
                 nested: true
diff --git a/src/lib/commandCenter/searchers/topics.ts b/src/lib/commandCenter/searchers/topics.ts
index eaa11dbd2..3153a26ac 100644
--- a/src/lib/commandCenter/searchers/topics.ts
+++ b/src/lib/commandCenter/searchers/topics.ts
@@ -1,8 +1,9 @@
 import { goto } from '$app/navigation';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import type { Searcher } from '../commands';
 import { sdk } from '$lib/stores/sdk';
+import { base } from '$app/paths';
 
 export const topicsSearcher = (async (query: string) => {
     const { topics } = await sdk.forProject.messaging.listTopics([], query || undefined);
@@ -17,7 +18,7 @@ export const topicsSearcher = (async (query: string) => {
                     group: 'topics',
                     label: topic.name,
                     callback: () => {
-                        goto(`/console/project-${projectId}/messaging/topics/topic-${topic.$id}`);
+                        goto(`${base}/project-${projectId}/messaging/topics/topic-${topic.$id}`);
                     },
                     icon: 'send'
                 }) as const
diff --git a/src/lib/commandCenter/searchers/users.ts b/src/lib/commandCenter/searchers/users.ts
index 0fcbe6ce4..7cb13381e 100644
--- a/src/lib/commandCenter/searchers/users.ts
+++ b/src/lib/commandCenter/searchers/users.ts
@@ -1,16 +1,17 @@
 import { goto } from '$app/navigation';
 import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/console/project-[project]/store';
+import { project } from '$routes/(console)/project-[project]/store';
 import { get } from 'svelte/store';
 import type { Command, Searcher } from '../commands';
 import type { Models } from '@appwrite.io/console';
-import { promptDeleteUser } from '$routes/console/project-[project]/auth/user-[user]/dangerZone.svelte';
+import { promptDeleteUser } from '$routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte';
+import { base } from '$app/paths';
 
 const getUserCommand = (user: Models.User<Models.Preferences>, projectId: string) =>
     ({
         label: user.name,
         callback: () => {
-            goto(`/console/project-${projectId}/auth/user-${user.$id}`);
+            goto(`${base}/project-${projectId}/auth/user-${user.$id}`);
         },
         group: 'users',
         icon: 'user-circle'
@@ -35,7 +36,7 @@ export const userSearcher = (async (query: string) => {
             {
                 label: 'Go to activity',
                 callback: () => {
-                    goto(`/console/project-${projectId}/auth/user-${users[0].$id}/activity`);
+                    goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/activity`);
                 },
                 group: 'users',
                 nested: true
@@ -43,7 +44,7 @@ export const userSearcher = (async (query: string) => {
             {
                 label: 'Go to sessions',
                 callback: () => {
-                    goto(`/console/project-${projectId}/auth/user-${users[0].$id}/sessions`);
+                    goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/sessions`);
                 },
                 group: 'users',
                 nested: true
@@ -51,7 +52,7 @@ export const userSearcher = (async (query: string) => {
             {
                 label: 'Go to memberships',
                 callback: () => {
-                    goto(`/console/project-${projectId}/auth/user-${users[0].$id}/memberships`);
+                    goto(`${base}/project-${projectId}/auth/user-${users[0].$id}/memberships`);
                 },
                 group: 'users',
                 nested: true
diff --git a/src/lib/components/billing/alerts/limitReached.svelte b/src/lib/components/billing/alerts/limitReached.svelte
index 03bc5c2bf..f3b5cc4b9 100644
--- a/src/lib/components/billing/alerts/limitReached.svelte
+++ b/src/lib/components/billing/alerts/limitReached.svelte
@@ -20,10 +20,7 @@
             plan. Consider upgrading to increase your resource usage.
         </svelte:fragment>
         <svelte:fragment slot="buttons">
-            <Button
-                href={`${base}/console/organization-${$organization.$id}/usage`}
-                text
-                fullWidthMobile>
+            <Button href={`${base}/organization-${$organization.$id}/usage`} text fullWidthMobile>
                 <span class="text">View usage</span>
             </Button>
             <Button
diff --git a/src/lib/components/billing/alerts/missingPaymentMethod.svelte b/src/lib/components/billing/alerts/missingPaymentMethod.svelte
index b1bfe7f1b..1dbfda565 100644
--- a/src/lib/components/billing/alerts/missingPaymentMethod.svelte
+++ b/src/lib/components/billing/alerts/missingPaymentMethod.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { HeaderAlert } from '$lib/layout';
     import { hideBillingHeaderRoutes } from '$lib/stores/billing';
-    import { orgMissingPaymentMethod } from '$routes/console/store';
+    import { orgMissingPaymentMethod } from '$routes/(console)/store';
 </script>
 
 {#if ($orgMissingPaymentMethod.billingPlan === BillingPlan.PRO || $orgMissingPaymentMethod.billingPlan === BillingPlan.SCALE) && !$orgMissingPaymentMethod.paymentMethodId && !$orgMissingPaymentMethod.backupPaymentMethodId && !hideBillingHeaderRoutes.includes($page.url.pathname)}
@@ -16,9 +17,7 @@
             your projects.
         </svelte:fragment>
         <svelte:fragment slot="buttons">
-            <Button
-                secondary
-                href={`/console/organization-${$orgMissingPaymentMethod.$id}/billing`}>
+            <Button secondary href={`${base}/organization-${$orgMissingPaymentMethod.$id}/billing`}>
                 Add payment method
             </Button>
         </svelte:fragment>
diff --git a/src/lib/components/billing/alerts/newDevUpgradePro.svelte b/src/lib/components/billing/alerts/newDevUpgradePro.svelte
index 32446f91c..c58ad7268 100644
--- a/src/lib/components/billing/alerts/newDevUpgradePro.svelte
+++ b/src/lib/components/billing/alerts/newDevUpgradePro.svelte
@@ -5,7 +5,7 @@
     import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { organization } from '$lib/stores/organization';
-    import { activeHeaderAlert } from '$routes/console/store';
+    import { activeHeaderAlert } from '$routes/(console)/store';
     import GradientBanner from '../gradientBanner.svelte';
 
     let show = true;
@@ -29,7 +29,7 @@
                 secondary
                 fullWidthMobile
                 class="u-line-height-1"
-                href={`${base}/console/apply-credit?code=appw50&org=${$organization.$id}`}
+                href={`${base}/apply-credit?code=appw50&org=${$organization.$id}`}
                 on:click={() => {
                     trackEvent('click_credits_redeem', {
                         from: 'button',
diff --git a/src/lib/components/billing/alerts/paymentAuthRequired.svelte b/src/lib/components/billing/alerts/paymentAuthRequired.svelte
index d1491bf61..ddec4a8b0 100644
--- a/src/lib/components/billing/alerts/paymentAuthRequired.svelte
+++ b/src/lib/components/billing/alerts/paymentAuthRequired.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Button } from '$lib/elements/forms';
     import { HeaderAlert } from '$lib/layout';
@@ -21,7 +22,7 @@
             </Button>
             <Button
                 secondary
-                href={`/console/organization-${$organization.$id}/billing?type=confirmation&invoice=${$actionRequiredInvoices.invoices[0].$id}`}>
+                href={`${base}/organization-${$organization.$id}/billing?type=confirmation&invoice=${$actionRequiredInvoices.invoices[0].$id}`}>
                 Authorize payment
             </Button>
         </svelte:fragment>
diff --git a/src/lib/components/billing/alerts/projectsAtRisk.svelte b/src/lib/components/billing/alerts/projectsAtRisk.svelte
index a6c656a95..6272c85a8 100644
--- a/src/lib/components/billing/alerts/projectsAtRisk.svelte
+++ b/src/lib/components/billing/alerts/projectsAtRisk.svelte
@@ -22,7 +22,7 @@
         </svelte:fragment>
         <svelte:fragment slot="buttons">
             <Button
-                href={`${base}/console/organization-${$failedInvoice?.teamId}/billing#paymentMethods`}
+                href={`${base}/organization-${$failedInvoice?.teamId}/billing#paymentMethods`}
                 secondary
                 fullWidthMobile>
                 <span class="text">Update billing details</span>
diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte
index 3ec802af3..d9dc6b9e3 100644
--- a/src/lib/components/filePicker.svelte
+++ b/src/lib/components/filePicker.svelte
@@ -516,7 +516,7 @@
                                     <Button
                                         secondary
                                         external
-                                        href={`${base}/console/project-${$page.params.project}/storage`}>
+                                        href={`${base}/project-${$page.params.project}/storage`}>
                                         Create bucket
                                     </Button>
                                 </div>
diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index b43ab3e8c..613a8170a 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -2,8 +2,8 @@
     import { Button } from '$lib/elements/forms';
     import { app } from '$lib/stores/app';
     import { wizard } from '$lib/stores/wizard';
-    import SupportWizard from '../../routes/console/supportWizard.svelte';
-    import { showSupportModal } from '../../routes/console/wizard/support/store';
+    import SupportWizard from '$routes/(console)/supportWizard.svelte';
+    import { showSupportModal } from '$routes/(console)/wizard/support/store';
     import { isCloud } from '$lib/system';
     import { organization } from '$lib/stores/organization';
     import { BillingPlan } from '$lib/constants';
diff --git a/src/lib/components/uploadBox.svelte b/src/lib/components/uploadBox.svelte
index 988567eba..0d744fd65 100644
--- a/src/lib/components/uploadBox.svelte
+++ b/src/lib/components/uploadBox.svelte
@@ -41,7 +41,7 @@
                     {#if file.completed || file.progress === 100}
                         <a
                             class="upload-box-item"
-                            href={`${base}/console/project-${$page.params.project}/storage/bucket-${$page.params.bucket}/file-${file.$id}`}>
+                            href={`${base}/project-${$page.params.project}/storage/bucket-${$page.params.bucket}/file-${file.$id}`}>
                             <div class="u-margin-inline-end-16">
                                 <Avatar
                                     size={32}
diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte
index 8a7457575..a21c07fa8 100644
--- a/src/lib/layout/footer.svelte
+++ b/src/lib/layout/footer.svelte
@@ -2,7 +2,7 @@
     import { settings } from '$lib/components/consent.svelte';
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { isCloud } from '$lib/system';
-    import { version } from '$routes/console/store';
+    import { version } from '$routes/(console)/store';
 
     const currentYear = new Date().getFullYear();
 </script>
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index 9bf39c8f2..f16fa75ff 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -55,7 +55,7 @@
     function createOrg() {
         showDropdown = false;
         if (isCloud) {
-            goto(`${base}/console/create-organization`);
+            goto(`${base}/create-organization`);
         } else newOrgModal.set(true);
     }
 
@@ -78,10 +78,7 @@
 <svelte:window on:click={onBlur} />
 
 <div class="logo u-inline-flex u-gap-16 u-cross-center">
-    <a
-        href={$organization
-            ? `${base}/console/organization-${$organization.$id}`
-            : `${base}/console`}>
+    <a href={$organization ? `${base}/organization-${$organization.$id}` : `${base}/console`}>
         <img
             src={$app.themeInUse == 'dark' ? AppwriteLogoDark : AppwriteLogoLight}
             width="120"
@@ -191,7 +188,7 @@
                                         : 'hover'}>
                                     {#each $organizationList.teams as org}
                                         <DropListLink
-                                            href={`${base}/console/organization-${org.$id}`}
+                                            href={`${base}/organization-${org.$id}`}
                                             on:click={() => {
                                                 showDropdown = false;
                                             }}>{org.name}</DropListLink>
@@ -205,7 +202,7 @@
                                     New organization
                                 </DropListItem>
                                 <DropListLink
-                                    href={`${base}/console/account`}
+                                    href={`${base}/account`}
                                     on:click={() => (showDropdown = false)}>
                                     Your account
                                 </DropListLink>
diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte
index 1084d4454..07fbd913a 100644
--- a/src/lib/layout/navigation.svelte
+++ b/src/lib/layout/navigation.svelte
@@ -10,13 +10,13 @@
     import { organization } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
     import { isCloud } from '$lib/system';
-    import Create from '$routes/console/feedbackWizard.svelte';
-    import { showSupportModal } from '$routes/console/wizard/support/store';
+    import Create from '$routes/(console)/feedbackWizard.svelte';
+    import { showSupportModal } from '$routes/(console)/wizard/support/store';
 
     export let isOpen = false;
 
     $: project = $page.params.project;
-    $: projectPath = `${base}/console/project-${project}`;
+    $: projectPath = `${base}/project-${project}`;
 
     $: subNavigation = $page.data.subNavigation;
     // We need to have this second variable, because we only want narrow
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 1106341b3..aac7b7254 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -4,7 +4,7 @@
     import { page } from '$app/stores';
     import { log } from '$lib/stores/logs';
     import { wizard } from '$lib/stores/wizard';
-    import { activeHeaderAlert } from '$routes/console/store';
+    import { activeHeaderAlert } from '$routes/(console)/store';
 
     export let isOpen = false;
     export let showSideNavigation = false;
diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte
index b7e250b54..c3d22a6f9 100644
--- a/src/lib/layout/unauthenticated.svelte
+++ b/src/lib/layout/unauthenticated.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Avatar, AvatarInitials, Card, Heading } from '$lib/components';
     import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg';
     import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
@@ -7,7 +8,6 @@
     import type { Coupon } from '$lib/sdk/billing';
     import { app } from '$lib/stores/app';
     import { campaigns, type CampaignData } from '$lib/stores/campaigns';
-    import { user } from '$lib/stores/user';
 
     export const imgLight = LoginLight;
     export const imgDark = LoginDark;
@@ -53,7 +53,7 @@
             class="logo u-flex u-gap-16"
             class:is-not-mobile={variation === 'default'}
             class:logo-variation={variation !== 'default'}>
-            <a href={user ? '/console' : '/'}>
+            <a href={base}>
                 {#if $app.themeInUse === 'dark'}
                     <img
                         src={AppwriteLogoDark}
@@ -195,7 +195,7 @@
             </div>
             <div
                 class="logo u-flex u-gap-16 u-margin-inline-auto is-only-mobile u-margin-block-start-32">
-                <a href={user ? '/console' : '/'}>
+                <a href={base}>
                     {#if $app.themeInUse === 'dark'}
                         <img
                             src={AppwriteLogoDark}
diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte
index ac27f864e..f6cac57dd 100644
--- a/src/lib/pages/domains/wizard/step1.svelte
+++ b/src/lib/pages/domains/wizard/step1.svelte
@@ -5,9 +5,9 @@
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
     import { isSelfHosted } from '$lib/system';
-    import { func } from '$routes/console/project-[project]/functions/function-[function]/store';
+    import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store';
     import { domain, typeStore } from './store';
-    import { consoleVariables } from '$routes/console/store';
+    import { consoleVariables } from '$routes/(console)/store';
     import { ResourceType } from '@appwrite.io/console';
 
     let error = null;
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 5e54db955..8eda8a6f8 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -20,7 +20,7 @@ import PaymentAuthRequired from '$lib/components/billing/alerts/paymentAuthRequi
 import { addNotification, notifications } from './notifications';
 import { goto } from '$app/navigation';
 import { base } from '$app/paths';
-import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/console/store';
+import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/(console)/store';
 import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte';
 import { BillingPlan } from '$lib/constants';
 import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte';
@@ -259,13 +259,13 @@ export async function checkForUsageLimit(org: Organization) {
                 {
                     name: 'View usage',
                     method: () => {
-                        goto(`${base}/console/organization-${org.$id}/usage`);
+                        goto(`${base}/organization-${org.$id}/usage`);
                     }
                 },
                 {
                     name: 'Upgrade plan',
                     method: () => {
-                        goto(`${base}/console/organization-${org.$id}/change-plan`);
+                        goto(`${base}/organization-${org.$id}/change-plan`);
                         trackEvent('click_organization_upgrade', {
                             from: 'button',
                             source: 'limit_reached_notification'
@@ -323,7 +323,7 @@ export async function paymentExpired(org: Organization) {
                 {
                     name: 'Update payment details',
                     method: () => {
-                        goto(`${base}/console/account/payments`);
+                        goto(`${base}/account/payments`);
                     }
                 }
             ]
@@ -337,7 +337,7 @@ export async function paymentExpired(org: Organization) {
                 {
                     name: 'Update payment details',
                     method: () => {
-                        goto(`${base}/console/account/payments`);
+                        goto(`${base}/account/payments`);
                     }
                 }
             ]
@@ -417,7 +417,7 @@ export async function checkForNewDevUpgradePro(org: Organization) {
 }
 export const upgradeURL = derived(
     page,
-    ($page) => `${base}/console/organization-${$page.data?.organization?.$id}/change-plan`
+    ($page) => `${base}/organization-${$page.data?.organization?.$id}/change-plan`
 );
 
 export const hideBillingHeaderRoutes = ['/console/create-organization', '/console/account'];
diff --git a/src/lib/stores/oauth-providers.ts b/src/lib/stores/oauth-providers.ts
index 2cb2ddd3f..e7310ac2b 100644
--- a/src/lib/stores/oauth-providers.ts
+++ b/src/lib/stores/oauth-providers.ts
@@ -1,13 +1,13 @@
 import type { SvelteComponent } from 'svelte';
-import Apple from '../../routes/console/project-[project]/auth/(providers)/appleOAuth.svelte';
-import Auth0 from '../../routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte';
-import Authentik from '../../routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte';
-import GitLab from '../../routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte';
-import Google from '../../routes/console/project-[project]/auth/(providers)/googleOAuth.svelte';
-import Main from '../../routes/console/project-[project]/auth/(providers)/mainOAuth.svelte';
-import Microsoft from '../../routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte';
-import Oidc from '../../routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte';
-import Okta from '../../routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte';
+import Apple from '$routes/(console)/project-[project]/auth/(providers)/appleOAuth.svelte';
+import Auth0 from '$routes/(console)/project-[project]/auth/(providers)/auth0OAuth.svelte';
+import Authentik from '$routes/(console)/project-[project]/auth/(providers)/authentikOAuth.svelte';
+import GitLab from '$routes/(console)/project-[project]/auth/(providers)/gitlabOAuth.svelte';
+import Google from '$routes/(console)/project-[project]/auth/(providers)/googleOAuth.svelte';
+import Main from '$routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte';
+import Microsoft from '$routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte';
+import Oidc from '$routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte';
+import Okta from '$routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte';
 
 export type Provider = {
     name: string;
diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts
index 93b4576ae..a25ad7a7b 100644
--- a/src/lib/stores/stripe.ts
+++ b/src/lib/stores/stripe.ts
@@ -6,6 +6,7 @@ import type { PaymentMethodData } from '$lib/sdk/billing';
 import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 import { addNotification } from './notifications';
 import { organization } from './organization';
+import { base } from '$app/paths';
 
 export const stripe = writable<Stripe>();
 let paymentMethod: PaymentMethodData;
@@ -120,7 +121,7 @@ export async function confirmPayment(
 ) {
     try {
         const url =
-            window.location.origin + (route ? route : `/console/organization-${orgId}/billing`);
+            window.location.origin + (route ? route : `${base}/organization-${orgId}/billing`);
 
         const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentMethodId);
 
diff --git a/src/lib/wizards/functions/components/repositories.svelte b/src/lib/wizards/functions/components/repositories.svelte
index dc8c73bd4..e067296f9 100644
--- a/src/lib/wizards/functions/components/repositories.svelte
+++ b/src/lib/wizards/functions/components/repositories.svelte
@@ -6,7 +6,7 @@
     import { timeFromNow } from '$lib/helpers/date';
     import { app } from '$lib/stores/app';
     import { sdk } from '$lib/stores/sdk';
-    import { repositories } from '$routes/console/project-[project]/functions/function-[function]/store';
+    import { repositories } from '$routes/(console)/project-[project]/functions/function-[function]/store';
     import { installation, installations, repository } from '../store';
     import { createEventDispatcher } from 'svelte';
 
@@ -120,7 +120,7 @@
     <p class="text u-margin-block-start-16">
         Manage organization configuration in your <a
             class="link"
-            href={`${base}/console/project-${$page.params.project}/settings`}>project settings</a
+            href={`${base}/project-${$page.params.project}/settings`}>project settings</a
         >.
     </p>
     {#if selectedInstallation}
diff --git a/src/lib/wizards/functions/connectExisting.svelte b/src/lib/wizards/functions/connectExisting.svelte
index f28cc8555..62331ed97 100644
--- a/src/lib/wizards/functions/connectExisting.svelte
+++ b/src/lib/wizards/functions/connectExisting.svelte
@@ -4,7 +4,7 @@
     import GitConfiguration from './steps/gitConfiguration.svelte';
     import type { WizardStepsType } from '$lib/layout/wizard.svelte';
     import { sdk } from '$lib/stores/sdk';
-    import { func } from '$routes/console/project-[project]/functions/function-[function]/store';
+    import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store';
     import { choices, installation, repository } from './store';
     import { wizard } from '$lib/stores/wizard';
     import { invalidate } from '$app/navigation';
diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index 08a18f119..08746d2e9 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -31,7 +31,7 @@
     import { marketplace, type MarketplaceTemplate } from '$lib/stores/marketplace';
     import { Button } from '$lib/elements/forms';
     import { page } from '$app/stores';
-    import { baseRuntimesList } from '$routes/console/project-[project]/functions/store';
+    import { baseRuntimesList } from '$routes/(console)/project-[project]/functions/store';
     import { trackEvent } from '$lib/actions/analytics';
     import type { Models } from '@appwrite.io/console';
     import WizardCover from '$lib/layout/wizardCover.svelte';
@@ -40,7 +40,7 @@
     import CreateGit from './createGit.svelte';
     import { tooltip } from '$lib/actions/tooltip';
     import { isSelfHosted } from '$lib/system';
-    import { consoleVariables } from '$routes/console/store';
+    import { consoleVariables } from '$routes/(console)/store';
 
     const isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
     let hasInstallations: boolean;
@@ -252,7 +252,7 @@
                         text
                         noMargin
                         class="u-margin-inline-start-auto u-margin-block-start-16"
-                        href={`${base}/console/project-${$page.params.project}/functions/templates`}>
+                        href={`${base}/project-${$page.params.project}/functions/templates`}>
                         <span> All templates </span>
                         <span class="icon-cheveron-right" aria-hidden="true" />
                     </Button>
diff --git a/src/lib/wizards/functions/createGit.svelte b/src/lib/wizards/functions/createGit.svelte
index f6307df41..fdee70aca 100644
--- a/src/lib/wizards/functions/createGit.svelte
+++ b/src/lib/wizards/functions/createGit.svelte
@@ -39,9 +39,7 @@
                 $choices.silentMode || undefined,
                 $choices.rootDir || undefined
             );
-            goto(
-                `${base}/console/project-${$page.params.project}/functions/function-${response.$id}`
-            );
+            goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
             addNotification({
                 message: `${$createFunction.name} has been created`,
                 type: 'success'
diff --git a/src/lib/wizards/functions/createManual.svelte b/src/lib/wizards/functions/createManual.svelte
index a5b9fe20c..f5ab83b3b 100644
--- a/src/lib/wizards/functions/createManual.svelte
+++ b/src/lib/wizards/functions/createManual.svelte
@@ -44,9 +44,7 @@
                 $createFunctionDeployment[0],
                 true
             );
-            goto(
-                `${base}/console/project-${$page.params.project}/functions/function-${response.$id}`
-            );
+            goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
             addNotification({
                 message: `${$createFunction.name} has been created`,
                 type: 'success'
diff --git a/src/lib/wizards/functions/createTemplate.svelte b/src/lib/wizards/functions/createTemplate.svelte
index 11580051f..36d74abdd 100644
--- a/src/lib/wizards/functions/createTemplate.svelte
+++ b/src/lib/wizards/functions/createTemplate.svelte
@@ -69,9 +69,7 @@
                 await Promise.all(promises);
             }
 
-            goto(
-                `${base}/console/project-${$page.params.project}/functions/function-${response.$id}`
-            );
+            goto(`${base}/project-${$page.params.project}/functions/function-${response.$id}`);
             addNotification({
                 message: `${response.name} has been created`,
                 type: 'success'
diff --git a/src/lib/wizards/functions/steps/details.svelte b/src/lib/wizards/functions/steps/details.svelte
index db5194d7c..c5c07bd07 100644
--- a/src/lib/wizards/functions/steps/details.svelte
+++ b/src/lib/wizards/functions/steps/details.svelte
@@ -5,7 +5,7 @@
     import { WizardStep } from '$lib/layout';
     import { onMount } from 'svelte';
     import { createFunction } from '../store';
-    import { runtimesList } from '$routes/console/project-[project]/functions/store';
+    import { runtimesList } from '$routes/(console)/project-[project]/functions/store';
 
     let showCustomId = false;
 
diff --git a/src/lib/wizards/functions/steps/functionConfiguration.svelte b/src/lib/wizards/functions/steps/functionConfiguration.svelte
index a0209dd8d..d575ed6b3 100644
--- a/src/lib/wizards/functions/steps/functionConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/functionConfiguration.svelte
@@ -7,7 +7,7 @@
     import { onMount } from 'svelte';
     import { sdk } from '$lib/stores/sdk';
     import { choices, createFunction, installation, repository } from '../store';
-    import { runtimesList } from '$routes/console/project-[project]/functions/store';
+    import { runtimesList } from '$routes/(console)/project-[project]/functions/store';
 
     let showCustomId = false;
 
diff --git a/src/lib/wizards/functions/steps/gitConfiguration.svelte b/src/lib/wizards/functions/steps/gitConfiguration.svelte
index 9980e765d..1552b668b 100644
--- a/src/lib/wizards/functions/steps/gitConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/gitConfiguration.svelte
@@ -4,7 +4,7 @@
     import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
-    import { sortBranches } from '$routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte';
+    import { sortBranches } from '$routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte';
     import { choices, installation, repository } from '../store';
 
     $choices.rootDir ??= '';
diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte
index 536d32b94..336ae7a25 100644
--- a/src/lib/wizards/functions/steps/templateConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte
@@ -3,7 +3,7 @@
     import { Pill } from '$lib/elements';
     import { FormList, InputSelect, InputText } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
-    import { runtimesList } from '$routes/console/project-[project]/functions/store';
+    import { runtimesList } from '$routes/(console)/project-[project]/functions/store';
     import { template, templateConfig } from '../store';
 
     let showCustomId = false;
diff --git a/src/routes/auth/+layout.svelte b/src/routes/(auth)/git/+layout.svelte
similarity index 73%
rename from src/routes/auth/+layout.svelte
rename to src/routes/(auth)/git/+layout.svelte
index f2ffcf1d2..24921622c 100644
--- a/src/routes/auth/+layout.svelte
+++ b/src/routes/(auth)/git/+layout.svelte
@@ -1,6 +1,6 @@
 <script>
     import { Container } from '$lib/layout';
-    import { loading } from '../store';
+    import { loading } from '$routes/store';
 
     loading.set(false);
 </script>
diff --git a/src/routes/git/authorize-contributor/+page.svelte b/src/routes/(auth)/git/authorize-contributor/+page.svelte
similarity index 100%
rename from src/routes/git/authorize-contributor/+page.svelte
rename to src/routes/(auth)/git/authorize-contributor/+page.svelte
diff --git a/src/routes/invite/+page.svelte b/src/routes/(auth)/invite/+page.svelte
similarity index 98%
rename from src/routes/invite/+page.svelte
rename to src/routes/(auth)/invite/+page.svelte
index cd6b2fc4e..b4d0b055e 100644
--- a/src/routes/invite/+page.svelte
+++ b/src/routes/(auth)/invite/+page.svelte
@@ -27,7 +27,7 @@
                 type: 'success',
                 message: 'Successfully logged in.'
             });
-            await goto(`${base}/console/organization-${teamId}`);
+            await goto(`${base}/organization-${teamId}`);
             trackEvent(Submit.MembershipUpdateStatus);
         } catch (error) {
             addNotification({
diff --git a/src/routes/login/+page.svelte b/src/routes/(auth)/login/+page.svelte
similarity index 92%
rename from src/routes/login/+page.svelte
rename to src/routes/(auth)/login/+page.svelte
index f1cacd36e..6b6c3b358 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/(auth)/login/+page.svelte
@@ -44,11 +44,11 @@
             await invalidate(Dependencies.ACCOUNT);
             if (data?.couponData?.code) {
                 trackEvent(Submit.AccountCreate, { campaign_name: data?.couponData?.code });
-                await goto(`${base}/console/apply-credit?code=${data?.couponData?.code}`);
+                await goto(`${base}/apply-credit?code=${data?.couponData?.code}`);
                 return;
             }
             if (data?.campaign) {
-                await goto(`${base}/console/apply-credit?campaign=${data.campaign}`);
+                await goto(`${base}/apply-credit?campaign=${data.campaign}`);
                 return;
             }
             if ($page.url.searchParams) {
@@ -57,10 +57,10 @@
                 if (redirect) {
                     await goto(`${base}${redirect}${$page.url.search}`);
                 } else {
-                    await goto(`${base}/console${$page.url.search ?? ''}`);
+                    await goto(`${base}${$page.url.search ?? ''}`);
                 }
             } else {
-                await goto(`${base}/console`);
+                await goto(base);
             }
         } catch (error) {
             disabled = false;
@@ -81,7 +81,7 @@
             if (redirect) {
                 url = `${base}${redirect}${$page.url.search}`;
             } else {
-                url = `${base}/console${$page.url.search ?? ''}`;
+                url = `${base}${$page.url.search ?? ''}`;
             }
         }
         sdk.forConsole.account.createOAuth2Session(
diff --git a/src/routes/login/+page.ts b/src/routes/(auth)/login/+page.ts
similarity index 100%
rename from src/routes/login/+page.ts
rename to src/routes/(auth)/login/+page.ts
diff --git a/src/routes/mfa/+page.svelte b/src/routes/(auth)/mfa/+page.svelte
similarity index 94%
rename from src/routes/mfa/+page.svelte
rename to src/routes/(auth)/mfa/+page.svelte
index 93b63c82b..7fbf43620 100644
--- a/src/routes/mfa/+page.svelte
+++ b/src/routes/(auth)/mfa/+page.svelte
@@ -19,7 +19,7 @@
 
     async function back() {
         await sdk.forConsole.account.deleteSession('current');
-        await goto(`${base}/`);
+        await goto(base);
     }
 
     async function submit() {
@@ -32,10 +32,10 @@
                 if (redirect) {
                     await goto(`${base}${redirect}${$page.url.search}`);
                 } else {
-                    await goto(`${base}/console${$page.url.search ?? ''}`);
+                    await goto(`${base}/${$page.url.search ?? ''}`);
                 }
             } else {
-                await goto(`${base}/console`);
+                await goto(base);
             }
         } catch (error) {
             addNotification({
diff --git a/src/routes/mfa/+page.ts b/src/routes/(auth)/mfa/+page.ts
similarity index 100%
rename from src/routes/mfa/+page.ts
rename to src/routes/(auth)/mfa/+page.ts
diff --git a/src/routes/recover/+page.svelte b/src/routes/(auth)/recover/+page.svelte
similarity index 100%
rename from src/routes/recover/+page.svelte
rename to src/routes/(auth)/recover/+page.svelte
diff --git a/src/routes/register/+page.svelte b/src/routes/(auth)/register/+page.svelte
similarity index 94%
rename from src/routes/register/+page.svelte
rename to src/routes/(auth)/register/+page.svelte
index cf3b6e4b5..8bcaa304f 100644
--- a/src/routes/register/+page.svelte
+++ b/src/routes/(auth)/register/+page.svelte
@@ -40,11 +40,11 @@
             await invalidate(Dependencies.ACCOUNT);
             trackEvent(Submit.AccountCreate, { campaign_name: data?.couponData?.code });
             if (data?.couponData?.code) {
-                await goto(`${base}/console/apply-credit?code=${data?.couponData?.code}`);
+                await goto(`${base}/apply-credit?code=${data?.couponData?.code}`);
                 return;
             }
             if (data?.campaign) {
-                await goto(`${base}/console/apply-credit?campaign=${data.campaign}`);
+                await goto(`${base}/apply-credit?campaign=${data.campaign}`);
                 return;
             }
             if ($page.url.searchParams) {
@@ -53,10 +53,10 @@
                 if (redirect) {
                     await goto(`${base}${redirect}${$page.url.search}`);
                 } else {
-                    await goto(`${base}/console${$page.url.search ?? ''}`);
+                    await goto(`${base}/${$page.url.search ?? ''}`);
                 }
             } else {
-                await goto(`${base}/console`);
+                await goto(base);
             }
             trackEvent(Submit.AccountCreate);
         } catch (error) {
diff --git a/src/routes/register/+page.ts b/src/routes/(auth)/register/+page.ts
similarity index 100%
rename from src/routes/register/+page.ts
rename to src/routes/(auth)/register/+page.ts
diff --git a/src/routes/register/invite/+layout.ts b/src/routes/(auth)/register/invite/+layout.ts
similarity index 100%
rename from src/routes/register/invite/+layout.ts
rename to src/routes/(auth)/register/invite/+layout.ts
diff --git a/src/routes/register/invite/[slug]/+page.svelte b/src/routes/(auth)/register/invite/[slug]/+page.svelte
similarity index 99%
rename from src/routes/register/invite/[slug]/+page.svelte
rename to src/routes/(auth)/register/invite/[slug]/+page.svelte
index 6b606bf18..a36c5505d 100644
--- a/src/routes/register/invite/[slug]/+page.svelte
+++ b/src/routes/(auth)/register/invite/[slug]/+page.svelte
@@ -77,7 +77,7 @@
                 const newPrefs = { ...prefs, code };
                 await sdk.forConsole.account.updatePrefs(newPrefs);
                 await invalidate(Dependencies.ACCOUNT);
-                await goto(`${base}/console`);
+                await goto(base);
                 trackEvent('submit_account_create', { code: code });
             }
         } catch (error) {
diff --git a/src/routes/register/invite/[slug]/mlh-dark.svg b/src/routes/(auth)/register/invite/[slug]/mlh-dark.svg
similarity index 100%
rename from src/routes/register/invite/[slug]/mlh-dark.svg
rename to src/routes/(auth)/register/invite/[slug]/mlh-dark.svg
diff --git a/src/routes/register/invite/[slug]/mlh-light.svg b/src/routes/(auth)/register/invite/[slug]/mlh-light.svg
similarity index 100%
rename from src/routes/register/invite/[slug]/mlh-light.svg
rename to src/routes/(auth)/register/invite/[slug]/mlh-light.svg
diff --git a/src/routes/console/(migration-wizard)/index.ts b/src/routes/(console)/(migration-wizard)/index.ts
similarity index 100%
rename from src/routes/console/(migration-wizard)/index.ts
rename to src/routes/(console)/(migration-wizard)/index.ts
diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/(console)/(migration-wizard)/resource-form.svelte
similarity index 100%
rename from src/routes/console/(migration-wizard)/resource-form.svelte
rename to src/routes/(console)/(migration-wizard)/resource-form.svelte
diff --git a/src/routes/console/(migration-wizard)/step1.svelte b/src/routes/(console)/(migration-wizard)/step1.svelte
similarity index 100%
rename from src/routes/console/(migration-wizard)/step1.svelte
rename to src/routes/(console)/(migration-wizard)/step1.svelte
diff --git a/src/routes/console/(migration-wizard)/step2.svelte b/src/routes/(console)/(migration-wizard)/step2.svelte
similarity index 100%
rename from src/routes/console/(migration-wizard)/step2.svelte
rename to src/routes/(console)/(migration-wizard)/step2.svelte
diff --git a/src/routes/console/(migration-wizard)/wizard.svelte b/src/routes/(console)/(migration-wizard)/wizard.svelte
similarity index 92%
rename from src/routes/console/(migration-wizard)/wizard.svelte
rename to src/routes/(console)/(migration-wizard)/wizard.svelte
index 7123309e2..44bc33026 100644
--- a/src/routes/console/(migration-wizard)/wizard.svelte
+++ b/src/routes/(console)/(migration-wizard)/wizard.svelte
@@ -10,6 +10,7 @@
     import Step1 from './step1.svelte';
     import Step2 from './step2.svelte';
     import { requestedMigration } from '$routes/store';
+    import { base } from '$app/paths';
 
     const onExit = () => {
         formData.reset();
@@ -30,7 +31,7 @@
         await invalidateAll();
         wizard.hide();
 
-        goto(`/console/project-${$selectedProject}/settings/migrations`);
+        goto(`${base}/project-${$selectedProject}/settings/migrations`);
     };
 
     onDestroy(onExit);
diff --git a/src/routes/console/+error.svelte b/src/routes/(console)/+error.svelte
similarity index 82%
rename from src/routes/console/+error.svelte
rename to src/routes/(console)/+error.svelte
index 408a5afaa..6b71031bd 100644
--- a/src/routes/console/+error.svelte
+++ b/src/routes/(console)/+error.svelte
@@ -1,4 +1,5 @@
 <script>
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Heading } from '$lib/components';
     import { Button } from '$lib/elements/forms';
@@ -9,6 +10,6 @@
     <div class="u-flex-vertical u-gap-16">
         <Heading size="1" tag="h3">{$page.error.status || 'Invalid Argument'}</Heading>
         <Heading size="4" tag="h4" trimmed={false}>{$page.error.message}</Heading>
-        <Button href="/console">Back to the console</Button>
+        <Button href={base}>Back to the console</Button>
     </div>
 </Container>
diff --git a/src/routes/console/+layout.svelte b/src/routes/(console)/+layout.svelte
similarity index 95%
rename from src/routes/console/+layout.svelte
rename to src/routes/(console)/+layout.svelte
index 5676ce57c..7361d3069 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -41,6 +41,7 @@
     import { activeHeaderAlert, consoleVariables } from './store';
     import { headerAlert } from '$lib/stores/headerAlert';
     import { UsageRates } from '$lib/components/billing';
+    import { base } from '$app/paths';
 
     function kebabToSentenceCase(str: string) {
         return str
@@ -59,7 +60,7 @@
         {
             label: 'Go to Projects',
             callback: () => {
-                goto('/console');
+                goto(base);
             },
             keys: ['g', 'p'],
             group: 'navigation',
@@ -147,7 +148,7 @@
                 ({
                     label: kebabToSentenceCase(heading),
                     async callback() {
-                        await goto(`/console/project-${$project.$id}/auth/security#${heading}`);
+                        await goto(`${base}/project-${$project.$id}/auth/security#${heading}`);
                         scrollBy({ top: -100 });
                     },
                     disabled: !$project?.$id,
@@ -161,7 +162,7 @@
 
             keys: isOnSettingsLayout ? ['g', 'o'] : undefined,
             callback: () => {
-                goto(`/console/project-${$project.$id}/settings`);
+                goto(`${base}/project-${$project.$id}/settings`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.endsWith('settings')),
@@ -173,7 +174,7 @@
 
             keys: isOnSettingsLayout ? ['g', 'd'] : undefined,
             callback: () => {
-                goto(`/console/project-${$project.$id}/settings/domains`);
+                goto(`${base}/project-${$project.$id}/settings/domains`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('domains')),
@@ -184,7 +185,7 @@
             label: 'Go to webhooks',
             keys: isOnSettingsLayout ? ['g', 'w'] : undefined,
             callback: () => {
-                goto(`/console/project-${$project.$id}/settings/webhooks`);
+                goto(`${base}/project-${$project.$id}/settings/webhooks`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('webhooks')),
@@ -196,7 +197,7 @@
             label: 'Go to migrations',
             keys: isOnSettingsLayout ? ['g', 'm'] : undefined,
             callback: () => {
-                goto(`/console/project-${$project.$id}/settings/migrations`);
+                goto(`${base}/project-${$project.$id}/settings/migrations`);
             },
             disabled:
                 !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('migrations')),
@@ -208,8 +209,7 @@
             label: 'Go to SMTP settings',
             keys: isOnSettingsLayout ? ['g', 's'] : undefined,
             callback: () => {
-                console.log('withing callback of go to smtp');
-                goto(`/console/project-${$project.$id}/settings/smtp`);
+                goto(`${base}/project-${$project.$id}/settings/smtp`);
             },
             disabled: !$project?.$id || (isOnSettingsLayout && $page.url.pathname.includes('smtp')),
             group: isOnSettingsLayout ? 'navigation' : 'settings',
diff --git a/src/routes/console/+layout.ts b/src/routes/(console)/+layout.ts
similarity index 100%
rename from src/routes/console/+layout.ts
rename to src/routes/(console)/+layout.ts
diff --git a/src/routes/console/account/+layout.svelte b/src/routes/(console)/account/+layout.svelte
similarity index 100%
rename from src/routes/console/account/+layout.svelte
rename to src/routes/(console)/account/+layout.svelte
diff --git a/src/routes/console/account/+layout.ts b/src/routes/(console)/account/+layout.ts
similarity index 100%
rename from src/routes/console/account/+layout.ts
rename to src/routes/(console)/account/+layout.ts
diff --git a/src/routes/console/account/+page.svelte b/src/routes/(console)/account/+page.svelte
similarity index 100%
rename from src/routes/console/account/+page.svelte
rename to src/routes/(console)/account/+page.svelte
diff --git a/src/routes/console/account/activity/+page.svelte b/src/routes/(console)/account/activity/+page.svelte
similarity index 100%
rename from src/routes/console/account/activity/+page.svelte
rename to src/routes/(console)/account/activity/+page.svelte
diff --git a/src/routes/console/account/activity/+page.ts b/src/routes/(console)/account/activity/+page.ts
similarity index 100%
rename from src/routes/console/account/activity/+page.ts
rename to src/routes/(console)/account/activity/+page.ts
diff --git a/src/routes/console/account/breadcrumbs.svelte b/src/routes/(console)/account/breadcrumbs.svelte
similarity index 75%
rename from src/routes/console/account/breadcrumbs.svelte
rename to src/routes/(console)/account/breadcrumbs.svelte
index 5fb181330..11cd1c4bc 100644
--- a/src/routes/console/account/breadcrumbs.svelte
+++ b/src/routes/(console)/account/breadcrumbs.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { user } from '$lib/stores/user';
 
     $: breadcrumbs = [
         {
-            href: `/console/account`,
+            href: `${base}/account`,
             title: $user?.name
         }
     ];
diff --git a/src/routes/console/account/delete.svelte b/src/routes/(console)/account/delete.svelte
similarity index 100%
rename from src/routes/console/account/delete.svelte
rename to src/routes/(console)/account/delete.svelte
diff --git a/src/routes/console/account/deleteAccount.svelte b/src/routes/(console)/account/deleteAccount.svelte
similarity index 100%
rename from src/routes/console/account/deleteAccount.svelte
rename to src/routes/(console)/account/deleteAccount.svelte
diff --git a/src/routes/console/account/deleteMfa.svelte b/src/routes/(console)/account/deleteMfa.svelte
similarity index 100%
rename from src/routes/console/account/deleteMfa.svelte
rename to src/routes/(console)/account/deleteMfa.svelte
diff --git a/src/routes/console/account/header.svelte b/src/routes/(console)/account/header.svelte
similarity index 98%
rename from src/routes/console/account/header.svelte
rename to src/routes/(console)/account/header.svelte
index 93fde74f9..9929edf57 100644
--- a/src/routes/console/account/header.svelte
+++ b/src/routes/(console)/account/header.svelte
@@ -11,7 +11,7 @@
     import { user } from '$lib/stores/user';
     import { isCloud } from '$lib/system';
 
-    const path = `/console/account`;
+    const path = `${base}/account`;
 
     $: permanentTabs = [
         {
diff --git a/src/routes/console/account/identities.svelte b/src/routes/(console)/account/identities.svelte
similarity index 100%
rename from src/routes/console/account/identities.svelte
rename to src/routes/(console)/account/identities.svelte
diff --git a/src/routes/console/account/mfa.svelte b/src/routes/(console)/account/mfa.svelte
similarity index 100%
rename from src/routes/console/account/mfa.svelte
rename to src/routes/(console)/account/mfa.svelte
diff --git a/src/routes/console/account/mfaRecoveryCodes.svelte b/src/routes/(console)/account/mfaRecoveryCodes.svelte
similarity index 100%
rename from src/routes/console/account/mfaRecoveryCodes.svelte
rename to src/routes/(console)/account/mfaRecoveryCodes.svelte
diff --git a/src/routes/console/account/mfaRegenerateCodes.svelte b/src/routes/(console)/account/mfaRegenerateCodes.svelte
similarity index 100%
rename from src/routes/console/account/mfaRegenerateCodes.svelte
rename to src/routes/(console)/account/mfaRegenerateCodes.svelte
diff --git a/src/routes/console/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte
similarity index 97%
rename from src/routes/console/account/organizations/+page.svelte
rename to src/routes/(console)/account/organizations/+page.svelte
index d9a67e0c5..1e4287e00 100644
--- a/src/routes/console/account/organizations/+page.svelte
+++ b/src/routes/(console)/account/organizations/+page.svelte
@@ -39,7 +39,7 @@
 
     function createOrg() {
         if (isCloud) {
-            goto(`${base}/console/create-organization`);
+            goto(`${base}/create-organization`);
         } else addOrganization = true;
     }
 </script>
@@ -62,7 +62,7 @@
             on:click={createOrg}>
             {#each data.organizations.teams as organization}
                 {@const avatarList = getMemberships(organization.$id)}
-                <GridItem1 href={`${base}/console/organization-${organization.$id}`}>
+                <GridItem1 href={`${base}/organization-${organization.$id}`}>
                     <svelte:fragment slot="eyebrow">
                         {organization?.total ? organization?.total : 'No'} members
                     </svelte:fragment>
diff --git a/src/routes/console/account/organizations/+page.ts b/src/routes/(console)/account/organizations/+page.ts
similarity index 100%
rename from src/routes/console/account/organizations/+page.ts
rename to src/routes/(console)/account/organizations/+page.ts
diff --git a/src/routes/console/account/payments/+page.svelte b/src/routes/(console)/account/payments/+page.svelte
similarity index 100%
rename from src/routes/console/account/payments/+page.svelte
rename to src/routes/(console)/account/payments/+page.svelte
diff --git a/src/routes/console/account/payments/+page.ts b/src/routes/(console)/account/payments/+page.ts
similarity index 100%
rename from src/routes/console/account/payments/+page.ts
rename to src/routes/(console)/account/payments/+page.ts
diff --git a/src/routes/console/account/payments/addressModal.svelte b/src/routes/(console)/account/payments/addressModal.svelte
similarity index 100%
rename from src/routes/console/account/payments/addressModal.svelte
rename to src/routes/(console)/account/payments/addressModal.svelte
diff --git a/src/routes/console/account/payments/billingAddress.svelte b/src/routes/(console)/account/payments/billingAddress.svelte
similarity index 97%
rename from src/routes/console/account/payments/billingAddress.svelte
rename to src/routes/(console)/account/payments/billingAddress.svelte
index 0440237a8..ad447c467 100644
--- a/src/routes/console/account/payments/billingAddress.svelte
+++ b/src/routes/(console)/account/payments/billingAddress.svelte
@@ -83,11 +83,11 @@
                                             trigger: 'click',
                                             content: `
                                     <div class="u-flex u-flex-vertical u-gap-8">
-                                        <p class="text">This billing address is linked to the following organizations:</p>                                                         
+                                        <p class="text">This billing address is linked to the following organizations:</p>
                                         ${linkedOrgs
                                             .map(
                                                 (org) =>
-                                                    `<a href="${base}/console/organization-${org.$id}/billing" class="link">${org.name}</a>`
+                                                    `<a href="${base}/organization-${org.$id}/billing" class="link">${org.name}</a>`
                                             )
                                             .join('')}
                                                 </div>`
diff --git a/src/routes/console/account/payments/deleteAddressModal.svelte b/src/routes/(console)/account/payments/deleteAddressModal.svelte
similarity index 95%
rename from src/routes/console/account/payments/deleteAddressModal.svelte
rename to src/routes/(console)/account/payments/deleteAddressModal.svelte
index 508ebc8fa..e20c6948b 100644
--- a/src/routes/console/account/payments/deleteAddressModal.svelte
+++ b/src/routes/(console)/account/payments/deleteAddressModal.svelte
@@ -57,8 +57,7 @@
         <ul>
             {#each linkedOrgs as org}
                 <li class="text">
-                    <a class="link" href={`${base}/console/organization-${org.$id}/billing`}
-                        >{org.name}</a>
+                    <a class="link" href={`${base}/organization-${org.$id}/billing`}>{org.name}</a>
                 </li>
             {/each}
         </ul>
diff --git a/src/routes/console/account/payments/deletePaymentModal.svelte b/src/routes/(console)/account/payments/deletePaymentModal.svelte
similarity index 95%
rename from src/routes/console/account/payments/deletePaymentModal.svelte
rename to src/routes/(console)/account/payments/deletePaymentModal.svelte
index 142df323c..59240ec39 100644
--- a/src/routes/console/account/payments/deletePaymentModal.svelte
+++ b/src/routes/(console)/account/payments/deletePaymentModal.svelte
@@ -56,8 +56,7 @@
         <ul>
             {#each linkedOrgs as org}
                 <li class="text">
-                    <a class="link" href={`${base}/console/organization-${org.$id}/billing`}
-                        >{org.name}</a>
+                    <a class="link" href={`${base}/organization-${org.$id}/billing`}>{org.name}</a>
                 </li>
             {/each}
         </ul>
diff --git a/src/routes/console/account/payments/editAddressModal.svelte b/src/routes/(console)/account/payments/editAddressModal.svelte
similarity index 100%
rename from src/routes/console/account/payments/editAddressModal.svelte
rename to src/routes/(console)/account/payments/editAddressModal.svelte
diff --git a/src/routes/console/account/payments/editPaymentModal.svelte b/src/routes/(console)/account/payments/editPaymentModal.svelte
similarity index 100%
rename from src/routes/console/account/payments/editPaymentModal.svelte
rename to src/routes/(console)/account/payments/editPaymentModal.svelte
diff --git a/src/routes/console/account/payments/paymentMethods.svelte b/src/routes/(console)/account/payments/paymentMethods.svelte
similarity index 97%
rename from src/routes/console/account/payments/paymentMethods.svelte
rename to src/routes/(console)/account/payments/paymentMethods.svelte
index d03911a40..73c5036f4 100644
--- a/src/routes/console/account/payments/paymentMethods.svelte
+++ b/src/routes/(console)/account/payments/paymentMethods.svelte
@@ -75,11 +75,11 @@
                                                     trigger: 'click',
                                                     content: `
                                                         <div class="u-flex u-flex-vertical u-gap-8">
-                                                            <p class="text">This payment method is linked to the following organizations:</p>                                                         
+                                                            <p class="text">This payment method is linked to the following organizations:</p>
                                                             ${linkedOrgs
                                                                 .map(
                                                                     (org) =>
-                                                                        `<a href="${base}/console/organization-${org.$id}/billing" class="link">${org.name}</a>`
+                                                                        `<a href="${base}/organization-${org.$id}/billing" class="link">${org.name}</a>`
                                                                 )
                                                                 .join('')}
                                                         </div>`
diff --git a/src/routes/console/account/sessions/+page.svelte b/src/routes/(console)/account/sessions/+page.svelte
similarity index 100%
rename from src/routes/console/account/sessions/+page.svelte
rename to src/routes/(console)/account/sessions/+page.svelte
diff --git a/src/routes/console/account/sessions/+page.ts b/src/routes/(console)/account/sessions/+page.ts
similarity index 100%
rename from src/routes/console/account/sessions/+page.ts
rename to src/routes/(console)/account/sessions/+page.ts
diff --git a/src/routes/console/account/store.ts b/src/routes/(console)/account/store.ts
similarity index 100%
rename from src/routes/console/account/store.ts
rename to src/routes/(console)/account/store.ts
diff --git a/src/routes/console/account/updateEmail.svelte b/src/routes/(console)/account/updateEmail.svelte
similarity index 100%
rename from src/routes/console/account/updateEmail.svelte
rename to src/routes/(console)/account/updateEmail.svelte
diff --git a/src/routes/console/account/updateMfa.svelte b/src/routes/(console)/account/updateMfa.svelte
similarity index 100%
rename from src/routes/console/account/updateMfa.svelte
rename to src/routes/(console)/account/updateMfa.svelte
diff --git a/src/routes/console/account/updateName.svelte b/src/routes/(console)/account/updateName.svelte
similarity index 100%
rename from src/routes/console/account/updateName.svelte
rename to src/routes/(console)/account/updateName.svelte
diff --git a/src/routes/console/account/updatePassword.svelte b/src/routes/(console)/account/updatePassword.svelte
similarity index 100%
rename from src/routes/console/account/updatePassword.svelte
rename to src/routes/(console)/account/updatePassword.svelte
diff --git a/src/routes/console/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
similarity index 98%
rename from src/routes/console/apply-credit/+page.svelte
rename to src/routes/(console)/apply-credit/+page.svelte
index c9f0db557..adc861554 100644
--- a/src/routes/console/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -30,19 +30,19 @@
     export let data;
 
     const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$/i;
-    let previousPage: string = `${base}/console`;
+    let previousPage: string = base;
     let showExitModal = false;
     let canSelectOrg = true;
 
     afterNavigate(({ from }) => {
         if (from?.url?.pathname) {
             if (from.url.pathname.includes('/login') || from.url.pathname.includes('/register')) {
-                previousPage = `${base}/console`;
+                previousPage = base;
             } else {
                 previousPage = from?.url?.pathname || previousPage;
             }
         } else {
-            previousPage = `${base}/console`;
+            previousPage = base;
         }
     });
 
@@ -138,7 +138,7 @@
                         collaborator,
                         undefined,
                         undefined,
-                        `${$page.url.origin}/console/organization-${org.$id}`
+                        `${$page.url.origin}/${base}/organization-${org.$id}`
                     );
                 });
             }
@@ -152,7 +152,7 @@
                 campaign: couponData?.campaign
             });
             await invalidate(Dependencies.ORGANIZATION);
-            await goto(`/console/organization-${org.$id}`);
+            await goto(`${base}/organization-${org.$id}`);
             addNotification({
                 type: 'success',
                 message: 'Credits applied successfully'
diff --git a/src/routes/console/apply-credit/+page.ts b/src/routes/(console)/apply-credit/+page.ts
similarity index 85%
rename from src/routes/console/apply-credit/+page.ts
rename to src/routes/(console)/apply-credit/+page.ts
index 82c357efa..6793b6b84 100644
--- a/src/routes/console/apply-credit/+page.ts
+++ b/src/routes/(console)/apply-credit/+page.ts
@@ -12,10 +12,10 @@ export const load = async ({ url }) => {
         try {
             couponData = await sdk.forConsole.billing.getCoupon(code);
         } catch (e) {
-            redirect(303, `${base}/console`);
+            redirect(303, base);
         }
         if (!couponData?.campaign || !campaigns.has(couponData.campaign)) {
-            redirect(303, `${base}/console`);
+            redirect(303, base);
         } else {
             return {
                 couponData,
@@ -31,11 +31,11 @@ export const load = async ({ url }) => {
                 campaign
             };
         } else {
-            redirect(303, `${base}/console`);
+            redirect(303, base);
         }
     }
     // No campaign or promo code
     else {
-        redirect(303, `${base}/console`);
+        redirect(303, base);
     }
 };
diff --git a/src/routes/console/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
similarity index 97%
rename from src/routes/console/create-organization/+page.svelte
rename to src/routes/(console)/create-organization/+page.svelte
index e7ac26659..9791d54a9 100644
--- a/src/routes/console/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -32,7 +32,7 @@
         (org) => (org as Organization)?.billingPlan === BillingPlan.FREE
     );
     const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$/i;
-    let previousPage: string = `${base}/console`;
+    let previousPage: string = base;
     let showExitModal = false;
 
     afterNavigate(({ from }) => {
@@ -142,7 +142,7 @@
                             collaborator,
                             undefined,
                             undefined,
-                            `${$page.url.origin}/console/organization-${org.$id}`
+                            `${$page.url.origin}/${base}/organization-${org.$id}`
                         );
                     });
                 }
@@ -160,8 +160,8 @@
             });
 
             await invalidate(Dependencies.ACCOUNT);
-            await preloadData(`${base}/console/organization-${org.$id}`);
-            await goto(`${base}/console/organization-${org.$id}`);
+            await preloadData(`${base}/organization-${org.$id}`);
+            await goto(`${base}/organization-${org.$id}`);
             addNotification({
                 type: 'success',
                 message: `${name ?? 'Organization'} has been created`
diff --git a/src/routes/console/createOrganization.svelte b/src/routes/(console)/createOrganization.svelte
similarity index 96%
rename from src/routes/console/createOrganization.svelte
rename to src/routes/(console)/createOrganization.svelte
index 70087ad91..b9d1bb477 100644
--- a/src/routes/console/createOrganization.svelte
+++ b/src/routes/(console)/createOrganization.svelte
@@ -11,6 +11,7 @@
     import { ID } from '@appwrite.io/console';
     import Alert from '$lib/components/alert.svelte';
     import { isCloud } from '$lib/system';
+    import { base } from '$app/paths';
 
     export let show = false;
 
@@ -26,7 +27,7 @@
             const org = await sdk.forConsole.teams.create(id ?? ID.unique(), name);
             await invalidate(Dependencies.ACCOUNT);
             dispatch('created');
-            await goto(`/console/organization-${org.$id}`);
+            await goto(`${base}/organization-${org.$id}`);
             addNotification({
                 type: 'success',
                 message: `${name} has been created`
diff --git a/src/routes/console/feedbackWizard.svelte b/src/routes/(console)/feedbackWizard.svelte
similarity index 100%
rename from src/routes/console/feedbackWizard.svelte
rename to src/routes/(console)/feedbackWizard.svelte
diff --git a/src/routes/console/onboarding/+layout.svelte b/src/routes/(console)/onboarding/+layout.svelte
similarity index 100%
rename from src/routes/console/onboarding/+layout.svelte
rename to src/routes/(console)/onboarding/+layout.svelte
diff --git a/src/routes/console/onboarding/+layout.ts b/src/routes/(console)/onboarding/+layout.ts
similarity index 100%
rename from src/routes/console/onboarding/+layout.ts
rename to src/routes/(console)/onboarding/+layout.ts
diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/(console)/onboarding/+page.svelte
similarity index 95%
rename from src/routes/console/onboarding/+page.svelte
rename to src/routes/(console)/onboarding/+page.svelte
index 27b5528b6..66e15dbd8 100644
--- a/src/routes/console/onboarding/+page.svelte
+++ b/src/routes/(console)/onboarding/+page.svelte
@@ -41,7 +41,7 @@
             if ($page.url.searchParams.has('type')) {
                 const paramType = $page.url.searchParams.get('type');
                 if (paramType === 'createPro') {
-                    goto(`${base}/console/create-organization`);
+                    goto(`${base}/create-organization`);
                 }
             }
         }
@@ -64,7 +64,7 @@
                         plan: tierToPlan(plan)?.name
                     });
                     await invalidate(Dependencies.ACCOUNT);
-                    await goto(`/console/organization-${org.$id}`);
+                    await goto(`${base}/organization-${org.$id}`);
                     addNotification({
                         message: `${orgName} organization successfully created`,
                         type: 'success'
@@ -77,14 +77,14 @@
                     trackError(error, Submit.OrganizationCreate);
                 }
             } else {
-                goto(`${base}/console/create-organization?name=${orgName}&plan=${plan}`);
+                goto(`${base}/create-organization?name=${orgName}&plan=${plan}`);
             }
         } else {
             try {
                 const org = await sdk.forConsole.teams.create(id ?? ID.unique(), orgName);
 
                 await invalidate(Dependencies.ACCOUNT);
-                await goto(`/console/organization-${org.$id}`);
+                await goto(`${base}/organization-${org.$id}`);
 
                 addNotification({
                     message: `${orgName} organization successfully created`,
diff --git a/src/routes/console/onboarding/header.svelte b/src/routes/(console)/onboarding/header.svelte
similarity index 100%
rename from src/routes/console/onboarding/header.svelte
rename to src/routes/(console)/onboarding/header.svelte
diff --git a/src/routes/console/organization-[organization]/+layout.svelte b/src/routes/(console)/organization-[organization]/+layout.svelte
similarity index 86%
rename from src/routes/console/organization-[organization]/+layout.svelte
rename to src/routes/(console)/organization-[organization]/+layout.svelte
index 77dcfa320..a6d00c4d5 100644
--- a/src/routes/console/organization-[organization]/+layout.svelte
+++ b/src/routes/(console)/organization-[organization]/+layout.svelte
@@ -7,6 +7,7 @@
     import { registerCommands } from '$lib/commandCenter';
     import { requestedMigration } from '$routes/store';
     import { openMigrationWizard } from '../(migration-wizard)';
+    import { base } from '$app/paths';
 
     export let data;
 
@@ -18,7 +19,7 @@
         {
             label: 'Go to members',
             callback: () => {
-                goto(`/console/organization-${data.organization.$id}/members`);
+                goto(`${base}/organization-${data.organization.$id}/members`);
             },
             keys: ['g', 'm'],
             disabled: $page.url.pathname.endsWith('/members'),
@@ -27,7 +28,7 @@
         {
             label: 'Go to settings',
             callback: () => {
-                goto(`/console/organization-${data.organization.$id}/settings`);
+                goto(`${base}/organization-${data.organization.$id}/settings`);
             },
             keys: ['g', 's'],
             disabled: $page.url.pathname.endsWith('/settings'),
diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/+layout.ts
rename to src/routes/(console)/organization-[organization]/+layout.ts
diff --git a/src/routes/console/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
similarity index 97%
rename from src/routes/console/organization-[organization]/+page.svelte
rename to src/routes/(console)/organization-[organization]/+page.svelte
index 95dd694b2..b88300a98 100644
--- a/src/routes/console/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -109,7 +109,7 @@
             trackEvent(Submit.ProjectCreate, {
                 teamId: $page.params.organization
             });
-            await goto(`/console/project-${project.$id}/settings/migrations`);
+            await goto(`${base}/project-${project.$id}/settings/migrations`);
             openImportWizard();
             loading.set(false);
         } catch (e) {
@@ -124,7 +124,7 @@
             if ($page.url.searchParams.has('type')) {
                 const paramType = $page.url.searchParams.get('type');
                 if (paramType === 'createPro') {
-                    goto(`${base}/console/create-organization`);
+                    goto(`${base}/create-organization`);
                 }
             }
         }
@@ -170,7 +170,7 @@
                         project.platforms.map((platform) => getPlatformInfo(platform.type))
                     )}
                     <li>
-                        <GridItem1 href={`${base}/console/project-${project.$id}`}>
+                        <GridItem1 href={`${base}/project-${project.$id}`}>
                             <svelte:fragment slot="eyebrow">
                                 {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
                             </svelte:fragment>
diff --git a/src/routes/console/organization-[organization]/+page.ts b/src/routes/(console)/organization-[organization]/+page.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/+page.ts
rename to src/routes/(console)/organization-[organization]/+page.ts
diff --git a/src/routes/console/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/+page.svelte
rename to src/routes/(console)/organization-[organization]/billing/+page.svelte
diff --git a/src/routes/console/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/+page.ts
rename to src/routes/(console)/organization-[organization]/billing/+page.ts
diff --git a/src/routes/console/organization-[organization]/billing/addCreditModal.svelte b/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/addCreditModal.svelte
rename to src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
diff --git a/src/routes/console/organization-[organization]/billing/addCreditWizard.svelte b/src/routes/(console)/organization-[organization]/billing/addCreditWizard.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/addCreditWizard.svelte
rename to src/routes/(console)/organization-[organization]/billing/addCreditWizard.svelte
diff --git a/src/routes/console/organization-[organization]/billing/availableCredit.svelte b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/availableCredit.svelte
rename to src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
diff --git a/src/routes/console/organization-[organization]/billing/billingAddress.svelte b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
similarity index 97%
rename from src/routes/console/organization-[organization]/billing/billingAddress.svelte
rename to src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
index 06036d124..b98a9a83f 100644
--- a/src/routes/console/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
@@ -10,8 +10,8 @@
     import { addNotification } from '$lib/stores/notifications';
     import { organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
-    import AddressModal from '$routes/console/account/payments/addressModal.svelte';
-    import EditAddressModal from '$routes/console/account/payments/editAddressModal.svelte';
+    import AddressModal from '$routes/(console)/account/payments/addressModal.svelte';
+    import EditAddressModal from '$routes/(console)/account/payments/editAddressModal.svelte';
     import ReplaceAddress from './replaceAddress.svelte';
 
     export let billingAddress: Address = null;
diff --git a/src/routes/console/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/budgetAlert.svelte
rename to src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
diff --git a/src/routes/console/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/budgetCap.svelte
rename to src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
diff --git a/src/routes/console/organization-[organization]/billing/deleteOrgPayment.svelte b/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/deleteOrgPayment.svelte
rename to src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
diff --git a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/paymentHistory.svelte
rename to src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
diff --git a/src/routes/console/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
similarity index 99%
rename from src/routes/console/organization-[organization]/billing/paymentMethods.svelte
rename to src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 6df295ebf..55e82efb6 100644
--- a/src/routes/console/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -19,7 +19,7 @@
     import type { PaymentMethodData } from '$lib/sdk/billing';
     import DeleteOrgPayment from './deleteOrgPayment.svelte';
     import ReplaceCard from './replaceCard.svelte';
-    import EditPaymentModal from '$routes/console/account/payments/editPaymentModal.svelte';
+    import EditPaymentModal from '$routes/(console)/account/payments/editPaymentModal.svelte';
     import { tooltip } from '$lib/actions/tooltip';
     import PaymentModal from '$lib/components/billing/paymentModal.svelte';
 
diff --git a/src/routes/console/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
similarity index 97%
rename from src/routes/console/organization-[organization]/billing/planSummary.svelte
rename to src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index 81edb295e..d69c4cd74 100644
--- a/src/routes/console/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -157,7 +157,7 @@
         <svelte:fragment slot="actions">
             {#if $organization?.billingPlan === BillingPlan.FREE}
                 <div class="u-flex u-gap-16 u-flex-wrap">
-                    <Button text href={`${base}/console/organization-${$organization?.$id}/usage`}>
+                    <Button text href={`${base}/organization-${$organization?.$id}/usage`}>
                         View estimated usage
                     </Button>
                     <Button
@@ -184,9 +184,7 @@
                             })}>
                         Change plan
                     </Button>
-                    <Button
-                        secondary
-                        href={`${base}/console/organization-${$organization?.$id}/usage`}>
+                    <Button secondary href={`${base}/organization-${$organization?.$id}/usage`}>
                         View estimated usage
                     </Button>
                 </div>
diff --git a/src/routes/console/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/replaceAddress.svelte
rename to src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
diff --git a/src/routes/console/organization-[organization]/billing/replaceCard.svelte b/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/replaceCard.svelte
rename to src/routes/(console)/organization-[organization]/billing/replaceCard.svelte
diff --git a/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte
rename to src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
diff --git a/src/routes/console/organization-[organization]/billing/store.ts b/src/routes/(console)/organization-[organization]/billing/store.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/store.ts
rename to src/routes/(console)/organization-[organization]/billing/store.ts
diff --git a/src/routes/console/organization-[organization]/billing/taxId.svelte b/src/routes/(console)/organization-[organization]/billing/taxId.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/taxId.svelte
rename to src/routes/(console)/organization-[organization]/billing/taxId.svelte
diff --git a/src/routes/console/organization-[organization]/billing/wizard/addCredit.svelte b/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/wizard/addCredit.svelte
rename to src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
diff --git a/src/routes/console/organization-[organization]/billing/wizard/paymentDetails.svelte b/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/billing/wizard/paymentDetails.svelte
rename to src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
diff --git a/src/routes/console/organization-[organization]/breadcrumbs.svelte b/src/routes/(console)/organization-[organization]/breadcrumbs.svelte
similarity index 71%
rename from src/routes/console/organization-[organization]/breadcrumbs.svelte
rename to src/routes/(console)/organization-[organization]/breadcrumbs.svelte
index e2a847beb..19c789a0f 100644
--- a/src/routes/console/organization-[organization]/breadcrumbs.svelte
+++ b/src/routes/(console)/organization-[organization]/breadcrumbs.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         }
     ];
diff --git a/src/routes/console/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
similarity index 97%
rename from src/routes/console/organization-[organization]/change-plan/+page.svelte
rename to src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index 5fcfaa2c7..1d0d9aa20 100644
--- a/src/routes/console/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -44,7 +44,7 @@
         (org) => (org as Organization)?.billingPlan === BillingPlan.FREE
     );
     const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$/i;
-    let previousPage: string = `${base}/console`;
+    let previousPage: string = base;
     let showExitModal = false;
     afterNavigate(({ from }) => {
         previousPage = from?.url?.pathname || previousPage;
@@ -140,7 +140,7 @@
                 })
             });
 
-            await goto(`/console/organization-${$organization.$id}`);
+            await goto(`${base}/organization-${$organization.$id}`);
             addNotification({
                 type: 'success',
                 isHtml: true,
@@ -195,7 +195,7 @@
                         collaborator,
                         undefined,
                         undefined,
-                        `${$page.url.origin}/console/organization-${org.$id}`
+                        `${$page.url.origin}/${base}/organization-${org.$id}`
                     );
                 });
             }
@@ -208,7 +208,7 @@
             await invalidate(Dependencies.ACCOUNT);
             await invalidate(Dependencies.ORGANIZATION);
 
-            await goto(`/console/organization-${org.$id}`);
+            await goto(`${base}/organization-${org.$id}`);
             if (isUpgrade) {
                 addNotification({
                     type: 'success',
@@ -266,8 +266,7 @@
                     You are limited to one {tierToPlan(BillingPlan.FREE).name} organization per account.
                     Consider upgrading or deleting <Button
                         link
-                        href={`${base}/console/organization-${anyOrgFree.$id}`}
-                        >{anyOrgFree.name}</Button
+                        href={`${base}/organization-${anyOrgFree.$id}`}>{anyOrgFree.name}</Button
                     >.
                 </Alert>
             {/if}
diff --git a/src/routes/console/organization-[organization]/change-plan/+page.ts b/src/routes/(console)/organization-[organization]/change-plan/+page.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/change-plan/+page.ts
rename to src/routes/(console)/organization-[organization]/change-plan/+page.ts
diff --git a/src/routes/console/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/createMember.svelte
rename to src/routes/(console)/organization-[organization]/createMember.svelte
diff --git a/src/routes/console/organization-[organization]/createProject.svelte b/src/routes/(console)/organization-[organization]/createProject.svelte
similarity index 95%
rename from src/routes/console/organization-[organization]/createProject.svelte
rename to src/routes/(console)/organization-[organization]/createProject.svelte
index 0f042d0c5..85bccc0f0 100644
--- a/src/routes/console/organization-[organization]/createProject.svelte
+++ b/src/routes/(console)/organization-[organization]/createProject.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal, CustomId } from '$lib/components';
     import { Pill } from '$lib/elements';
@@ -39,7 +40,7 @@
                 type: 'success',
                 message: `${name} has been created`
             });
-            await goto(`/console/project-${project.$id}`);
+            await goto(`${base}/project-${project.$id}`);
         } catch (e) {
             error = e.message;
             trackError(e, Submit.ProjectCreate);
diff --git a/src/routes/console/organization-[organization]/createProjectCloud.svelte b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
similarity index 95%
rename from src/routes/console/organization-[organization]/createProjectCloud.svelte
rename to src/routes/(console)/organization-[organization]/createProjectCloud.svelte
index 214ec5b9d..a8cfdcc15 100644
--- a/src/routes/console/organization-[organization]/createProjectCloud.svelte
+++ b/src/routes/(console)/organization-[organization]/createProjectCloud.svelte
@@ -13,6 +13,7 @@
     import { ID, Region } from '@appwrite.io/console';
     import { createProject } from './wizard/store';
     import { wizard } from '$lib/stores/wizard';
+    import { base } from '$app/paths';
 
     const teamId = $page.params.organization;
 
@@ -38,7 +39,7 @@
                 type: 'success',
                 message: `${$createProject.name} has been created`
             });
-            await goto(`/console/project-${project.$id}`);
+            await goto(`${base}/project-${project.$id}`);
             wizard.hide();
         } catch (e) {
             addNotification({
diff --git a/src/routes/console/organization-[organization]/deleteMember.svelte b/src/routes/(console)/organization-[organization]/deleteMember.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/deleteMember.svelte
rename to src/routes/(console)/organization-[organization]/deleteMember.svelte
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
similarity index 97%
rename from src/routes/console/organization-[organization]/header.svelte
rename to src/routes/(console)/organization-[organization]/header.svelte
index 01ef09e1d..40b4996f8 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -47,13 +47,13 @@
     function createOrg() {
         showDropdown = false;
         if (isCloud) {
-            goto(`${base}/console/create-organization`);
+            goto(`${base}/create-organization`);
         } else newOrgModal.set(true);
     }
 
     $: avatars = $members.memberships?.map((m) => m.userName) ?? [];
     $: organizationId = $page.params.organization;
-    $: path = `/console/organization-${organizationId}`;
+    $: path = `${base}/organization-${organizationId}`;
     $: permanentTabSettings = [
         {
             href: `${path}/settings`,
@@ -130,7 +130,7 @@
                 <div data-sveltekit-preload-data="false" slot="list">
                     {#each $organizationList.teams as org}
                         <DropListLink
-                            href={`${base}/console/organization-${org.$id}`}
+                            href={`${base}/organization-${org.$id}`}
                             on:click={() => (showDropdown = false)}>
                             {org.name}
                         </DropListLink>
diff --git a/src/routes/console/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
similarity index 98%
rename from src/routes/console/organization-[organization]/members/+page.svelte
rename to src/routes/(console)/organization-[organization]/members/+page.svelte
index 1c2d69ae8..54de73659 100644
--- a/src/routes/console/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -20,12 +20,13 @@
     import type { Models } from '@appwrite.io/console';
     import type { PageData } from './$types';
     import Delete from '../deleteMember.svelte';
+    import { base } from '$app/paths';
 
     export let data: PageData;
 
     let selectedMember: Models.Membership;
     let showDelete = false;
-    const url = `${$page.url.origin}/console/`;
+    const url = `${$page.url.origin}/${base}/`;
     const resend = async (member: Models.Membership) => {
         try {
             await sdk.forConsole.teams.createMembership(
diff --git a/src/routes/console/organization-[organization]/members/+page.ts b/src/routes/(console)/organization-[organization]/members/+page.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/members/+page.ts
rename to src/routes/(console)/organization-[organization]/members/+page.ts
diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/(console)/organization-[organization]/settings/+page.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/settings/+page.svelte
rename to src/routes/(console)/organization-[organization]/settings/+page.svelte
diff --git a/src/routes/console/organization-[organization]/settings/+page.ts b/src/routes/(console)/organization-[organization]/settings/+page.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/settings/+page.ts
rename to src/routes/(console)/organization-[organization]/settings/+page.ts
diff --git a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
similarity index 95%
rename from src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte
rename to src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
index f071e6108..2143ced28 100644
--- a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
@@ -28,9 +28,9 @@
             const newPrefs = { ...prefs, organization: null };
             await sdk.forConsole.account.updatePrefs(newPrefs);
             if ($organizationList?.total > 1) {
-                await goto(`${base}/console/account/organizations`);
+                await goto(`${base}/account/organizations`);
             } else {
-                await goto(`${base}/console/onboarding`);
+                await goto(`${base}/onboarding`);
             }
             await invalidate(Dependencies.ACCOUNT);
             await invalidate(Dependencies.ORGANIZATION);
diff --git a/src/routes/console/organization-[organization]/settings/downloadDPA.svelte b/src/routes/(console)/organization-[organization]/settings/downloadDPA.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/settings/downloadDPA.svelte
rename to src/routes/(console)/organization-[organization]/settings/downloadDPA.svelte
diff --git a/src/routes/console/organization-[organization]/store.ts b/src/routes/(console)/organization-[organization]/store.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/store.ts
rename to src/routes/(console)/organization-[organization]/store.ts
diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/usage/[[invoice]]/+page.svelte
rename to src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts
rename to src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
similarity index 96%
rename from src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
rename to src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index 456559272..99a829376 100644
--- a/src/routes/console/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -13,6 +13,7 @@
     import { abbreviateNumber } from '$lib/helpers/numbers';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
     import type { OrganizationUsage } from '$lib/sdk/billing';
+    import { base } from '$app/paths';
 
     type Metric = 'users' | 'storage' | 'bandwidth' | 'executions';
     export let data: PageData;
@@ -24,7 +25,7 @@
     }
 
     function getProjectUsageLink(projectId: string): string {
-        return `/console/project-${projectId}/settings/usage`;
+        return `${base}/project-${projectId}/settings/usage`;
     }
 
     function groupByProject(metric: Metric): Array<{ projectId: string; usage: number }> {
diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/totalMembers.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
rename to src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
diff --git a/src/routes/console/organization-[organization]/wizard/step1.svelte b/src/routes/(console)/organization-[organization]/wizard/step1.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/wizard/step1.svelte
rename to src/routes/(console)/organization-[organization]/wizard/step1.svelte
diff --git a/src/routes/console/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte
similarity index 100%
rename from src/routes/console/organization-[organization]/wizard/step2.svelte
rename to src/routes/(console)/organization-[organization]/wizard/step2.svelte
diff --git a/src/routes/console/organization-[organization]/wizard/store.ts b/src/routes/(console)/organization-[organization]/wizard/store.ts
similarity index 100%
rename from src/routes/console/organization-[organization]/wizard/store.ts
rename to src/routes/(console)/organization-[organization]/wizard/store.ts
diff --git a/src/routes/console/project-[project]/+error.svelte b/src/routes/(console)/project-[project]/+error.svelte
similarity index 100%
rename from src/routes/console/project-[project]/+error.svelte
rename to src/routes/(console)/project-[project]/+error.svelte
diff --git a/src/routes/console/project-[project]/+layout.svelte b/src/routes/(console)/project-[project]/+layout.svelte
similarity index 83%
rename from src/routes/console/project-[project]/+layout.svelte
rename to src/routes/(console)/project-[project]/+layout.svelte
index a2cdf33f5..a168e58f3 100644
--- a/src/routes/console/project-[project]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/+layout.svelte
@@ -16,6 +16,7 @@
     } from '$lib/commandCenter/searchers';
     import { MigrationBox } from '$lib/components';
     import { page } from '$app/stores';
+    import { base } from '$app/paths';
 
     onMount(() => {
         return sdk.forConsole.client.subscribe(['project', 'console'], (response) => {
@@ -31,7 +32,7 @@
         {
             label: 'Go to Auth',
             callback: () => {
-                goto(`/console/project-${$project.$id}/auth`);
+                goto(`${base}/project-${$project.$id}/auth`);
             },
             keys: ['g', 'a'],
             group: 'navigation'
@@ -39,7 +40,7 @@
         {
             label: 'Go to Databases',
             callback: () => {
-                goto(`/console/project-${$project.$id}/databases`);
+                goto(`${base}/project-${$project.$id}/databases`);
             },
             keys: ['g', 'd'],
             group: 'navigation'
@@ -47,7 +48,7 @@
         {
             label: 'Go to Functions',
             callback: () => {
-                goto(`/console/project-${$project.$id}/functions`);
+                goto(`${base}/project-${$project.$id}/functions`);
             },
             keys: ['g', 'f'],
             group: 'navigation'
@@ -55,7 +56,7 @@
         {
             label: 'Go to Messaging',
             callback: () => {
-                goto(`/console/project-${$project.$id}/messaging`);
+                goto(`${base}/project-${$project.$id}/messaging`);
             },
             keys: ['g', 'm'],
             disabled: $page.url.pathname.endsWith('messaging'),
@@ -64,7 +65,7 @@
         {
             label: 'Go to Storage',
             callback: () => {
-                goto(`/console/project-${$project.$id}/storage`);
+                goto(`${base}/project-${$project.$id}/storage`);
             },
             keys: ['g', 's'],
             group: 'navigation'
@@ -72,7 +73,7 @@
         {
             label: 'Go to Settings',
             callback: () => {
-                goto(`/console/project-${$project.$id}/settings`);
+                goto(`${base}/project-${$project.$id}/settings`);
             },
             keys: ['g', 'e'],
             group: 'navigation'
@@ -80,7 +81,7 @@
         {
             label: 'Go to Overview',
             callback: () => {
-                goto(`/console/project-${$project.$id}`);
+                goto(`${base}/project-${$project.$id}`);
             },
             keys: ['g', 'o'],
             group: 'navigation'
diff --git a/src/routes/console/project-[project]/+layout.ts b/src/routes/(console)/project-[project]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/+layout.ts
rename to src/routes/(console)/project-[project]/+layout.ts
diff --git a/src/routes/console/project-[project]/+page.ts b/src/routes/(console)/project-[project]/+page.ts
similarity index 70%
rename from src/routes/console/project-[project]/+page.ts
rename to src/routes/(console)/project-[project]/+page.ts
index 021a67bc0..200bfa858 100644
--- a/src/routes/console/project-[project]/+page.ts
+++ b/src/routes/(console)/project-[project]/+page.ts
@@ -3,5 +3,5 @@ import { base } from '$app/paths';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
-    redirect(302, `${base}/console/project-${params.project}/overview`);
+    redirect(302, `${base}/project-${params.project}/overview`);
 };
diff --git a/src/routes/console/project-[project]/auth/(providers)/appleOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/appleOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/appleOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/appleOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/auth0OAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/auth0OAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/auth0OAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/authentikOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/authentikOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/authentikOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/gitlabOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/gitlabOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/gitlabOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/googleOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/googleOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/googleOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/googleOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/mainOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/mainOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/mainOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/microsoftOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/microsoftOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/oidcOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/oidcOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte b/src/routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/(providers)/oktaOAuth.svelte
rename to src/routes/(console)/project-[project]/auth/(providers)/oktaOAuth.svelte
diff --git a/src/routes/console/project-[project]/auth/+layout.svelte b/src/routes/(console)/project-[project]/auth/+layout.svelte
similarity index 86%
rename from src/routes/console/project-[project]/auth/+layout.svelte
rename to src/routes/(console)/project-[project]/auth/+layout.svelte
index ca114d653..e94b0ea51 100644
--- a/src/routes/console/project-[project]/auth/+layout.svelte
+++ b/src/routes/(console)/project-[project]/auth/+layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
     import { TeamsPanel, UsersPanel } from '$lib/commandCenter/panels';
@@ -14,7 +15,7 @@
             label: 'Create user',
             callback: async () => {
                 if (!$page.url.pathname.endsWith('auth')) {
-                    await goto(`/console/project-${$project.$id}/auth`);
+                    await goto(`${base}/project-${$project.$id}/auth`);
                 }
                 showCreateUser.set(true);
             },
@@ -28,7 +29,7 @@
             label: 'Create team',
             callback: async () => {
                 if (!$page.url.pathname.endsWith('teams')) {
-                    await goto(`/console/project-${$project.$id}/auth/teams`);
+                    await goto(`${base}/project-${$project.$id}/auth/teams`);
                 }
                 showCreateTeam.set(true);
             },
@@ -43,7 +44,7 @@
             label: 'Go to teams',
             keys: ['g', 't'],
             callback() {
-                goto(`/console/project-${$project.$id}/auth/teams`);
+                goto(`${base}/project-${$project.$id}/auth/teams`);
             },
             group: 'navigation',
             rank: 1,
@@ -53,7 +54,7 @@
             label: 'Go to usage',
             keys: ['g', 'u'],
             callback() {
-                goto(`/console/project-${$project.$id}/auth/usage`);
+                goto(`${base}/project-${$project.$id}/auth/usage`);
             },
             group: 'navigation',
             rank: 1,
@@ -63,7 +64,7 @@
             label: 'Go to security',
             keys: ['g', 'e'],
             callback() {
-                goto(`/console/project-${$project.$id}/auth/security`);
+                goto(`${base}/project-${$project.$id}/auth/security`);
             },
             group: 'navigation',
             rank: 1,
@@ -73,7 +74,7 @@
             label: 'Go to settings',
             keys: ['g', 's'],
             callback() {
-                goto(`/console/project-${$project.$id}/auth/settings`);
+                goto(`${base}/project-${$project.$id}/auth/settings`);
             },
             group: 'navigation',
             rank: 1,
diff --git a/src/routes/console/project-[project]/auth/+layout.ts b/src/routes/(console)/project-[project]/auth/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/+layout.ts
rename to src/routes/(console)/project-[project]/auth/+layout.ts
diff --git a/src/routes/console/project-[project]/auth/+page.svelte b/src/routes/(console)/project-[project]/auth/+page.svelte
similarity index 95%
rename from src/routes/console/project-[project]/auth/+page.svelte
rename to src/routes/(console)/project-[project]/auth/+page.svelte
index 209c3d37d..af04a3e56 100644
--- a/src/routes/console/project-[project]/auth/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/+page.svelte
@@ -37,7 +37,7 @@
 
     const projectId = $page.params.project;
     async function userCreated(event: CustomEvent<Models.User<Record<string, unknown>>>) {
-        await goto(`${base}/console/project-${projectId}/auth/user-${event.detail.$id}`);
+        await goto(`${base}/project-${projectId}/auth/user-${event.detail.$id}`);
     }
 </script>
 
@@ -71,8 +71,7 @@
             </TableHeader>
             <TableBody>
                 {#each data.users.users as user}
-                    <TableRowLink
-                        href={`${base}/console/project-${projectId}/auth/user-${user.$id}`}>
+                    <TableRowLink href={`${base}/project-${projectId}/auth/user-${user.$id}`}>
                         <TableCell title="Name">
                             <div class="u-flex u-gap-12 u-cross-center">
                                 {#if user.email || user.phone}
@@ -145,7 +144,7 @@
                 <b>Sorry, we couldn't find '{data.search}'</b>
                 <p>There are no users that match your search.</p>
             </div>
-            <Button href={`/console/project-${projectId}/auth`} secondary>Clear Search</Button>
+            <Button href={`${base}/project-${projectId}/auth`} secondary>Clear Search</Button>
         </EmptySearch>
     {:else}
         <Empty
diff --git a/src/routes/console/project-[project]/auth/+page.ts b/src/routes/(console)/project-[project]/auth/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/+page.ts
rename to src/routes/(console)/project-[project]/auth/+page.ts
diff --git a/src/routes/console/project-[project]/auth/breadcrumbs.svelte b/src/routes/(console)/project-[project]/auth/breadcrumbs.svelte
similarity index 64%
rename from src/routes/console/project-[project]/auth/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/auth/breadcrumbs.svelte
index 77e02ac04..7fe41fa7c 100644
--- a/src/routes/console/project-[project]/auth/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/auth/breadcrumbs.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/auth`,
+            href: `${base}/project-${$project?.$id}/auth`,
             title: 'Auth'
         }
     ];
diff --git a/src/routes/console/project-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[project]/auth/createTeam.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/createTeam.svelte
rename to src/routes/(console)/project-[project]/auth/createTeam.svelte
diff --git a/src/routes/console/project-[project]/auth/createUser.svelte b/src/routes/(console)/project-[project]/auth/createUser.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/createUser.svelte
rename to src/routes/(console)/project-[project]/auth/createUser.svelte
diff --git a/src/routes/console/project-[project]/auth/header.svelte b/src/routes/(console)/project-[project]/auth/header.svelte
similarity index 94%
rename from src/routes/console/project-[project]/auth/header.svelte
rename to src/routes/(console)/project-[project]/auth/header.svelte
index e5fa08cb3..0217cda11 100644
--- a/src/routes/console/project-[project]/auth/header.svelte
+++ b/src/routes/(console)/project-[project]/auth/header.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
 
     const projectId = $page.params.project;
-    const path = `/console/project-${projectId}/auth`;
+    const path = `${base}/project-${projectId}/auth`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/console/project-[project]/auth/security/+page.svelte b/src/routes/(console)/project-[project]/auth/security/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/+page.svelte
rename to src/routes/(console)/project-[project]/auth/security/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/security/updateMockNumbers.svelte b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/updateMockNumbers.svelte
rename to src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte b/src/routes/(console)/project-[project]/auth/security/updatePasswordDictionary.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/updatePasswordDictionary.svelte
rename to src/routes/(console)/project-[project]/auth/security/updatePasswordDictionary.svelte
diff --git a/src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte b/src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/updatePasswordHistory.svelte
rename to src/routes/(console)/project-[project]/auth/security/updatePasswordHistory.svelte
diff --git a/src/routes/console/project-[project]/auth/security/updatePersonalDataCheck.svelte b/src/routes/(console)/project-[project]/auth/security/updatePersonalDataCheck.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/updatePersonalDataCheck.svelte
rename to src/routes/(console)/project-[project]/auth/security/updatePersonalDataCheck.svelte
diff --git a/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte b/src/routes/(console)/project-[project]/auth/security/updateSessionLength.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/updateSessionLength.svelte
rename to src/routes/(console)/project-[project]/auth/security/updateSessionLength.svelte
diff --git a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte b/src/routes/(console)/project-[project]/auth/security/updateSessionsLimit.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte
rename to src/routes/(console)/project-[project]/auth/security/updateSessionsLimit.svelte
diff --git a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte b/src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte
rename to src/routes/(console)/project-[project]/auth/security/updateUsersLimit.svelte
diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/(console)/project-[project]/auth/settings/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/settings/+page.svelte
rename to src/routes/(console)/project-[project]/auth/settings/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/store.ts b/src/routes/(console)/project-[project]/auth/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/store.ts
rename to src/routes/(console)/project-[project]/auth/store.ts
diff --git a/src/routes/console/project-[project]/auth/teams/+page.svelte b/src/routes/(console)/project-[project]/auth/teams/+page.svelte
similarity index 92%
rename from src/routes/console/project-[project]/auth/teams/+page.svelte
rename to src/routes/(console)/project-[project]/auth/teams/+page.svelte
index 5aa93c321..ccb1d354b 100644
--- a/src/routes/console/project-[project]/auth/teams/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/+page.svelte
@@ -37,7 +37,7 @@
 
     const project = $page.params.project;
     const teamCreated = async (event: CustomEvent<Models.Team<Record<string, unknown>>>) => {
-        await goto(`${base}/console/project-${project}/auth/teams/team-${event.detail.$id}`);
+        await goto(`${base}/project-${project}/auth/teams/team-${event.detail.$id}`);
     };
 </script>
 
@@ -74,8 +74,7 @@
             </TableHeader>
             <TableBody service="teams" total={data.teams.total}>
                 {#each data.teams.teams as team}
-                    <TableRowLink
-                        href={`${base}/console/project-${project}/auth/teams/team-${team.$id}`}>
+                    <TableRowLink href={`${base}/project-${project}/auth/teams/team-${team.$id}`}>
                         <TableCell title="Name">
                             <div class="u-flex u-gap-12 u-cross-center">
                                 <AvatarInitials size={32} name={team.name} />
@@ -103,7 +102,7 @@
                 <b>Sorry, we couldn't find ‘{data.search}'</b>
                 <p>There are no teams that match your search.</p>
             </div>
-            <Button secondary href={`/console/project-${$page.params.project}/auth/teams`}>
+            <Button secondary href={`${base}/project-${$page.params.project}/auth/teams`}>
                 Clear Search
             </Button>
         </EmptySearch>
diff --git a/src/routes/console/project-[project]/auth/teams/+page.ts b/src/routes/(console)/project-[project]/auth/teams/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/+page.ts
rename to src/routes/(console)/project-[project]/auth/teams/+page.ts
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/+layout.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.svelte
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts b/src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/+layout.ts
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts b/src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/activity/+page.ts
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/activity/+page.ts
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte
similarity index 62%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte
index e83103b02..3a0eada37 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/team-[team]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../../store';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project.$id}`,
+            href: `${base}/project-${$project.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/auth`,
+            href: `${base}/project-${$project?.$id}/auth`,
             title: 'Auth'
         },
         {
-            href: `/console/project-${$project?.$id}/auth/teams/team-${$team?.$id}`,
+            href: `${base}/project-${$project?.$id}/auth/teams/team-${$team?.$id}`,
             title: $team?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte
similarity index 95%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte
index 4d4fab614..401dffdc8 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/team-[team]/createMembership.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Modal, Alert } from '$lib/components';
@@ -16,7 +17,7 @@
     let error: string;
 
     async function create() {
-        const url = `${$page.url.origin}/console/project-${$page.params.project}/auth/teams/team-${$page.params.team}/members`;
+        const url = `${$page.url.origin}/${base}/project-${$page.params.project}/auth/teams/team-${$page.params.team}/members`;
 
         try {
             const user = await sdk.forProject.teams.createMembership(
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/dangerZone.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/dangerZone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/dangerZone.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/dangerZone.svelte
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteMembership.svelte
similarity index 93%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteMembership.svelte
index 42cca27ae..0d94968fb 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteMembership.svelte
@@ -25,7 +25,7 @@
             dispatch('deleted');
             trackEvent(Submit.MemberDelete);
             await goto(
-                `${base}/console/project-${$page.params.project}/auth/teams/team-${selectedMembership.teamId}/members`
+                `${base}/project-${$page.params.project}/auth/teams/team-${selectedMembership.teamId}/members`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteTeam.svelte
similarity index 94%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteTeam.svelte
index e7eb30c85..aab5dfa5d 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/team-[team]/deleteTeam.svelte
@@ -17,7 +17,7 @@
             await sdk.forProject.teams.delete(team.$id);
             showDelete = false;
             trackEvent(Submit.TeamDelete);
-            await goto(`${base}/console/project-${$page.params.project}/auth/teams`);
+            await goto(`${base}/project-${$page.params.project}/auth/teams`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/header.svelte
similarity index 87%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/header.svelte
index d176f8740..d28321a6a 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/header.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/team-[team]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -7,7 +8,7 @@
 
     const projectId = $page.params.project;
     const teamId = $page.params.team;
-    const path = `/console/project-${projectId}/auth/teams/team-${teamId}`;
+    const path = `${base}/project-${projectId}/auth/teams/team-${teamId}`;
     const tabs = [
         {
             href: path,
@@ -31,7 +32,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/auth/teams`}>
+        <CoverTitle href={`${base}/project-${projectId}/auth/teams`}>
             {$team?.name}
         </CoverTitle>
         <Id value={$team?.$id} event="team">{$team?.$id}</Id>
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
similarity index 97%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
index c8ea77952..d562a730a 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.svelte
@@ -60,7 +60,7 @@
                 {#each data.memberships.memberships as membership}
                     {@const username = membership.userName ? membership.userName : '-'}
                     <TableRowLink
-                        href={`${base}/console/project-${project}/auth/user-${membership.userId}`}>
+                        href={`${base}/project-${project}/auth/user-${membership.userId}`}>
                         <TableCellText title="Name">
                             <div class="u-flex u-gap-12 u-cross-center">
                                 <AvatarInitials size={32} name={username} />
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts b/src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.ts
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/members/+page.ts
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/store.ts b/src/routes/(console)/project-[project]/auth/teams/team-[team]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/store.ts
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/store.ts
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/updateName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/updateName.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/updateName.svelte
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte b/src/routes/(console)/project-[project]/auth/teams/team-[team]/updatePrefs.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/teams/team-[team]/updatePrefs.svelte
rename to src/routes/(console)/project-[project]/auth/teams/team-[team]/updatePrefs.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
similarity index 98%
rename from src/routes/console/project-[project]/auth/templates/+page.svelte
rename to src/routes/(console)/project-[project]/auth/templates/+page.svelte
index cc4d83c4d..c99f2aaac 100644
--- a/src/routes/console/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
@@ -110,7 +110,7 @@
                 buttons={[
                     {
                         slot: 'SMTP settings',
-                        href: `${base}/console/project-${$project.$id}/settings/smtp`
+                        href: `${base}/project-${$project.$id}/settings/smtp`
                     }
                 ]}>
                 <svelte:fragment slot="title">
@@ -192,7 +192,7 @@
             </Collapsible>
         </svelte:fragment>
         <svelte:fragment slot="actions">
-            <Button href={`${base}/console/project-${$project.$id}/settings/smtp`} secondary>
+            <Button href={`${base}/project-${$project.$id}/settings/smtp`} secondary>
                 SMTP settings
             </Button>
         </svelte:fragment>
diff --git a/src/routes/console/project-[project]/auth/templates/+page.ts b/src/routes/(console)/project-[project]/auth/templates/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/+page.ts
rename to src/routes/(console)/project-[project]/auth/templates/+page.ts
diff --git a/src/routes/console/project-[project]/auth/templates/email-footer-dark.png b/src/routes/(console)/project-[project]/auth/templates/email-footer-dark.png
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/email-footer-dark.png
rename to src/routes/(console)/project-[project]/auth/templates/email-footer-dark.png
diff --git a/src/routes/console/project-[project]/auth/templates/email-footer-light.png b/src/routes/(console)/project-[project]/auth/templates/email-footer-light.png
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/email-footer-light.png
rename to src/routes/(console)/project-[project]/auth/templates/email-footer-light.png
diff --git a/src/routes/console/project-[project]/auth/templates/email-footer-mobile-dark.png b/src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-dark.png
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/email-footer-mobile-dark.png
rename to src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-dark.png
diff --git a/src/routes/console/project-[project]/auth/templates/email-footer-mobile-light.png b/src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-light.png
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/email-footer-mobile-light.png
rename to src/routes/(console)/project-[project]/auth/templates/email-footer-mobile-light.png
diff --git a/src/routes/console/project-[project]/auth/templates/email2FATemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/email2FATemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/email2FATemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/email2FATemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/emailInviteTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/emailRecoveryTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/emailSignature.svelte b/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/emailSignature.svelte
rename to src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/emailTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/emailTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/emailVerificationTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/emailVerificationTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/localeOptions.svelte b/src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/localeOptions.svelte
rename to src/routes/(console)/project-[project]/auth/templates/localeOptions.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/resetEmail.svelte b/src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/resetEmail.svelte
rename to src/routes/(console)/project-[project]/auth/templates/resetEmail.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/resetSms.svelte b/src/routes/(console)/project-[project]/auth/templates/resetSms.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/resetSms.svelte
rename to src/routes/(console)/project-[project]/auth/templates/resetSms.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/smsInvitationTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/smsInvitationTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/smsInvitationTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/smsLoginTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/smsLoginTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/smsLoginTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/smsTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/smsTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/smsTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/smsTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/smsVerificationTemplate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/smsVerificationTemplate.svelte
rename to src/routes/(console)/project-[project]/auth/templates/smsVerificationTemplate.svelte
diff --git a/src/routes/console/project-[project]/auth/templates/store.ts b/src/routes/(console)/project-[project]/auth/templates/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/templates/store.ts
rename to src/routes/(console)/project-[project]/auth/templates/store.ts
diff --git a/src/routes/console/project-[project]/auth/updateOAuth.ts b/src/routes/(console)/project-[project]/auth/updateOAuth.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/updateOAuth.ts
rename to src/routes/(console)/project-[project]/auth/updateOAuth.ts
diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte
similarity index 78%
rename from src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte
index c8ffc9c54..031057404 100644
--- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Usage } from '$lib/layout';
     import type { PageData } from './$types';
@@ -10,7 +11,7 @@
 
 <Usage
     title="Users"
-    path={`/console/project-${$page.params.project}/auth/usage`}
+    path={`${base}/project-${$page.params.project}/auth/usage`}
     countMetadata={{
         legend: 'Users',
         title: 'Registered users'
diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/auth/usage/[[period]]/+page.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/+layout.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/+layout.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/+layout.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts b/src/routes/(console)/project-[project]/auth/user-[user]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/+layout.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/+layout.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/+page.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/activity/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/activity/+page.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/activity/+page.ts b/src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/activity/+page.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/activity/+page.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/breadcrumbs.svelte
similarity index 62%
rename from src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/breadcrumbs.svelte
index 1662d3e4f..a457244f1 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/auth/user-[user]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/auth`,
+            href: `${base}/project-${$project?.$id}/auth`,
             title: 'Auth'
         },
         {
-            href: `/console/project-${$project?.$id}/auth/user-${$user?.$id}`,
+            href: `${base}/project-${$project?.$id}/auth/user-${$user?.$id}`,
             title: $user?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte
similarity index 95%
rename from src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte
index a1e50d5cb..4be1852a2 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/dangerZone.svelte
+++ b/src/routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte
@@ -5,7 +5,7 @@
 
     export const promptDeleteUser = (id: string) => {
         showDelete.set(true);
-        goto(`/console/project-${get(project).$id}/auth/user-${id}`);
+        goto(`${base}/project-${get(project).$id}/auth/user-${id}`);
     };
 </script>
 
@@ -18,6 +18,7 @@
     import { goto } from '$app/navigation';
     import { project } from '../../store';
     import { toLocaleDate } from '$lib/helpers/date';
+    import { base } from '$app/paths';
     $: accessedAt = ($user as unknown as { accessedAt: string }).accessedAt;
 </script>
 
diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/deleteMembership.svelte
similarity index 94%
rename from src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/deleteMembership.svelte
index b13ac80bc..f08c98a31 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte
+++ b/src/routes/(console)/project-[project]/auth/user-[user]/deleteMembership.svelte
@@ -27,7 +27,7 @@
             });
             trackEvent(Submit.MemberDelete);
             await goto(
-                `${base}/console/project-${$page.params.project}/auth/user-${selectedMembership.userId}/memberships`
+                `${base}/project-${$page.params.project}/auth/user-${selectedMembership.userId}/memberships`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/deleteMfa.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/deleteMfa.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/deleteSession.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/deleteSession.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/deleteUser.svelte
similarity index 94%
rename from src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/deleteUser.svelte
index fd769a16a..35dbc8df8 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte
+++ b/src/routes/(console)/project-[project]/auth/user-[user]/deleteUser.svelte
@@ -21,7 +21,7 @@
                 message: `${$user.name ? $user.name : 'User'} has been deleted`
             });
             trackEvent(Submit.UserDelete);
-            await goto(`${base}/console/project-${$page.params.project}/auth`);
+            await goto(`${base}/project-${$page.params.project}/auth`);
         } catch (e) {
             error = e.message;
             trackError(e, Submit.UserDelete);
diff --git a/src/routes/console/project-[project]/auth/user-[user]/header.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/header.svelte
similarity index 90%
rename from src/routes/console/project-[project]/auth/user-[user]/header.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/header.svelte
index cf8ac5303..86e0f119a 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/header.svelte
+++ b/src/routes/(console)/project-[project]/auth/user-[user]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -7,7 +8,7 @@
 
     const projectId = $page.params.project;
     const userId = $page.params.user;
-    const path = `/console/project-${projectId}/auth/user-${userId}`;
+    const path = `${base}/project-${projectId}/auth/user-${userId}`;
     const tabs = [
         {
             href: path,
@@ -45,7 +46,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/auth`}>
+        <CoverTitle href={`${base}/project-${projectId}/auth`}>
             {$user.name ? $user.name : '-'}
         </CoverTitle>
         <Id value={$user.$id} event="user">{$user.$id}</Id>
diff --git a/src/routes/console/project-[project]/auth/user-[user]/identities/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/identities/+page.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/identities/+page.ts b/src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/identities/+page.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/identities/+page.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/identities/table.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/identities/table.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/identities/table.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/identities/table.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.svelte
similarity index 96%
rename from src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.svelte
index b85ab34c6..f7d708717 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.svelte
@@ -39,7 +39,7 @@
             <TableBody>
                 {#each data.memberships.memberships as membership}
                     <TableRowLink
-                        href={`${base}/console/project-${project}/auth/teams/team-${membership.teamId}`}>
+                        href={`${base}/project-${project}/auth/teams/team-${membership.teamId}`}>
                         <TableCellText title="Name">
                             <div class="u-flex u-cross-center u-gap-12">
                                 <AvatarInitials size={32} name={membership.teamName} />
diff --git a/src/routes/console/project-[project]/auth/user-[user]/memberships/+page.ts b/src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/memberships/+page.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/memberships/+page.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/sessions/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/sessions/+page.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/sessions/+page.ts b/src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/sessions/+page.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/sessions/+page.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/store.ts b/src/routes/(console)/project-[project]/auth/user-[user]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/store.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/store.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/targets/+page.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/targets/+page.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/targets/+page.ts b/src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/targets/+page.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/targets/+page.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/targets/create.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/targets/create.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/targets/create.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/targets/store.ts b/src/routes/(console)/project-[project]/auth/user-[user]/targets/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/targets/store.ts
rename to src/routes/(console)/project-[project]/auth/user-[user]/targets/store.ts
diff --git a/src/routes/console/project-[project]/auth/user-[user]/targets/table.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte
similarity index 97%
rename from src/routes/console/project-[project]/auth/user-[user]/targets/table.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte
index fb945b6c8..4527d2a88 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/targets/table.svelte
+++ b/src/routes/(console)/project-[project]/auth/user-[user]/targets/table.svelte
@@ -15,8 +15,8 @@
     import type { PageData } from './$types';
     import { columns } from './store';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import ProviderType from '$routes/console/project-[project]/messaging/providerType.svelte';
-    import Provider from '$routes/console/project-[project]/messaging/provider.svelte';
+    import ProviderType from '$routes/(console)/project-[project]/messaging/providerType.svelte';
+    import Provider from '$routes/(console)/project-[project]/messaging/provider.svelte';
     import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updateEmail.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updateLabels.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updateLabels.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateMfa.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updateMfa.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updateMfa.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updateName.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updateName.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updatePassword.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updatePhone.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updatePrefs.svelte
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte
similarity index 100%
rename from src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
rename to src/routes/(console)/project-[project]/auth/user-[user]/updateStatus.svelte
diff --git a/src/routes/console/project-[project]/createVariable.svelte b/src/routes/(console)/project-[project]/createVariable.svelte
similarity index 96%
rename from src/routes/console/project-[project]/createVariable.svelte
rename to src/routes/(console)/project-[project]/createVariable.svelte
index c637896b5..479f6ec42 100644
--- a/src/routes/console/project-[project]/createVariable.svelte
+++ b/src/routes/(console)/project-[project]/createVariable.svelte
@@ -50,7 +50,7 @@
             <Alert type="info">
                 <p class="text">
                     When there is a naming conflict with a global variable in your <a
-                        href={`${base}/console/project-${$project.$id}/settings/variables`}
+                        href={`${base}/project-${$project.$id}/settings/variables`}
                         title="Project settings"
                         class="link">
                         project settings</a> and a function environment variable, the global variable
diff --git a/src/routes/console/project-[project]/databases/+layout.svelte b/src/routes/(console)/project-[project]/databases/+layout.svelte
similarity index 89%
rename from src/routes/console/project-[project]/databases/+layout.svelte
rename to src/routes/(console)/project-[project]/databases/+layout.svelte
index 439c5e488..ac8c9b711 100644
--- a/src/routes/console/project-[project]/databases/+layout.svelte
+++ b/src/routes/(console)/project-[project]/databases/+layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
     import { DatabasesPanel } from '$lib/commandCenter/panels';
@@ -9,7 +10,7 @@
         {
             label: 'Go to usage',
             callback: () => {
-                goto(`/console/project-${$project.$id}/databases/usage`);
+                goto(`${base}/project-${$project.$id}/databases/usage`);
             },
             keys: ['g', 'u'],
             disabled:
diff --git a/src/routes/console/project-[project]/databases/+layout.ts b/src/routes/(console)/project-[project]/databases/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/+layout.ts
rename to src/routes/(console)/project-[project]/databases/+layout.ts
diff --git a/src/routes/console/project-[project]/databases/+page.svelte b/src/routes/(console)/project-[project]/databases/+page.svelte
similarity index 96%
rename from src/routes/console/project-[project]/databases/+page.svelte
rename to src/routes/(console)/project-[project]/databases/+page.svelte
index e70630db2..d11e8d95b 100644
--- a/src/routes/console/project-[project]/databases/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/+page.svelte
@@ -23,7 +23,7 @@
 
     async function handleCreate(event: CustomEvent<Models.Database>) {
         showCreate = false;
-        await goto(`${base}/console/project-${project}/databases/database-${event.detail.$id}`);
+        await goto(`${base}/project-${project}/databases/database-${event.detail.$id}`);
     }
 
     $: $registerCommands([
diff --git a/src/routes/console/project-[project]/databases/+page.ts b/src/routes/(console)/project-[project]/databases/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/+page.ts
rename to src/routes/(console)/project-[project]/databases/+page.ts
diff --git a/src/routes/console/project-[project]/databases/breadcrumbs.svelte b/src/routes/(console)/project-[project]/databases/breadcrumbs.svelte
similarity index 63%
rename from src/routes/console/project-[project]/databases/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/databases/breadcrumbs.svelte
index 4460be30e..4c775c0f5 100644
--- a/src/routes/console/project-[project]/databases/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/databases/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
@@ -6,15 +7,15 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$page.data.organization?.$id}`,
+            href: `${base}/organization-${$page.data.organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$page.data.project?.$id}`,
+            href: `${base}/project-${$page.data.project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$page.data.project?.$id}/databases`,
+            href: `${base}/project-${$page.data.project?.$id}/databases`,
             title: 'Databases'
         }
     ];
diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/(console)/project-[project]/databases/create.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/create.svelte
rename to src/routes/(console)/project-[project]/databases/create.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
similarity index 85%
rename from src/routes/console/project-[project]/databases/database-[database]/+layout.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
index 39ba47350..fbfa94777 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/+layout.svelte
@@ -22,7 +22,7 @@
         $showCreate = false;
         await invalidate(Dependencies.DATABASE);
         await goto(
-            `${base}/console/project-${project}/databases/database-${databaseId}/collection-${event.detail.$id}`
+            `${base}/project-${project}/databases/database-${databaseId}/collection-${event.detail.$id}`
         );
     }
 
@@ -32,7 +32,7 @@
             callback() {
                 $showCreate = true;
                 if (!$page.url.pathname.endsWith(databaseId)) {
-                    goto(`/console/project-${project}/databases/database-${databaseId}`);
+                    goto(`${base}/project-${project}/databases/database-${databaseId}`);
                 }
             },
             keys: $page.url.pathname.endsWith(databaseId) ? ['c'] : ['c', 'c'],
@@ -43,7 +43,7 @@
         {
             label: 'Go to collections',
             callback() {
-                goto(`/console/project-${project}/databases/database-${databaseId}`);
+                goto(`${base}/project-${project}/databases/database-${databaseId}`);
             },
             disabled:
                 $page.url.pathname.endsWith(databaseId) ||
@@ -54,7 +54,7 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`/console/project-${project}/databases/database-${databaseId}/usage`);
+                goto(`${base}/project-${project}/databases/database-${databaseId}/usage`);
             },
             disabled:
                 $page.url.pathname.includes('/usage') || $page.url.pathname.includes('collection-'),
@@ -64,7 +64,7 @@
         {
             label: 'Go to settings',
             callback() {
-                goto(`/console/project-${project}/databases/database-${databaseId}/settings`);
+                goto(`${base}/project-${project}/databases/database-${databaseId}/settings`);
             },
             disabled:
                 $page.url.pathname.includes('/settings') ||
diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts b/src/routes/(console)/project-[project]/databases/database-[database]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/+layout.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/+layout.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/+page.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/[[page]]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/[[page]]/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/[[page]]/store.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte
similarity index 60%
rename from src/routes/console/project-[project]/databases/database-[database]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte
index 0da8a6705..f5d6ec07d 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
+            href: `${base}/organization-${$organization.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$page.data.project.$id}`,
+            href: `${base}/project-${$page.data.project.$id}`,
             title: $page.data.project.name
         },
         {
-            href: `/console/project-${$page.data.project.$id}/databases`,
+            href: `${base}/project-${$page.data.project.$id}/databases`,
             title: 'Databases'
         },
         {
-            href: `/console/project-${$page.data.project.$id}/databases/database-${$database.$id}`,
+            href: `${base}/project-${$page.data.project.$id}/databases/database-${$database.$id}`,
             title: $database.name
         }
     ];
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
similarity index 81%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
index 004e4e971..09497939b 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
@@ -26,11 +26,12 @@
     import type { Option } from './attributes/store';
     import { CreateAttributePanel } from '$lib/commandCenter/panels';
     import { database } from '../store';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import { page } from '$app/stores';
     import CreateIndex from './indexes/createIndex.svelte';
     import { wizard } from '$lib/stores/wizard';
     import CreateDocument from './createDocument.svelte';
+    import { base } from '$app/paths';
 
     let unsubscribe: { (): void };
 
@@ -75,7 +76,7 @@
             keys: ['g', 'd'],
             callback() {
                 goto(
-                    `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`
                 );
             },
             disabled: $page.url.pathname.endsWith($collection.$id),
@@ -86,7 +87,7 @@
             keys: ['g', 'a'],
             callback() {
                 goto(
-                    `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/attributes`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/attributes`
                 );
             },
             disabled: $page.url.pathname.endsWith('attributes'),
@@ -97,7 +98,7 @@
             keys: ['g', 'i'],
             callback() {
                 goto(
-                    `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/indexes`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/indexes`
                 );
             },
             disabled: $page.url.pathname.endsWith('indexes'),
@@ -108,7 +109,7 @@
             keys: ['g', 'c'],
             callback() {
                 goto(
-                    `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/activity`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/activity`
                 );
             },
             disabled: $page.url.pathname.endsWith('activity'),
@@ -119,7 +120,7 @@
             keys: ['g', 'u'],
             callback() {
                 goto(
-                    `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/usage`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/usage`
                 );
             },
             disabled: $page.url.pathname.endsWith('usage'),
@@ -130,7 +131,7 @@
             keys: ['g', 's'],
             callback() {
                 goto(
-                    `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/settings`
+                    `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/settings`
                 );
             },
             disabled: $page.url.pathname.endsWith('settings'),
@@ -140,7 +141,7 @@
             label: 'Display Name',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#display-name`
+                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#display-name`
                 );
             },
             group: 'collections',
@@ -153,7 +154,7 @@
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#permissions`
+                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#permissions`
                 );
             },
             group: 'collections',
@@ -166,7 +167,7 @@
             label: 'Document security',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#document-security`
+                    `${base}/project-${$project.$id}/databases/database-${$database.$id}/collection-${$collection.$id}/settings#document-security`
                 );
             },
             group: 'collections',
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+page.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/activity/+page.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
similarity index 98%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
index 88bc3bef7..17f1f77bd 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
@@ -123,7 +123,7 @@
                                 {#if isRelationship(attribute)}
                                     <span>
                                         with <a
-                                            href={`${base}/console/project-${projectId}/databases/database-${databaseId}/collection-${attribute?.relatedCollection}`}
+                                            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${attribute?.relatedCollection}`}
                                             ><b data-private>{attribute?.key}</b></a>
                                     </span>
                                 {/if}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-one.svg
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/arrow-two.svg
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttributeDropdown.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
similarity index 95%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
index d3fd84ada..cddc5d5c0 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte
@@ -31,7 +31,7 @@
             });
             trackEvent(Submit.AttributeDelete);
             await goto(
-                `${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${$page.params.collection}/attributes`
+                `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${$page.params.collection}/attributes`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
similarity index 95%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
index a59723d75..4cbd41550 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
@@ -36,7 +36,7 @@
             await invalidate(Dependencies.COLLECTION);
             if (!$page.url.pathname.includes('attributes')) {
                 await goto(
-                    `${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
+                    `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
                 );
             }
             addNotification({
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/store.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
similarity index 60%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
index 07620ef93..2e54f9fd6 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { project } from '../../../store';
     import { database } from '../store';
@@ -9,15 +10,15 @@
             title: '...'
         },
         {
-            href: `/console/project-${$project?.$id}/databases`,
+            href: `${base}/project-${$project?.$id}/databases`,
             title: 'Databases'
         },
         {
-            href: `/console/project-${$project?.$id}/databases/database-${$database?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}`,
             title: $database?.name
         },
         {
-            href: `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
             title: $collection?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
similarity index 97%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
index 641841c52..83ffb505b 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte
@@ -35,7 +35,7 @@
             await invalidate(Dependencies.COLLECTION);
             if (!$page.url.pathname.includes('attributes')) {
                 await goto(
-                    `${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
+                    `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${collectionId}/attributes`
                 );
             }
             addNotification({
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/+page.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attribute.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeItem.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/datetime.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/email.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/enum.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/integer.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/string.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
similarity index 56%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
index 788e29309..0ba31c343 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { project } from '../../../../store';
     import { database } from '../../store';
@@ -10,15 +11,15 @@
             title: '...'
         },
         {
-            href: `/console/project-${$project?.$id}/databases/database-${$database?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}`,
             title: $database?.name
         },
         {
-            href: `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}`,
             title: $collection?.name
         },
         {
-            href: `/console/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/document-${$doc?.$id}`,
+            href: `${base}/project-${$project?.$id}/databases/database-${$database?.$id}/collection-${$collection?.$id}/document-${$doc?.$id}`,
             title: $doc?.$id
         }
     ];
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
similarity index 96%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
index dfece1274..eedf18f02 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte
@@ -38,7 +38,7 @@
             });
             trackEvent(Submit.DocumentDelete);
             await goto(
-                `${base}/console/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}`
+                `${base}/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
similarity index 82%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
index 8e28ec6ac..5e01de273 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -9,7 +10,7 @@
     const databaseId = $page.params.database;
     const collectionId = $page.params.collection;
     const documentId = $page.params.document;
-    const path = `/console/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}/document-${documentId}`;
+    const path = `${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}/document-${documentId}`;
     const tabs = [
         {
             href: path,
@@ -34,7 +35,7 @@
 <Cover>
     <svelte:fragment slot="header">
         <CoverTitle
-            href={`/console/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`}>
+            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`}>
             {$doc?.$id}
         </CoverTitle>
         <Id value={$doc?.$id} event="document">Document ID</Id>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/store.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/failedModal.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
similarity index 88%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
index 2fe829bef..7fd15fec8 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -8,7 +9,7 @@
     $: projectId = $page.params.project;
     $: databaseId = $page.params.database;
     $: collectionId = $page.params.collection;
-    $: path = `/console/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`;
+    $: path = `${base}/project-${projectId}/databases/database-${databaseId}/collection-${collectionId}`;
     $: tabs = [
         {
             href: path,
@@ -48,7 +49,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/databases/database-${databaseId}`}>
+        <CoverTitle href={`${base}/project-${projectId}/databases/database-${databaseId}`}>
             {$collection?.name}
         </CoverTitle>
         {#key $collection?.$id}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
similarity index 97%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
index 998677ebc..ab1f0e539 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
@@ -74,7 +74,7 @@
             ]);
 
             goto(
-                `${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes`
+                `${base}/project-${$page.params.project}/databases/database-${databaseId}/collection-${$collection.$id}/indexes`
             );
 
             addNotification({
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/overviewIndex.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/indexes/select.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
similarity index 91%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
index 6e11394b2..1f0079879 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/relationshipsModal.svelte
@@ -35,7 +35,7 @@
             <ClickableList>
                 {#each paginatedItems as doc}
                     <ClickableListItem
-                        href={`${base}/console/project-${projectId}/databases/database-${databaseId}/collection-${selectedRelationship.relatedCollection}/document-${doc.$id}`}
+                        href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${selectedRelationship.relatedCollection}/document-${doc.$id}`}
                         on:click={() => (show = false)}>
                         {#if args?.length}
                             {#each args as arg, i}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/dangerZone.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
similarity index 94%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
index 04226550c..849d5b65e 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte
@@ -25,7 +25,7 @@
             });
             trackEvent(Submit.CollectionDelete);
             await goto(
-                `${base}/console/project-${$page.params.project}/databases/database-${$page.params.database}`
+                `${base}/project-${$page.params.project}/databases/database-${$page.params.database}`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/displayName.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/store.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
similarity index 87%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
index 7b022b459..26d60dc96 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
@@ -17,7 +17,7 @@
 <section class="drop-section u-flex-vertical u-gap-8">
     <a
         class="u-flex u-cross-center u-sep-block-end u-padding-block-12 is-not-desktop"
-        href={`${base}/console/project-${project}/databases/database-${databaseId}?openNavbar=true`}>
+        href={`${base}/project-${project}/databases/database-${databaseId}?openNavbar=true`}>
         <span class="icon-cheveron-left" aria-hidden="true" />
         <h5 class="eyebrow-heading-3 u-margin-inline-auto">Collections</h5>
     </a>
@@ -31,7 +31,7 @@
     {#if data?.allCollections?.total}
         <ul class="drop-list">
             {#each sortedCollections as collection}
-                {@const href = `${base}/console/project-${project}/databases/database-${databaseId}/collection-${collection.$id}`}
+                {@const href = `${base}/project-${project}/databases/database-${databaseId}/collection-${collection.$id}`}
                 {@const isSelected = collectionId === collection.$id}
                 <li class="drop-list-item">
                     <a class="drop-button" class:is-selected={isSelected} {href}>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
similarity index 97%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
index 133292ee8..8b8c7832d 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte
@@ -158,7 +158,7 @@
     <TableBody>
         {#each data.documents.documents as document}
             <TableRowLink
-                href={`${base}/console/project-${projectId}/databases/database-${databaseId}/collection-${$collection.$id}/document-${document.$id}`}>
+                href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${$collection.$id}/document-${document.$id}`}>
                 <TableCellCheck bind:selectedIds={selectedDb} id={document.$id} />
 
                 <TableCell width={150}>
@@ -185,7 +185,7 @@
                                             on:keyup={clickOnEnter}
                                             on:click|preventDefault|stopPropagation={() =>
                                                 goto(
-                                                    `${base}/console/project-${projectId}/databases/database-${databaseId}/collection-${attr.relatedCollection}/document-${related.$id}`
+                                                    `${base}/project-${projectId}/databases/database-${databaseId}/collection-${attr.relatedCollection}/document-${related.$id}`
                                                 )}>
                                             {#each args as arg, i}
                                                 {#if arg !== undefined}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
similarity index 69%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
index 6634fbb3b..60177715e 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Usage } from '$lib/layout';
     import type { PageData } from './$types';
@@ -10,7 +11,7 @@
 
 <Usage
     title="Databases"
-    path={`/console/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}/usage`}
+    path={`${base}/project-${$page.params.project}/databases/database-${$page.params.database}/collection-${$page.params.collection}/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/wizard/store.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/createCollection.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/createCollection.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/createCollection.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/delete.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte
similarity index 94%
rename from src/routes/console/project-[project]/databases/database-[database]/delete.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte
index 4a4c7d2e1..7cd9419bc 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/delete.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/delete.svelte
@@ -20,7 +20,7 @@
                 type: 'success',
                 message: `${$database.name} has been deleted`
             });
-            await goto(`${base}/console/project-${$page.params.project}/databases`);
+            await goto(`${base}/project-${$page.params.project}/databases`);
             trackEvent(Submit.DatabaseDelete);
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/databases/database-[database]/grid.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
similarity index 88%
rename from src/routes/console/project-[project]/databases/database-[database]/grid.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
index 741c48d84..e24c339ca 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/grid.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/grid.svelte
@@ -16,7 +16,7 @@
     event="collection">
     {#each data.collections.collections as collection}
         <GridItem1
-            href={`${base}/console/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
+            href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
             <svelte:fragment slot="title">{collection.name}</svelte:fragment>
             <svelte:fragment slot="status">
                 {#if !collection.enabled}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/header.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte
similarity index 86%
rename from src/routes/console/project-[project]/databases/database-[database]/header.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/header.svelte
index b5a068d72..d575c05fc 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/header.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -7,7 +8,7 @@
 
     const projectId = $page.params.project;
     const databaseId = $page.params.database;
-    const path = `/console/project-${projectId}/databases/database-${databaseId}`;
+    const path = `${base}/project-${projectId}/databases/database-${databaseId}`;
     const tabs = [
         {
             href: path,
@@ -31,7 +32,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/databases`}>
+        <CoverTitle href={`${base}/project-${projectId}/databases`}>
             {$database.name}
         </CoverTitle>
         <Id value={$database.$id}>{$database.$id}</Id>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/settings/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte
diff --git a/src/routes/console/project-[project]/databases/database-[database]/store.ts b/src/routes/(console)/project-[project]/databases/database-[database]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/store.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/store.ts
diff --git a/src/routes/console/project-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
similarity index 97%
rename from src/routes/console/project-[project]/databases/database-[database]/table.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
index cacbf72ec..dec85c599 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/table.svelte
@@ -73,7 +73,7 @@
     <TableBody>
         {#each data.collections.collections as collection}
             <TableRowLink
-                href={`${base}/console/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
+                href={`${base}/project-${projectId}/databases/database-${databaseId}/collection-${collection.$id}`}>
                 <TableCellCheck bind:selectedIds={selected} id={collection.$id} />
                 {#each $columns as column}
                     {#if column.show}
diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
similarity index 74%
rename from src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
index f5486b738..1ff1c4eb1 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Usage } from '$lib/layout';
     import type { PageData } from './$types';
@@ -11,7 +12,7 @@
 
 <Usage
     title="Databases"
-    path={`/console/project-${$page.params.project}/databases/database-${$page.params.database}/usage`}
+    path={`${base}/project-${$page.params.project}/databases/database-${$page.params.database}/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts
diff --git a/src/routes/console/project-[project]/databases/grid.svelte b/src/routes/(console)/project-[project]/databases/grid.svelte
similarity index 88%
rename from src/routes/console/project-[project]/databases/grid.svelte
rename to src/routes/(console)/project-[project]/databases/grid.svelte
index 030241ac4..d7a4a471e 100644
--- a/src/routes/console/project-[project]/databases/grid.svelte
+++ b/src/routes/(console)/project-[project]/databases/grid.svelte
@@ -14,7 +14,7 @@
     event="database"
     service="databases">
     {#each data.databases.databases as database}
-        <GridItem1 href={`${base}/console/project-${project}/databases/database-${database.$id}`}>
+        <GridItem1 href={`${base}/project-${project}/databases/database-${database.$id}`}>
             <svelte:fragment slot="title">{database.name}</svelte:fragment>
             <Id value={database.$id}>{database.$id}</Id>
         </GridItem1>
diff --git a/src/routes/console/project-[project]/databases/header.svelte b/src/routes/(console)/project-[project]/databases/header.svelte
similarity index 90%
rename from src/routes/console/project-[project]/databases/header.svelte
rename to src/routes/(console)/project-[project]/databases/header.svelte
index 078f92683..4ae1293a7 100644
--- a/src/routes/console/project-[project]/databases/header.svelte
+++ b/src/routes/(console)/project-[project]/databases/header.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
 
     const projectId = $page.params.project;
-    const path = `/console/project-${projectId}/databases`;
+    const path = `${base}/project-${projectId}/databases`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/console/project-[project]/databases/store.ts b/src/routes/(console)/project-[project]/databases/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/store.ts
rename to src/routes/(console)/project-[project]/databases/store.ts
diff --git a/src/routes/console/project-[project]/databases/table.svelte b/src/routes/(console)/project-[project]/databases/table.svelte
similarity index 97%
rename from src/routes/console/project-[project]/databases/table.svelte
rename to src/routes/(console)/project-[project]/databases/table.svelte
index fca33b11f..f36b0d65d 100644
--- a/src/routes/console/project-[project]/databases/table.svelte
+++ b/src/routes/(console)/project-[project]/databases/table.svelte
@@ -69,8 +69,7 @@
     </TableHeader>
     <TableBody>
         {#each data.databases.databases as database}
-            <TableRowLink
-                href={`${base}/console/project-${projectId}/databases/database-${database.$id}`}>
+            <TableRowLink href={`${base}/project-${projectId}/databases/database-${database.$id}`}>
                 <TableCellCheck bind:selectedIds={selected} id={database.$id} />
                 {#each $columns as column}
                     {#if column.show}
diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte
similarity index 78%
rename from src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte
index 55b97f174..d261dd5f9 100644
--- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Usage } from '$lib/layout';
     import type { PageData } from './$types';
@@ -10,7 +11,7 @@
 
 <Usage
     title="Databases"
-    path={`/console/project-${$page.params.project}/databases/usage`}
+    path={`${base}/project-${$page.params.project}/databases/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/databases/usage/[[period]]/+page.ts
diff --git a/src/routes/console/project-[project]/functions/+layout.svelte b/src/routes/(console)/project-[project]/functions/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/+layout.svelte
rename to src/routes/(console)/project-[project]/functions/+layout.svelte
diff --git a/src/routes/console/project-[project]/functions/+layout.ts b/src/routes/(console)/project-[project]/functions/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/+layout.ts
rename to src/routes/(console)/project-[project]/functions/+layout.ts
diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/(console)/project-[project]/functions/+page.svelte
similarity index 97%
rename from src/routes/console/project-[project]/functions/+page.svelte
rename to src/routes/(console)/project-[project]/functions/+page.svelte
index 7f45d8302..39978b738 100644
--- a/src/routes/console/project-[project]/functions/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/+page.svelte
@@ -91,8 +91,7 @@
             on:click={openWizard}
             service="functions">
             {#each data.functions.functions as func}
-                <GridItem1
-                    href={`${base}/console/project-${project}/functions/function-${func.$id}`}>
+                <GridItem1 href={`${base}/project-${project}/functions/function-${func.$id}`}>
                     <svelte:fragment slot="title">
                         <div class="u-flex u-gap-16 u-cross-center">
                             <div class="avatar is-medium">
@@ -108,7 +107,7 @@
                                     class="icon-clock"
                                     aria-hidden="true"
                                     use:tooltip={{
-                                        content: `Next execution: 
+                                        content: `Next execution:
                                         ${toLocaleDateTime(parseExpression(func.schedule, { utc: true }).next().toString())}`
                                     }} />
                             </li>
diff --git a/src/routes/console/project-[project]/functions/+page.ts b/src/routes/(console)/project-[project]/functions/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/+page.ts
rename to src/routes/(console)/project-[project]/functions/+page.ts
diff --git a/src/routes/console/project-[project]/functions/breadcrumbs.svelte b/src/routes/(console)/project-[project]/functions/breadcrumbs.svelte
similarity index 64%
rename from src/routes/console/project-[project]/functions/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/functions/breadcrumbs.svelte
index 65754ecd0..680afb49c 100644
--- a/src/routes/console/project-[project]/functions/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/functions/breadcrumbs.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/functions`,
+            href: `${base}/project-${$project?.$id}/functions`,
             title: 'Functions'
         }
     ];
diff --git a/src/routes/console/project-[project]/functions/createFunction.svelte b/src/routes/(console)/project-[project]/functions/createFunction.svelte
similarity index 97%
rename from src/routes/console/project-[project]/functions/createFunction.svelte
rename to src/routes/(console)/project-[project]/functions/createFunction.svelte
index 8da3df129..23b1a075f 100644
--- a/src/routes/console/project-[project]/functions/createFunction.svelte
+++ b/src/routes/(console)/project-[project]/functions/createFunction.svelte
@@ -48,7 +48,7 @@
                 )
             );
             await invalidate(Dependencies.FUNCTIONS);
-            await goto(`${base}/console/project-${projectId}/functions/function-${response.$id}`);
+            await goto(`${base}/project-${projectId}/functions/function-${response.$id}`);
             addNotification({
                 message: `${$createFunction.name} has been created`,
                 type: 'success'
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+layout.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte
similarity index 79%
rename from src/routes/console/project-[project]/functions/function-[function]/+layout.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte
index 8ae5bc6d4..3d96a8f56 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/+layout.svelte
@@ -9,6 +9,7 @@
     import { project } from '../../store';
     import type { Models } from '@appwrite.io/console';
     import Execute from './execute.svelte';
+    import { base } from '$app/paths';
 
     onMount(() => {
         let previousStatus = null;
@@ -41,7 +42,7 @@
             label: 'Create deployment',
             async callback() {
                 if (!$page.url.pathname.endsWith($func.$id)) {
-                    await goto(`/console/project-${$project.$id}/functions/function-${$func.$id}`);
+                    await goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}`);
                 }
                 showCreateDeployment.set(true);
             },
@@ -53,7 +54,7 @@
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/functions/function-${$func.$id}/settings#permissions`
+                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#permissions`
                 );
                 scrollBy({ top: -100 });
             },
@@ -64,7 +65,7 @@
             label: 'Events',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/functions/function-${$func.$id}/settings#events`
+                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#events`
                 );
                 scrollBy({ top: -100 });
             },
@@ -75,7 +76,7 @@
             label: 'Variables',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/functions/function-${$func.$id}/settings#variables`
+                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#variables`
                 );
             },
             icon: 'list',
@@ -85,7 +86,7 @@
             label: 'Timeout',
             callback() {
                 goto(
-                    `/console/project-${$project.$id}/functions/function-${$func.$id}/settings#timeout`
+                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#timeout`
                 );
             },
             icon: 'x-circle',
@@ -95,7 +96,7 @@
             label: 'Schedule',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/functions/function-${$func.$id}/settings#schedule`
+                    `${base}/project-${$project.$id}/functions/function-${$func.$id}/settings#schedule`
                 );
                 scrollBy({ top: -100 });
             },
@@ -105,7 +106,7 @@
         {
             label: 'Go to deployments',
             callback() {
-                goto(`/console/project-${$project.$id}/functions/function-${$func.$id}`);
+                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}`);
             },
             keys: ['g', 'd'],
             group: 'navigation',
@@ -115,7 +116,7 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`/console/project-${$project.$id}/functions/function-${$func.$id}/usage`);
+                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}/usage`);
             },
             keys: ['g', 'u'],
             group: 'navigation',
@@ -125,7 +126,7 @@
         {
             label: 'Go to executions',
             callback() {
-                goto(`/console/project-${$project.$id}/functions/function-${$func.$id}/executions`);
+                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions`);
             },
             keys: ['g', 'e'],
             group: 'navigation',
@@ -135,7 +136,7 @@
         {
             label: 'Go to settings',
             callback() {
-                goto(`/console/project-${$project.$id}/functions/function-${$func.$id}/settings`);
+                goto(`${base}/project-${$project.$id}/functions/function-${$func.$id}/settings`);
             },
             keys: ['g', 's'],
             group: 'navigation',
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+layout.ts b/src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/+layout.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/+layout.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte
similarity index 97%
rename from src/routes/console/project-[project]/functions/function-[function]/+page.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte
index de49e904b..634ad8d69 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/+page.svelte
@@ -130,7 +130,7 @@
                     <div class="u-flex u-flex-wrap">
                         <Button
                             text
-                            href={`/console/project-${$page.params.project}/functions/function-${$page.params.function}/deployment-${activeDeployment.$id}`}>
+                            href={`${base}/project-${$page.params.project}/functions/function-${$page.params.function}/deployment-${activeDeployment.$id}`}>
                             Build logs
                         </Button>
                         <Button
@@ -144,7 +144,7 @@
                         </Button>
                         <Button
                             secondary
-                            href={`${base}/console/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
+                            href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
                             disabled={isCloud && $readOnly && !GRACE_PERIOD_OVERRIDE}>
                             Execute
                         </Button>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/+page.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/+page.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/activate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/activate.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/activate.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte
similarity index 61%
rename from src/routes/console/project-[project]/functions/function-[function]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte
index d0af4e3ca..5b626d71d 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/functions`,
+            href: `${base}/project-${$project?.$id}/functions`,
             title: 'Functions'
         },
         {
-            href: `/console/project-${$project?.$id}/functions/function-${$func?.$id}`,
+            href: `${base}/project-${$project?.$id}/functions/function-${$func?.$id}`,
             title: $func?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/functions/function-[function]/cancel.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/cancel.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/cancel.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/create.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/create.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/create.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/create.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createCli.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/createCli.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/createCli.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createGit.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/createGit.svelte
similarity index 96%
rename from src/routes/console/project-[project]/functions/function-[function]/createGit.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/createGit.svelte
index 6e050ccb0..05ef83954 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/createGit.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/createGit.svelte
@@ -81,7 +81,7 @@
                             Learn more
                         </Button>
                         <Button
-                            href={`${base}/console/project-${$page.params.project}/functions/function-${$page.params.function}/settings`}>
+                            href={`${base}/project-${$page.params.project}/functions/function-${$page.params.function}/settings`}>
                             Install Git
                         </Button>
                     </div>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/createManual.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/createManual.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/createManual.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/delete.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/delete.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/delete.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+layout.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
similarity index 60%
rename from src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
index b0db3f896..7b9ff99bf 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { project } from '../../../store';
     import { func } from '../store';
@@ -9,15 +10,15 @@
             title: '...'
         },
         {
-            href: `/console/project-${$project?.$id}/functions`,
+            href: `${base}/project-${$project?.$id}/functions`,
             title: 'Functions'
         },
         {
-            href: `/console/project-${$project?.$id}/functions/function-${$func?.$id}`,
+            href: `${base}/project-${$project?.$id}/functions/function-${$func?.$id}`,
             title: $func?.name
         },
         {
-            href: `/console/project-${$project?.$id}/functions/function-${$func?.$id}/deployment-${$deployment?.$id}`,
+            href: `${base}/project-${$project?.$id}/functions/function-${$func?.$id}/deployment-${$deployment?.$id}`,
             title: 'Deployment'
         }
     ];
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
similarity index 78%
rename from src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
index c35f5fe07..69d87cbe0 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { Cover, CoverTitle } from '$lib/layout';
@@ -10,7 +11,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/functions/function-${functionId}`}>
+        <CoverTitle href={`${base}/project-${projectId}/functions/function-${functionId}`}>
             Deployment
         </CoverTitle>
         <Id value={$deployment.$id}>{$deployment.$id}</Id>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/store.ts b/src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/store.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/deployment-[deployment]/store.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentCard.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deploymentCard.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deploymentCard.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/deploymentCard.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentDomains.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deploymentDomains.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deploymentDomains.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/deploymentDomains.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/deploymentSource.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/deploymentSource.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/domains/+page.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/domains/+page.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/execute.svelte
similarity index 98%
rename from src/routes/console/project-[project]/functions/function-[function]/execute.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/execute.svelte
index 4a3a4c94e..1fd6d941b 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/execute.svelte
@@ -55,7 +55,7 @@
             );
             if (!$page.url?.toString()?.includes('/executions')) {
                 await goto(
-                    `${base}/console/project-${$page.params.project}/functions/function-${$execute.$id}/executions`
+                    `${base}/project-${$page.params.project}/functions/function-${$execute.$id}/executions`
                 );
             }
             invalidate(Dependencies.EXECUTIONS);
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
similarity index 95%
rename from src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
index 5a7b0a74d..0ec996cfb 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
@@ -10,7 +10,7 @@
     import { func } from '../store';
     import { organization } from '$lib/stores/organization';
     import { getServiceLimit, showUsageRatesModal } from '$lib/stores/billing';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import Create from '../create.svelte';
     import { abbreviateNumber } from '$lib/helpers/numbers';
     import { base } from '$app/paths';
@@ -167,7 +167,7 @@
             <ViewSelector view={View.Table} {columns} hideView allowNoColumns hideText />
             <Button
                 event="execute_function"
-                href={`${base}/console/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
+                href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
                 disabled={!$func.$id || !$func?.deployment}>
                 <span class="icon-plus" aria-hidden="true" />
                 <span class="text">Execute now</span>
@@ -191,7 +191,7 @@
             <ViewSelector view={View.Table} {columns} hideView allowNoColumns />
             <Button
                 event="execute_function"
-                href={`${base}/console/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
+                href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}
                 disabled={!$func.$id || !$func?.deployment}>
                 <span class="text">Execute</span>
             </Button>
@@ -205,7 +205,7 @@
 
                 To see the latest execution logs, enable them in your
                 <a
-                    href={`/console/project-${$project.$id}/functions/function-${$func.$id}/settings`}
+                    href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/settings`}
                     class="link">
                     Function settings</a
                 >.
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/executions/+page.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/delete.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/executions/delete.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/executions/delete.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
similarity index 99%
rename from src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
index 51f6e5b4b..019173f31 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.svelte
@@ -104,7 +104,7 @@
                 isScheduled ? dateTime.toISOString() : undefined
             );
             await goto(
-                `${base}/console/project-${$page.params.project}/functions/function-${func.$id}/executions`
+                `${base}/project-${$page.params.project}/functions/function-${func.$id}/executions`
             );
             invalidate(Dependencies.EXECUTIONS);
             close();
@@ -319,7 +319,7 @@
                             <Pill success>
                                 <span class="icon-lightning-bolt"></span><span>active</span>
                             </Pill>
-                            <!-- {#if deployment?.$id === func.deployment && deployment?.status === 'active'} 
+                            <!-- {#if deployment?.$id === func.deployment && deployment?.status === 'active'}
                              {:else}
                                 <Pill
                                     danger={deployment?.status === 'failed'}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/executions/execute-function/+page.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/executions/execute-function/+page.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/executions/table.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/header.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte
similarity index 89%
rename from src/routes/console/project-[project]/functions/function-[function]/header.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/header.svelte
index 1bc52e83c..ef0125067 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/header.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -7,7 +8,7 @@
 
     const projectId = $page.params.project;
     const functionId = $page.params.function;
-    const path = `/console/project-${projectId}/functions/function-${functionId}`;
+    const path = `${base}/project-${projectId}/functions/function-${functionId}`;
     const tabs = [
         {
             href: path,
@@ -42,7 +43,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/functions`}>
+        <CoverTitle href={`${base}/project-${projectId}/functions`}>
             {$func?.name}
         </CoverTitle>
         {#if $func?.$id}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/redeployModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/redeployModal.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/redeployModal.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/+page.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/dangerZone.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/deleteModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
similarity index 94%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/deleteModal.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
index 27a6962b4..589f01e39 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/deleteModal.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/deleteModal.svelte
@@ -19,7 +19,7 @@
                 type: 'success',
                 message: `Function has been deleted`
             });
-            await goto(`${base}/console/project-${$page.params.project}/functions`);
+            await goto(`${base}/project-${$page.params.project}/functions`);
             trackEvent(Submit.FunctionDelete);
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/disconnectRepo.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/executeFunction.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte
similarity index 85%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/executeFunction.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte
index 43702d9c9..045717dfb 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/executeFunction.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/executeFunction.svelte
@@ -3,7 +3,7 @@
     import { CardGrid, Heading, SvgIcon } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import { func } from '../store';
 </script>
 
@@ -30,7 +30,7 @@
     <svelte:fragment slot="actions">
         <Button
             secondary
-            href={`${base}/console/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}>
+            href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions/execute-function`}>
             Execute now
         </Button>
     </svelte:fragment>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
similarity index 98%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
index cd43beb40..baf802e2c 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/gitConfigurationModal.svelte
@@ -160,8 +160,7 @@
             <p class="text">
                 Manage organization configuration in your <a
                     class="link"
-                    href={`${base}/console/project-${$page.params.project}/settings`}
-                    >project settings</a
+                    href={`${base}/project-${$page.params.project}/settings`}>project settings</a
                 >.
             </p>
             {#if repositoriesList.length}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
similarity index 98%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
index 132520cf3..98f0d7ee1 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
@@ -38,7 +38,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { Runtime, type Models } from '@appwrite.io/console';
     import { func } from '../store';
-    import GitInstallationModal from '$routes/console/project-[project]/settings/GitInstallationModal.svelte';
+    import GitInstallationModal from '$routes/(console)/project-[project]/settings/GitInstallationModal.svelte';
     import GitConfigurationModal from './gitConfigurationModal.svelte';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { onMount } from 'svelte';
@@ -49,7 +49,7 @@
     import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
     import { installations } from '$lib/wizards/functions/store';
     import { isSelfHosted } from '$lib/system';
-    import { consoleVariables } from '$routes/console/store';
+    import { consoleVariables } from '$routes/(console)/store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
 
     const functionId = $page.params.function;
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateEvents.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte
similarity index 93%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte
index 59a722f0c..37da597f9 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateLogging.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte
@@ -8,11 +8,12 @@
     import InputSwitch from '$lib/elements/forms/inputSwitch.svelte';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import { onMount } from 'svelte';
     import { func } from '../store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { Runtime } from '@appwrite.io/console';
+    import { base } from '$app/paths';
 
     const functionId = $page.params.function;
     let functionLogging: boolean = null;
@@ -77,7 +78,7 @@
                     <svelte:fragment slot="description">
                         <p>
                             When enabled, all execution responses will be accessible in the <a
-                                href={`/console/project-${$project.$id}/functions/function-${$func.$id}/executions`}
+                                href={`${base}/project-${$project.$id}/functions/function-${$func.$id}/executions`}
                                 class="link">
                                 Executions</a> tab
                         </p>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateName.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateName.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updatePermissions.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateSchedule.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateSchedule.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateScopes.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte
similarity index 97%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateScopes.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte
index 4e1d49500..38a06d447 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateScopes.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateScopes.svelte
@@ -11,7 +11,7 @@
     import { func } from '../store';
     import { isValueOfStringEnum } from '$lib/helpers/types';
     import { Runtime } from '@appwrite.io/console';
-    import Scopes from '$routes/console/project-[project]/overview/keys/scopes.svelte';
+    import Scopes from '$routes/(console)/project-[project]/overview/keys/scopes.svelte';
     import { symmetricDifference } from '$lib/helpers/array';
 
     const functionId = $page.params.function;
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/settings/updateTimeout.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/settings/updateTimeout.svelte
diff --git a/src/routes/console/project-[project]/functions/function-[function]/store.ts b/src/routes/(console)/project-[project]/functions/function-[function]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/store.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/store.ts
diff --git a/src/routes/console/project-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
similarity index 97%
rename from src/routes/console/project-[project]/functions/function-[function]/table.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
index 941c09242..f4a7eb73d 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/table.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/table.svelte
@@ -27,6 +27,7 @@
     import { Dependencies } from '$lib/constants';
     import Cancel from './cancel.svelte';
     import { sdk } from '$lib/stores/sdk';
+    import { base } from '$app/paths';
 
     export let columns: Column[];
     export let data: PageData;
@@ -144,7 +145,7 @@
                             {/if}
                             <DropListLink
                                 icon="terminal"
-                                href={`/console/project-${$page.params.project}/functions/function-${$page.params.function}/deployment-${deployment.$id}`}>
+                                href={`${base}/project-${$page.params.project}/functions/function-${$page.params.function}/deployment-${deployment.$id}`}>
                                 Logs
                             </DropListLink>
                             {#if deployment.status === 'ready'}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
similarity index 80%
rename from src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
index c486d2ba5..dcd003a74 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.svelte
@@ -5,6 +5,7 @@
     import { page } from '$app/stores';
     import type { PageData } from './$types';
     import { formatNumberWithCommas } from '$lib/helpers/numbers';
+    import { base } from '$app/paths';
 
     export let data: PageData;
     $: total = data.executionsTotal;
@@ -16,17 +17,17 @@
         <Heading tag="h2" size="5">Functions</Heading>
         <SecondaryTabs>
             <SecondaryTabsItem
-                href={`/console/project-${data.project.$id}/functions/function-${data.function.$id}/usage/24h`}
+                href={`${base}/project-${data.project.$id}/functions/function-${data.function.$id}/usage/24h`}
                 disabled={($page.params.period ?? '24h') === '24h'}>
                 24h
             </SecondaryTabsItem>
             <SecondaryTabsItem
-                href={`/console/project-${data.project.$id}/functions/function-${data.function.$id}/usage/30d`}
+                href={`${base}/project-${data.project.$id}/functions/function-${data.function.$id}/usage/30d`}
                 disabled={$page.params.period === '30d'}>
                 30d
             </SecondaryTabsItem>
             <SecondaryTabsItem
-                href={`/console/project-${data.project.$id}/functions/function-${data.function.$id}/usage/90d`}
+                href={`${base}/project-${data.project.$id}/functions/function-${data.function.$id}/usage/90d`}
                 disabled={$page.params.period === '90d'}>
                 90d
             </SecondaryTabsItem>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts
diff --git a/src/routes/console/project-[project]/functions/header.svelte b/src/routes/(console)/project-[project]/functions/header.svelte
similarity index 90%
rename from src/routes/console/project-[project]/functions/header.svelte
rename to src/routes/(console)/project-[project]/functions/header.svelte
index 8674ef158..824ee2c33 100644
--- a/src/routes/console/project-[project]/functions/header.svelte
+++ b/src/routes/(console)/project-[project]/functions/header.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
 
     $: projectId = $page.params.project;
-    $: path = `/console/project-${projectId}/functions`;
+    $: path = `${base}/project-${projectId}/functions`;
     $: tabs = [
         {
             href: path,
diff --git a/src/routes/console/project-[project]/functions/store.ts b/src/routes/(console)/project-[project]/functions/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/store.ts
rename to src/routes/(console)/project-[project]/functions/store.ts
diff --git a/src/routes/console/project-[project]/functions/templates/+page.svelte b/src/routes/(console)/project-[project]/functions/templates/+page.svelte
similarity index 98%
rename from src/routes/console/project-[project]/functions/templates/+page.svelte
rename to src/routes/(console)/project-[project]/functions/templates/+page.svelte
index c1a0ba1f6..f3919c599 100644
--- a/src/routes/console/project-[project]/functions/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/templates/+page.svelte
@@ -222,7 +222,7 @@
 
                                 <div class="u-flex u-gap-16 u-main-end u-margin-block-start-24">
                                     <Button
-                                        href={`${base}/console/project-${$page.params.project}/functions/templates/template-${template.id}`}
+                                        href={`${base}/project-${$page.params.project}/functions/templates/template-${template.id}`}
                                         text>
                                         <span class="text">View details</span>
                                     </Button>
diff --git a/src/routes/console/project-[project]/functions/templates/+page.ts b/src/routes/(console)/project-[project]/functions/templates/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/templates/+page.ts
rename to src/routes/(console)/project-[project]/functions/templates/+page.ts
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+layout.ts b/src/routes/(console)/project-[project]/functions/templates/template-[template]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/templates/template-[template]/+layout.ts
rename to src/routes/(console)/project-[project]/functions/templates/template-[template]/+layout.ts
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte
similarity index 98%
rename from src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
rename to src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte
index fc6e5ec74..0c8da22c0 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.svelte
@@ -7,7 +7,7 @@
     import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg';
     import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
     import { connectTemplate } from '$lib/wizards/functions/cover.svelte';
-    import { consoleVariables } from '$routes/console/store';
+    import { consoleVariables } from '$routes/(console)/store';
     import { template } from './store';
     import { app } from '$lib/stores/app';
     import { isServiceLimited } from '$lib/stores/billing';
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.ts b/src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/templates/template-[template]/+page.ts
rename to src/routes/(console)/project-[project]/functions/templates/template-[template]/+page.ts
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/header.svelte b/src/routes/(console)/project-[project]/functions/templates/template-[template]/header.svelte
similarity index 75%
rename from src/routes/console/project-[project]/functions/templates/template-[template]/header.svelte
rename to src/routes/(console)/project-[project]/functions/templates/template-[template]/header.svelte
index 00caf218b..5ad5d1527 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/header.svelte
+++ b/src/routes/(console)/project-[project]/functions/templates/template-[template]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { Cover, CoverTitle } from '$lib/layout';
@@ -7,7 +8,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${$page.params.project}/functions/templates`}>
+        <CoverTitle href={`${base}/project-${$page.params.project}/functions/templates`}>
             {$template.name}
         </CoverTitle>
         <Id value={$template.id} event="user">{$template.id}</Id>
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/store.ts b/src/routes/(console)/project-[project]/functions/templates/template-[template]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/templates/template-[template]/store.ts
rename to src/routes/(console)/project-[project]/functions/templates/template-[template]/store.ts
diff --git a/src/routes/console/project-[project]/functions/wizard/step1.svelte b/src/routes/(console)/project-[project]/functions/wizard/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/wizard/step1.svelte
rename to src/routes/(console)/project-[project]/functions/wizard/step1.svelte
diff --git a/src/routes/console/project-[project]/functions/wizard/step2.svelte b/src/routes/(console)/project-[project]/functions/wizard/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/wizard/step2.svelte
rename to src/routes/(console)/project-[project]/functions/wizard/step2.svelte
diff --git a/src/routes/console/project-[project]/functions/wizard/step3.svelte b/src/routes/(console)/project-[project]/functions/wizard/step3.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/wizard/step3.svelte
rename to src/routes/(console)/project-[project]/functions/wizard/step3.svelte
diff --git a/src/routes/console/project-[project]/functions/wizard/step4.svelte b/src/routes/(console)/project-[project]/functions/wizard/step4.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/wizard/step4.svelte
rename to src/routes/(console)/project-[project]/functions/wizard/step4.svelte
diff --git a/src/routes/console/project-[project]/functions/wizard/step5.svelte b/src/routes/(console)/project-[project]/functions/wizard/step5.svelte
similarity index 100%
rename from src/routes/console/project-[project]/functions/wizard/step5.svelte
rename to src/routes/(console)/project-[project]/functions/wizard/step5.svelte
diff --git a/src/routes/console/project-[project]/functions/wizard/store.ts b/src/routes/(console)/project-[project]/functions/wizard/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/functions/wizard/store.ts
rename to src/routes/(console)/project-[project]/functions/wizard/store.ts
diff --git a/src/routes/console/project-[project]/messaging/+layout.svelte b/src/routes/(console)/project-[project]/messaging/+layout.svelte
similarity index 90%
rename from src/routes/console/project-[project]/messaging/+layout.svelte
rename to src/routes/(console)/project-[project]/messaging/+layout.svelte
index 3890483eb..5775b672a 100644
--- a/src/routes/console/project-[project]/messaging/+layout.svelte
+++ b/src/routes/(console)/project-[project]/messaging/+layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import {
         addSubPanel,
@@ -28,7 +29,7 @@
             label: 'Go to Topics',
             keys: ['g', 't'],
             callback() {
-                goto(`/console/project-${$project.$id}/messaging/topics`);
+                goto(`${base}/project-${$project.$id}/messaging/topics`);
             },
             disabled:
                 $page.url.pathname.endsWith('topics') || $page.url.pathname.includes('message-'),
@@ -39,7 +40,7 @@
             label: 'Go to Providers',
             keys: ['g', 'p'],
             callback() {
-                goto(`/console/project-${$project.$id}/messaging/providers`);
+                goto(`${base}/project-${$project.$id}/messaging/providers`);
             },
             disabled:
                 $page.url.pathname.endsWith('providers') || $page.url.pathname.includes('message-'),
diff --git a/src/routes/console/project-[project]/messaging/+layout.ts b/src/routes/(console)/project-[project]/messaging/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/+layout.ts
rename to src/routes/(console)/project-[project]/messaging/+layout.ts
diff --git a/src/routes/console/project-[project]/messaging/+page.svelte b/src/routes/(console)/project-[project]/messaging/+page.svelte
similarity index 98%
rename from src/routes/console/project-[project]/messaging/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/+page.svelte
index 6508c30ea..039f9865f 100644
--- a/src/routes/console/project-[project]/messaging/+page.svelte
+++ b/src/routes/(console)/project-[project]/messaging/+page.svelte
@@ -145,7 +145,7 @@
             <TableBody>
                 {#each data.messages.messages as message (message.$id)}
                     <TableRowLink
-                        href={`${base}/console/project-${project}/messaging/message-${message.$id}`}>
+                        href={`${base}/project-${project}/messaging/message-${message.$id}`}>
                         <TableCellCheck
                             bind:selectedIds={selected}
                             id={message.$id}
@@ -248,7 +248,7 @@
                 <Button external href="https://appwrite.io/docs/products/messaging/messages" text>
                     Documentation
                 </Button>
-                <Button secondary href={`/console/project-${$page.params.project}/messaging`}>
+                <Button secondary href={`${base}/project-${$page.params.project}/messaging`}>
                     Clear search
                 </Button>
             </div>
diff --git a/src/routes/console/project-[project]/messaging/+page.ts b/src/routes/(console)/project-[project]/messaging/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/+page.ts
rename to src/routes/(console)/project-[project]/messaging/+page.ts
diff --git a/src/routes/console/project-[project]/messaging/actions.svelte b/src/routes/(console)/project-[project]/messaging/actions.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/actions.svelte
rename to src/routes/(console)/project-[project]/messaging/actions.svelte
diff --git a/src/routes/console/project-[project]/messaging/breadcrumbs.svelte b/src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte
similarity index 64%
rename from src/routes/console/project-[project]/messaging/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte
index 9e28bee67..b3d6b6a09 100644
--- a/src/routes/console/project-[project]/messaging/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/messaging/breadcrumbs.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
+            href: `${base}/organization-${$organization.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$project.$id}`,
+            href: `${base}/project-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `/console/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.$id}/messaging`,
             title: 'Messaging'
         }
     ];
diff --git a/src/routes/console/project-[project]/messaging/bubble-tail-dark.svg b/src/routes/(console)/project-[project]/messaging/bubble-tail-dark.svg
similarity index 100%
rename from src/routes/console/project-[project]/messaging/bubble-tail-dark.svg
rename to src/routes/(console)/project-[project]/messaging/bubble-tail-dark.svg
diff --git a/src/routes/console/project-[project]/messaging/bubble-tail-light.svg b/src/routes/(console)/project-[project]/messaging/bubble-tail-light.svg
similarity index 100%
rename from src/routes/console/project-[project]/messaging/bubble-tail-light.svg
rename to src/routes/(console)/project-[project]/messaging/bubble-tail-light.svg
diff --git a/src/routes/console/project-[project]/messaging/create.svelte b/src/routes/(console)/project-[project]/messaging/create.svelte
similarity index 98%
rename from src/routes/console/project-[project]/messaging/create.svelte
rename to src/routes/(console)/project-[project]/messaging/create.svelte
index 8d137a0fc..4f62b5fa1 100644
--- a/src/routes/console/project-[project]/messaging/create.svelte
+++ b/src/routes/(console)/project-[project]/messaging/create.svelte
@@ -102,7 +102,7 @@
                 providerType: $providerType,
                 status: response.status
             });
-            await goto(`${base}/console/project-${$project.$id}/messaging/message-${response.$id}`);
+            await goto(`${base}/project-${$project.$id}/messaging/message-${response.$id}`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/messaging/createMessageDropdown.svelte b/src/routes/(console)/project-[project]/messaging/createMessageDropdown.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/createMessageDropdown.svelte
rename to src/routes/(console)/project-[project]/messaging/createMessageDropdown.svelte
diff --git a/src/routes/console/project-[project]/messaging/failedModal.svelte b/src/routes/(console)/project-[project]/messaging/failedModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/failedModal.svelte
rename to src/routes/(console)/project-[project]/messaging/failedModal.svelte
diff --git a/src/routes/console/project-[project]/messaging/header.svelte b/src/routes/(console)/project-[project]/messaging/header.svelte
similarity index 91%
rename from src/routes/console/project-[project]/messaging/header.svelte
rename to src/routes/(console)/project-[project]/messaging/header.svelte
index 9534915ab..f46fce442 100644
--- a/src/routes/console/project-[project]/messaging/header.svelte
+++ b/src/routes/(console)/project-[project]/messaging/header.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
 
     const projectId = $page.params.project;
-    const path = `/console/project-${projectId}/messaging`;
+    const path = `${base}/project-${projectId}/messaging`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+layout.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/+layout.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/+layout.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+layout.ts b/src/routes/(console)/project-[project]/messaging/message-[message]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/+layout.ts
rename to src/routes/(console)/project-[project]/messaging/message-[message]/+layout.ts
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/+page.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/breadcrumbs.svelte
similarity index 70%
rename from src/routes/console/project-[project]/messaging/message-[message]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/breadcrumbs.svelte
index caf1d7778..8f0dc331a 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/messaging/message-[message]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -6,15 +7,15 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
+            href: `${base}/organization-${$organization.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$project.$id}`,
+            href: `${base}/project-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `/console/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.$id}/messaging`,
             title:
                 $message.data.title ?? $message.data.subject ?? $message.data.content ?? 'Message'
         }
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/cancelModal.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/cancelModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/cancelModal.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/cancelModal.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/delete.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/delete.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/delete.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/delete.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/deleteModal.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/deleteModal.svelte
similarity index 97%
rename from src/routes/console/project-[project]/messaging/message-[message]/deleteModal.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/deleteModal.svelte
index 0f6396df3..6d335bd78 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/deleteModal.svelte
+++ b/src/routes/(console)/project-[project]/messaging/message-[message]/deleteModal.svelte
@@ -36,7 +36,7 @@
                 message: notificationMessage
             });
             trackEvent(Submit.MessagingMessageDelete);
-            await goto(`${base}/console/project-${$page.params.project}/messaging`);
+            await goto(`${base}/project-${$page.params.project}/messaging`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/emailMessage.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/emailMessage.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/emailMessage.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/header.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/header.svelte
similarity index 82%
rename from src/routes/console/project-[project]/messaging/message-[message]/header.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/header.svelte
index f97cc9e21..27688a3d1 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/header.svelte
+++ b/src/routes/(console)/project-[project]/messaging/message-[message]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { Cover, CoverTitle } from '$lib/layout';
@@ -9,7 +10,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/messaging`}>
+        <CoverTitle href={`${base}/project-${projectId}/messaging`}>
             {$message.data.title ?? $message.data.subject ?? $message.data.content ?? 'Message'}
         </CoverTitle>
         <Id value={$message.$id} event="message">{$message.$id}</Id>
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/overview.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/overview.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/overview.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/overview.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/pushMessage.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/pushMessage.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/pushMessage.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/scheduleModal.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/scheduleModal.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/scheduleModal.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/sendModal.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/sendModal.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/sendModal.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/smsMessage.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/smsMessage.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/smsMessage.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/smsMessage.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/store.ts b/src/routes/(console)/project-[project]/messaging/message-[message]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/store.ts
rename to src/routes/(console)/project-[project]/messaging/message-[message]/store.ts
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/updateTargets.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/updateTargets.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/updateTargets.svelte
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/updateTopics.svelte b/src/routes/(console)/project-[project]/messaging/message-[message]/updateTopics.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/message-[message]/updateTopics.svelte
rename to src/routes/(console)/project-[project]/messaging/message-[message]/updateTopics.svelte
diff --git a/src/routes/console/project-[project]/messaging/messageStatusPill.svelte b/src/routes/(console)/project-[project]/messaging/messageStatusPill.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/messageStatusPill.svelte
rename to src/routes/(console)/project-[project]/messaging/messageStatusPill.svelte
diff --git a/src/routes/console/project-[project]/messaging/provider.svelte b/src/routes/(console)/project-[project]/messaging/provider.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/provider.svelte
rename to src/routes/(console)/project-[project]/messaging/provider.svelte
diff --git a/src/routes/console/project-[project]/messaging/providerType.svelte b/src/routes/(console)/project-[project]/messaging/providerType.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providerType.svelte
rename to src/routes/(console)/project-[project]/messaging/providerType.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/+page.svelte b/src/routes/(console)/project-[project]/messaging/providers/+page.svelte
similarity index 96%
rename from src/routes/console/project-[project]/messaging/providers/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/+page.svelte
index ca097cf8f..e2fd321f0 100644
--- a/src/routes/console/project-[project]/messaging/providers/+page.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/+page.svelte
@@ -16,6 +16,7 @@
     import { Filters, hasPageQueries } from '$lib/components/filters';
     import CreateProviderDropdown from './createProviderDropdown.svelte';
     import Table from './table.svelte';
+    import { base } from '$app/paths';
 
     export let data: PageData;
 
@@ -77,7 +78,7 @@
                 <b>Sorry, we couldn't find '{data.search}'</b>
                 <p>There are no providers that match your search.</p>
             </div>
-            <Button secondary href={`/console/project-${$page.params.project}/messaging/providers`}>
+            <Button secondary href={`${base}/project-${$page.params.project}/messaging/providers`}>
                 Clear search
             </Button>
         </EmptySearch>
diff --git a/src/routes/console/project-[project]/messaging/providers/+page.ts b/src/routes/(console)/project-[project]/messaging/providers/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/+page.ts
rename to src/routes/(console)/project-[project]/messaging/providers/+page.ts
diff --git a/src/routes/console/project-[project]/messaging/providers/create.svelte b/src/routes/(console)/project-[project]/messaging/providers/create.svelte
similarity index 98%
rename from src/routes/console/project-[project]/messaging/providers/create.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/create.svelte
index fef14c640..09c3c2268 100644
--- a/src/routes/console/project-[project]/messaging/providers/create.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/create.svelte
@@ -143,7 +143,7 @@
                 provider: $provider
             });
             await goto(
-                `${base}/console/project-${$project.$id}/messaging/providers/provider-${response.$id}`
+                `${base}/project-${$project.$id}/messaging/providers/provider-${response.$id}`
             );
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte b/src/routes/(console)/project-[project]/messaging/providers/createProviderDropdown.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/createProviderDropdown.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/createProviderDropdown.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/popoverContent.svelte b/src/routes/(console)/project-[project]/messaging/providers/popoverContent.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/popoverContent.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/popoverContent.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+layout.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/+layout.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+layout.ts b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/+layout.ts
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+layout.ts
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/+page.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
similarity index 54%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
index 5a3f26f90..0d8b2c1c8 100644
--- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/breadcrumbs.svelte
@@ -1,24 +1,25 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import { provider } from './store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
+            href: `${base}/organization-${$organization.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$project.$id}`,
+            href: `${base}/project-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `/console/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.$id}/messaging`,
             title: 'Messaging'
         },
         {
-            href: `/console/project-${$project.$id}/messaging/providers/provider-${$provider?.$id}`,
+            href: `${base}/project-${$project.$id}/messaging/providers/provider-${$provider?.$id}`,
             title: $provider?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
similarity index 88%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
index 7befc15c0..ad935aaf8 100644
--- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/dangerZone.svelte
@@ -5,7 +5,7 @@
 
     export const promptDeleteUser = (id: string) => {
         showDelete.set(true);
-        goto(`/console/project-${get(project).$id}/auth/user-${id}`);
+        goto(`${base}/project-${get(project).$id}/auth/user-${id}`);
     };
 </script>
 
@@ -16,8 +16,9 @@
     import { provider } from './store';
     import { goto } from '$app/navigation';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import DeleteProvider from './deleteProvider.svelte';
+    import { base } from '$app/paths';
 </script>
 
 <CardGrid danger>
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
similarity index 94%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
index 485f84adf..2f039855a 100644
--- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/deleteProvider.svelte
@@ -21,7 +21,7 @@
                 message: `${$provider.name} has been deleted`
             });
             trackEvent(Submit.MessagingProviderDelete);
-            await goto(`${base}/console/project-${$page.params.project}/messaging/providers`);
+            await goto(`${base}/project-${$page.params.project}/messaging/providers`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/header.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte
similarity index 80%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/header.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte
index d78a0f0d4..7a55ce558 100644
--- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/header.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { Cover, CoverTitle } from '$lib/layout';
@@ -9,7 +10,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/messaging/providers`}>
+        <CoverTitle href={`${base}/project-${projectId}/messaging/providers`}>
             {$provider?.name ? $provider?.name : '-'}
         </CoverTitle>
         <Id value={$provider?.$id} event="provider">{$provider?.$id}</Id>
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/store.ts b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/store.ts
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/store.ts
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateName.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateName.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateName.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
similarity index 99%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
index 4af90877f..c7af0e6ad 100644
--- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte
@@ -11,7 +11,7 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Button, Form } from '$lib/elements/forms';
     import { onMount } from 'svelte';
-    import CreateMember from '$routes/console/organization-[organization]/createMember.svelte';
+    import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte';
 
     export let inputs: (ProviderInput | ProviderInput[])[];
     export let providerType: MessagingProviderType;
diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte b/src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/provider-[provider]/updateStatus.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/settingsFormInput.svelte b/src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/settingsFormInput.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/settingsFormInput.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/(console)/project-[project]/messaging/providers/settingsFormList.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/settingsFormList.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/(console)/project-[project]/messaging/providers/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/store.ts
rename to src/routes/(console)/project-[project]/messaging/providers/store.ts
diff --git a/src/routes/console/project-[project]/messaging/providers/table.svelte b/src/routes/(console)/project-[project]/messaging/providers/table.svelte
similarity index 97%
rename from src/routes/console/project-[project]/messaging/providers/table.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/table.svelte
index 541308dab..2d8ac4500 100644
--- a/src/routes/console/project-[project]/messaging/providers/table.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/table.svelte
@@ -17,7 +17,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import type { PageData } from './$types';
     import { columns } from './store';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import Provider from '../provider.svelte';
     import ProviderType from '../providerType.svelte';
     import { Pill } from '$lib/elements';
@@ -75,7 +75,7 @@
     <TableBody>
         {#each data.providers.providers as provider (provider.$id)}
             <TableRowLink
-                href={`${base}/console/project-${$project.$id}/messaging/providers/provider-${provider.$id}`}>
+                href={`${base}/project-${$project.$id}/messaging/providers/provider-${provider.$id}`}>
                 <TableCellCheck bind:selectedIds id={provider.$id} />
                 {#each $columns as column}
                     {#if column.show}
diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte b/src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/wizard/provider.svelte
diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/settings.svelte b/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte
similarity index 97%
rename from src/routes/console/project-[project]/messaging/providers/wizard/settings.svelte
rename to src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte
index 23c2ec44b..00a930445 100644
--- a/src/routes/console/project-[project]/messaging/providers/wizard/settings.svelte
+++ b/src/routes/(console)/project-[project]/messaging/providers/wizard/settings.svelte
@@ -5,10 +5,10 @@
     import { providerType, provider, providerParams } from './store';
     import SettingsFormList from '../settingsFormList.svelte';
     import { newMemberModal } from '$lib/stores/organization';
-    import CreateMember from '$routes/console/organization-[organization]/createMember.svelte';
+    import CreateMember from '$routes/(console)/organization-[organization]/createMember.svelte';
     import Provider from '../../provider.svelte';
     import { MessagingProviderType } from '@appwrite.io/console';
-    import ProviderTypeComponent from '$routes/console/project-[project]/messaging/providerType.svelte';
+    import ProviderTypeComponent from '$routes/(console)/project-[project]/messaging/providerType.svelte';
     import {
         Collapsible,
         CollapsibleItem,
diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/store.ts b/src/routes/(console)/project-[project]/messaging/providers/wizard/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/providers/wizard/store.ts
rename to src/routes/(console)/project-[project]/messaging/providers/wizard/store.ts
diff --git a/src/routes/console/project-[project]/messaging/push-notification-preview-dark.svg b/src/routes/(console)/project-[project]/messaging/push-notification-preview-dark.svg
similarity index 100%
rename from src/routes/console/project-[project]/messaging/push-notification-preview-dark.svg
rename to src/routes/(console)/project-[project]/messaging/push-notification-preview-dark.svg
diff --git a/src/routes/console/project-[project]/messaging/push-notification-preview-light.svg b/src/routes/(console)/project-[project]/messaging/push-notification-preview-light.svg
similarity index 100%
rename from src/routes/console/project-[project]/messaging/push-notification-preview-light.svg
rename to src/routes/(console)/project-[project]/messaging/push-notification-preview-light.svg
diff --git a/src/routes/console/project-[project]/messaging/pushPhone.svelte b/src/routes/(console)/project-[project]/messaging/pushPhone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/pushPhone.svelte
rename to src/routes/(console)/project-[project]/messaging/pushPhone.svelte
diff --git a/src/routes/console/project-[project]/messaging/sms-preview-dark.svg b/src/routes/(console)/project-[project]/messaging/sms-preview-dark.svg
similarity index 100%
rename from src/routes/console/project-[project]/messaging/sms-preview-dark.svg
rename to src/routes/(console)/project-[project]/messaging/sms-preview-dark.svg
diff --git a/src/routes/console/project-[project]/messaging/sms-preview-light.svg b/src/routes/(console)/project-[project]/messaging/sms-preview-light.svg
similarity index 100%
rename from src/routes/console/project-[project]/messaging/sms-preview-light.svg
rename to src/routes/(console)/project-[project]/messaging/sms-preview-light.svg
diff --git a/src/routes/console/project-[project]/messaging/smsPhone.svelte b/src/routes/(console)/project-[project]/messaging/smsPhone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/smsPhone.svelte
rename to src/routes/(console)/project-[project]/messaging/smsPhone.svelte
diff --git a/src/routes/console/project-[project]/messaging/store.ts b/src/routes/(console)/project-[project]/messaging/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/store.ts
rename to src/routes/(console)/project-[project]/messaging/store.ts
diff --git a/src/routes/console/project-[project]/messaging/topics/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte
similarity index 95%
rename from src/routes/console/project-[project]/messaging/topics/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/+page.svelte
index 118d31a46..26f7c616f 100644
--- a/src/routes/console/project-[project]/messaging/topics/+page.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/+page.svelte
@@ -44,7 +44,7 @@
     ]);
 
     const topicCreated = async (event: CustomEvent<Models.Team<Record<string, unknown>>>) => {
-        await goto(`${base}/console/project-${project}/messaging/topics/topic-${event.detail.$id}`);
+        await goto(`${base}/project-${project}/messaging/topics/topic-${event.detail.$id}`);
     };
 </script>
 
@@ -107,7 +107,7 @@
                 <b>Sorry, we couldn't find '{data.search}'</b>
                 <p>There are no topics that match your search.</p>
             </div>
-            <Button secondary href={`/console/project-${$page.params.project}/messaging/topics`}>
+            <Button secondary href={`${base}/project-${$page.params.project}/messaging/topics`}>
                 Clear Search
             </Button>
         </EmptySearch>
diff --git a/src/routes/console/project-[project]/messaging/topics/+page.ts b/src/routes/(console)/project-[project]/messaging/topics/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/+page.ts
rename to src/routes/(console)/project-[project]/messaging/topics/+page.ts
diff --git a/src/routes/console/project-[project]/messaging/topics/create.svelte b/src/routes/(console)/project-[project]/messaging/topics/create.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/create.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/create.svelte
diff --git a/src/routes/console/project-[project]/messaging/topics/store.ts b/src/routes/(console)/project-[project]/messaging/topics/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/store.ts
rename to src/routes/(console)/project-[project]/messaging/topics/store.ts
diff --git a/src/routes/console/project-[project]/messaging/topics/table.svelte b/src/routes/(console)/project-[project]/messaging/topics/table.svelte
similarity index 96%
rename from src/routes/console/project-[project]/messaging/topics/table.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/table.svelte
index 9ffc0b2eb..7344c142f 100644
--- a/src/routes/console/project-[project]/messaging/topics/table.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/table.svelte
@@ -16,7 +16,7 @@
     } from '$lib/elements/table';
     import { addNotification } from '$lib/stores/notifications';
     import type { PageData } from './$types';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { sdk } from '$lib/stores/sdk';
@@ -72,7 +72,7 @@
     <TableBody>
         {#each data.topics.topics as topic (topic.$id)}
             <TableRowLink
-                href={`${base}/console/project-${$project.$id}/messaging/topics/topic-${topic.$id}`}>
+                href={`${base}/project-${$project.$id}/messaging/topics/topic-${topic.$id}`}>
                 <TableCellCheck bind:selectedIds id={topic.$id} />
 
                 {#each columns as column (column.id)}
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte
similarity index 73%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte
index 6ec507e4f..7db149a3e 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { registerCommands } from '$lib/commandCenter';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
 
     const topicId = $page.params.topic;
 
@@ -11,7 +12,7 @@
             label: 'Go to Subscribers',
             callback() {
                 goto(
-                    `/console/project-${$project.$id}/messaging/topics/topic-${topicId}/subscribers`
+                    `${base}/project-${$project.$id}/messaging/topics/topic-${topicId}/subscribers`
                 );
             },
             keys: ['g', 's'],
@@ -22,7 +23,7 @@
         {
             label: 'Go to Activity',
             callback() {
-                goto(`/console/project-${$project.$id}/messaging/topics/topic-${topicId}/activity`);
+                goto(`${base}/project-${$project.$id}/messaging/topics/topic-${topicId}/activity`);
             },
             keys: ['g', 'a'],
             disabled: $page.url.pathname.endsWith('activity'),
@@ -32,7 +33,7 @@
         {
             label: 'Go to Overview',
             callback() {
-                goto(`/console/project-${$project.$id}/messaging/topics/topic-${topicId}`);
+                goto(`${base}/project-${$project.$id}/messaging/topics/topic-${topicId}`);
             },
             keys: ['g', 'o'],
             disabled: $page.url.pathname.endsWith(`topic-${topicId}`),
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.ts b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.ts
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+layout.ts
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte
similarity index 97%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte
index 7b977d1ee..f8d6fb2d0 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+page.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.svelte
@@ -26,6 +26,7 @@
     import { View } from '$lib/helpers/load';
     import { writable } from 'svelte/store';
     import type { Column } from '$lib/helpers/types';
+    import { base } from '$app/paths';
 
     export let data: PageData;
     let showAdd = false;
@@ -147,7 +148,7 @@
             </div>
             <Button
                 secondary
-                href={`/console/project-${$page.params.project}/messaging/topics/topic-${$page.params.topic}/subscribers`}>
+                href={`${base}/project-${$page.params.project}/messaging/topics/topic-${$page.params.topic}/subscribers`}>
                 Clear Search
             </Button>
         </EmptySearch>
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+page.ts b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/+page.ts
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/+page.ts
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.svelte
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
similarity index 54%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
index c41df553b..d4aafa911 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/breadcrumbs.svelte
@@ -1,24 +1,25 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import { topic } from './store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
+            href: `${base}/organization-${$organization.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$project.$id}`,
+            href: `${base}/project-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `/console/project-${$project.$id}/messaging`,
+            href: `${base}/project-${$project.$id}/messaging`,
             title: 'Messaging'
         },
         {
-            href: `/console/project-${$project.$id}/messaging/topics/topic-${$topic?.$id}`,
+            href: `${base}/project-${$project.$id}/messaging/topics/topic-${$topic?.$id}`,
             title: $topic?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
similarity index 94%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
index e0eb3a5ff..ae0481e7a 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/deleteTopic.svelte
@@ -21,7 +21,7 @@
                 message: `${$topic.name} has been deleted`
             });
             trackEvent(Submit.MessagingTopicDelete);
-            await goto(`${base}/console/project-${$page.params.project}/messaging/topics`);
+            await goto(`${base}/project-${$page.params.project}/messaging/topics`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/header.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte
similarity index 85%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/header.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte
index 680a967e5..69fc5c9bc 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/header.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -7,7 +8,7 @@
 
     const projectId = $page.params.project;
     const topicId = $page.params.topic;
-    const path = `/console/project-${projectId}/messaging/topics/topic-${topicId}`;
+    const path = `${base}/project-${projectId}/messaging/topics/topic-${topicId}`;
     const tabs = [
         {
             href: path,
@@ -29,7 +30,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/messaging/topics`}>
+        <CoverTitle href={`${base}/project-${projectId}/messaging/topics`}>
             {$topic.name}
         </CoverTitle>
         <Id value={$topic.$id} event="topic">{$topic.$id}</Id>
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/+page.svelte
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/dangerZone.svelte
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/details.svelte
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updateName.svelte
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/settings/updatePermissions.svelte
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/store.ts b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/store.ts
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/store.ts
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/table.svelte b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
similarity index 97%
rename from src/routes/console/project-[project]/messaging/topics/topic-[topic]/table.svelte
rename to src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
index e469b7991..515ea6605 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/table.svelte
+++ b/src/routes/(console)/project-[project]/messaging/topics/topic-[topic]/table.svelte
@@ -20,7 +20,7 @@
     import type { PageData } from './$types';
     import ProviderType from '../../providerType.svelte';
     import { toLocaleDateTime } from '$lib/helpers/date';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import { targetsById } from '../../store';
@@ -95,7 +95,7 @@
         {#each data.subscribers.subscribers as subscriber (subscriber.$id)}
             {@const target = subscriber.target}
             <TableRowLink
-                href={`${base}/console/project-${$project.$id}/auth/user-${subscriber.target.userId}`}>
+                href={`${base}/project-${$project.$id}/auth/user-${subscriber.target.userId}`}>
                 <TableCellCheck bind:selectedIds id={subscriber.$id} />
 
                 {#each columns as column}
diff --git a/src/routes/console/project-[project]/messaging/topicsModal.svelte b/src/routes/(console)/project-[project]/messaging/topicsModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/topicsModal.svelte
rename to src/routes/(console)/project-[project]/messaging/topicsModal.svelte
diff --git a/src/routes/console/project-[project]/messaging/userTargetsModal.svelte b/src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/userTargetsModal.svelte
rename to src/routes/(console)/project-[project]/messaging/userTargetsModal.svelte
diff --git a/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte
rename to src/routes/(console)/project-[project]/messaging/wizard/emailFormList.svelte
diff --git a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte
rename to src/routes/(console)/project-[project]/messaging/wizard/pushFormList.svelte
diff --git a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte
rename to src/routes/(console)/project-[project]/messaging/wizard/smsFormList.svelte
diff --git a/src/routes/console/project-[project]/messaging/wizard/step1.svelte b/src/routes/(console)/project-[project]/messaging/wizard/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/wizard/step1.svelte
rename to src/routes/(console)/project-[project]/messaging/wizard/step1.svelte
diff --git a/src/routes/console/project-[project]/messaging/wizard/step2.svelte b/src/routes/(console)/project-[project]/messaging/wizard/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/wizard/step2.svelte
rename to src/routes/(console)/project-[project]/messaging/wizard/step2.svelte
diff --git a/src/routes/console/project-[project]/messaging/wizard/step3.svelte b/src/routes/(console)/project-[project]/messaging/wizard/step3.svelte
similarity index 100%
rename from src/routes/console/project-[project]/messaging/wizard/step3.svelte
rename to src/routes/(console)/project-[project]/messaging/wizard/step3.svelte
diff --git a/src/routes/console/project-[project]/messaging/wizard/store.ts b/src/routes/(console)/project-[project]/messaging/wizard/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/messaging/wizard/store.ts
rename to src/routes/(console)/project-[project]/messaging/wizard/store.ts
diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/(console)/project-[project]/overview/+layout.svelte
similarity index 96%
rename from src/routes/console/project-[project]/overview/+layout.svelte
rename to src/routes/(console)/project-[project]/overview/+layout.svelte
index 19726983f..aefaa55a1 100644
--- a/src/routes/console/project-[project]/overview/+layout.svelte
+++ b/src/routes/(console)/project-[project]/overview/+layout.svelte
@@ -28,7 +28,7 @@
     import { periodToDates } from '$lib/layout/usage.svelte';
 
     $: projectId = $page.params.project;
-    $: path = `/console/project-${projectId}/overview`;
+    $: path = `${base}/project-${projectId}/overview`;
     let period: UsagePeriods = '30d';
 
     onMount(handle);
@@ -94,7 +94,7 @@
                             <Requests {period} on:change={(e) => changePeriod(e.detail)} />
                         </div>
                         <a
-                            href={`${base}/console/project-${projectId}/databases`}
+                            href={`${base}/project-${projectId}/databases`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
@@ -121,7 +121,7 @@
                             </div>
                         </a>
                         <a
-                            href={`${base}/console/project-${projectId}/storage`}
+                            href={`${base}/project-${projectId}/storage`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
@@ -149,7 +149,7 @@
                             </div>
                         </a>
                         <a
-                            href={`${base}/console/project-${projectId}/auth`}
+                            href={`${base}/project-${projectId}/auth`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
@@ -170,7 +170,7 @@
                             </div>
                         </a>
                         <a
-                            href={`${base}/console/project-${projectId}/functions`}
+                            href={`${base}/project-${projectId}/functions`}
                             class="card is-2-columns-large-screen">
                             <div class="grid-item-1">
                                 <div class="grid-item-1-start-start">
diff --git a/src/routes/console/project-[project]/overview/+layout.ts b/src/routes/(console)/project-[project]/overview/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/+layout.ts
rename to src/routes/(console)/project-[project]/overview/+layout.ts
diff --git a/src/routes/console/project-[project]/overview/+page.ts b/src/routes/(console)/project-[project]/overview/+page.ts
similarity index 64%
rename from src/routes/console/project-[project]/overview/+page.ts
rename to src/routes/(console)/project-[project]/overview/+page.ts
index 541af53e9..8b3b6cca3 100644
--- a/src/routes/console/project-[project]/overview/+page.ts
+++ b/src/routes/(console)/project-[project]/overview/+page.ts
@@ -6,8 +6,8 @@ import { selectedTab } from './store';
 
 export const load: PageLoad = async ({ params }) => {
     if (get(selectedTab) === 'keys') {
-        redirect(302, `${base}/console/project-${params.project}/overview/keys`);
+        redirect(302, `${base}/project-${params.project}/overview/keys`);
     } else {
-        redirect(302, `${base}/console/project-${params.project}/overview/platforms`);
+        redirect(302, `${base}/project-${params.project}/overview/platforms`);
     }
 };
diff --git a/src/routes/console/project-[project]/overview/bandwith.svelte b/src/routes/(console)/project-[project]/overview/bandwith.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/bandwith.svelte
rename to src/routes/(console)/project-[project]/overview/bandwith.svelte
diff --git a/src/routes/console/project-[project]/overview/breadcrumbs.svelte b/src/routes/(console)/project-[project]/overview/breadcrumbs.svelte
similarity index 69%
rename from src/routes/console/project-[project]/overview/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/overview/breadcrumbs.svelte
index cf6b91aec..fad7b3cbc 100644
--- a/src/routes/console/project-[project]/overview/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/overview/breadcrumbs.svelte
@@ -1,15 +1,16 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/overview/header.svelte b/src/routes/(console)/project-[project]/overview/header.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/header.svelte
rename to src/routes/(console)/project-[project]/overview/header.svelte
diff --git a/src/routes/console/project-[project]/overview/intro-dark.png b/src/routes/(console)/project-[project]/overview/intro-dark.png
similarity index 100%
rename from src/routes/console/project-[project]/overview/intro-dark.png
rename to src/routes/(console)/project-[project]/overview/intro-dark.png
diff --git a/src/routes/console/project-[project]/overview/intro-light.png b/src/routes/(console)/project-[project]/overview/intro-light.png
similarity index 100%
rename from src/routes/console/project-[project]/overview/intro-light.png
rename to src/routes/(console)/project-[project]/overview/intro-light.png
diff --git a/src/routes/console/project-[project]/overview/keys/+page.svelte b/src/routes/(console)/project-[project]/overview/keys/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/+page.svelte
rename to src/routes/(console)/project-[project]/overview/keys/+page.svelte
diff --git a/src/routes/console/project-[project]/overview/keys/+page.ts b/src/routes/(console)/project-[project]/overview/keys/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/+page.ts
rename to src/routes/(console)/project-[project]/overview/keys/+page.ts
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page.ts b/src/routes/(console)/project-[project]/overview/keys/[key]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/[key]/+page.ts
rename to src/routes/(console)/project-[project]/overview/keys/[key]/+page.ts
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
rename to src/routes/(console)/project-[project]/overview/keys/[key]/+page@project-[project].svelte
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/overview/keys/[key]/breadcrumbs.svelte
similarity index 61%
rename from src/routes/console/project-[project]/overview/keys/[key]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/overview/keys/[key]/breadcrumbs.svelte
index 4c8d21b54..426594191 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/overview/keys/[key]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../../store';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/overview/keys`,
+            href: `${base}/project-${$project?.$id}/overview/keys`,
             title: 'API keys'
         },
         {
-            href: `/console/project-${$project?.$id}/overview/keys/${$key?.$id}`,
+            href: `${base}/project-${$project?.$id}/overview/keys/${$key?.$id}`,
             title: $key?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte b/src/routes/(console)/project-[project]/overview/keys/[key]/delete.svelte
similarity index 95%
rename from src/routes/console/project-[project]/overview/keys/[key]/delete.svelte
rename to src/routes/(console)/project-[project]/overview/keys/[key]/delete.svelte
index 33f99fc6d..cbf3d0b7d 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte
+++ b/src/routes/(console)/project-[project]/overview/keys/[key]/delete.svelte
@@ -22,7 +22,7 @@
                 message: `${$key.name} has been deleted`
             });
             trackEvent(Submit.KeyDelete);
-            await goto(`${base}/console/project-${$project.$id}/overview/keys`);
+            await goto(`${base}/project-${$project.$id}/overview/keys`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/header.svelte b/src/routes/(console)/project-[project]/overview/keys/[key]/header.svelte
similarity index 78%
rename from src/routes/console/project-[project]/overview/keys/[key]/header.svelte
rename to src/routes/(console)/project-[project]/overview/keys/[key]/header.svelte
index 9949241e1..09259d558 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/header.svelte
+++ b/src/routes/(console)/project-[project]/overview/keys/[key]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { Cover, CoverTitle } from '$lib/layout';
@@ -9,7 +10,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/overview/keys`}>
+        <CoverTitle href={`${base}/project-${projectId}/overview/keys`}>
             {$key?.name}
         </CoverTitle>
         <Id value={$key?.secret}>API key secret</Id>
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/store.ts b/src/routes/(console)/project-[project]/overview/keys/[key]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/[key]/store.ts
rename to src/routes/(console)/project-[project]/overview/keys/[key]/store.ts
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte
rename to src/routes/(console)/project-[project]/overview/keys/[key]/updateExpirationDate.svelte
diff --git a/src/routes/console/project-[project]/overview/keys/checkbox.svelte b/src/routes/(console)/project-[project]/overview/keys/checkbox.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/checkbox.svelte
rename to src/routes/(console)/project-[project]/overview/keys/checkbox.svelte
diff --git a/src/routes/console/project-[project]/overview/keys/expirationInput.svelte b/src/routes/(console)/project-[project]/overview/keys/expirationInput.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/expirationInput.svelte
rename to src/routes/(console)/project-[project]/overview/keys/expirationInput.svelte
diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/(console)/project-[project]/overview/keys/scopes.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/scopes.svelte
rename to src/routes/(console)/project-[project]/overview/keys/scopes.svelte
diff --git a/src/routes/console/project-[project]/overview/keys/wizard.svelte b/src/routes/(console)/project-[project]/overview/keys/wizard.svelte
similarity index 93%
rename from src/routes/console/project-[project]/overview/keys/wizard.svelte
rename to src/routes/(console)/project-[project]/overview/keys/wizard.svelte
index 96069d6b9..e6c6701fa 100644
--- a/src/routes/console/project-[project]/overview/keys/wizard.svelte
+++ b/src/routes/(console)/project-[project]/overview/keys/wizard.svelte
@@ -12,6 +12,7 @@
     import { onboarding } from '../../store';
     import { Dependencies } from '$lib/constants';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { base } from '$app/paths';
 
     async function onFinish() {
         try {
@@ -27,7 +28,7 @@
             trackEvent(Submit.KeyCreate, {
                 scopes: $key.scopes
             });
-            goto(`/console/project-${$page.params.project}/overview/keys/${$id}`);
+            goto(`${base}/project-${$page.params.project}/overview/keys/${$id}`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step1.svelte b/src/routes/(console)/project-[project]/overview/keys/wizard/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/wizard/step1.svelte
rename to src/routes/(console)/project-[project]/overview/keys/wizard/step1.svelte
diff --git a/src/routes/console/project-[project]/overview/keys/wizard/step2.svelte b/src/routes/(console)/project-[project]/overview/keys/wizard/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/wizard/step2.svelte
rename to src/routes/(console)/project-[project]/overview/keys/wizard/step2.svelte
diff --git a/src/routes/console/project-[project]/overview/keys/wizard/store.ts b/src/routes/(console)/project-[project]/overview/keys/wizard/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/keys/wizard/store.ts
rename to src/routes/(console)/project-[project]/overview/keys/wizard/store.ts
diff --git a/src/routes/console/project-[project]/overview/onboard-1-dark-desktop.svg b/src/routes/(console)/project-[project]/overview/onboard-1-dark-desktop.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-1-dark-desktop.svg
rename to src/routes/(console)/project-[project]/overview/onboard-1-dark-desktop.svg
diff --git a/src/routes/console/project-[project]/overview/onboard-1-dark-mobile.svg b/src/routes/(console)/project-[project]/overview/onboard-1-dark-mobile.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-1-dark-mobile.svg
rename to src/routes/(console)/project-[project]/overview/onboard-1-dark-mobile.svg
diff --git a/src/routes/console/project-[project]/overview/onboard-1-light-desktop.svg b/src/routes/(console)/project-[project]/overview/onboard-1-light-desktop.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-1-light-desktop.svg
rename to src/routes/(console)/project-[project]/overview/onboard-1-light-desktop.svg
diff --git a/src/routes/console/project-[project]/overview/onboard-1-light-mobile.svg b/src/routes/(console)/project-[project]/overview/onboard-1-light-mobile.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-1-light-mobile.svg
rename to src/routes/(console)/project-[project]/overview/onboard-1-light-mobile.svg
diff --git a/src/routes/console/project-[project]/overview/onboard-2-dark-desktop.svg b/src/routes/(console)/project-[project]/overview/onboard-2-dark-desktop.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-2-dark-desktop.svg
rename to src/routes/(console)/project-[project]/overview/onboard-2-dark-desktop.svg
diff --git a/src/routes/console/project-[project]/overview/onboard-2-dark-mobile.svg b/src/routes/(console)/project-[project]/overview/onboard-2-dark-mobile.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-2-dark-mobile.svg
rename to src/routes/(console)/project-[project]/overview/onboard-2-dark-mobile.svg
diff --git a/src/routes/console/project-[project]/overview/onboard-2-light-desktop.svg b/src/routes/(console)/project-[project]/overview/onboard-2-light-desktop.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-2-light-desktop.svg
rename to src/routes/(console)/project-[project]/overview/onboard-2-light-desktop.svg
diff --git a/src/routes/console/project-[project]/overview/onboard-2-light-mobile.svg b/src/routes/(console)/project-[project]/overview/onboard-2-light-mobile.svg
similarity index 100%
rename from src/routes/console/project-[project]/overview/onboard-2-light-mobile.svg
rename to src/routes/(console)/project-[project]/overview/onboard-2-light-mobile.svg
diff --git a/src/routes/console/project-[project]/overview/onboard.svelte b/src/routes/(console)/project-[project]/overview/onboard.svelte
similarity index 98%
rename from src/routes/console/project-[project]/overview/onboard.svelte
rename to src/routes/(console)/project-[project]/overview/onboard.svelte
index 0c3d848d2..568f592c0 100644
--- a/src/routes/console/project-[project]/overview/onboard.svelte
+++ b/src/routes/(console)/project-[project]/overview/onboard.svelte
@@ -13,6 +13,7 @@
     import { app } from '$lib/stores/app';
     import { wizard } from '$lib/stores/wizard';
     import Wizard from './keys/wizard.svelte';
+    import { base } from '$app/paths';
 
     export let projectId: string;
 
@@ -128,7 +129,7 @@
                 </li>
                 <li class="grid-box-item">
                     <a
-                        href={`/console/project-${projectId}/settings/webhooks`}
+                        href={`${base}/project-${projectId}/settings/webhooks`}
                         style="line-height: 1.5;"
                         class="card u-width-full-line">
                         <span class="u-flex u-cross-center u-gap-16">
diff --git a/src/routes/console/project-[project]/overview/platforms/+page.svelte b/src/routes/(console)/project-[project]/overview/platforms/+page.svelte
similarity index 98%
rename from src/routes/console/project-[project]/overview/platforms/+page.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/+page.svelte
index 93bcd0ff8..a39c40482 100644
--- a/src/routes/console/project-[project]/overview/platforms/+page.svelte
+++ b/src/routes/(console)/project-[project]/overview/platforms/+page.svelte
@@ -56,7 +56,7 @@
     }
     let showDropdown = false;
     let showDropdownEmpty = false;
-    const path = `/console/project-${$page.params.project}/overview/platforms`;
+    const path = `${base}/project-${$page.params.project}/overview/platforms`;
 
     const getPlatformInfo = (platform: string) => {
         if (platform.includes('flutter')) {
diff --git a/src/routes/console/project-[project]/overview/platforms/+page.ts b/src/routes/(console)/project-[project]/overview/platforms/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/+page.ts
rename to src/routes/(console)/project-[project]/overview/platforms/+page.ts
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts b/src/routes/(console)/project-[project]/overview/platforms/[platform]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/+page.ts
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/android.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/android.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleIOS.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/appleIOS.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte
similarity index 61%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte
index f07a84a65..c30a96d9a 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/overview/platforms/[platform]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../../store';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
+            href: `${base}/organization-${$organization.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$project.$id}`,
+            href: `${base}/project-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `/console/project-${$project.$id}/overview/platforms`,
+            href: `${base}/project-${$project.$id}/overview/platforms`,
             title: 'Platforms'
         },
         {
-            href: `/console/project-${$project.$id}/overview/platforms/${$platform.$id}`,
+            href: `${base}/project-${$project.$id}/overview/platforms/${$platform.$id}`,
             title: $platform.name
         }
     ];
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte
similarity index 95%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte
index 2420ed803..305dad410 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte
+++ b/src/routes/(console)/project-[project]/overview/platforms/[platform]/delete.svelte
@@ -22,7 +22,7 @@
                 message: `${$platform.name} has been deleted`
             });
             trackEvent(Submit.PlatformDelete);
-            await goto(`${base}/console/project-${$project.$id}/overview/platforms`);
+            await goto(`${base}/project-${$project.$id}/overview/platforms`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/header.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte
similarity index 74%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/header.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte
index 22728fd6a..8ab370595 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/header.svelte
+++ b/src/routes/(console)/project-[project]/overview/platforms/[platform]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Cover, CoverTitle } from '$lib/layout';
     import { platform } from './store';
@@ -8,7 +9,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/overview/platforms`}>
+        <CoverTitle href={`${base}/project-${projectId}/overview/platforms`}>
             {$platform?.name}
         </CoverTitle>
     </svelte:fragment>
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/store.ts b/src/routes/(console)/project-[project]/overview/platforms/[platform]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/store.ts
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/store.ts
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/createAndroid.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/createAndroid.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/createApple.svelte b/src/routes/(console)/project-[project]/overview/platforms/createApple.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/createApple.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/createApple.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/createFlutter.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/createFlutter.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte b/src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/createWeb.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/createWeb.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/android/step1.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/android/step2.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/android/step2.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/android/step3.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step1.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/apple/step2.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step2.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/apple/step3.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step1.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/flutter/step2.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step2.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/flutter/step3.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/step4.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/step4.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/step4.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/step4.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts b/src/routes/(console)/project-[project]/overview/platforms/wizard/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/store.ts
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/store.ts
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/web/step1.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/web/step2.svelte
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte b/src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte
rename to src/routes/(console)/project-[project]/overview/platforms/wizard/web/step3.svelte
diff --git a/src/routes/console/project-[project]/overview/realtime.svelte b/src/routes/(console)/project-[project]/overview/realtime.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/realtime.svelte
rename to src/routes/(console)/project-[project]/overview/realtime.svelte
diff --git a/src/routes/console/project-[project]/overview/requests.svelte b/src/routes/(console)/project-[project]/overview/requests.svelte
similarity index 100%
rename from src/routes/console/project-[project]/overview/requests.svelte
rename to src/routes/(console)/project-[project]/overview/requests.svelte
diff --git a/src/routes/console/project-[project]/overview/store.ts b/src/routes/(console)/project-[project]/overview/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/overview/store.ts
rename to src/routes/(console)/project-[project]/overview/store.ts
diff --git a/src/routes/console/project-[project]/promoteVariableModal.svelte b/src/routes/(console)/project-[project]/promoteVariableModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/promoteVariableModal.svelte
rename to src/routes/(console)/project-[project]/promoteVariableModal.svelte
diff --git a/src/routes/console/project-[project]/rawVariableEditor.svelte b/src/routes/(console)/project-[project]/rawVariableEditor.svelte
similarity index 100%
rename from src/routes/console/project-[project]/rawVariableEditor.svelte
rename to src/routes/(console)/project-[project]/rawVariableEditor.svelte
diff --git a/src/routes/console/project-[project]/settings/+layout.svelte b/src/routes/(console)/project-[project]/settings/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/+layout.svelte
rename to src/routes/(console)/project-[project]/settings/+layout.svelte
diff --git a/src/routes/console/project-[project]/settings/+layout.ts b/src/routes/(console)/project-[project]/settings/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/+layout.ts
rename to src/routes/(console)/project-[project]/settings/+layout.ts
diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/(console)/project-[project]/settings/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/+page.svelte
rename to src/routes/(console)/project-[project]/settings/+page.svelte
diff --git a/src/routes/console/project-[project]/settings/+page.ts b/src/routes/(console)/project-[project]/settings/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/+page.ts
rename to src/routes/(console)/project-[project]/settings/+page.ts
diff --git a/src/routes/console/project-[project]/settings/GitDisconnectModal.svelte b/src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/GitDisconnectModal.svelte
rename to src/routes/(console)/project-[project]/settings/GitDisconnectModal.svelte
diff --git a/src/routes/console/project-[project]/settings/GitInstallationModal.svelte b/src/routes/(console)/project-[project]/settings/GitInstallationModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/GitInstallationModal.svelte
rename to src/routes/(console)/project-[project]/settings/GitInstallationModal.svelte
diff --git a/src/routes/console/project-[project]/settings/breadcrumbs.svelte b/src/routes/(console)/project-[project]/settings/breadcrumbs.svelte
similarity index 64%
rename from src/routes/console/project-[project]/settings/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/settings/breadcrumbs.svelte
index 2a4b6cb8f..0db760fa7 100644
--- a/src/routes/console/project-[project]/settings/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/settings/breadcrumbs.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/settings`,
+            href: `${base}/project-${$project?.$id}/settings`,
             title: 'Settings'
         }
     ];
diff --git a/src/routes/console/project-[project]/settings/deleteProject.svelte b/src/routes/(console)/project-[project]/settings/deleteProject.svelte
similarity index 98%
rename from src/routes/console/project-[project]/settings/deleteProject.svelte
rename to src/routes/(console)/project-[project]/settings/deleteProject.svelte
index b4d40ad24..fbf1d4c7e 100644
--- a/src/routes/console/project-[project]/settings/deleteProject.svelte
+++ b/src/routes/(console)/project-[project]/settings/deleteProject.svelte
@@ -31,7 +31,7 @@
                 message: `${$project.name} has been deleted`
             });
             trackEvent(Submit.ProjectDelete);
-            await goto(`${base}/console`);
+            await goto(base);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/settings/disableAllServices.svelte b/src/routes/(console)/project-[project]/settings/disableAllServices.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/disableAllServices.svelte
rename to src/routes/(console)/project-[project]/settings/disableAllServices.svelte
diff --git a/src/routes/console/project-[project]/settings/domains/+page.svelte b/src/routes/(console)/project-[project]/settings/domains/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/domains/+page.svelte
rename to src/routes/(console)/project-[project]/settings/domains/+page.svelte
diff --git a/src/routes/console/project-[project]/settings/domains/+page.ts b/src/routes/(console)/project-[project]/settings/domains/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/domains/+page.ts
rename to src/routes/(console)/project-[project]/settings/domains/+page.ts
diff --git a/src/routes/console/project-[project]/settings/enableAllServices.svelte b/src/routes/(console)/project-[project]/settings/enableAllServices.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/enableAllServices.svelte
rename to src/routes/(console)/project-[project]/settings/enableAllServices.svelte
diff --git a/src/routes/console/project-[project]/settings/header.svelte b/src/routes/(console)/project-[project]/settings/header.svelte
similarity index 94%
rename from src/routes/console/project-[project]/settings/header.svelte
rename to src/routes/(console)/project-[project]/settings/header.svelte
index 919d1f19d..a9e3e2e8f 100644
--- a/src/routes/console/project-[project]/settings/header.svelte
+++ b/src/routes/(console)/project-[project]/settings/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -7,7 +8,7 @@
     import { isCloud } from '$lib/system';
 
     const projectId = $page.params.project;
-    const path = `/console/project-${projectId}/settings`;
+    const path = `${base}/project-${projectId}/settings`;
     const tabs: TabElement[] = [
         {
             href: path,
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/index.ts b/src/routes/(console)/project-[project]/settings/migrations/(import)/index.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/(import)/index.ts
rename to src/routes/(console)/project-[project]/settings/migrations/(import)/index.ts
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/(console)/project-[project]/settings/migrations/(import)/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
rename to src/routes/(console)/project-[project]/settings/migrations/(import)/step1.svelte
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step2.svelte b/src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte
similarity index 89%
rename from src/routes/console/project-[project]/settings/migrations/(import)/step2.svelte
rename to src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte
index 6528ed9d7..a78648131 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/step2.svelte
+++ b/src/routes/(console)/project-[project]/settings/migrations/(import)/step2.svelte
@@ -2,7 +2,7 @@
     import { WizardStep } from '$lib/layout';
     import { sdk } from '$lib/stores/sdk';
 
-    import ResourceForm from '$routes/console/(migration-wizard)/resource-form.svelte';
+    import ResourceForm from '$routes/(console)/(migration-wizard)/resource-form.svelte';
     import { formData, provider } from '.';
 </script>
 
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
rename to src/routes/(console)/project-[project]/settings/migrations/(import)/wizard.svelte
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[project]/settings/migrations/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/+page.svelte
rename to src/routes/(console)/project-[project]/settings/migrations/+page.svelte
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.ts b/src/routes/(console)/project-[project]/settings/migrations/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/+page.ts
rename to src/routes/(console)/project-[project]/settings/migrations/+page.ts
diff --git a/src/routes/console/project-[project]/settings/migrations/details.svelte b/src/routes/(console)/project-[project]/settings/migrations/details.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/details.svelte
rename to src/routes/(console)/project-[project]/settings/migrations/details.svelte
diff --git a/src/routes/console/project-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/exportModal.svelte
rename to src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte
diff --git a/src/routes/console/project-[project]/settings/migrations/stores.ts b/src/routes/(console)/project-[project]/settings/migrations/stores.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/migrations/stores.ts
rename to src/routes/(console)/project-[project]/settings/migrations/stores.ts
diff --git a/src/routes/console/project-[project]/settings/smtp/+page.svelte b/src/routes/(console)/project-[project]/settings/smtp/+page.svelte
similarity index 99%
rename from src/routes/console/project-[project]/settings/smtp/+page.svelte
rename to src/routes/(console)/project-[project]/settings/smtp/+page.svelte
index 83f27b5fe..b57172f45 100644
--- a/src/routes/console/project-[project]/settings/smtp/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/smtp/+page.svelte
@@ -127,7 +127,7 @@
             <p class="text">
                 You can customize the email service by providing your own SMTP server. View your
                 email templates <a
-                    href="{base}/console/project-{$project.$id}/auth/templates"
+                    href={`${base}/project-${$project.$id}/auth/templates`}
                     class="link">here</a>
             </p>
             <svelte:fragment slot="aside">
diff --git a/src/routes/console/project-[project]/settings/transferProject.svelte b/src/routes/(console)/project-[project]/settings/transferProject.svelte
similarity index 96%
rename from src/routes/console/project-[project]/settings/transferProject.svelte
rename to src/routes/(console)/project-[project]/settings/transferProject.svelte
index 9f73063b6..73445839e 100644
--- a/src/routes/console/project-[project]/settings/transferProject.svelte
+++ b/src/routes/(console)/project-[project]/settings/transferProject.svelte
@@ -21,7 +21,7 @@
                 message: `${$project.name} has been transfered to ${teamName}`
             });
             trackEvent(Submit.ProjectUpdateTeam);
-            await goto(`${base}/console/organization-${teamId}`);
+            await goto(`${base}/organization-${teamId}`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte
similarity index 99%
rename from src/routes/console/project-[project]/settings/updateInstallations.svelte
rename to src/routes/(console)/project-[project]/settings/updateInstallations.svelte
index 749260fd3..aaabb6fba 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte
@@ -29,7 +29,7 @@
     import GitDisconnectModal from './GitDisconnectModal.svelte';
     import dayjs from 'dayjs';
     import { isSelfHosted } from '$lib/system';
-    import { consoleVariables } from '$routes/console/store';
+    import { consoleVariables } from '$routes/(console)/store';
 
     export let total: number;
     export let limit: number;
diff --git a/src/routes/console/project-[project]/settings/updateName.svelte b/src/routes/(console)/project-[project]/settings/updateName.svelte
similarity index 96%
rename from src/routes/console/project-[project]/settings/updateName.svelte
rename to src/routes/(console)/project-[project]/settings/updateName.svelte
index a6c93dc79..db404ff3b 100644
--- a/src/routes/console/project-[project]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[project]/settings/updateName.svelte
@@ -55,7 +55,7 @@
             <Button
                 secondary
                 event="view_keys"
-                href={`${base}/console/project-${projectId}/overview/keys#integrations`}>
+                href={`${base}/project-${projectId}/overview/keys#integrations`}>
                 View API keys
             </Button>
         </svelte:fragment>
diff --git a/src/routes/console/project-[project]/settings/updateServices.svelte b/src/routes/(console)/project-[project]/settings/updateServices.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/updateServices.svelte
rename to src/routes/(console)/project-[project]/settings/updateServices.svelte
diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
similarity index 99%
rename from src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte
rename to src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
index a4d52bdf4..b67c06650 100644
--- a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
@@ -21,7 +21,7 @@
 
     export let data;
 
-    $: base = `/console/project-${data.project.$id}`;
+    $: base = `${base}/project-${data.project.$id}`;
     $: network = data.usage.network;
     $: users = data.usage.users;
     $: usersTotal = data.usage.usersTotal;
diff --git a/src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.ts b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/usage/[[invoice]]/+page.ts
rename to src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts
diff --git a/src/routes/console/project-[project]/settings/webhooks/+page.svelte b/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte
similarity index 98%
rename from src/routes/console/project-[project]/settings/webhooks/+page.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/+page.svelte
index ea1a2cbe6..26304e445 100644
--- a/src/routes/console/project-[project]/settings/webhooks/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte
@@ -67,7 +67,7 @@
             <TableBody service="webhooks" total={data.webhooks.total}>
                 {#each data.webhooks.webhooks as webhook}
                     <TableRowLink
-                        href={`${base}/console/project-${projectId}/settings/webhooks/${webhook.$id}`}>
+                        href={`${base}/project-${projectId}/settings/webhooks/${webhook.$id}`}>
                         {#each $columns as column (column.id)}
                             {#if column.show}
                                 {#if column.id === '$id'}
diff --git a/src/routes/console/project-[project]/settings/webhooks/+page.ts b/src/routes/(console)/project-[project]/settings/webhooks/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/+page.ts
rename to src/routes/(console)/project-[project]/settings/webhooks/+page.ts
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+layout.ts
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+page.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/+page.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/+page.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
similarity index 60%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
index 77a2fad04..13d6f9b1b 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../../store';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization?.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project?.name
         },
         {
-            href: `/console/project-${$project?.$id}/settings/webhooks`,
+            href: `${base}/project-${$project?.$id}/settings/webhooks`,
             title: 'Settings'
         },
         {
-            href: `/console/project-${$project?.$id}/settings/webhooks/webhook/${$webhook?.$id}`,
+            href: `${base}/project-${$project?.$id}/settings/webhooks/webhook/${$webhook?.$id}`,
             title: $webhook?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/dangerZone.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/dangerZone.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/dangerZone.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/dangerZone.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/delete.svelte
similarity index 95%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/delete.svelte
index e1416a95a..6fa515a6c 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte
+++ b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/delete.svelte
@@ -22,7 +22,7 @@
                 message: `${$webhook.name} has been deleted`
             });
             trackEvent(Submit.WebhookDelete);
-            await goto(`${base}/console/project-${$project.$id}/settings/webhooks`);
+            await goto(`${base}/project-${$project.$id}/settings/webhooks`);
         } catch (error) {
             addNotification({
                 type: 'error',
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/details.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/details.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/details.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/details.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/header.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/header.svelte
similarity index 79%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/header.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/header.svelte
index 8debdc385..1bb3b8b0b 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/header.svelte
+++ b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { Cover, CoverTitle } from '$lib/layout';
@@ -9,7 +10,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/settings/webhooks`}>
+        <CoverTitle href={`${base}/project-${projectId}/settings/webhooks`}>
             {$webhook?.name}
         </CoverTitle>
         <Id value={$webhook?.$id} event="webhook">{$webhook?.$id}</Id>
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/regenerate.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/regenerate.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/store.ts b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/store.ts
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/store.ts
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateName.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateName.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateSignature.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte b/src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte b/src/routes/(console)/project-[project]/settings/webhooks/createWebhook.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/createWebhook.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/failedModal.svelte b/src/routes/(console)/project-[project]/settings/webhooks/failedModal.svelte
similarity index 95%
rename from src/routes/console/project-[project]/settings/webhooks/failedModal.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/failedModal.svelte
index 67437a82b..22f8221b0 100644
--- a/src/routes/console/project-[project]/settings/webhooks/failedModal.svelte
+++ b/src/routes/(console)/project-[project]/settings/webhooks/failedModal.svelte
@@ -14,7 +14,7 @@
     const projectId = $page.params.project;
 
     $: webhookPath = webhook
-        ? `${base}/console/project-${projectId}/settings/webhooks/` + (webhook['$id'] ?? '')
+        ? `${base}/project-${projectId}/settings/webhooks/` + (webhook['$id'] ?? '')
         : '';
 
     let enabled = webhook ? webhook.enabled : false;
diff --git a/src/routes/console/project-[project]/settings/webhooks/messageStatusPill.svelte b/src/routes/(console)/project-[project]/settings/webhooks/messageStatusPill.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/messageStatusPill.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/messageStatusPill.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/store.ts b/src/routes/(console)/project-[project]/settings/webhooks/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/store.ts
rename to src/routes/(console)/project-[project]/settings/webhooks/store.ts
diff --git a/src/routes/console/project-[project]/settings/webhooks/wizard/step1.svelte b/src/routes/(console)/project-[project]/settings/webhooks/wizard/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/wizard/step1.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/wizard/step1.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/wizard/step2.svelte b/src/routes/(console)/project-[project]/settings/webhooks/wizard/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/wizard/step2.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/wizard/step2.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/wizard/step3.svelte b/src/routes/(console)/project-[project]/settings/webhooks/wizard/step3.svelte
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/wizard/step3.svelte
rename to src/routes/(console)/project-[project]/settings/webhooks/wizard/step3.svelte
diff --git a/src/routes/console/project-[project]/settings/webhooks/wizard/store.ts b/src/routes/(console)/project-[project]/settings/webhooks/wizard/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/settings/webhooks/wizard/store.ts
rename to src/routes/(console)/project-[project]/settings/webhooks/wizard/store.ts
diff --git a/src/routes/console/project-[project]/storage/+layout.svelte b/src/routes/(console)/project-[project]/storage/+layout.svelte
similarity index 88%
rename from src/routes/console/project-[project]/storage/+layout.svelte
rename to src/routes/(console)/project-[project]/storage/+layout.svelte
index ef7181113..6acf53b7d 100644
--- a/src/routes/console/project-[project]/storage/+layout.svelte
+++ b/src/routes/(console)/project-[project]/storage/+layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
     import { BucketsPanel } from '$lib/commandCenter/panels';
@@ -11,7 +12,7 @@
             label: 'Create bucket',
             callback: () => {
                 if (!$page.url.pathname.endsWith('storage')) {
-                    goto(`/console/project-${$project.$id}/storage`);
+                    goto(`${base}/project-${$project.$id}/storage`);
                 }
                 $showCreateBucket = true;
             },
@@ -22,7 +23,7 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`/console/project-${$project.$id}/storage/usage`);
+                goto(`${base}/project-${$project.$id}/storage/usage`);
             },
             keys: ['g', 'u'],
             disabled:
diff --git a/src/routes/console/project-[project]/storage/+layout.ts b/src/routes/(console)/project-[project]/storage/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/+layout.ts
rename to src/routes/(console)/project-[project]/storage/+layout.ts
diff --git a/src/routes/console/project-[project]/storage/+page.svelte b/src/routes/(console)/project-[project]/storage/+page.svelte
similarity index 94%
rename from src/routes/console/project-[project]/storage/+page.svelte
rename to src/routes/(console)/project-[project]/storage/+page.svelte
index 7515a7963..cb6d2dcbe 100644
--- a/src/routes/console/project-[project]/storage/+page.svelte
+++ b/src/routes/(console)/project-[project]/storage/+page.svelte
@@ -21,7 +21,7 @@
 
     async function bucketCreated(event: CustomEvent<Models.Bucket>) {
         $showCreateBucket = false;
-        await goto(`${base}/console/project-${project}/storage/bucket-${event.detail.$id}`);
+        await goto(`${base}/project-${project}/storage/bucket-${event.detail.$id}`);
     }
 </script>
 
@@ -40,7 +40,7 @@
             service="buckets"
             on:click={() => ($showCreateBucket = true)}>
             {#each data.buckets.buckets as bucket}
-                <GridItem1 href={`${base}/console/project-${project}/storage/bucket-${bucket.$id}`}>
+                <GridItem1 href={`${base}/project-${project}/storage/bucket-${bucket.$id}`}>
                     <svelte:fragment slot="title">{bucket.name}</svelte:fragment>
                     <svelte:fragment slot="status">
                         {#if !bucket.enabled}
diff --git a/src/routes/console/project-[project]/storage/+page.ts b/src/routes/(console)/project-[project]/storage/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/+page.ts
rename to src/routes/(console)/project-[project]/storage/+page.ts
diff --git a/src/routes/console/project-[project]/storage/breadcrumbs.svelte b/src/routes/(console)/project-[project]/storage/breadcrumbs.svelte
similarity index 64%
rename from src/routes/console/project-[project]/storage/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/storage/breadcrumbs.svelte
index 67dd8a078..acdceadec 100644
--- a/src/routes/console/project-[project]/storage/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/storage/breadcrumbs.svelte
@@ -1,19 +1,20 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../store';
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
+            href: `${base}/organization-${$organization.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$project.$id}`,
+            href: `${base}/project-${$project.$id}`,
             title: $project.name
         },
         {
-            href: `/console/project-${$project.$id}/storage`,
+            href: `${base}/project-${$project.$id}/storage`,
             title: 'Storage'
         }
     ];
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte
similarity index 77%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte
index bd199a1a7..b00632c79 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import {
         registerCommands,
@@ -16,7 +17,7 @@
             label: 'Create file',
             async callback() {
                 if (!$page.url.pathname.endsWith($bucket.$id)) {
-                    goto(`/console/project-${$project.$id}/storage/bucket-${$bucket.$id}`);
+                    goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}`);
                 }
                 showCreateFile();
             },
@@ -28,7 +29,7 @@
             label: 'Permissions',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#permissions`
+                    `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#permissions`
                 );
                 scrollBy({ top: -100 });
             },
@@ -39,7 +40,7 @@
             label: 'Extensions',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#extensions`
+                    `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#extensions`
                 );
             },
             group: 'buckets',
@@ -49,7 +50,7 @@
             label: 'File security',
             async callback() {
                 await goto(
-                    `/console/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#file-security`
+                    `${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings#file-security`
                 );
                 scrollBy({ top: -100 });
             },
@@ -59,7 +60,7 @@
         {
             label: 'Go to files',
             callback() {
-                goto(`/console/project-${$project.$id}/storage/bucket-${$bucket.$id}`);
+                goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}`);
             },
             disabled: $page.url.pathname.endsWith($bucket.$id),
             keys: ['g', 'f'],
@@ -69,7 +70,7 @@
         {
             label: 'Go to usage',
             callback() {
-                goto(`/console/project-${$project.$id}/storage/bucket-${$bucket.$id}/usage`);
+                goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/usage`);
             },
             disabled: $page.url.pathname.endsWith('usage'),
             keys: ['g', 'u'],
@@ -79,7 +80,7 @@
         {
             label: 'Go to settings',
             callback() {
-                goto(`/console/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings`);
+                goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/settings`);
             },
             disabled: $page.url.pathname.endsWith('settings'),
             keys: ['g', 's'],
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/+layout.ts
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
similarity index 97%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
index 1726305ae..c383c6135 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
@@ -191,7 +191,7 @@
                         </TableRow>
                     {:else}
                         <TableRowLink
-                            href={`${base}/console/project-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}>
+                            href={`${base}/project-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}>
                             <TableCell title="Name">
                                 <div class="u-flex u-gap-12 u-cross-center">
                                     <Avatar size={32} src={getPreview(file.$id)} name={file.name} />
@@ -223,7 +223,7 @@
                                             on:click={() => {
                                                 showDropdown[index] = false;
                                             }}
-                                            href={`${base}/console/project-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}
+                                            href={`${base}/project-${projectId}/storage/bucket-${bucketId}/file-${file.$id}`}
                                             icon="pencil">Update</DropListLink>
                                         <DropListItem
                                             icon="trash"
@@ -261,7 +261,7 @@
                 </Button>
                 <Button
                     secondary
-                    href={`/console/project-${$page.params.project}/storage/bucket-${$page.params.bucket}`}>
+                    href={`${base}/project-${$page.params.project}/storage/bucket-${$page.params.bucket}`}>
                     Clear Search
                 </Button>
             </div>
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
similarity index 62%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
index da7f07ba4..dc28fe8a6 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { organization } from '$lib/stores/organization';
     import { project } from '../../store';
@@ -6,19 +7,19 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization?.$id}`,
+            href: `${base}/organization-${$organization?.$id}`,
             title: $organization.name
         },
         {
-            href: `/console/project-${$project?.$id}`,
+            href: `${base}/project-${$project?.$id}`,
             title: $project.name
         },
         {
-            href: `/console/project-${$project?.$id}/storage`,
+            href: `${base}/project-${$project?.$id}/storage`,
             title: 'Storage'
         },
         {
-            href: `/console/project-${$project?.$id}/storage/bucket-${$bucket?.$id}`,
+            href: `${base}/project-${$project?.$id}/storage/bucket-${$bucket?.$id}`,
             title: $bucket?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/create.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/store.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/store.ts
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/store.ts
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte
similarity index 94%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte
index 4ffbb1868..9990debae 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte
@@ -19,7 +19,7 @@
                 type: 'success',
                 message: `${$bucket.name} has been deleted`
             });
-            await goto(`${base}/console/project-${$page.params.project}/storage`);
+            await goto(`${base}/project-${$page.params.project}/storage`);
             trackEvent(Submit.BucketDelete);
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/deleteFile.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
similarity index 61%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
index d7814aae7..45bd9c355 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/breadcrumbs.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { Breadcrumbs } from '$lib/layout';
     import { project } from '../../../store';
     import { bucket } from '../store';
@@ -9,15 +10,15 @@
             title: '...'
         },
         {
-            href: `/console/project-${$project?.$id}/storage`,
+            href: `${base}/project-${$project?.$id}/storage`,
             title: 'Storage'
         },
         {
-            href: `/console/project-${$project?.$id}/storage/bucket-${$bucket?.$id}`,
+            href: `${base}/project-${$project?.$id}/storage/bucket-${$bucket?.$id}`,
             title: $bucket?.name
         },
         {
-            href: `/console/project-${$project?.$id}/storage/bucket-${$bucket?.$id}/file-${$file?.$id}`,
+            href: `${base}/project-${$project?.$id}/storage/bucket-${$bucket?.$id}/file-${$file?.$id}`,
             title: $file?.name
         }
     ];
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
similarity index 91%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
index 0701a5697..7f4841621 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte
@@ -15,9 +15,7 @@
         try {
             await sdk.forProject.storage.deleteFile($file.bucketId, $file.$id);
             showDelete = false;
-            await goto(
-                `${base}/console/project-${$page.params.project}/storage/bucket-${$file.bucketId}`
-            );
+            await goto(`${base}/project-${$page.params.project}/storage/bucket-${$file.bucketId}`);
             addNotification({
                 type: 'success',
                 message: `${$file.name} has been deleted`
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
similarity index 79%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
index 7a301a86d..5fd06e90e 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id } from '$lib/components';
     import { Cover, CoverTitle } from '$lib/layout';
@@ -10,7 +11,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/storage/bucket-${bucketId}`}>
+        <CoverTitle href={`${base}/project-${projectId}/storage/bucket-${bucketId}`}>
             {$file?.name}
         </CoverTitle>
         <Id value={$file?.$id} event="file">{$file?.$id}</Id>
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/store.ts
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/header.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte
similarity index 87%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/header.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte
index ce37faa4d..06b60073d 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/header.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/header.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Id, Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
@@ -7,7 +8,7 @@
 
     const projectId = $page.params.project;
     const bucketId = $page.params.bucket;
-    const path = `/console/project-${projectId}/storage/bucket-${bucketId}`;
+    const path = `${base}/project-${projectId}/storage/bucket-${bucketId}`;
     const tabs = [
         {
             href: path,
@@ -31,7 +32,7 @@
 
 <Cover>
     <svelte:fragment slot="header">
-        <CoverTitle href={`/console/project-${projectId}/storage`}>
+        <CoverTitle href={`${base}/project-${projectId}/storage`}>
             {$bucket?.name}
         </CoverTitle>
         {#if $bucket?.$id}
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/+page.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/store.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/store.ts
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/store.ts
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
similarity index 73%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
index 4002161a4..f169fdab3 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Usage } from '$lib/layout';
     import type { PageData } from './$types';
@@ -10,7 +11,7 @@
 
 <Usage
     title="Files"
-    path={`/console/project-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`}
+    path={`${base}/project-${$page.params.project}/storage/bucket-${$page.params.bucket}/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts
diff --git a/src/routes/console/project-[project]/storage/create.svelte b/src/routes/(console)/project-[project]/storage/create.svelte
similarity index 100%
rename from src/routes/console/project-[project]/storage/create.svelte
rename to src/routes/(console)/project-[project]/storage/create.svelte
diff --git a/src/routes/console/project-[project]/storage/header.svelte b/src/routes/(console)/project-[project]/storage/header.svelte
similarity index 90%
rename from src/routes/console/project-[project]/storage/header.svelte
rename to src/routes/(console)/project-[project]/storage/header.svelte
index 7a9730778..43aa2b0e5 100644
--- a/src/routes/console/project-[project]/storage/header.svelte
+++ b/src/routes/(console)/project-[project]/storage/header.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Tab, Tabs } from '$lib/components';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
 
     const projectId = $page.params.project;
-    const path = `/console/project-${projectId}/storage`;
+    const path = `${base}/project-${projectId}/storage`;
     const tabs = [
         {
             href: path,
diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte b/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte
similarity index 78%
rename from src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte
rename to src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte
index bc084c930..08e6f956c 100644
--- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Usage } from '$lib/layout';
     import type { PageData } from './$types';
@@ -10,7 +11,7 @@
 
 <Usage
     title="Buckets"
-    path={`/console/project-${$page.params.project}/storage/usage`}
+    path={`${base}/project-${$page.params.project}/storage/usage`}
     {total}
     {count}
     countMetadata={{
diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.ts
similarity index 100%
rename from src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts
rename to src/routes/(console)/project-[project]/storage/usage/[[period]]/+page.ts
diff --git a/src/routes/console/project-[project]/store.ts b/src/routes/(console)/project-[project]/store.ts
similarity index 100%
rename from src/routes/console/project-[project]/store.ts
rename to src/routes/(console)/project-[project]/store.ts
diff --git a/src/routes/console/project-[project]/updateVariables.svelte b/src/routes/(console)/project-[project]/updateVariables.svelte
similarity index 98%
rename from src/routes/console/project-[project]/updateVariables.svelte
rename to src/routes/(console)/project-[project]/updateVariables.svelte
index 7396219fa..ada7911e7 100644
--- a/src/routes/console/project-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[project]/updateVariables.svelte
@@ -26,7 +26,7 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
-    import { project } from '$routes/console/project-[project]/store';
+    import { project } from '$routes/(console)/project-[project]/store';
     import Alert from '$lib/components/alert.svelte';
     import PromoteVariableModal from './promoteVariableModal.svelte';
     import CreateVariable from './createVariable.svelte';
@@ -188,7 +188,7 @@
         <p>
             Set the environment variables or secret keys that will be passed to your function.
             Global variables can be found in <a
-                href={`${base}/console/project-${$project.$id}/settings#variables`}
+                href={`${base}/project-${$project.$id}/settings#variables`}
                 title="Project settings"
                 class="link">
                 project settings</a
@@ -230,7 +230,7 @@
                             {/if}
                             a naming conflict with a global variable. View global variables in
                             <a
-                                href={`${base}/console/project-${$project.$id}/settings`}
+                                href={`${base}/project-${$project.$id}/settings`}
                                 title="Project settings"
                                 class="link">
                                 project settings</a
diff --git a/src/routes/console/project-[project]/uploadVariablesModal.svelte b/src/routes/(console)/project-[project]/uploadVariablesModal.svelte
similarity index 100%
rename from src/routes/console/project-[project]/uploadVariablesModal.svelte
rename to src/routes/(console)/project-[project]/uploadVariablesModal.svelte
diff --git a/src/routes/console/store.ts b/src/routes/(console)/store.ts
similarity index 100%
rename from src/routes/console/store.ts
rename to src/routes/(console)/store.ts
diff --git a/src/routes/console/supportWizard.svelte b/src/routes/(console)/supportWizard.svelte
similarity index 100%
rename from src/routes/console/supportWizard.svelte
rename to src/routes/(console)/supportWizard.svelte
diff --git a/src/routes/console/wizard/feedback/step1.svelte b/src/routes/(console)/wizard/feedback/step1.svelte
similarity index 100%
rename from src/routes/console/wizard/feedback/step1.svelte
rename to src/routes/(console)/wizard/feedback/step1.svelte
diff --git a/src/routes/console/wizard/feedback/step2.svelte b/src/routes/(console)/wizard/feedback/step2.svelte
similarity index 100%
rename from src/routes/console/wizard/feedback/step2.svelte
rename to src/routes/(console)/wizard/feedback/step2.svelte
diff --git a/src/routes/console/wizard/support/mobileSupportModal.svelte b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
similarity index 100%
rename from src/routes/console/wizard/support/mobileSupportModal.svelte
rename to src/routes/(console)/wizard/support/mobileSupportModal.svelte
diff --git a/src/routes/console/wizard/support/step1.svelte b/src/routes/(console)/wizard/support/step1.svelte
similarity index 100%
rename from src/routes/console/wizard/support/step1.svelte
rename to src/routes/(console)/wizard/support/step1.svelte
diff --git a/src/routes/console/wizard/support/store.ts b/src/routes/(console)/wizard/support/store.ts
similarity index 100%
rename from src/routes/console/wizard/support/store.ts
rename to src/routes/(console)/wizard/support/store.ts
diff --git a/src/routes/git/+layout.svelte b/src/routes/(others)/auth/+layout.svelte
similarity index 73%
rename from src/routes/git/+layout.svelte
rename to src/routes/(others)/auth/+layout.svelte
index f2ffcf1d2..24921622c 100644
--- a/src/routes/git/+layout.svelte
+++ b/src/routes/(others)/auth/+layout.svelte
@@ -1,6 +1,6 @@
 <script>
     import { Container } from '$lib/layout';
-    import { loading } from '../store';
+    import { loading } from '$routes/store';
 
     loading.set(false);
 </script>
diff --git a/src/routes/auth/magic-url/+page.svelte b/src/routes/(others)/auth/magic-url/+page.svelte
similarity index 100%
rename from src/routes/auth/magic-url/+page.svelte
rename to src/routes/(others)/auth/magic-url/+page.svelte
diff --git a/src/routes/auth/oauth2/failure/+page.svelte b/src/routes/(others)/auth/oauth2/failure/+page.svelte
similarity index 100%
rename from src/routes/auth/oauth2/failure/+page.svelte
rename to src/routes/(others)/auth/oauth2/failure/+page.svelte
diff --git a/src/routes/auth/oauth2/success/+page.svelte b/src/routes/(others)/auth/oauth2/success/+page.svelte
similarity index 100%
rename from src/routes/auth/oauth2/success/+page.svelte
rename to src/routes/(others)/auth/oauth2/success/+page.svelte
diff --git a/src/routes/card/+layout.svelte b/src/routes/(others)/card/+layout.svelte
similarity index 86%
rename from src/routes/card/+layout.svelte
rename to src/routes/(others)/card/+layout.svelte
index 23fdb4a3d..eaebf310b 100644
--- a/src/routes/card/+layout.svelte
+++ b/src/routes/(others)/card/+layout.svelte
@@ -4,10 +4,11 @@
     import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg';
     import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
     import Footer from '$lib/layout/footer.svelte';
+    import { base } from '$app/paths';
 </script>
 
 <Shell>
-    <a class="logo" slot="header" href={`/console`}>
+    <a class="logo" slot="header" href={base}>
         <img
             src={$app.themeInUse == 'dark' ? AppwriteLogoDark : AppwriteLogoLight}
             width="120"
diff --git a/src/routes/card/+page.ts b/src/routes/(others)/card/+page.ts
similarity index 100%
rename from src/routes/card/+page.ts
rename to src/routes/(others)/card/+page.ts
diff --git a/src/routes/card/Card.svelte b/src/routes/(others)/card/Card.svelte
similarity index 100%
rename from src/routes/card/Card.svelte
rename to src/routes/(others)/card/Card.svelte
diff --git a/src/routes/card/[uid]/+page.svelte b/src/routes/(others)/card/[uid]/+page.svelte
similarity index 97%
rename from src/routes/card/[uid]/+page.svelte
rename to src/routes/(others)/card/[uid]/+page.svelte
index 4d943ea17..893d85080 100644
--- a/src/routes/card/[uid]/+page.svelte
+++ b/src/routes/(others)/card/[uid]/+page.svelte
@@ -8,6 +8,7 @@
     import { Confetti } from 'svelte-confetti';
     import { fade } from 'svelte/transition';
     import Card from '../Card.svelte';
+    import { base } from '$app/paths';
 
     export let data;
     const base64 = data.base64;
@@ -107,7 +108,7 @@
                 {/if}
                 {#if variant === 'external'}
                     <a
-                        href="/register"
+                        href={`${base}/register`}
                         class="button u-width-full-line u-main-center u-margin-block-start-16 external-btn-top"
                         data-sveltekit-reload>Claim your card</a>
                 {/if}
@@ -142,9 +143,9 @@
         </ul>
         <div class="card-footer">
             {#if variant === 'owner'}
-                <a data-sveltekit-reload href="/console" class="button">Go to console</a>
+                <a data-sveltekit-reload href={base} class="button">Go to console</a>
             {:else}
-                <a data-sveltekit-reload href="/card" class="button external-btn-bottom"
+                <a data-sveltekit-reload href={`${base}/card`} class="button external-btn-bottom"
                     >Claim your card</a>
             {/if}
         </div>
diff --git a/src/routes/card/[uid]/+page.ts b/src/routes/(others)/card/[uid]/+page.ts
similarity index 100%
rename from src/routes/card/[uid]/+page.ts
rename to src/routes/(others)/card/[uid]/+page.ts
diff --git a/src/routes/card/helpers.ts b/src/routes/(others)/card/helpers.ts
similarity index 100%
rename from src/routes/card/helpers.ts
rename to src/routes/(others)/card/helpers.ts
diff --git a/src/routes/hackathon/+layout.svelte b/src/routes/(others)/hackathon/+layout.svelte
similarity index 86%
rename from src/routes/hackathon/+layout.svelte
rename to src/routes/(others)/hackathon/+layout.svelte
index 23fdb4a3d..eaebf310b 100644
--- a/src/routes/hackathon/+layout.svelte
+++ b/src/routes/(others)/hackathon/+layout.svelte
@@ -4,10 +4,11 @@
     import AppwriteLogoDark from '$lib/images/appwrite-logo-dark.svg';
     import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
     import Footer from '$lib/layout/footer.svelte';
+    import { base } from '$app/paths';
 </script>
 
 <Shell>
-    <a class="logo" slot="header" href={`/console`}>
+    <a class="logo" slot="header" href={base}>
         <img
             src={$app.themeInUse == 'dark' ? AppwriteLogoDark : AppwriteLogoLight}
             width="120"
diff --git a/src/routes/hackathon/+page.svelte b/src/routes/(others)/hackathon/+page.svelte
similarity index 99%
rename from src/routes/hackathon/+page.svelte
rename to src/routes/(others)/hackathon/+page.svelte
index c1d933162..22271ff97 100644
--- a/src/routes/hackathon/+page.svelte
+++ b/src/routes/(others)/hackathon/+page.svelte
@@ -39,7 +39,7 @@
             </li>
         </ol>
         <div class="u-margin-block-start-32 u-flex u-gap-16">
-            <Button external href={`${base}/console`}>Go to console</Button>
+            <Button external href={base}>Go to console</Button>
             <Button
                 secondary
                 external
diff --git a/src/routes/hackathon/+page.ts b/src/routes/(others)/hackathon/+page.ts
similarity index 100%
rename from src/routes/hackathon/+page.ts
rename to src/routes/(others)/hackathon/+page.ts
diff --git a/src/routes/hackathon/cloud-dark.svg b/src/routes/(others)/hackathon/cloud-dark.svg
similarity index 100%
rename from src/routes/hackathon/cloud-dark.svg
rename to src/routes/(others)/hackathon/cloud-dark.svg
diff --git a/src/routes/hackathon/cloud-light.svg b/src/routes/(others)/hackathon/cloud-light.svg
similarity index 100%
rename from src/routes/hackathon/cloud-light.svg
rename to src/routes/(others)/hackathon/cloud-light.svg
diff --git a/src/routes/hackathon/hackathon-badge.svg b/src/routes/(others)/hackathon/hackathon-badge.svg
similarity index 100%
rename from src/routes/hackathon/hackathon-badge.svg
rename to src/routes/(others)/hackathon/hackathon-badge.svg
diff --git a/src/routes/hackathon/hashnode-dark.svg b/src/routes/(others)/hackathon/hashnode-dark.svg
similarity index 100%
rename from src/routes/hackathon/hashnode-dark.svg
rename to src/routes/(others)/hackathon/hashnode-dark.svg
diff --git a/src/routes/hackathon/hashnode-light.svg b/src/routes/(others)/hackathon/hashnode-light.svg
similarity index 100%
rename from src/routes/hackathon/hashnode-light.svg
rename to src/routes/(others)/hackathon/hashnode-light.svg
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index 8b914f299..aeb76ff92 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -1,4 +1,5 @@
 <script>
+    import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { Heading } from '$lib/components';
     import { Button } from '$lib/elements/forms';
@@ -8,5 +9,5 @@
 <Unauthenticated>
     <Heading size="1" tag="h3">{$page.error.status || 'Invalid Argument'}</Heading>
     <Heading size="3" tag="h4">{$page.error.message}</Heading>
-    <Button href="/">Back to the console</Button>
+    <Button href={base}>Back to the console</Button>
 </Unauthenticated>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 202f13850..656613414 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -6,8 +6,7 @@
     import { trackPageView } from '$lib/actions/analytics';
     import { Notifications, Progress } from '$lib/layout';
     import { app } from '$lib/stores/app';
-    import { ENV, isCloud } from '$lib/system';
-    import * as Sentry from '@sentry/svelte';
+    import { isCloud } from '$lib/system';
     import { onMount } from 'svelte';
     import Loading from './loading.svelte';
     import { loading, requestedMigration } from './store';
@@ -41,17 +40,6 @@
             requestedMigration.set(parseIfString(migrateData) as Record<string, string>);
         }
 
-        if (ENV.PROD) {
-            /**
-             * Sentry Error Logging
-             */
-            Sentry.init({
-                dsn: 'https://c7ce178bdedd486480317b72f282fd39@o1063647.ingest.sentry.io/4504158071422976',
-                integrations: [new Sentry.BrowserTracing()],
-                tracesSampleRate: 1.0
-            });
-        }
-
         /**
          * Handle initial load.
          */
@@ -87,7 +75,7 @@
                 const couponData = await sdk.forConsole.billing.getCoupon(code);
                 if (couponData?.campaign && campaigns.has(couponData.campaign)) {
                     if (user) {
-                        goto(`${base}/console/apply-credit?code=${code}`);
+                        goto(`${base}/apply-credit?code=${code}`);
                         loading.set(false);
                         return;
                     }
@@ -100,7 +88,7 @@
             const campaign = $page.url.searchParams.get('campaign');
             if (campaigns.has(campaign)) {
                 if (user) {
-                    goto(`${base}/console/apply-credit?campaign=${campaign}`);
+                    goto(`${base}/apply-credit?campaign=${campaign}`);
                     loading.set(false);
                     return;
                 }
@@ -110,7 +98,7 @@
         if (shouldRedirect(pathname, authenticationRoutes)) {
             if (user?.$id) {
                 if (shouldRedirect(pathname, acceptedAuthenticatedRoutes)) {
-                    await goto(`${base}/console`, {
+                    await goto(base, {
                         replaceState: true
                     });
                 }
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 85ad4e83d..82d874422 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -6,6 +6,7 @@ import { redirect } from '@sveltejs/kit';
 import { Dependencies } from '$lib/constants';
 import type { LayoutLoad } from './$types';
 import { redirectTo } from './store';
+import { base } from '$app/paths';
 
 export const ssr = false;
 
@@ -42,12 +43,12 @@ export const load: LayoutLoad = async ({ depends, url }) => {
         const path = url.search ? `${url.search}&${redirectUrl}` : `?${redirectUrl}`;
 
         if (error.type === 'user_more_factors_required') {
-            if (url.pathname === '/mfa') return {}; // Ensure any previous account/organizations are cleared
-            redirect(303, `/mfa${path}`);
+            if (url.pathname === `${base}/mfa`) return {}; // Ensure any previous account/organizations are cleared
+            redirect(303, `${base}/mfa${path}`);
         }
 
         if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) {
-            redirect(303, `/login${path}`);
+            redirect(303, `${base}/login${path}`);
         }
         return {}; // Ensure any previous account/organizations are cleared
     }
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
index 1068c4406..ffac694a3 100644
--- a/src/routes/+page.ts
+++ b/src/routes/+page.ts
@@ -1,10 +1,20 @@
 import { redirect } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import type { PageLoad } from './$types';
-import { user } from '$lib/stores/user';
 
-export const load: PageLoad = async () => {
-    if (!user) {
+export const load: PageLoad = async ({ parent, url }) => {
+    const { organizations, account } = await parent();
+
+    if (!account) {
         redirect(302, `${base}/login`);
     }
+
+    if (organizations.total) {
+        const teamId = account.prefs.organization ?? organizations.teams[0].$id;
+        if (!teamId) {
+            redirect(303, `${base}/account/organizations${url.search ?? ''}`);
+        } else redirect(303, `${base}/organization-${teamId}${url.search ?? ''}`);
+    } else {
+        redirect(303, `${base}/onboarding${url.search ?? ''}`);
+    }
 };
diff --git a/src/routes/console/+page.ts b/src/routes/console/+page.ts
deleted file mode 100644
index c35f5ce51..000000000
--- a/src/routes/console/+page.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { base } from '$app/paths';
-import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
-
-export const load: PageLoad = async ({ parent, url }) => {
-    const { organizations, account } = await parent();
-
-    if (organizations.total) {
-        const teamId = account.prefs.organization ?? organizations.teams[0].$id;
-        if (!teamId) {
-            redirect(303, `${base}/console/account/organizations${url.search ?? ''}`);
-        } else redirect(303, `${base}/console/organization-${teamId}${url.search ?? ''}`);
-    } else {
-        redirect(303, `${base}/console/onboarding${url.search ?? ''}`);
-    }
-};
diff --git a/svelte.config.js b/svelte.config.js
index dc1a8f5ed..f95245fdc 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -19,7 +19,7 @@ const config = {
             fallback: 'index.html'
         }),
         paths: {
-            base: ''
+            base: '/console'
         }
     },
     vitePlugin: {
diff --git a/tests/e2e/helpers/url.ts b/tests/e2e/helpers/url.ts
index f4d0e2b35..61c4c2425 100644
--- a/tests/e2e/helpers/url.ts
+++ b/tests/e2e/helpers/url.ts
@@ -1,4 +1,5 @@
 export function getOrganizationIdFromUrl(pathname: string) {
+    // TODO: use base path from svelte here
     const regex = /\/console\/organization-([^/]+)(\/.*)?/;
     const match = pathname.match(regex);
 
@@ -10,6 +11,7 @@ export function getOrganizationIdFromUrl(pathname: string) {
 }
 
 export function getProjectIdFromUrl(pathname: string) {
+    // TODO: use base path from svelte here
     const regex = /\/console\/project-([^/]+)(\/.*)?/;
     const match = pathname.match(regex);
 
diff --git a/vercel.json b/vercel.json
index 31a34553e..13d4cf0a7 100644
--- a/vercel.json
+++ b/vercel.json
@@ -1,9 +1,15 @@
 {
+    "redirects": [
+        {
+            "source": "/",
+            "destination": "/console"
+        }
+    ],
     "rewrites": [
         {
-            "source": "/(.*)",
+            "source": "/console/(.*)",
             "destination": "/"
         }
     ],
-    "installCommand": "npm install --legacy-peer-deps"
+    "installCommand": "npm ci"
 }