middleapi · dinwwwh · Sep 10, 2025 · Sep 10, 2025 · Sep 10, 2025
diff --git a/apps/content/docs/adapters/electron.md b/apps/content/docs/adapters/electron.md
@@ -13,7 +13,6 @@ Listen for a port sent from the renderer, then upgrade it:
 
 ```ts
 import { RPCHandler } from '@orpc/server/message-port'
-import { router } from './router'
 
 const handler = new RPCHandler(router)
 

diff --git a/apps/content/docs/migrations/from-trpc.md b/apps/content/docs/migrations/from-trpc.md
@@ -239,15 +239,15 @@ The main router structure is similar between tRPC and oRPC, except in oRPC you d
 
 ::: code-group
 
-```ts [orpc/router/index.ts]
+```ts [orpc/routers/index.ts]
 import { planetRouter } from './planet'
 
 export const appRouter = {
   planet: planetRouter,
 }
 ```
 
-```ts [trpc/router/index.ts]
+```ts [trpc/routers/index.ts]
 import { planetRouter } from './planet'
 
 export const appRouter = createTRPCRouter({

diff --git a/playgrounds/astro/src/lib/orpc.ts b/playgrounds/astro/src/lib/orpc.ts
@@ -1,4 +1,4 @@
-import type { router } from '../router'
+import type { router } from '../routers'
 import type { RouterClient } from '@orpc/server'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'

diff --git a/playgrounds/astro/src/pages/api/[...rest].ts b/playgrounds/astro/src/pages/api/[...rest].ts
@@ -4,7 +4,7 @@ import { onError } from '@orpc/server'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
 import { experimental_SmartCoercionPlugin as SmartCoercionPlugin } from '@orpc/json-schema'
 import { OpenAPIReferencePlugin } from '@orpc/openapi/plugins'
-import { router } from '../../router'
+import { router } from '../../routers'
 import type { APIRoute } from 'astro'
 import { NewUserSchema, UserSchema } from '../../schemas/user'
 import { CredentialSchema, TokenSchema } from '../../schemas/auth'

diff --git a/playgrounds/astro/src/pages/rpc/[...rest].ts b/playgrounds/astro/src/pages/rpc/[...rest].ts
@@ -3,7 +3,7 @@ import type { APIRoute } from 'astro'
 import { onError } from '@orpc/server'
 import { BatchHandlerPlugin } from '@orpc/server/plugins'
 import { RPCHandler } from '@orpc/server/fetch'
-import { router } from '../../router'
+import { router } from '../../routers'
 
 const handler = new RPCHandler(router, {
   interceptors: [

diff --git a/playgrounds/astro/src/router/auth.ts → playgrounds/astro/src/routers/auth.ts b/playgrounds/astro/src/router/auth.ts → playgrounds/astro/src/routers/auth.ts
diff --git a/playgrounds/astro/src/router/index.ts → playgrounds/astro/src/routers/index.ts b/playgrounds/astro/src/router/index.ts → playgrounds/astro/src/routers/index.ts
diff --git a/playgrounds/astro/src/router/planet.ts → playgrounds/astro/src/routers/planet.ts b/playgrounds/astro/src/router/planet.ts → playgrounds/astro/src/routers/planet.ts
diff --git a/playgrounds/astro/src/router/sse.ts → playgrounds/astro/src/routers/sse.ts b/playgrounds/astro/src/router/sse.ts → playgrounds/astro/src/routers/sse.ts
diff --git a/playgrounds/browser-extension/entrypoints/background/index.ts b/playgrounds/browser-extension/entrypoints/background/index.ts
@@ -1,5 +1,5 @@
 import { RPCHandler } from '@orpc/server/message-port'
-import { router } from './router'
+import { router } from './routers'
 
 const handler = new RPCHandler(router)
 

diff --git a/...ion/entrypoints/background/router/auth.ts → ...on/entrypoints/background/routers/auth.ts b/...ion/entrypoints/background/router/auth.ts → ...on/entrypoints/background/routers/auth.ts
diff --git a/...on/entrypoints/background/router/index.ts → ...n/entrypoints/background/routers/index.ts b/...on/entrypoints/background/router/index.ts → ...n/entrypoints/background/routers/index.ts
diff --git a/...n/entrypoints/background/router/planet.ts → .../entrypoints/background/routers/planet.ts b/...n/entrypoints/background/router/planet.ts → .../entrypoints/background/routers/planet.ts
diff --git a/...sion/entrypoints/background/router/sse.ts → ...ion/entrypoints/background/routers/sse.ts b/...sion/entrypoints/background/router/sse.ts → ...ion/entrypoints/background/routers/sse.ts
diff --git a/playgrounds/browser-extension/entrypoints/popup/lib/orpc.ts b/playgrounds/browser-extension/entrypoints/popup/lib/orpc.ts
@@ -1,4 +1,4 @@
-import type { router } from '../.../../../background/router'
+import type { router } from '../.../../../background/routers'
 import type { RouterClient } from '@orpc/server'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/message-port'

diff --git a/playgrounds/bun-websocket-otel/src/index.tsx b/playgrounds/bun-websocket-otel/src/index.tsx
@@ -2,7 +2,7 @@ import './instrumentation'
 
 import { serve } from 'bun'
 import index from './index.html'
-import { router } from './router'
+import { router } from './routers'
 import { RPCHandler } from '@orpc/server/bun-ws'
 import { OTEL_TRACE_EXPORTER_URL } from './consts'
 import { trace } from '@opentelemetry/api'

diff --git a/playgrounds/bun-websocket-otel/src/lib/orpc.ts b/playgrounds/bun-websocket-otel/src/lib/orpc.ts
@@ -1,5 +1,5 @@
 import type { RouterClient } from '@orpc/server'
-import type { router } from '../router'
+import type { router } from '../routers'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/websocket'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'

diff --git a/...nds/bun-websocket-otel/src/router/auth.ts → ...ds/bun-websocket-otel/src/routers/auth.ts b/...nds/bun-websocket-otel/src/router/auth.ts → ...ds/bun-websocket-otel/src/routers/auth.ts
diff --git a/...ds/bun-websocket-otel/src/router/index.ts → ...s/bun-websocket-otel/src/routers/index.ts b/...ds/bun-websocket-otel/src/router/index.ts → ...s/bun-websocket-otel/src/routers/index.ts
diff --git a/...s/bun-websocket-otel/src/router/planet.ts → .../bun-websocket-otel/src/routers/planet.ts b/...s/bun-websocket-otel/src/router/planet.ts → .../bun-websocket-otel/src/routers/planet.ts
diff --git a/...unds/bun-websocket-otel/src/router/sse.ts → ...nds/bun-websocket-otel/src/routers/sse.ts b/...unds/bun-websocket-otel/src/router/sse.ts → ...nds/bun-websocket-otel/src/routers/sse.ts
diff --git a/playgrounds/cloudflare-worker/src/lib/orpc.ts b/playgrounds/cloudflare-worker/src/lib/orpc.ts
@@ -3,7 +3,7 @@ import { RPCLink } from '@orpc/client/fetch'
 import { DurableEventIteratorLinkPlugin } from '@orpc/experimental-durable-event-iterator/client'
 import type { RouterClient } from '@orpc/server'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'
-import type { router } from '../../worker/router'
+import type { router } from '../../worker/routers'
 
 const link = new RPCLink({
   url: `${window.location.origin}/rpc`,

diff --git a/playgrounds/cloudflare-worker/worker/index.ts b/playgrounds/cloudflare-worker/worker/index.ts
@@ -4,7 +4,7 @@ import { OpenAPIReferencePlugin } from '@orpc/openapi/plugins'
 import { experimental_SmartCoercionPlugin as SmartCoercionPlugin } from '@orpc/json-schema'
 import { upgradeDurableEventIteratorRequest } from '@orpc/experimental-durable-event-iterator/durable-object'
 import { BatchHandlerPlugin } from '@orpc/server/plugins'
-import { router } from './router'
+import { router } from './routers'
 import { onError } from '@orpc/client'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
 import { NewUserSchema, UserSchema } from './schemas/user'

diff --git a/...s/cloudflare-worker/worker/router/auth.ts → .../cloudflare-worker/worker/routers/auth.ts b/...s/cloudflare-worker/worker/router/auth.ts → .../cloudflare-worker/worker/routers/auth.ts
diff --git a/.../cloudflare-worker/worker/router/index.ts → ...cloudflare-worker/worker/routers/index.ts b/.../cloudflare-worker/worker/router/index.ts → ...cloudflare-worker/worker/routers/index.ts
diff --git a/...loudflare-worker/worker/router/message.ts → ...oudflare-worker/worker/routers/message.ts b/...loudflare-worker/worker/router/message.ts → ...oudflare-worker/worker/routers/message.ts
diff --git a/...cloudflare-worker/worker/router/planet.ts → ...loudflare-worker/worker/routers/planet.ts b/...cloudflare-worker/worker/router/planet.ts → ...loudflare-worker/worker/routers/planet.ts
diff --git a/...ds/cloudflare-worker/worker/router/sse.ts → ...s/cloudflare-worker/worker/routers/sse.ts b/...ds/cloudflare-worker/worker/router/sse.ts → ...s/cloudflare-worker/worker/routers/sse.ts
diff --git a/playgrounds/contract-first/src/main.ts b/playgrounds/contract-first/src/main.ts
@@ -4,7 +4,7 @@ import { onError } from '@orpc/server'
 import { RPCHandler } from '@orpc/server/node'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
 import { experimental_SmartCoercionPlugin as SmartCoercionPlugin } from '@orpc/json-schema'
-import { router } from './router'
+import { router } from './routers'
 import { OpenAPIReferencePlugin } from '@orpc/openapi/plugins'
 import './polyfill'
 import { NewUserSchema, UserSchema } from './schemas/user'

diff --git a/...grounds/contract-first/src/router/auth.ts → ...rounds/contract-first/src/routers/auth.ts b/...grounds/contract-first/src/router/auth.ts → ...rounds/contract-first/src/routers/auth.ts
diff --git a/...rounds/contract-first/src/router/index.ts → ...ounds/contract-first/src/routers/index.ts b/...rounds/contract-first/src/router/index.ts → ...ounds/contract-first/src/routers/index.ts
diff --git a/...ounds/contract-first/src/router/planet.ts → ...unds/contract-first/src/routers/planet.ts b/...ounds/contract-first/src/router/planet.ts → ...unds/contract-first/src/routers/planet.ts
diff --git a/playgrounds/contract-first/src/router/sse.ts → ...grounds/contract-first/src/routers/sse.ts b/playgrounds/contract-first/src/router/sse.ts → ...grounds/contract-first/src/routers/sse.ts
diff --git a/playgrounds/electron/src/main/index.ts b/playgrounds/electron/src/main/index.ts
@@ -2,7 +2,7 @@ import { app, BrowserWindow, ipcMain, shell } from 'electron'
 import { join } from 'node:path'
 import { electronApp, is, optimizer } from '@electron-toolkit/utils'
 import { RPCHandler } from '@orpc/server/message-port'
-import { router } from './router'
+import { router } from './routers'
 
 function createWindow(): void {
   // Create the browser window.

diff --git a/playgrounds/electron/src/main/router/auth.ts → ...grounds/electron/src/main/routers/auth.ts b/playgrounds/electron/src/main/router/auth.ts → ...grounds/electron/src/main/routers/auth.ts
diff --git a/...grounds/electron/src/main/router/index.ts → ...rounds/electron/src/main/routers/index.ts b/...grounds/electron/src/main/router/index.ts → ...rounds/electron/src/main/routers/index.ts
diff --git a/...rounds/electron/src/main/router/planet.ts → ...ounds/electron/src/main/routers/planet.ts b/...rounds/electron/src/main/router/planet.ts → ...ounds/electron/src/main/routers/planet.ts
diff --git a/playgrounds/electron/src/main/router/sse.ts → playgrounds/electron/src/main/routers/sse.ts b/playgrounds/electron/src/main/router/sse.ts → playgrounds/electron/src/main/routers/sse.ts
diff --git a/playgrounds/electron/src/renderer/src/lib/orpc.ts b/playgrounds/electron/src/renderer/src/lib/orpc.ts
@@ -1,4 +1,4 @@
-import type { router } from '../../../main/router'
+import type { router } from '../../../main/routers'
 import type { RouterClient } from '@orpc/server'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/message-port'

diff --git a/playgrounds/next/src/app/api/[[...rest]]/route.ts b/playgrounds/next/src/app/api/[[...rest]]/route.ts
@@ -1,4 +1,4 @@
-import { router } from '@/router'
+import { router } from '@/routers'
 import { OpenAPIHandler } from '@orpc/openapi/fetch'
 import { onError } from '@orpc/server'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'

diff --git a/playgrounds/next/src/app/rpc/[[...rest]]/route.ts b/playgrounds/next/src/app/rpc/[[...rest]]/route.ts
@@ -1,4 +1,4 @@
-import { router } from '@/router'
+import { router } from '@/routers'
 import { onError } from '@orpc/server'
 import { BatchHandlerPlugin } from '@orpc/server/plugins'
 import { RPCHandler } from '@orpc/server/fetch'

diff --git a/playgrounds/next/src/lib/orpc.server.ts b/playgrounds/next/src/lib/orpc.server.ts
@@ -1,6 +1,6 @@
 import 'server-only'
 
-import { router } from '@/router'
+import { router } from '@/routers'
 import { createRouterClient } from '@orpc/server'
 import { headers } from 'next/headers'
 

diff --git a/playgrounds/next/src/lib/orpc.ts b/playgrounds/next/src/lib/orpc.ts
@@ -1,4 +1,4 @@
-import type { router } from '@/router'
+import type { router } from '@/routers'
 import type { RouterClient } from '@orpc/server'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'

diff --git a/playgrounds/next/src/router/auth.ts → playgrounds/next/src/routers/auth.ts b/playgrounds/next/src/router/auth.ts → playgrounds/next/src/routers/auth.ts
diff --git a/playgrounds/next/src/router/index.ts → playgrounds/next/src/routers/index.ts b/playgrounds/next/src/router/index.ts → playgrounds/next/src/routers/index.ts
diff --git a/playgrounds/next/src/router/planet.ts → playgrounds/next/src/routers/planet.ts b/playgrounds/next/src/router/planet.ts → playgrounds/next/src/routers/planet.ts
diff --git a/playgrounds/next/src/router/sse.ts → playgrounds/next/src/routers/sse.ts b/playgrounds/next/src/router/sse.ts → playgrounds/next/src/routers/sse.ts
diff --git a/playgrounds/nuxt/plugins/orpc.client.ts b/playgrounds/nuxt/plugins/orpc.client.ts
@@ -1,5 +1,5 @@
 import type { RouterClient } from '@orpc/server'
-import type { router } from '~/server/router'
+import type { router } from '~/server/routers'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'

diff --git a/playgrounds/nuxt/plugins/orpc.server.ts b/playgrounds/nuxt/plugins/orpc.server.ts
@@ -1,5 +1,5 @@
 import { createRouterClient } from '@orpc/server'
-import { router } from '~/server/router'
+import { router } from '~/server/routers'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'
 
 /**

diff --git a/playgrounds/nuxt/server/router/auth.ts → playgrounds/nuxt/server/routers/auth.ts b/playgrounds/nuxt/server/router/auth.ts → playgrounds/nuxt/server/routers/auth.ts
diff --git a/playgrounds/nuxt/server/router/index.ts → playgrounds/nuxt/server/routers/index.ts b/playgrounds/nuxt/server/router/index.ts → playgrounds/nuxt/server/routers/index.ts
diff --git a/playgrounds/nuxt/server/router/planet.ts → playgrounds/nuxt/server/routers/planet.ts b/playgrounds/nuxt/server/router/planet.ts → playgrounds/nuxt/server/routers/planet.ts
diff --git a/playgrounds/nuxt/server/router/sse.ts → playgrounds/nuxt/server/routers/sse.ts b/playgrounds/nuxt/server/router/sse.ts → playgrounds/nuxt/server/routers/sse.ts
diff --git a/playgrounds/nuxt/server/routes/api/[...].ts b/playgrounds/nuxt/server/routes/api/[...].ts
@@ -2,7 +2,7 @@ import { OpenAPIHandler } from '@orpc/openapi/node'
 import { onError } from '@orpc/server'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
 import { experimental_SmartCoercionPlugin as SmartCoercionPlugin } from '@orpc/json-schema'
-import { router } from '~/server/router'
+import { router } from '~/server/routers'
 import { OpenAPIReferencePlugin } from '@orpc/openapi/plugins'
 import { NewUserSchema, UserSchema } from '~/server/schemas/user'
 import { CredentialSchema, TokenSchema } from '~/server/schemas/auth'

diff --git a/playgrounds/nuxt/server/routes/rpc/[...].ts b/playgrounds/nuxt/server/routes/rpc/[...].ts
@@ -1,6 +1,6 @@
 import { onError } from '@orpc/server'
 import { RPCHandler } from '@orpc/server/node'
-import { router } from '~/server/router'
+import { router } from '~/server/routers'
 
 const rpcHandler = new RPCHandler(router, {
   interceptors: [

diff --git a/playgrounds/solid-start/src/lib/orpc.server.ts b/playgrounds/solid-start/src/lib/orpc.server.ts
@@ -1,6 +1,6 @@
 import { createRouterClient } from '@orpc/server'
 import { getRequestEvent } from 'solid-js/web'
-import { router } from '~/router'
+import { router } from '~/routers'
 
 if (typeof window !== 'undefined') {
   throw new Error('This file should not be imported in the browser')

diff --git a/playgrounds/solid-start/src/lib/orpc.ts b/playgrounds/solid-start/src/lib/orpc.ts
@@ -3,7 +3,7 @@ if (typeof window === 'undefined') {
 }
 
 import type { RouterClient } from '@orpc/server'
-import type { router } from '~/router'
+import type { router } from '~/routers'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'

diff --git a/playgrounds/solid-start/src/router/auth.ts → playgrounds/solid-start/src/routers/auth.ts b/playgrounds/solid-start/src/router/auth.ts → playgrounds/solid-start/src/routers/auth.ts
diff --git a/playgrounds/solid-start/src/router/index.ts → playgrounds/solid-start/src/routers/index.ts b/playgrounds/solid-start/src/router/index.ts → playgrounds/solid-start/src/routers/index.ts
diff --git a/playgrounds/solid-start/src/router/planet.ts → ...grounds/solid-start/src/routers/planet.ts b/playgrounds/solid-start/src/router/planet.ts → ...grounds/solid-start/src/routers/planet.ts
diff --git a/playgrounds/solid-start/src/router/sse.ts → playgrounds/solid-start/src/routers/sse.ts b/playgrounds/solid-start/src/router/sse.ts → playgrounds/solid-start/src/routers/sse.ts
diff --git a/playgrounds/solid-start/src/routes/api/[...rest].ts b/playgrounds/solid-start/src/routes/api/[...rest].ts
@@ -1,6 +1,6 @@
 import type { APIEvent } from '@solidjs/start/server'
 import { OpenAPIHandler } from '@orpc/openapi/fetch'
-import { router } from '~/router'
+import { router } from '~/routers'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
 import { experimental_SmartCoercionPlugin as SmartCoercionPlugin } from '@orpc/json-schema'
 import { onError } from '@orpc/server'

diff --git a/playgrounds/solid-start/src/routes/rpc/[...rest].ts b/playgrounds/solid-start/src/routes/rpc/[...rest].ts
@@ -1,6 +1,6 @@
 import type { APIEvent } from '@solidjs/start/server'
 import { RPCHandler } from '@orpc/server/fetch'
-import { router } from '~/router'
+import { router } from '~/routers'
 import { onError } from '@orpc/server'
 import '~/polyfill'
 

diff --git a/playgrounds/svelte-kit/src/lib/orpc.ts b/playgrounds/svelte-kit/src/lib/orpc.ts
@@ -1,5 +1,5 @@
 import type { RouterClient } from '@orpc/server'
-import type { router } from '../router'
+import type { router } from '../routers'
 import { createORPCClient } from '@orpc/client'
 import { RPCLink } from '@orpc/client/fetch'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'

diff --git a/playgrounds/svelte-kit/src/router/auth.ts → playgrounds/svelte-kit/src/routers/auth.ts b/playgrounds/svelte-kit/src/router/auth.ts → playgrounds/svelte-kit/src/routers/auth.ts
diff --git a/playgrounds/svelte-kit/src/router/index.ts → playgrounds/svelte-kit/src/routers/index.ts b/playgrounds/svelte-kit/src/router/index.ts → playgrounds/svelte-kit/src/routers/index.ts
diff --git a/playgrounds/svelte-kit/src/router/planet.ts → playgrounds/svelte-kit/src/routers/planet.ts b/playgrounds/svelte-kit/src/router/planet.ts → playgrounds/svelte-kit/src/routers/planet.ts
diff --git a/playgrounds/svelte-kit/src/router/sse.ts → playgrounds/svelte-kit/src/routers/sse.ts b/playgrounds/svelte-kit/src/router/sse.ts → playgrounds/svelte-kit/src/routers/sse.ts
diff --git a/playgrounds/svelte-kit/src/routes/api/[...rest]/+server.ts b/playgrounds/svelte-kit/src/routes/api/[...rest]/+server.ts
@@ -1,5 +1,5 @@
 import { OpenAPIHandler } from '@orpc/openapi/fetch'
-import { router } from '../../../router'
+import { router } from '../../../routers'
 import { onError } from '@orpc/server'
 import type { RequestHandler } from '@sveltejs/kit'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'

diff --git a/playgrounds/svelte-kit/src/routes/rpc/[...rest]/+server.ts b/playgrounds/svelte-kit/src/routes/rpc/[...rest]/+server.ts
@@ -1,5 +1,5 @@
 import { RPCHandler } from '@orpc/server/fetch'
-import { router } from '../../../router'
+import { router } from '../../../routers'
 import { onError } from '@orpc/server'
 import type { RequestHandler } from '@sveltejs/kit'
 import '../../../polyfill'

diff --git a/playgrounds/tanstack-start/src/lib/orpc.ts b/playgrounds/tanstack-start/src/lib/orpc.ts
@@ -1,4 +1,4 @@
-import { router } from '~/router/index'
+import { router } from '~/routers'
 import { createRouterClient } from '@orpc/server'
 import type { RouterClient } from '@orpc/server'
 import { createORPCClient } from '@orpc/client'

diff --git a/...grounds/tanstack-start/src/router/auth.ts → ...rounds/tanstack-start/src/routers/auth.ts b/...grounds/tanstack-start/src/router/auth.ts → ...rounds/tanstack-start/src/routers/auth.ts
diff --git a/...rounds/tanstack-start/src/router/index.ts → ...ounds/tanstack-start/src/routers/index.ts b/...rounds/tanstack-start/src/router/index.ts → ...ounds/tanstack-start/src/routers/index.ts
diff --git a/...ounds/tanstack-start/src/router/planet.ts → ...unds/tanstack-start/src/routers/planet.ts b/...ounds/tanstack-start/src/router/planet.ts → ...unds/tanstack-start/src/routers/planet.ts
diff --git a/playgrounds/tanstack-start/src/router/sse.ts → ...grounds/tanstack-start/src/routers/sse.ts b/playgrounds/tanstack-start/src/router/sse.ts → ...grounds/tanstack-start/src/routers/sse.ts
diff --git a/playgrounds/tanstack-start/src/routes/api/$.ts b/playgrounds/tanstack-start/src/routes/api/$.ts
@@ -4,7 +4,7 @@ import { OpenAPIHandler } from '@orpc/openapi/fetch'
 import { ZodToJsonSchemaConverter } from '@orpc/zod/zod4'
 import { experimental_SmartCoercionPlugin as SmartCoercionPlugin } from '@orpc/json-schema'
 import { createServerFileRoute } from '@tanstack/react-start/server'
-import { router } from '~/router/index'
+import { router } from '~/routers'
 import { onError } from '@orpc/server'
 import { OpenAPIReferencePlugin } from '@orpc/openapi/plugins'
 import { NewUserSchema, UserSchema } from '~/schemas/user'

diff --git a/playgrounds/tanstack-start/src/routes/api/rpc.$.ts b/playgrounds/tanstack-start/src/routes/api/rpc.$.ts
@@ -2,7 +2,7 @@ import '~/polyfill'
 
 import { RPCHandler } from '@orpc/server/fetch'
 import { createServerFileRoute } from '@tanstack/react-start/server'
-import { router } from '~/router/index'
+import { router } from '~/routers'
 
 const handler = new RPCHandler(router)
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ Listen for a port sent from the renderer, then upgrade it: @@
     ```ts
     import { RPCHandler } from '@orpc/server/message-port'
-    import { router } from './router'
     const handler = new RPCHandler(router)
@@ Expand Down @@