diff --git a/apps/remix/app/components/general/menu-switcher.tsx b/apps/remix/app/components/general/menu-switcher.tsx
index 0ad12dc94..608106b5c 100644
--- a/apps/remix/app/components/general/menu-switcher.tsx
+++ b/apps/remix/app/components/general/menu-switcher.tsx
@@ -85,12 +85,12 @@ export const MenuSwitcher = ({ user, teams: initialTeamsData }: MenuSwitcherProp
    * seemlessly between teams and personal accounts.
    */
   const formatRedirectUrlOnSwitch = (teamUrl?: string) => {
-    const baseUrl = teamUrl ? `/t/${teamUrl}/` : '/';
+    const baseUrl = teamUrl ? `/t/${teamUrl}` : '';
 
     const currentPathname = (pathname ?? '/').replace(TEAM_URL_REGEX, '');
 
     if (currentPathname === '/templates') {
-      return `${baseUrl}templates`;
+      return `${baseUrl}/templates`;
     }
 
     return baseUrl;
diff --git a/apps/remix/package.json b/apps/remix/package.json
index bbbe66ed0..9ed2ed65a 100644
--- a/apps/remix/package.json
+++ b/apps/remix/package.json
@@ -32,57 +32,57 @@
     "@lingui/react": "^4.11.3",
     "@oslojs/crypto": "^1.0.1",
     "@oslojs/encoding": "^1.1.0",
-    "@simplewebauthn/browser": "^9.0.1",
-    "@simplewebauthn/server": "^9.0.3",
     "@react-router/node": "^7.1.5",
     "@react-router/serve": "^7.1.5",
+    "@simplewebauthn/browser": "^9.0.1",
+    "@simplewebauthn/server": "^9.0.3",
     "autoprefixer": "^10.4.13",
     "colord": "^2.9.3",
     "framer-motion": "^10.12.8",
     "hono": "4.6.15",
     "hono-react-router-adapter": "^0.6.2",
     "input-otp": "^1.2.4",
-    "luxon": "^3.4.0",
-    "lucide-react": "^0.279.0",
     "isbot": "^5.1.17",
     "jsonwebtoken": "^9.0.2",
+    "lucide-react": "^0.279.0",
+    "luxon": "^3.4.0",
     "papaparse": "^5.4.1",
     "posthog-js": "^1.75.3",
     "posthog-node": "^3.1.1",
     "react": "^18",
-    "react-dom": "^18",
-    "react-router": "^7.1.5",
     "react-call": "^1.3.0",
+    "react-dom": "^18",
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.43.9",
     "react-hotkeys-hook": "^4.4.1",
     "react-icons": "^4.11.0",
     "react-rnd": "^10.4.1",
+    "react-router": "^7.1.5",
     "recharts": "^2.7.2",
     "remeda": "^2.17.3",
     "remix-themes": "^2.0.4",
     "sharp": "0.32.6",
-    "uqr": "^0.1.2",
-    "ua-parser-js": "^1.0.37",
     "tailwindcss": "^3.4.15",
-    "ts-pattern": "^5.0.5"
+    "ts-pattern": "^5.0.5",
+    "ua-parser-js": "^1.0.37",
+    "uqr": "^0.1.2"
   },
   "devDependencies": {
     "@lingui/vite-plugin": "^5.2.0",
     "@react-router/dev": "^7.1.1",
     "@react-router/remix-routes-option-adapter": "^7.1.5",
-    "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
     "@simplewebauthn/types": "^9.0.1",
     "@types/formidable": "^2.0.6",
     "@types/luxon": "^3.3.1",
+    "@types/node": "^20",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
     "@types/ua-parser-js": "^0.7.39",
     "cross-env": "^7.0.3",
     "remix-flat-routes": "^0.8.4",
     "tsx": "^4.11.0",
     "typescript": "5.6.2",
-    "vite": "^6.0.11",
+    "vite": "^6.1.0",
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   }
diff --git a/package-lock.json b/package-lock.json
index eddf67253..83d9678da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "prettier": "^3.3.3",
         "rimraf": "^5.0.1",
         "turbo": "^1.9.3",
-        "vite": "^6.0.11"
+        "vite": "^6.1.0"
       },
       "engines": {
         "node": ">=22.0.0",
@@ -165,7 +165,7 @@
         "remix-flat-routes": "^0.8.4",
         "tsx": "^4.11.0",
         "typescript": "5.6.2",
-        "vite": "^6.0.11",
+        "vite": "^6.1.0",
         "vite-plugin-babel-macros": "^1.0.6",
         "vite-tsconfig-paths": "^5.1.4"
       }
