chore: move start e2e and example projects from ./app to ./src (#3712)

Using the below setting, the examples and e2e projects opt into the future behavior of using `./src` as the app directory, rather than './app': ```ts tsr: { appDirectory: 'src', }, ``` The `./src` directory is typically used for pure-TS Router projects, as well as CRA. Thus this reduces the churn for a TS Router SPA to opt into server features with TS Start.
TanStack · Mar 9, 2025 · f616ba9 · f616ba9
1 parent a73bf99
commit f616ba9
Show file tree

Hide file tree

Showing 693 changed files with 199 additions and 120 deletions.
diff --git a/e2e/react-start/basic-auth/app.config.ts b/e2e/react-start/basic-auth/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/react-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/e2e/react-start/basic-auth/app/client.tsx → e2e/react-start/basic-auth/src/client.tsx b/e2e/react-start/basic-auth/app/client.tsx → e2e/react-start/basic-auth/src/client.tsx
diff --git a/...-start/basic-auth/app/components/Auth.tsx → ...-start/basic-auth/src/components/Auth.tsx b/...-start/basic-auth/app/components/Auth.tsx → ...-start/basic-auth/src/components/Auth.tsx
diff --git a/...h/app/components/DefaultCatchBoundary.tsx → ...h/src/components/DefaultCatchBoundary.tsx b/...h/app/components/DefaultCatchBoundary.tsx → ...h/src/components/DefaultCatchBoundary.tsx
diff --git a/...start/basic-auth/app/components/Login.tsx → ...start/basic-auth/src/components/Login.tsx b/...start/basic-auth/app/components/Login.tsx → ...start/basic-auth/src/components/Login.tsx
diff --git a/...rt/basic-auth/app/components/NotFound.tsx → ...rt/basic-auth/src/components/NotFound.tsx b/...rt/basic-auth/app/components/NotFound.tsx → ...rt/basic-auth/src/components/NotFound.tsx
diff --git a/...start/basic-auth/app/hooks/useMutation.ts → ...start/basic-auth/src/hooks/useMutation.ts b/...start/basic-auth/app/hooks/useMutation.ts → ...start/basic-auth/src/hooks/useMutation.ts
diff --git a/...act-start/basic-auth/app/routeTree.gen.ts → ...act-start/basic-auth/src/routeTree.gen.ts b/...act-start/basic-auth/app/routeTree.gen.ts → ...act-start/basic-auth/src/routeTree.gen.ts
diff --git a/e2e/react-start/basic-auth/app/router.tsx → e2e/react-start/basic-auth/src/router.tsx b/e2e/react-start/basic-auth/app/router.tsx → e2e/react-start/basic-auth/src/router.tsx
diff --git a/...ct-start/basic-auth/app/routes/__root.tsx → ...ct-start/basic-auth/src/routes/__root.tsx b/...ct-start/basic-auth/app/routes/__root.tsx → ...ct-start/basic-auth/src/routes/__root.tsx
diff --git a/...t-start/basic-auth/app/routes/_authed.tsx → ...t-start/basic-auth/src/routes/_authed.tsx b/...t-start/basic-auth/app/routes/_authed.tsx → ...t-start/basic-auth/src/routes/_authed.tsx
diff --git a/...auth/app/routes/_authed/posts.$postId.tsx → ...auth/src/routes/_authed/posts.$postId.tsx b/...auth/app/routes/_authed/posts.$postId.tsx → ...auth/src/routes/_authed/posts.$postId.tsx
diff --git a/...c-auth/app/routes/_authed/posts.index.tsx → ...c-auth/src/routes/_authed/posts.index.tsx b/...c-auth/app/routes/_authed/posts.index.tsx → ...c-auth/src/routes/_authed/posts.index.tsx
diff --git a/...t/basic-auth/app/routes/_authed/posts.tsx → ...t/basic-auth/src/routes/_authed/posts.tsx b/...t/basic-auth/app/routes/_authed/posts.tsx → ...t/basic-auth/src/routes/_authed/posts.tsx
diff --git a/...act-start/basic-auth/app/routes/index.tsx → ...act-start/basic-auth/src/routes/index.tsx b/...act-start/basic-auth/app/routes/index.tsx → ...act-start/basic-auth/src/routes/index.tsx
diff --git a/...act-start/basic-auth/app/routes/login.tsx → ...act-start/basic-auth/src/routes/login.tsx b/...act-start/basic-auth/app/routes/login.tsx → ...act-start/basic-auth/src/routes/login.tsx
diff --git a/...ct-start/basic-auth/app/routes/logout.tsx → ...ct-start/basic-auth/src/routes/logout.tsx b/...ct-start/basic-auth/app/routes/logout.tsx → ...ct-start/basic-auth/src/routes/logout.tsx
diff --git a/...ct-start/basic-auth/app/routes/signup.tsx → ...ct-start/basic-auth/src/routes/signup.tsx b/...ct-start/basic-auth/app/routes/signup.tsx → ...ct-start/basic-auth/src/routes/signup.tsx
diff --git a/e2e/react-start/basic-auth/app/ssr.tsx → e2e/react-start/basic-auth/src/ssr.tsx b/e2e/react-start/basic-auth/app/ssr.tsx → e2e/react-start/basic-auth/src/ssr.tsx
diff --git a/...react-start/basic-auth/app/styles/app.css → ...react-start/basic-auth/src/styles/app.css b/...react-start/basic-auth/app/styles/app.css → ...react-start/basic-auth/src/styles/app.css
diff --git a/...react-start/basic-auth/app/utils/posts.ts → ...react-start/basic-auth/src/utils/posts.ts b/...react-start/basic-auth/app/utils/posts.ts → ...react-start/basic-auth/src/utils/posts.ts
diff --git a/...eact-start/basic-auth/app/utils/prisma.ts → ...eact-start/basic-auth/src/utils/prisma.ts b/...eact-start/basic-auth/app/utils/prisma.ts → ...eact-start/basic-auth/src/utils/prisma.ts
diff --git a/e2e/react-start/basic-auth/app/utils/seo.ts → e2e/react-start/basic-auth/src/utils/seo.ts b/e2e/react-start/basic-auth/app/utils/seo.ts → e2e/react-start/basic-auth/src/utils/seo.ts
diff --git a/...act-start/basic-auth/app/utils/session.ts → ...act-start/basic-auth/src/utils/session.ts b/...act-start/basic-auth/app/utils/session.ts → ...act-start/basic-auth/src/utils/session.ts
@@ -1,4 +1,4 @@
-// app/services/session.server.ts
+// src/services/session.server.ts
 import { useSession } from '@tanstack/react-start/server'
 import type { User } from '@prisma/client'
 

diff --git a/e2e/react-start/basic-auth/tailwind.config.mjs b/e2e/react-start/basic-auth/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/basic-auth/tsconfig.json b/e2e/react-start/basic-auth/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/basic-react-query/app.config.ts b/e2e/react-start/basic-react-query/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/react-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/e2e/react-start/basic-react-query/app/api.ts → e2e/react-start/basic-react-query/src/api.ts b/e2e/react-start/basic-react-query/app/api.ts → e2e/react-start/basic-react-query/src/api.ts
diff --git a/...ct-start/basic-react-query/app/client.tsx → ...ct-start/basic-react-query/src/client.tsx b/...ct-start/basic-react-query/app/client.tsx → ...ct-start/basic-react-query/src/client.tsx
diff --git a/...y/app/components/DefaultCatchBoundary.tsx → ...y/src/components/DefaultCatchBoundary.tsx b/...y/app/components/DefaultCatchBoundary.tsx → ...y/src/components/DefaultCatchBoundary.tsx
diff --git a/...c-react-query/app/components/NotFound.tsx → ...c-react-query/src/components/NotFound.tsx b/...c-react-query/app/components/NotFound.tsx → ...c-react-query/src/components/NotFound.tsx
diff --git a/...rt/basic-react-query/app/routeTree.gen.ts → ...rt/basic-react-query/src/routeTree.gen.ts b/...rt/basic-react-query/app/routeTree.gen.ts → ...rt/basic-react-query/src/routeTree.gen.ts
diff --git a/...ct-start/basic-react-query/app/router.tsx → ...ct-start/basic-react-query/src/router.tsx b/...ct-start/basic-react-query/app/router.tsx → ...ct-start/basic-react-query/src/router.tsx
diff --git a/...t/basic-react-query/app/routes/__root.tsx → ...t/basic-react-query/src/routes/__root.tsx b/...t/basic-react-query/app/routes/__root.tsx → ...t/basic-react-query/src/routes/__root.tsx
diff --git a/.../basic-react-query/app/routes/_layout.tsx → .../basic-react-query/src/routes/_layout.tsx b/.../basic-react-query/app/routes/_layout.tsx → .../basic-react-query/src/routes/_layout.tsx
diff --git a/...ct-query/app/routes/_layout/_layout-2.tsx → ...ct-query/src/routes/_layout/_layout-2.tsx b/...ct-query/app/routes/_layout/_layout-2.tsx → ...ct-query/src/routes/_layout/_layout-2.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx b/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx b/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx
diff --git a/...basic-react-query/app/routes/api.users.ts → ...basic-react-query/src/routes/api.users.ts b/...basic-react-query/app/routes/api.users.ts → ...basic-react-query/src/routes/api.users.ts
diff --git a/...c-react-query/app/routes/api/users.$id.ts → ...c-react-query/src/routes/api/users.$id.ts b/...c-react-query/app/routes/api/users.$id.ts → ...c-react-query/src/routes/api/users.$id.ts
diff --git a/...basic-react-query/app/routes/deferred.tsx → ...basic-react-query/src/routes/deferred.tsx b/...basic-react-query/app/routes/deferred.tsx → ...basic-react-query/src/routes/deferred.tsx
diff --git a/...rt/basic-react-query/app/routes/index.tsx → ...rt/basic-react-query/src/routes/index.tsx b/...rt/basic-react-query/app/routes/index.tsx → ...rt/basic-react-query/src/routes/index.tsx
diff --git a/...-react-query/app/routes/posts.$postId.tsx → ...-react-query/src/routes/posts.$postId.tsx b/...-react-query/app/routes/posts.$postId.tsx → ...-react-query/src/routes/posts.$postId.tsx
diff --git a/...ic-react-query/app/routes/posts.index.tsx → ...ic-react-query/src/routes/posts.index.tsx b/...ic-react-query/app/routes/posts.index.tsx → ...ic-react-query/src/routes/posts.index.tsx
diff --git a/...rt/basic-react-query/app/routes/posts.tsx → ...rt/basic-react-query/src/routes/posts.tsx b/...rt/basic-react-query/app/routes/posts.tsx → ...rt/basic-react-query/src/routes/posts.tsx
diff --git a/...-query/app/routes/posts_.$postId.deep.tsx → ...-query/src/routes/posts_.$postId.deep.tsx b/...-query/app/routes/posts_.$postId.deep.tsx → ...-query/src/routes/posts_.$postId.deep.tsx
diff --git a/...basic-react-query/app/routes/redirect.tsx → ...basic-react-query/src/routes/redirect.tsx b/...basic-react-query/app/routes/redirect.tsx → ...basic-react-query/src/routes/redirect.tsx
diff --git a/...-react-query/app/routes/users.$userId.tsx → ...-react-query/src/routes/users.$userId.tsx b/...-react-query/app/routes/users.$userId.tsx → ...-react-query/src/routes/users.$userId.tsx
diff --git a/...ic-react-query/app/routes/users.index.tsx → ...ic-react-query/src/routes/users.index.tsx b/...ic-react-query/app/routes/users.index.tsx → ...ic-react-query/src/routes/users.index.tsx
diff --git a/...rt/basic-react-query/app/routes/users.tsx → ...rt/basic-react-query/src/routes/users.tsx b/...rt/basic-react-query/app/routes/users.tsx → ...rt/basic-react-query/src/routes/users.tsx
diff --git a/...react-start/basic-react-query/app/ssr.tsx → ...react-start/basic-react-query/src/ssr.tsx b/...react-start/basic-react-query/app/ssr.tsx → ...react-start/basic-react-query/src/ssr.tsx
diff --git a/...tart/basic-react-query/app/styles/app.css → ...tart/basic-react-query/src/styles/app.css b/...tart/basic-react-query/app/styles/app.css → ...tart/basic-react-query/src/styles/app.css
diff --git a/...art/basic-react-query/app/utils/posts.tsx → ...art/basic-react-query/src/utils/posts.tsx b/...art/basic-react-query/app/utils/posts.tsx → ...art/basic-react-query/src/utils/posts.tsx
diff --git a/...-start/basic-react-query/app/utils/seo.ts → ...-start/basic-react-query/src/utils/seo.ts b/...-start/basic-react-query/app/utils/seo.ts → ...-start/basic-react-query/src/utils/seo.ts
diff --git a/...art/basic-react-query/app/utils/users.tsx → ...art/basic-react-query/src/utils/users.tsx b/...art/basic-react-query/app/utils/users.tsx → ...art/basic-react-query/src/utils/users.tsx
diff --git a/e2e/react-start/basic-react-query/tailwind.config.mjs b/e2e/react-start/basic-react-query/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/basic-react-query/tsconfig.json b/e2e/react-start/basic-react-query/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/basic-rsc/app.config.ts b/e2e/react-start/basic-rsc/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/react-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/e2e/react-start/basic-rsc/app/client.tsx → e2e/react-start/basic-rsc/src/client.tsx b/e2e/react-start/basic-rsc/app/client.tsx → e2e/react-start/basic-rsc/src/client.tsx
diff --git a/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx b/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx
diff --git a/...art/basic-rsc/app/components/NotFound.tsx → ...art/basic-rsc/src/components/NotFound.tsx b/...art/basic-rsc/app/components/NotFound.tsx → ...art/basic-rsc/src/components/NotFound.tsx
diff --git a/...eact-start/basic-rsc/app/routeTree.gen.ts → ...eact-start/basic-rsc/src/routeTree.gen.ts b/...eact-start/basic-rsc/app/routeTree.gen.ts → ...eact-start/basic-rsc/src/routeTree.gen.ts
diff --git a/e2e/react-start/basic-rsc/app/router.tsx → e2e/react-start/basic-rsc/src/router.tsx b/e2e/react-start/basic-rsc/app/router.tsx → e2e/react-start/basic-rsc/src/router.tsx
diff --git a/...act-start/basic-rsc/app/routes/__root.tsx → ...act-start/basic-rsc/src/routes/__root.tsx b/...act-start/basic-rsc/app/routes/__root.tsx → ...act-start/basic-rsc/src/routes/__root.tsx
diff --git a/...ct-start/basic-rsc/app/routes/_layout.tsx → ...ct-start/basic-rsc/src/routes/_layout.tsx b/...ct-start/basic-rsc/app/routes/_layout.tsx → ...ct-start/basic-rsc/src/routes/_layout.tsx
diff --git a/...asic-rsc/app/routes/_layout/_layout-2.tsx → ...asic-rsc/src/routes/_layout/_layout-2.tsx b/...asic-rsc/app/routes/_layout/_layout-2.tsx → ...asic-rsc/src/routes/_layout/_layout-2.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx b/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx b/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx
diff --git a/...eact-start/basic-rsc/app/routes/index.tsx → ...eact-start/basic-rsc/src/routes/index.tsx b/...eact-start/basic-rsc/app/routes/index.tsx → ...eact-start/basic-rsc/src/routes/index.tsx
diff --git a/...rt/basic-rsc/app/routes/posts.$postId.tsx → ...rt/basic-rsc/src/routes/posts.$postId.tsx b/...rt/basic-rsc/app/routes/posts.$postId.tsx → ...rt/basic-rsc/src/routes/posts.$postId.tsx
diff --git a/...tart/basic-rsc/app/routes/posts.index.tsx → ...tart/basic-rsc/src/routes/posts.index.tsx b/...tart/basic-rsc/app/routes/posts.index.tsx → ...tart/basic-rsc/src/routes/posts.index.tsx
diff --git a/...eact-start/basic-rsc/app/routes/posts.tsx → ...eact-start/basic-rsc/src/routes/posts.tsx b/...eact-start/basic-rsc/app/routes/posts.tsx → ...eact-start/basic-rsc/src/routes/posts.tsx
diff --git a/...ic-rsc/app/routes/posts_.$postId.deep.tsx → ...ic-rsc/src/routes/posts_.$postId.deep.tsx b/...ic-rsc/app/routes/posts_.$postId.deep.tsx → ...ic-rsc/src/routes/posts_.$postId.deep.tsx
diff --git a/e2e/react-start/basic-rsc/app/ssr.tsx → e2e/react-start/basic-rsc/src/ssr.tsx b/e2e/react-start/basic-rsc/app/ssr.tsx → e2e/react-start/basic-rsc/src/ssr.tsx
diff --git a/e2e/react-start/basic-rsc/app/styles/app.css → e2e/react-start/basic-rsc/src/styles/app.css b/e2e/react-start/basic-rsc/app/styles/app.css → e2e/react-start/basic-rsc/src/styles/app.css
diff --git a/...react-start/basic-rsc/app/utils/posts.tsx → ...react-start/basic-rsc/src/utils/posts.tsx b/...react-start/basic-rsc/app/utils/posts.tsx → ...react-start/basic-rsc/src/utils/posts.tsx
diff --git a/...start/basic-rsc/app/utils/renderPosts.tsx → ...start/basic-rsc/src/utils/renderPosts.tsx b/...start/basic-rsc/app/utils/renderPosts.tsx → ...start/basic-rsc/src/utils/renderPosts.tsx
diff --git a/e2e/react-start/basic-rsc/app/utils/seo.ts → e2e/react-start/basic-rsc/src/utils/seo.ts b/e2e/react-start/basic-rsc/app/utils/seo.ts → e2e/react-start/basic-rsc/src/utils/seo.ts
diff --git a/e2e/react-start/basic-rsc/tailwind.config.mjs b/e2e/react-start/basic-rsc/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/basic-rsc/tsconfig.json b/e2e/react-start/basic-rsc/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/basic-tsr-config/tsconfig.json b/e2e/react-start/basic-tsr-config/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/app/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/basic/app.config.ts b/e2e/react-start/basic/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/e2e/react-start/basic/app/api.ts → e2e/react-start/basic/src/api.ts b/e2e/react-start/basic/app/api.ts → e2e/react-start/basic/src/api.ts
diff --git a/e2e/react-start/basic/app/client.tsx → e2e/react-start/basic/src/client.tsx b/e2e/react-start/basic/app/client.tsx → e2e/react-start/basic/src/client.tsx
diff --git a/...rt/basic/app/components/CustomMessage.tsx → ...rt/basic/src/components/CustomMessage.tsx b/...rt/basic/app/components/CustomMessage.tsx → ...rt/basic/src/components/CustomMessage.tsx
diff --git a/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx b/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx
diff --git a/...t-start/basic/app/components/NotFound.tsx → ...t-start/basic/src/components/NotFound.tsx b/...t-start/basic/app/components/NotFound.tsx → ...t-start/basic/src/components/NotFound.tsx
diff --git a/.../basic/app/components/RedirectOnClick.tsx → .../basic/src/components/RedirectOnClick.tsx b/.../basic/app/components/RedirectOnClick.tsx → .../basic/src/components/RedirectOnClick.tsx
diff --git a/...art/basic/app/components/throwRedirect.ts → ...art/basic/src/components/throwRedirect.ts b/...art/basic/app/components/throwRedirect.ts → ...art/basic/src/components/throwRedirect.ts
diff --git a/e2e/react-start/basic/app/routeTree.gen.ts → e2e/react-start/basic/src/routeTree.gen.ts b/e2e/react-start/basic/app/routeTree.gen.ts → e2e/react-start/basic/src/routeTree.gen.ts
diff --git a/e2e/react-start/basic/app/router.tsx → e2e/react-start/basic/src/router.tsx b/e2e/react-start/basic/app/router.tsx → e2e/react-start/basic/src/router.tsx
diff --git a/e2e/react-start/basic/app/routes/__root.tsx → e2e/react-start/basic/src/routes/__root.tsx b/e2e/react-start/basic/app/routes/__root.tsx → e2e/react-start/basic/src/routes/__root.tsx
diff --git a/e2e/react-start/basic/app/routes/_layout.tsx → e2e/react-start/basic/src/routes/_layout.tsx b/e2e/react-start/basic/app/routes/_layout.tsx → e2e/react-start/basic/src/routes/_layout.tsx
diff --git a/...rt/basic/app/routes/_layout/_layout-2.tsx → ...rt/basic/src/routes/_layout/_layout-2.tsx b/...rt/basic/app/routes/_layout/_layout-2.tsx → ...rt/basic/src/routes/_layout/_layout-2.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx b/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx b/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx
diff --git a/...react-start/basic/app/routes/api.users.ts → ...react-start/basic/src/routes/api.users.ts b/...react-start/basic/app/routes/api.users.ts → ...react-start/basic/src/routes/api.users.ts
diff --git a/...t-start/basic/app/routes/api/users.$id.ts → ...t-start/basic/src/routes/api/users.$id.ts b/...t-start/basic/app/routes/api/users.$id.ts → ...t-start/basic/src/routes/api/users.$id.ts
diff --git a/...react-start/basic/app/routes/deferred.tsx → ...react-start/basic/src/routes/deferred.tsx b/...react-start/basic/app/routes/deferred.tsx → ...react-start/basic/src/routes/deferred.tsx
diff --git a/e2e/react-start/basic/app/routes/index.tsx → e2e/react-start/basic/src/routes/index.tsx b/e2e/react-start/basic/app/routes/index.tsx → e2e/react-start/basic/src/routes/index.tsx
diff --git a/e2e/react-start/basic/app/routes/links.tsx → e2e/react-start/basic/src/routes/links.tsx b/e2e/react-start/basic/app/routes/links.tsx → e2e/react-start/basic/src/routes/links.tsx
diff --git a/...tart/basic/app/routes/not-found/index.tsx → ...tart/basic/src/routes/not-found/index.tsx b/...tart/basic/app/routes/not-found/index.tsx → ...tart/basic/src/routes/not-found/index.tsx
diff --git a/...tart/basic/app/routes/not-found/route.tsx → ...tart/basic/src/routes/not-found/route.tsx b/...tart/basic/app/routes/not-found/route.tsx → ...tart/basic/src/routes/not-found/route.tsx
diff --git a/...c/app/routes/not-found/via-beforeLoad.tsx → ...c/src/routes/not-found/via-beforeLoad.tsx b/...c/app/routes/not-found/via-beforeLoad.tsx → ...c/src/routes/not-found/via-beforeLoad.tsx
diff --git a/...basic/app/routes/not-found/via-loader.tsx → ...basic/src/routes/not-found/via-loader.tsx b/...basic/app/routes/not-found/via-loader.tsx → ...basic/src/routes/not-found/via-loader.tsx
diff --git a/...-start/basic/app/routes/posts.$postId.tsx → ...-start/basic/src/routes/posts.$postId.tsx b/...-start/basic/app/routes/posts.$postId.tsx → ...-start/basic/src/routes/posts.$postId.tsx
diff --git a/...ct-start/basic/app/routes/posts.index.tsx → ...ct-start/basic/src/routes/posts.index.tsx b/...ct-start/basic/app/routes/posts.index.tsx → ...ct-start/basic/src/routes/posts.index.tsx
diff --git a/e2e/react-start/basic/app/routes/posts.tsx → e2e/react-start/basic/src/routes/posts.tsx b/e2e/react-start/basic/app/routes/posts.tsx → e2e/react-start/basic/src/routes/posts.tsx
diff --git a/.../basic/app/routes/posts_.$postId.deep.tsx → .../basic/src/routes/posts_.$postId.deep.tsx b/.../basic/app/routes/posts_.$postId.deep.tsx → .../basic/src/routes/posts_.$postId.deep.tsx
diff --git a/...art/basic/app/routes/redirect/$target.tsx → ...art/basic/src/routes/redirect/$target.tsx b/...art/basic/app/routes/redirect/$target.tsx → ...art/basic/src/routes/redirect/$target.tsx
diff --git a/...sic/app/routes/redirect/$target/index.tsx → ...sic/src/routes/redirect/$target/index.tsx b/...sic/app/routes/redirect/$target/index.tsx → ...sic/src/routes/redirect/$target/index.tsx
diff --git a/...outes/redirect/$target/serverFn/index.tsx → ...outes/redirect/$target/serverFn/index.tsx b/...outes/redirect/$target/serverFn/index.tsx → ...outes/redirect/$target/serverFn/index.tsx
diff --git a/...irect/$target/serverFn/via-beforeLoad.tsx → ...irect/$target/serverFn/via-beforeLoad.tsx b/...irect/$target/serverFn/via-beforeLoad.tsx → ...irect/$target/serverFn/via-beforeLoad.tsx
diff --git a/.../redirect/$target/serverFn/via-loader.tsx → .../redirect/$target/serverFn/via-loader.tsx b/.../redirect/$target/serverFn/via-loader.tsx → .../redirect/$target/serverFn/via-loader.tsx
diff --git a/...rect/$target/serverFn/via-useServerFn.tsx → ...rect/$target/serverFn/via-useServerFn.tsx b/...rect/$target/serverFn/via-useServerFn.tsx → ...rect/$target/serverFn/via-useServerFn.tsx
diff --git a/...outes/redirect/$target/via-beforeLoad.tsx → ...outes/redirect/$target/via-beforeLoad.tsx b/...outes/redirect/$target/via-beforeLoad.tsx → ...outes/redirect/$target/via-beforeLoad.tsx
diff --git a/...pp/routes/redirect/$target/via-loader.tsx → ...rc/routes/redirect/$target/via-loader.tsx b/...pp/routes/redirect/$target/via-loader.tsx → ...rc/routes/redirect/$target/via-loader.tsx
diff --git a/...start/basic/app/routes/redirect/index.tsx → ...start/basic/src/routes/redirect/index.tsx b/...start/basic/app/routes/redirect/index.tsx → ...start/basic/src/routes/redirect/index.tsx
diff --git a/e2e/react-start/basic/app/routes/scripts.tsx → e2e/react-start/basic/src/routes/scripts.tsx b/e2e/react-start/basic/app/routes/scripts.tsx → e2e/react-start/basic/src/routes/scripts.tsx
diff --git a/...-start/basic/app/routes/search-params.tsx → ...-start/basic/src/routes/search-params.tsx b/...-start/basic/app/routes/search-params.tsx → ...-start/basic/src/routes/search-params.tsx
diff --git a/e2e/react-start/basic/app/routes/stream.tsx → e2e/react-start/basic/src/routes/stream.tsx b/e2e/react-start/basic/app/routes/stream.tsx → e2e/react-start/basic/src/routes/stream.tsx
diff --git a/...-start/basic/app/routes/users.$userId.tsx → ...-start/basic/src/routes/users.$userId.tsx b/...-start/basic/app/routes/users.$userId.tsx → ...-start/basic/src/routes/users.$userId.tsx
diff --git a/...ct-start/basic/app/routes/users.index.tsx → ...ct-start/basic/src/routes/users.index.tsx b/...ct-start/basic/app/routes/users.index.tsx → ...ct-start/basic/src/routes/users.index.tsx
diff --git a/e2e/react-start/basic/app/routes/users.tsx → e2e/react-start/basic/src/routes/users.tsx b/e2e/react-start/basic/app/routes/users.tsx → e2e/react-start/basic/src/routes/users.tsx
diff --git a/e2e/react-start/basic/app/ssr.tsx → e2e/react-start/basic/src/ssr.tsx b/e2e/react-start/basic/app/ssr.tsx → e2e/react-start/basic/src/ssr.tsx
diff --git a/e2e/react-start/basic/app/styles/app.css → e2e/react-start/basic/src/styles/app.css b/e2e/react-start/basic/app/styles/app.css → e2e/react-start/basic/src/styles/app.css
diff --git a/e2e/react-start/basic/app/utils/posts.tsx → e2e/react-start/basic/src/utils/posts.tsx b/e2e/react-start/basic/app/utils/posts.tsx → e2e/react-start/basic/src/utils/posts.tsx
diff --git a/e2e/react-start/basic/app/utils/seo.ts → e2e/react-start/basic/src/utils/seo.ts b/e2e/react-start/basic/app/utils/seo.ts → e2e/react-start/basic/src/utils/seo.ts
diff --git a/e2e/react-start/basic/app/utils/users.tsx → e2e/react-start/basic/src/utils/users.tsx b/e2e/react-start/basic/app/utils/users.tsx → e2e/react-start/basic/src/utils/users.tsx
diff --git a/e2e/react-start/basic/tailwind.config.mjs b/e2e/react-start/basic/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/basic/tsconfig.json b/e2e/react-start/basic/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/clerk-basic/app.config.ts b/e2e/react-start/clerk-basic/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/react-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/e2e/react-start/clerk-basic/app/client.tsx → e2e/react-start/clerk-basic/src/client.tsx b/e2e/react-start/clerk-basic/app/client.tsx → e2e/react-start/clerk-basic/src/client.tsx
diff --git a/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx b/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx
diff --git a/...t/clerk-basic/app/components/NotFound.tsx → ...t/clerk-basic/src/components/NotFound.tsx b/...t/clerk-basic/app/components/NotFound.tsx → ...t/clerk-basic/src/components/NotFound.tsx
diff --git a/...ct-start/clerk-basic/app/routeTree.gen.ts → ...ct-start/clerk-basic/src/routeTree.gen.ts b/...ct-start/clerk-basic/app/routeTree.gen.ts → ...ct-start/clerk-basic/src/routeTree.gen.ts
diff --git a/e2e/react-start/clerk-basic/app/router.tsx → e2e/react-start/clerk-basic/src/router.tsx b/e2e/react-start/clerk-basic/app/router.tsx → e2e/react-start/clerk-basic/src/router.tsx
diff --git a/...t-start/clerk-basic/app/routes/__root.tsx → ...t-start/clerk-basic/src/routes/__root.tsx b/...t-start/clerk-basic/app/routes/__root.tsx → ...t-start/clerk-basic/src/routes/__root.tsx
diff --git a/...-start/clerk-basic/app/routes/_authed.tsx → ...-start/clerk-basic/src/routes/_authed.tsx b/...-start/clerk-basic/app/routes/_authed.tsx → ...-start/clerk-basic/src/routes/_authed.tsx
diff --git a/...asic/app/routes/_authed/posts.$postId.tsx → ...asic/src/routes/_authed/posts.$postId.tsx b/...asic/app/routes/_authed/posts.$postId.tsx → ...asic/src/routes/_authed/posts.$postId.tsx
diff --git a/...-basic/app/routes/_authed/posts.index.tsx → ...-basic/src/routes/_authed/posts.index.tsx b/...-basic/app/routes/_authed/posts.index.tsx → ...-basic/src/routes/_authed/posts.index.tsx
diff --git a/.../clerk-basic/app/routes/_authed/posts.tsx → .../clerk-basic/src/routes/_authed/posts.tsx b/.../clerk-basic/app/routes/_authed/posts.tsx → .../clerk-basic/src/routes/_authed/posts.tsx
diff --git a/...rk-basic/app/routes/_authed/profile.$.tsx → ...rk-basic/src/routes/_authed/profile.$.tsx b/...rk-basic/app/routes/_authed/profile.$.tsx → ...rk-basic/src/routes/_authed/profile.$.tsx
diff --git a/...ct-start/clerk-basic/app/routes/index.tsx → ...ct-start/clerk-basic/src/routes/index.tsx b/...ct-start/clerk-basic/app/routes/index.tsx → ...ct-start/clerk-basic/src/routes/index.tsx
diff --git a/e2e/react-start/clerk-basic/app/ssr.tsx → e2e/react-start/clerk-basic/src/ssr.tsx b/e2e/react-start/clerk-basic/app/ssr.tsx → e2e/react-start/clerk-basic/src/ssr.tsx
diff --git a/...eact-start/clerk-basic/app/styles/app.css → ...eact-start/clerk-basic/src/styles/app.css b/...eact-start/clerk-basic/app/styles/app.css → ...eact-start/clerk-basic/src/styles/app.css
diff --git a/...eact-start/clerk-basic/app/utils/posts.ts → ...eact-start/clerk-basic/src/utils/posts.ts b/...eact-start/clerk-basic/app/utils/posts.ts → ...eact-start/clerk-basic/src/utils/posts.ts
diff --git a/e2e/react-start/clerk-basic/app/utils/seo.ts → e2e/react-start/clerk-basic/src/utils/seo.ts b/e2e/react-start/clerk-basic/app/utils/seo.ts → e2e/react-start/clerk-basic/src/utils/seo.ts
diff --git a/e2e/react-start/clerk-basic/tailwind.config.mjs b/e2e/react-start/clerk-basic/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/clerk-basic/tsconfig.json b/e2e/react-start/clerk-basic/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/scroll-restoration/app.config.ts b/e2e/react-start/scroll-restoration/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/react-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/...react-start/scroll-restoration/app/api.ts → ...react-start/scroll-restoration/src/api.ts b/...react-start/scroll-restoration/app/api.ts → ...react-start/scroll-restoration/src/api.ts
diff --git a/...t-start/scroll-restoration/app/client.tsx → ...t-start/scroll-restoration/src/client.tsx b/...t-start/scroll-restoration/app/client.tsx → ...t-start/scroll-restoration/src/client.tsx
diff --git a/...n/app/components/DefaultCatchBoundary.tsx → ...n/src/components/DefaultCatchBoundary.tsx b/...n/app/components/DefaultCatchBoundary.tsx → ...n/src/components/DefaultCatchBoundary.tsx
diff --git a/...l-restoration/app/components/NotFound.tsx → ...l-restoration/src/components/NotFound.tsx b/...l-restoration/app/components/NotFound.tsx → ...l-restoration/src/components/NotFound.tsx
diff --git a/...t/scroll-restoration/app/routeTree.gen.ts → ...t/scroll-restoration/src/routeTree.gen.ts b/...t/scroll-restoration/app/routeTree.gen.ts → ...t/scroll-restoration/src/routeTree.gen.ts
diff --git a/...t-start/scroll-restoration/app/router.tsx → ...t-start/scroll-restoration/src/router.tsx b/...t-start/scroll-restoration/app/router.tsx → ...t-start/scroll-restoration/src/router.tsx
diff --git a/...ration/app/routes/(tests)/normal-page.tsx → ...ration/src/routes/(tests)/normal-page.tsx b/...ration/app/routes/(tests)/normal-page.tsx → ...ration/src/routes/(tests)/normal-page.tsx
diff --git a/...ration/app/routes/(tests)/with-loader.tsx → ...ration/src/routes/(tests)/with-loader.tsx b/...ration/app/routes/(tests)/with-loader.tsx → ...ration/src/routes/(tests)/with-loader.tsx
diff --git a/...ration/app/routes/(tests)/with-search.tsx → ...ration/src/routes/(tests)/with-search.tsx b/...ration/app/routes/(tests)/with-search.tsx → ...ration/src/routes/(tests)/with-search.tsx
diff --git a/...n/app/routes/-components/scroll-block.tsx → ...n/src/routes/-components/scroll-block.tsx b/...n/app/routes/-components/scroll-block.tsx → ...n/src/routes/-components/scroll-block.tsx
diff --git a/.../scroll-restoration/app/routes/__root.tsx → .../scroll-restoration/src/routes/__root.tsx b/.../scroll-restoration/app/routes/__root.tsx → .../scroll-restoration/src/routes/__root.tsx
diff --git a/...t/scroll-restoration/app/routes/index.tsx → ...t/scroll-restoration/src/routes/index.tsx b/...t/scroll-restoration/app/routes/index.tsx → ...t/scroll-restoration/src/routes/index.tsx
diff --git a/...eact-start/scroll-restoration/app/ssr.tsx → ...eact-start/scroll-restoration/src/ssr.tsx b/...eact-start/scroll-restoration/app/ssr.tsx → ...eact-start/scroll-restoration/src/ssr.tsx
diff --git a/...art/scroll-restoration/app/styles/app.css → ...art/scroll-restoration/src/styles/app.css b/...art/scroll-restoration/app/styles/app.css → ...art/scroll-restoration/src/styles/app.css
diff --git a/...rt/scroll-restoration/app/utils/posts.tsx → ...rt/scroll-restoration/src/utils/posts.tsx b/...rt/scroll-restoration/app/utils/posts.tsx → ...rt/scroll-restoration/src/utils/posts.tsx
diff --git a/...start/scroll-restoration/app/utils/seo.ts → ...start/scroll-restoration/src/utils/seo.ts b/...start/scroll-restoration/app/utils/seo.ts → ...start/scroll-restoration/src/utils/seo.ts
diff --git a/...rt/scroll-restoration/app/utils/users.tsx → ...rt/scroll-restoration/src/utils/users.tsx b/...rt/scroll-restoration/app/utils/users.tsx → ...rt/scroll-restoration/src/utils/users.tsx
diff --git a/e2e/react-start/scroll-restoration/tailwind.config.mjs b/e2e/react-start/scroll-restoration/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/scroll-restoration/tsconfig.json b/e2e/react-start/scroll-restoration/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/server-functions/app.config.ts b/e2e/react-start/server-functions/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/react-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/...act-start/server-functions/app/client.tsx → ...act-start/server-functions/src/client.tsx b/...act-start/server-functions/app/client.tsx → ...act-start/server-functions/src/client.tsx
diff --git a/...s/app/components/DefaultCatchBoundary.tsx → ...s/src/components/DefaultCatchBoundary.tsx b/...s/app/components/DefaultCatchBoundary.tsx → ...s/src/components/DefaultCatchBoundary.tsx
diff --git a/...ver-functions/app/components/NotFound.tsx → ...ver-functions/src/components/NotFound.tsx b/...ver-functions/app/components/NotFound.tsx → ...ver-functions/src/components/NotFound.tsx
diff --git a/...art/server-functions/app/routeTree.gen.ts → ...art/server-functions/src/routeTree.gen.ts b/...art/server-functions/app/routeTree.gen.ts → ...art/server-functions/src/routeTree.gen.ts
diff --git a/...act-start/server-functions/app/router.tsx → ...act-start/server-functions/src/router.tsx b/...act-start/server-functions/app/router.tsx → ...act-start/server-functions/src/router.tsx
diff --git a/...rt/server-functions/app/routes/__root.tsx → ...rt/server-functions/src/routes/__root.tsx b/...rt/server-functions/app/routes/__root.tsx → ...rt/server-functions/src/routes/__root.tsx
diff --git a/...ver-functions/app/routes/abort-signal.tsx → ...ver-functions/src/routes/abort-signal.tsx b/...ver-functions/app/routes/abort-signal.tsx → ...ver-functions/src/routes/abort-signal.tsx
diff --git a/...erver-functions/app/routes/consistent.tsx → ...erver-functions/src/routes/consistent.tsx b/...erver-functions/app/routes/consistent.tsx → ...erver-functions/src/routes/consistent.tsx
diff --git a/...er-functions/app/routes/cookies/index.tsx → ...er-functions/src/routes/cookies/index.tsx b/...er-functions/app/routes/cookies/index.tsx → ...er-functions/src/routes/cookies/index.tsx
diff --git a/...rver-functions/app/routes/cookies/set.tsx → ...rver-functions/src/routes/cookies/set.tsx b/...rver-functions/app/routes/cookies/set.tsx → ...rver-functions/src/routes/cookies/set.tsx
diff --git a/...nctions/app/routes/dead-code-preserve.tsx → ...nctions/src/routes/dead-code-preserve.tsx b/...nctions/app/routes/dead-code-preserve.tsx → ...nctions/src/routes/dead-code-preserve.tsx
diff --git a/.../server-functions/app/routes/env-only.tsx → .../server-functions/src/routes/env-only.tsx b/.../server-functions/app/routes/env-only.tsx → .../server-functions/src/routes/env-only.tsx
diff --git a/...t/server-functions/app/routes/headers.tsx → ...t/server-functions/src/routes/headers.tsx b/...t/server-functions/app/routes/headers.tsx → ...t/server-functions/src/routes/headers.tsx
diff --git a/...art/server-functions/app/routes/index.tsx → ...art/server-functions/src/routes/index.tsx b/...art/server-functions/app/routes/index.tsx → ...art/server-functions/src/routes/index.tsx
diff --git a/...r-functions/app/routes/isomorphic-fns.tsx → ...r-functions/src/routes/isomorphic-fns.tsx b/...r-functions/app/routes/isomorphic-fns.tsx → ...r-functions/src/routes/isomorphic-fns.tsx
diff --git a/...server-functions/app/routes/multipart.tsx → ...server-functions/src/routes/multipart.tsx b/...server-functions/app/routes/multipart.tsx → ...server-functions/src/routes/multipart.tsx
diff --git a/...ver-functions/app/routes/raw-response.tsx → ...ver-functions/src/routes/raw-response.tsx b/...ver-functions/app/routes/raw-response.tsx → ...ver-functions/src/routes/raw-response.tsx
diff --git a/...rver-functions/app/routes/return-null.tsx → ...rver-functions/src/routes/return-null.tsx b/...rver-functions/app/routes/return-null.tsx → ...rver-functions/src/routes/return-null.tsx
diff --git a/...ctions/app/routes/serialize-form-data.tsx → ...ctions/src/routes/serialize-form-data.tsx b/...ctions/app/routes/serialize-form-data.tsx → ...ctions/src/routes/serialize-form-data.tsx
diff --git a/...rt/server-functions/app/routes/status.tsx → ...rt/server-functions/src/routes/status.tsx b/...rt/server-functions/app/routes/status.tsx → ...rt/server-functions/src/routes/status.tsx
diff --git a/...tions/app/routes/submit-post-formdata.tsx → ...tions/src/routes/submit-post-formdata.tsx b/...tions/app/routes/submit-post-formdata.tsx → ...tions/src/routes/submit-post-formdata.tsx
diff --git a/e2e/react-start/server-functions/app/ssr.tsx → e2e/react-start/server-functions/src/ssr.tsx b/e2e/react-start/server-functions/app/ssr.tsx → e2e/react-start/server-functions/src/ssr.tsx
diff --git a/...start/server-functions/app/styles/app.css → ...start/server-functions/src/styles/app.css b/...start/server-functions/app/styles/app.css → ...start/server-functions/src/styles/app.css
diff --git a/e2e/react-start/server-functions/tailwind.config.mjs b/e2e/react-start/server-functions/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/server-functions/tsconfig.json b/e2e/react-start/server-functions/tsconfig.json
@@ -13,9 +13,9 @@
     "target": "ES2022",
     "allowJs": true,
     "forceConsistentCasingInFileNames": true,
-    "baseUrl": "",
+    "baseUrl": ".",
     "paths": {
-      "~/*": ["app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/react-start/website/app.config.ts b/e2e/react-start/website/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/react-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/e2e/react-start/website/app/client.tsx → e2e/react-start/website/src/client.tsx b/e2e/react-start/website/app/client.tsx → e2e/react-start/website/src/client.tsx
diff --git a/...e/app/components/DefaultCatchBoundary.tsx → ...e/src/components/DefaultCatchBoundary.tsx b/...e/app/components/DefaultCatchBoundary.tsx → ...e/src/components/DefaultCatchBoundary.tsx
diff --git a/...start/website/app/components/NotFound.tsx → ...start/website/src/components/NotFound.tsx b/...start/website/app/components/NotFound.tsx → ...start/website/src/components/NotFound.tsx
diff --git a/e2e/react-start/website/app/routeTree.gen.ts → e2e/react-start/website/src/routeTree.gen.ts b/e2e/react-start/website/app/routeTree.gen.ts → e2e/react-start/website/src/routeTree.gen.ts
diff --git a/e2e/react-start/website/app/router.tsx → e2e/react-start/website/src/router.tsx b/e2e/react-start/website/app/router.tsx → e2e/react-start/website/src/router.tsx
diff --git a/....$version.docs.framework.$framework.$.tsx → ....$version.docs.framework.$framework.$.tsx b/....$version.docs.framework.$framework.$.tsx → ....$version.docs.framework.$framework.$.tsx
diff --git a/....docs.framework.$framework.examples.$.tsx → ....docs.framework.$framework.examples.$.tsx b/....docs.framework.$framework.examples.$.tsx → ....docs.framework.$framework.examples.$.tsx
diff --git a/...rsion.docs.framework.$framework.index.tsx → ...rsion.docs.framework.$framework.index.tsx b/...rsion.docs.framework.$framework.index.tsx → ...rsion.docs.framework.$framework.index.tsx
diff --git a/...ct.$version.docs.framework.$framework.tsx → ...ct.$version.docs.framework.$framework.tsx b/...ct.$version.docs.framework.$framework.tsx → ...ct.$version.docs.framework.$framework.tsx
diff --git a/...p/routes/$project.$version.docs.index.tsx → ...c/routes/$project.$version.docs.index.tsx b/...p/routes/$project.$version.docs.index.tsx → ...c/routes/$project.$version.docs.index.tsx
diff --git a/...art/website/app/routes/$project.index.tsx → ...art/website/src/routes/$project.index.tsx b/...art/website/app/routes/$project.index.tsx → ...art/website/src/routes/$project.index.tsx
diff --git a/...react-start/website/app/routes/__root.tsx → ...react-start/website/src/routes/__root.tsx b/...react-start/website/app/routes/__root.tsx → ...react-start/website/src/routes/__root.tsx
diff --git a/...utes/_library.$project.$version.index.tsx → ...utes/_library.$project.$version.index.tsx b/...utes/_library.$project.$version.index.tsx → ...utes/_library.$project.$version.index.tsx
diff --git a/.../website/app/routes/_library.$project.tsx → .../website/src/routes/_library.$project.tsx b/.../website/app/routes/_library.$project.tsx → .../website/src/routes/_library.$project.tsx
diff --git a/...art/website/app/routes/_library.index.tsx → ...art/website/src/routes/_library.index.tsx b/...art/website/app/routes/_library.index.tsx → ...art/website/src/routes/_library.index.tsx
diff --git a/...act-start/website/app/routes/_library.tsx → ...act-start/website/src/routes/_library.tsx b/...act-start/website/app/routes/_library.tsx → ...act-start/website/src/routes/_library.tsx
diff --git a/...act-start/website/app/server/document.tsx → ...act-start/website/src/server/document.tsx b/...act-start/website/app/server/document.tsx → ...act-start/website/src/server/document.tsx
diff --git a/...act-start/website/app/server/projects.tsx → ...act-start/website/src/server/projects.tsx b/...act-start/website/app/server/projects.tsx → ...act-start/website/src/server/projects.tsx
diff --git a/e2e/react-start/website/app/ssr.tsx → e2e/react-start/website/src/ssr.tsx b/e2e/react-start/website/app/ssr.tsx → e2e/react-start/website/src/ssr.tsx
diff --git a/e2e/react-start/website/app/styles/app.css → e2e/react-start/website/src/styles/app.css b/e2e/react-start/website/app/styles/app.css → e2e/react-start/website/src/styles/app.css
diff --git a/e2e/react-start/website/app/utils/seo.ts → e2e/react-start/website/src/utils/seo.ts b/e2e/react-start/website/app/utils/seo.ts → e2e/react-start/website/src/utils/seo.ts
diff --git a/e2e/react-start/website/tailwind.config.mjs b/e2e/react-start/website/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/react-start/website/tsconfig.json b/e2e/react-start/website/tsconfig.json
@@ -15,7 +15,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/solid-start/basic-tsr-config/tsconfig.json b/e2e/solid-start/basic-tsr-config/tsconfig.json
@@ -16,7 +16,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/app/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/solid-start/basic/app.config.ts b/e2e/solid-start/basic/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/solid-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/e2e/solid-start/basic/app/api.ts → e2e/solid-start/basic/src/api.ts b/e2e/solid-start/basic/app/api.ts → e2e/solid-start/basic/src/api.ts
diff --git a/e2e/solid-start/basic/app/client.tsx → e2e/solid-start/basic/src/client.tsx b/e2e/solid-start/basic/app/client.tsx → e2e/solid-start/basic/src/client.tsx
diff --git a/...rt/basic/app/components/CustomMessage.tsx → ...rt/basic/src/components/CustomMessage.tsx b/...rt/basic/app/components/CustomMessage.tsx → ...rt/basic/src/components/CustomMessage.tsx
diff --git a/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx b/...c/app/components/DefaultCatchBoundary.tsx → ...c/src/components/DefaultCatchBoundary.tsx
diff --git a/...d-start/basic/app/components/NotFound.tsx → ...d-start/basic/src/components/NotFound.tsx b/...d-start/basic/app/components/NotFound.tsx → ...d-start/basic/src/components/NotFound.tsx
diff --git a/...sic/app/components/PostErrorComponent.tsx → ...sic/src/components/PostErrorComponent.tsx b/...sic/app/components/PostErrorComponent.tsx → ...sic/src/components/PostErrorComponent.tsx
diff --git a/.../basic/app/components/RedirectOnClick.tsx → .../basic/src/components/RedirectOnClick.tsx b/.../basic/app/components/RedirectOnClick.tsx → .../basic/src/components/RedirectOnClick.tsx
diff --git a/...sic/app/components/UserErrorComponent.tsx → ...sic/src/components/UserErrorComponent.tsx b/...sic/app/components/UserErrorComponent.tsx → ...sic/src/components/UserErrorComponent.tsx
diff --git a/...art/basic/app/components/throwRedirect.ts → ...art/basic/src/components/throwRedirect.ts b/...art/basic/app/components/throwRedirect.ts → ...art/basic/src/components/throwRedirect.ts
diff --git a/e2e/solid-start/basic/app/routeTree.gen.ts → e2e/solid-start/basic/src/routeTree.gen.ts b/e2e/solid-start/basic/app/routeTree.gen.ts → e2e/solid-start/basic/src/routeTree.gen.ts
diff --git a/e2e/solid-start/basic/app/router.tsx → e2e/solid-start/basic/src/router.tsx b/e2e/solid-start/basic/app/router.tsx → e2e/solid-start/basic/src/router.tsx
diff --git a/e2e/solid-start/basic/app/routes/__root.tsx → e2e/solid-start/basic/src/routes/__root.tsx b/e2e/solid-start/basic/app/routes/__root.tsx → e2e/solid-start/basic/src/routes/__root.tsx
diff --git a/e2e/solid-start/basic/app/routes/_layout.tsx → e2e/solid-start/basic/src/routes/_layout.tsx b/e2e/solid-start/basic/app/routes/_layout.tsx → e2e/solid-start/basic/src/routes/_layout.tsx
diff --git a/...rt/basic/app/routes/_layout/_layout-2.tsx → ...rt/basic/src/routes/_layout/_layout-2.tsx b/...rt/basic/app/routes/_layout/_layout-2.tsx → ...rt/basic/src/routes/_layout/_layout-2.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx b/...app/routes/_layout/_layout-2/layout-a.tsx → ...src/routes/_layout/_layout-2/layout-a.tsx
diff --git a/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx b/...app/routes/_layout/_layout-2/layout-b.tsx → ...src/routes/_layout/_layout-2/layout-b.tsx
diff --git a/...solid-start/basic/app/routes/api.users.ts → ...solid-start/basic/src/routes/api.users.ts b/...solid-start/basic/app/routes/api.users.ts → ...solid-start/basic/src/routes/api.users.ts
diff --git a/...d-start/basic/app/routes/api/users.$id.ts → ...d-start/basic/src/routes/api/users.$id.ts b/...d-start/basic/app/routes/api/users.$id.ts → ...d-start/basic/src/routes/api/users.$id.ts
diff --git a/...solid-start/basic/app/routes/deferred.tsx → ...solid-start/basic/src/routes/deferred.tsx b/...solid-start/basic/app/routes/deferred.tsx → ...solid-start/basic/src/routes/deferred.tsx
diff --git a/e2e/solid-start/basic/app/routes/index.tsx → e2e/solid-start/basic/src/routes/index.tsx b/e2e/solid-start/basic/app/routes/index.tsx → e2e/solid-start/basic/src/routes/index.tsx
diff --git a/e2e/solid-start/basic/app/routes/links.tsx → e2e/solid-start/basic/src/routes/links.tsx b/e2e/solid-start/basic/app/routes/links.tsx → e2e/solid-start/basic/src/routes/links.tsx
diff --git a/...tart/basic/app/routes/not-found/index.tsx → ...tart/basic/src/routes/not-found/index.tsx b/...tart/basic/app/routes/not-found/index.tsx → ...tart/basic/src/routes/not-found/index.tsx
diff --git a/...tart/basic/app/routes/not-found/route.tsx → ...tart/basic/src/routes/not-found/route.tsx b/...tart/basic/app/routes/not-found/route.tsx → ...tart/basic/src/routes/not-found/route.tsx
diff --git a/...c/app/routes/not-found/via-beforeLoad.tsx → ...c/src/routes/not-found/via-beforeLoad.tsx b/...c/app/routes/not-found/via-beforeLoad.tsx → ...c/src/routes/not-found/via-beforeLoad.tsx
diff --git a/...basic/app/routes/not-found/via-loader.tsx → ...basic/src/routes/not-found/via-loader.tsx b/...basic/app/routes/not-found/via-loader.tsx → ...basic/src/routes/not-found/via-loader.tsx
diff --git a/...-start/basic/app/routes/posts.$postId.tsx → ...-start/basic/src/routes/posts.$postId.tsx b/...-start/basic/app/routes/posts.$postId.tsx → ...-start/basic/src/routes/posts.$postId.tsx
diff --git a/...id-start/basic/app/routes/posts.index.tsx → ...id-start/basic/src/routes/posts.index.tsx b/...id-start/basic/app/routes/posts.index.tsx → ...id-start/basic/src/routes/posts.index.tsx
diff --git a/e2e/solid-start/basic/app/routes/posts.tsx → e2e/solid-start/basic/src/routes/posts.tsx b/e2e/solid-start/basic/app/routes/posts.tsx → e2e/solid-start/basic/src/routes/posts.tsx
diff --git a/.../basic/app/routes/posts_.$postId.deep.tsx → .../basic/src/routes/posts_.$postId.deep.tsx b/.../basic/app/routes/posts_.$postId.deep.tsx → .../basic/src/routes/posts_.$postId.deep.tsx
diff --git a/...art/basic/app/routes/redirect/$target.tsx → ...art/basic/src/routes/redirect/$target.tsx b/...art/basic/app/routes/redirect/$target.tsx → ...art/basic/src/routes/redirect/$target.tsx
diff --git a/...sic/app/routes/redirect/$target/index.tsx → ...sic/src/routes/redirect/$target/index.tsx b/...sic/app/routes/redirect/$target/index.tsx → ...sic/src/routes/redirect/$target/index.tsx
diff --git a/...outes/redirect/$target/serverFn/index.tsx → ...outes/redirect/$target/serverFn/index.tsx b/...outes/redirect/$target/serverFn/index.tsx → ...outes/redirect/$target/serverFn/index.tsx
diff --git a/...irect/$target/serverFn/via-beforeLoad.tsx → ...irect/$target/serverFn/via-beforeLoad.tsx b/...irect/$target/serverFn/via-beforeLoad.tsx → ...irect/$target/serverFn/via-beforeLoad.tsx
diff --git a/.../redirect/$target/serverFn/via-loader.tsx → .../redirect/$target/serverFn/via-loader.tsx b/.../redirect/$target/serverFn/via-loader.tsx → .../redirect/$target/serverFn/via-loader.tsx
diff --git a/...rect/$target/serverFn/via-useServerFn.tsx → ...rect/$target/serverFn/via-useServerFn.tsx b/...rect/$target/serverFn/via-useServerFn.tsx → ...rect/$target/serverFn/via-useServerFn.tsx
diff --git a/...outes/redirect/$target/via-beforeLoad.tsx → ...outes/redirect/$target/via-beforeLoad.tsx b/...outes/redirect/$target/via-beforeLoad.tsx → ...outes/redirect/$target/via-beforeLoad.tsx
diff --git a/...pp/routes/redirect/$target/via-loader.tsx → ...rc/routes/redirect/$target/via-loader.tsx b/...pp/routes/redirect/$target/via-loader.tsx → ...rc/routes/redirect/$target/via-loader.tsx
diff --git a/...start/basic/app/routes/redirect/index.tsx → ...start/basic/src/routes/redirect/index.tsx b/...start/basic/app/routes/redirect/index.tsx → ...start/basic/src/routes/redirect/index.tsx
diff --git a/e2e/solid-start/basic/app/routes/scripts.tsx → e2e/solid-start/basic/src/routes/scripts.tsx b/e2e/solid-start/basic/app/routes/scripts.tsx → e2e/solid-start/basic/src/routes/scripts.tsx
diff --git a/...-start/basic/app/routes/search-params.tsx → ...-start/basic/src/routes/search-params.tsx b/...-start/basic/app/routes/search-params.tsx → ...-start/basic/src/routes/search-params.tsx
diff --git a/e2e/solid-start/basic/app/routes/stream.tsx → e2e/solid-start/basic/src/routes/stream.tsx b/e2e/solid-start/basic/app/routes/stream.tsx → e2e/solid-start/basic/src/routes/stream.tsx
diff --git a/...-start/basic/app/routes/users.$userId.tsx → ...-start/basic/src/routes/users.$userId.tsx b/...-start/basic/app/routes/users.$userId.tsx → ...-start/basic/src/routes/users.$userId.tsx
diff --git a/...id-start/basic/app/routes/users.index.tsx → ...id-start/basic/src/routes/users.index.tsx b/...id-start/basic/app/routes/users.index.tsx → ...id-start/basic/src/routes/users.index.tsx
diff --git a/e2e/solid-start/basic/app/routes/users.tsx → e2e/solid-start/basic/src/routes/users.tsx b/e2e/solid-start/basic/app/routes/users.tsx → e2e/solid-start/basic/src/routes/users.tsx
diff --git a/e2e/solid-start/basic/app/ssr.tsx → e2e/solid-start/basic/src/ssr.tsx b/e2e/solid-start/basic/app/ssr.tsx → e2e/solid-start/basic/src/ssr.tsx
diff --git a/e2e/solid-start/basic/app/styles/app.css → e2e/solid-start/basic/src/styles/app.css b/e2e/solid-start/basic/app/styles/app.css → e2e/solid-start/basic/src/styles/app.css
diff --git a/e2e/solid-start/basic/app/utils/posts.tsx → e2e/solid-start/basic/src/utils/posts.tsx b/e2e/solid-start/basic/app/utils/posts.tsx → e2e/solid-start/basic/src/utils/posts.tsx
diff --git a/e2e/solid-start/basic/app/utils/seo.ts → e2e/solid-start/basic/src/utils/seo.ts b/e2e/solid-start/basic/app/utils/seo.ts → e2e/solid-start/basic/src/utils/seo.ts
diff --git a/e2e/solid-start/basic/app/utils/users.tsx → e2e/solid-start/basic/src/utils/users.tsx b/e2e/solid-start/basic/app/utils/users.tsx → e2e/solid-start/basic/src/utils/users.tsx
diff --git a/e2e/solid-start/basic/tailwind.config.mjs b/e2e/solid-start/basic/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/solid-start/basic/tsconfig.json b/e2e/solid-start/basic/tsconfig.json
@@ -16,7 +16,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/solid-start/scroll-restoration/app.config.ts b/e2e/solid-start/scroll-restoration/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/solid-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/...solid-start/scroll-restoration/app/api.ts → ...solid-start/scroll-restoration/src/api.ts b/...solid-start/scroll-restoration/app/api.ts → ...solid-start/scroll-restoration/src/api.ts
diff --git a/...d-start/scroll-restoration/app/client.tsx → ...d-start/scroll-restoration/src/client.tsx b/...d-start/scroll-restoration/app/client.tsx → ...d-start/scroll-restoration/src/client.tsx
diff --git a/...n/app/components/DefaultCatchBoundary.tsx → ...n/src/components/DefaultCatchBoundary.tsx b/...n/app/components/DefaultCatchBoundary.tsx → ...n/src/components/DefaultCatchBoundary.tsx
diff --git a/...l-restoration/app/components/NotFound.tsx → ...l-restoration/src/components/NotFound.tsx b/...l-restoration/app/components/NotFound.tsx → ...l-restoration/src/components/NotFound.tsx
diff --git a/...t/scroll-restoration/app/routeTree.gen.ts → ...t/scroll-restoration/src/routeTree.gen.ts b/...t/scroll-restoration/app/routeTree.gen.ts → ...t/scroll-restoration/src/routeTree.gen.ts
diff --git a/...d-start/scroll-restoration/app/router.tsx → ...d-start/scroll-restoration/src/router.tsx b/...d-start/scroll-restoration/app/router.tsx → ...d-start/scroll-restoration/src/router.tsx
diff --git a/...ration/app/routes/(tests)/normal-page.tsx → ...ration/src/routes/(tests)/normal-page.tsx b/...ration/app/routes/(tests)/normal-page.tsx → ...ration/src/routes/(tests)/normal-page.tsx
diff --git a/...ration/app/routes/(tests)/with-loader.tsx → ...ration/src/routes/(tests)/with-loader.tsx b/...ration/app/routes/(tests)/with-loader.tsx → ...ration/src/routes/(tests)/with-loader.tsx
diff --git a/...ration/app/routes/(tests)/with-search.tsx → ...ration/src/routes/(tests)/with-search.tsx b/...ration/app/routes/(tests)/with-search.tsx → ...ration/src/routes/(tests)/with-search.tsx
diff --git a/...n/app/routes/-components/scroll-block.tsx → ...n/src/routes/-components/scroll-block.tsx b/...n/app/routes/-components/scroll-block.tsx → ...n/src/routes/-components/scroll-block.tsx
diff --git a/.../scroll-restoration/app/routes/__root.tsx → .../scroll-restoration/src/routes/__root.tsx b/.../scroll-restoration/app/routes/__root.tsx → .../scroll-restoration/src/routes/__root.tsx
diff --git a/...t/scroll-restoration/app/routes/index.tsx → ...t/scroll-restoration/src/routes/index.tsx b/...t/scroll-restoration/app/routes/index.tsx → ...t/scroll-restoration/src/routes/index.tsx
diff --git a/...olid-start/scroll-restoration/app/ssr.tsx → ...olid-start/scroll-restoration/src/ssr.tsx b/...olid-start/scroll-restoration/app/ssr.tsx → ...olid-start/scroll-restoration/src/ssr.tsx
diff --git a/...art/scroll-restoration/app/styles/app.css → ...art/scroll-restoration/src/styles/app.css b/...art/scroll-restoration/app/styles/app.css → ...art/scroll-restoration/src/styles/app.css
diff --git a/...rt/scroll-restoration/app/utils/posts.tsx → ...rt/scroll-restoration/src/utils/posts.tsx b/...rt/scroll-restoration/app/utils/posts.tsx → ...rt/scroll-restoration/src/utils/posts.tsx
diff --git a/...start/scroll-restoration/app/utils/seo.ts → ...start/scroll-restoration/src/utils/seo.ts b/...start/scroll-restoration/app/utils/seo.ts → ...start/scroll-restoration/src/utils/seo.ts
diff --git a/...rt/scroll-restoration/app/utils/users.tsx → ...rt/scroll-restoration/src/utils/users.tsx b/...rt/scroll-restoration/app/utils/users.tsx → ...rt/scroll-restoration/src/utils/users.tsx
diff --git a/e2e/solid-start/scroll-restoration/tailwind.config.mjs b/e2e/solid-start/scroll-restoration/tailwind.config.mjs
@@ -1,4 +1,4 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ['./app/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
 }
diff --git a/e2e/solid-start/scroll-restoration/tsconfig.json b/e2e/solid-start/scroll-restoration/tsconfig.json
@@ -16,7 +16,7 @@
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./app/*"]
+      "~/*": ["./src/*"]
     },
     "noEmit": true
   }

diff --git a/e2e/solid-start/server-functions/app.config.ts b/e2e/solid-start/server-functions/app.config.ts
@@ -2,6 +2,9 @@ import { defineConfig } from '@tanstack/solid-start/config'
 import tsConfigPaths from 'vite-tsconfig-paths'
 
 export default defineConfig({
+  tsr: {
+    appDirectory: 'src',
+  },
   vite: {
     plugins: [
       tsConfigPaths({

diff --git a/...lid-start/server-functions/app/client.tsx → ...lid-start/server-functions/src/client.tsx b/...lid-start/server-functions/app/client.tsx → ...lid-start/server-functions/src/client.tsx
diff --git a/...s/app/components/DefaultCatchBoundary.tsx → ...s/src/components/DefaultCatchBoundary.tsx b/...s/app/components/DefaultCatchBoundary.tsx → ...s/src/components/DefaultCatchBoundary.tsx
diff --git a/...ver-functions/app/components/NotFound.tsx → ...ver-functions/src/components/NotFound.tsx b/...ver-functions/app/components/NotFound.tsx → ...ver-functions/src/components/NotFound.tsx
diff --git a/...art/server-functions/app/routeTree.gen.ts → ...art/server-functions/src/routeTree.gen.ts b/...art/server-functions/app/routeTree.gen.ts → ...art/server-functions/src/routeTree.gen.ts
diff --git a/...lid-start/server-functions/app/router.tsx → ...lid-start/server-functions/src/router.tsx b/...lid-start/server-functions/app/router.tsx → ...lid-start/server-functions/src/router.tsx
diff --git a/...rt/server-functions/app/routes/__root.tsx → ...rt/server-functions/src/routes/__root.tsx b/...rt/server-functions/app/routes/__root.tsx → ...rt/server-functions/src/routes/__root.tsx