@@ -39060,15 +39060,15 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
-      "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz",
+      "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.24.2",
-        "postcss": "^8.4.49",
-        "rollup": "^4.23.0"
+        "postcss": "^8.5.1",
+        "rollup": "^4.30.1"
       },
       "bin": {
         "vite": "bin/vite.js"
diff --git a/package.json b/package.json
index 9edb4555c..ed0cbfbe7 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "prettier": "^3.3.3",
     "rimraf": "^5.0.1",
     "turbo": "^1.9.3",
-    "vite": "^6.0.11"
+    "vite": "^6.1.0"
   },
   "name": "@documenso/root",
   "workspaces": [
diff --git a/packages/lib/server-only/team/find-team-member-invites.ts b/packages/lib/server-only/team/find-team-member-invites.ts
index aedaa441a..ccc4fbb2b 100644
--- a/packages/lib/server-only/team/find-team-member-invites.ts
+++ b/packages/lib/server-only/team/find-team-member-invites.ts
@@ -4,7 +4,7 @@ import { P, match } from 'ts-pattern';
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamMemberInviteSchema } from '@documenso/prisma/generated/zod';
+import { TeamMemberInviteSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberInviteSchema';
 
 import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../../constants/teams';
 import { type FindResultResponse, ZFindResultResponse } from '../../types/search-params';
diff --git a/packages/lib/server-only/team/find-team-members.ts b/packages/lib/server-only/team/find-team-members.ts
index 2f65d468f..bb1d4b213 100644
--- a/packages/lib/server-only/team/find-team-members.ts
+++ b/packages/lib/server-only/team/find-team-members.ts
@@ -4,7 +4,8 @@ import { P, match } from 'ts-pattern';
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamMemberSchema, UserSchema } from '@documenso/prisma/generated/zod';
+import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
+import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
 
 import type { FindResultResponse } from '../../types/search-params';
 import { ZFindResultResponse } from '../../types/search-params';
diff --git a/packages/lib/server-only/team/find-teams-pending.ts b/packages/lib/server-only/team/find-teams-pending.ts
index 9a4ac526d..e902c42ad 100644
--- a/packages/lib/server-only/team/find-teams-pending.ts
+++ b/packages/lib/server-only/team/find-teams-pending.ts
@@ -3,7 +3,7 @@ import { Prisma } from '@prisma/client';
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamPendingSchema } from '@documenso/prisma/generated/zod';
+import { TeamPendingSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamPendingSchema';
 
 import { type FindResultResponse, ZFindResultResponse } from '../../types/search-params';
 
diff --git a/packages/lib/server-only/team/get-team-invitations.ts b/packages/lib/server-only/team/get-team-invitations.ts
index aae664189..0ae3e0e5b 100644
--- a/packages/lib/server-only/team/get-team-invitations.ts
+++ b/packages/lib/server-only/team/get-team-invitations.ts
@@ -1,7 +1,8 @@
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamMemberInviteSchema, TeamSchema } from '@documenso/prisma/generated/zod';
+import { TeamMemberInviteSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberInviteSchema';
+import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
 
 export type GetTeamInvitationsOptions = {
   email: string;
diff --git a/packages/lib/server-only/team/get-team-members.ts b/packages/lib/server-only/team/get-team-members.ts
index 9d61afaed..025eb3dc3 100644
--- a/packages/lib/server-only/team/get-team-members.ts
+++ b/packages/lib/server-only/team/get-team-members.ts
@@ -1,7 +1,8 @@
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamMemberSchema, UserSchema } from '@documenso/prisma/generated/zod';
+import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
+import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
 
 export type GetTeamMembersOptions = {
   userId: number;
diff --git a/packages/lib/server-only/team/get-team.ts b/packages/lib/server-only/team/get-team.ts
index 719c0d6a3..cee09a690 100644
--- a/packages/lib/server-only/team/get-team.ts
+++ b/packages/lib/server-only/team/get-team.ts
@@ -2,12 +2,10 @@ import type { Prisma } from '@prisma/client';
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import {
-  TeamEmailSchema,
-  TeamGlobalSettingsSchema,
-  TeamSchema,
-} from '@documenso/prisma/generated/zod';
-import { TeamMemberSchema } from '@documenso/prisma/generated/zod';
+import { TeamEmailSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamEmailSchema';
+import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
+import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
+import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 
diff --git a/packages/lib/server-only/team/get-teams.ts b/packages/lib/server-only/team/get-teams.ts
index e3fb1f842..01effafa7 100644
--- a/packages/lib/server-only/team/get-teams.ts
+++ b/packages/lib/server-only/team/get-teams.ts
@@ -1,7 +1,8 @@
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamMemberSchema, TeamSchema } from '@documenso/prisma/generated/zod';
+import { TeamMemberSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamMemberSchema';
+import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
 
 export type GetTeamsOptions = {
   userId: number;
diff --git a/packages/lib/server-only/team/update-team-branding-settings.ts b/packages/lib/server-only/team/update-team-branding-settings.ts
index 11781ebcf..6ba3afc3f 100644
--- a/packages/lib/server-only/team/update-team-branding-settings.ts
+++ b/packages/lib/server-only/team/update-team-branding-settings.ts
@@ -2,7 +2,7 @@ import { TeamMemberRole } from '@prisma/client';
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod';
+import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
 
 export type UpdateTeamBrandingSettingsOptions = {
   userId: number;
diff --git a/packages/lib/server-only/team/update-team-document-settings.ts b/packages/lib/server-only/team/update-team-document-settings.ts
index 03df41055..de2f51413 100644
--- a/packages/lib/server-only/team/update-team-document-settings.ts
+++ b/packages/lib/server-only/team/update-team-document-settings.ts
@@ -3,7 +3,7 @@ import { TeamMemberRole } from '@prisma/client';
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod';
+import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
 
 import type { SupportedLanguageCodes } from '../../constants/i18n';
 
diff --git a/packages/lib/server-only/template/create-template.ts b/packages/lib/server-only/template/create-template.ts
index e5dd10ecc..16991401e 100644
--- a/packages/lib/server-only/template/create-template.ts
+++ b/packages/lib/server-only/template/create-template.ts
@@ -1,7 +1,7 @@
 import type { z } from 'zod';
 
 import { prisma } from '@documenso/prisma';
-import { TemplateSchema } from '@documenso/prisma/generated/zod';
+import { TemplateSchema } from '@documenso/prisma/generated/zod/modelSchema//TemplateSchema';
 import type { TCreateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema';
 
 export type CreateTemplateOptions = TCreateTemplateMutationSchema & {
diff --git a/packages/lib/types/document.ts b/packages/lib/types/document.ts
index 830842e83..496f37469 100644
--- a/packages/lib/types/document.ts
+++ b/packages/lib/types/document.ts
@@ -1,12 +1,10 @@
 import type { z } from 'zod';
 
-import {
-  DocumentDataSchema,
-  DocumentMetaSchema,
-  DocumentSchema,
-  TeamSchema,
-  UserSchema,
-} from '@documenso/prisma/generated/zod';
+import { DocumentDataSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentDataSchema';
+import { DocumentMetaSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentMetaSchema';
+import { DocumentSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentSchema';
+import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
 
 import { ZFieldSchema } from './field';
 import { ZRecipientLiteSchema } from './recipient';
diff --git a/packages/lib/types/field.ts b/packages/lib/types/field.ts
index da9ffc797..5b3839f0c 100644
--- a/packages/lib/types/field.ts
+++ b/packages/lib/types/field.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { FieldSchema } from '@documenso/prisma/generated/zod';
+import { FieldSchema } from '@documenso/prisma/generated/zod/modelSchema/FieldSchema';
 
 /**
  * The full field response schema.
diff --git a/packages/lib/types/recipient.ts b/packages/lib/types/recipient.ts
index 3c0fa944f..e46681f44 100644
--- a/packages/lib/types/recipient.ts
+++ b/packages/lib/types/recipient.ts
@@ -1,5 +1,6 @@
-import { TeamSchema, UserSchema } from '@documenso/prisma/generated/zod';
-import RecipientSchema from '@documenso/prisma/generated/zod/modelSchema/RecipientSchema';
+import { RecipientSchema } from '@documenso/prisma/generated/zod/modelSchema/RecipientSchema';
+import { TeamSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
 
 import { ZFieldSchema } from './field';
 
diff --git a/packages/lib/types/template.ts b/packages/lib/types/template.ts
index da3df474b..90c95466d 100644
--- a/packages/lib/types/template.ts
+++ b/packages/lib/types/template.ts
@@ -1,13 +1,11 @@
 import type { z } from 'zod';
 
-import {
-  DocumentDataSchema,
-  TeamSchema,
-  TemplateDirectLinkSchema,
-  TemplateMetaSchema,
-  TemplateSchema,
-  UserSchema,
-} from '@documenso/prisma/generated/zod';
+import { DocumentDataSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentDataSchema';
+import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
+import { TemplateDirectLinkSchema } from '@documenso/prisma/generated/zod/modelSchema/TemplateDirectLinkSchema';
+import { TemplateMetaSchema } from '@documenso/prisma/generated/zod/modelSchema/TemplateMetaSchema';
+import { TemplateSchema } from '@documenso/prisma/generated/zod/modelSchema/TemplateSchema';
+import { UserSchema } from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
 
 import { ZFieldSchema } from './field';
 import { ZRecipientLiteSchema } from './recipient';
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 1e82705db..3085ef2b1 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -13,7 +13,7 @@ generator json {
 generator zod {
   provider         = "zod-prisma-types"
   createInputTypes = false
-  writeBarrelFiles = true
+  writeBarrelFiles = false
   useMultipleFiles = true
 }
 
diff --git a/packages/trpc/server/template-router/schema.ts b/packages/trpc/server/template-router/schema.ts
index 620843d1e..fa9d25e82 100644
--- a/packages/trpc/server/template-router/schema.ts
+++ b/packages/trpc/server/template-router/schema.ts
@@ -13,7 +13,7 @@ import {
   ZTemplateManySchema,
   ZTemplateSchema,
 } from '@documenso/lib/types/template';
-import { TemplateDirectLinkSchema } from '@documenso/prisma/generated/zod';
+import { TemplateDirectLinkSchema } from '@documenso/prisma/generated/zod/modelSchema/TemplateDirectLinkSchema';
 
 import {
   ZDocumentMetaDateFormatSchema,