diff --git a/.changeset/mean-trams-beam.md b/.changeset/mean-trams-beam.md
new file mode 100644
index 0000000..9bb845f
--- /dev/null
+++ b/.changeset/mean-trams-beam.md
@@ -0,0 +1,5 @@
+---
+"create-better-t-stack": patch
+---
+
+fix ai example template path
diff --git a/README.md b/README.md
index ecec36c..3d57268 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ This repository is organized as a monorepo containing:
 
 ## Documentation
 
-Visit [better-t-stack.pages.dev](https://better-t-stack.pages.dev) for full documentation, guides, and examples.
+Visit [better-t-stack.amanv.dev](https://better-t-stack.amanv.dev) for full documentation, guides, and examples.
 
 ## Development
 
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 40b027b..2b295e8 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -43,7 +43,7 @@
     "url": "git+https://github.com/AmanVarshney01/create-better-t-stack.git",
     "directory": "apps/cli"
   },
-  "homepage": "https://better-t-stack.pages.dev/",
+  "homepage": "https://better-t-stack.amanv.dev/",
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
diff --git a/apps/cli/src/prompts/addons.ts b/apps/cli/src/prompts/addons.ts
index 34a41d0..e85a22c 100644
--- a/apps/cli/src/prompts/addons.ts
+++ b/apps/cli/src/prompts/addons.ts
@@ -14,6 +14,11 @@ export async function getAddonsChoice(
 		frontends?.includes("tanstack-router");
 
 	const addonOptions = [
+		{
+			value: "turborepo" as const,
+			label: "Turborepo (Recommended)",
+			hint: "Optimize builds for monorepos",
+		},
 		{
 			value: "starlight" as const,
 			label: "Starlight",
@@ -29,11 +34,6 @@ export async function getAddonsChoice(
 			label: "Husky",
 			hint: "Add Git hooks with Husky, lint-staged (requires Biome)",
 		},
-		{
-			value: "turborepo" as const,
-			label: "Turborepo",
-			hint: "Optimize builds for monorepos",
-		},
 	];
 
 	const webAddonOptions = [
diff --git a/apps/cli/templates/backend/server-base/src/routers/index.ts.hbs b/apps/cli/templates/backend/server-base/src/routers/index.ts.hbs
index 80dfee4..7a6cf55 100644
--- a/apps/cli/templates/backend/server-base/src/routers/index.ts.hbs
+++ b/apps/cli/templates/backend/server-base/src/routers/index.ts.hbs
@@ -12,7 +12,7 @@ export const appRouter = {
   privateData: protectedProcedure.handler(({ context }) => {
     return {
       message: "This is private",
-      user: context.session!.user,
+      user: context.session?.user,
     };
   }),
   {{/if}}
@@ -48,4 +48,4 @@ export const appRouter = router({
   {{/if}}
 });
 {{/if}}
-export type AppRouter = typeof appRouter;
\ No newline at end of file
+export type AppRouter = typeof appRouter;
diff --git a/apps/cli/templates/examples/ai/apps/react-router/src/routes/ai.tsx b/apps/cli/templates/examples/ai/web/react-router/src/routes/ai.tsx
similarity index 100%
rename from apps/cli/templates/examples/ai/apps/react-router/src/routes/ai.tsx
rename to apps/cli/templates/examples/ai/web/react-router/src/routes/ai.tsx
diff --git a/apps/cli/templates/examples/ai/apps/tanstack-router/src/routes/ai.tsx b/apps/cli/templates/examples/ai/web/tanstack-router/src/routes/ai.tsx
similarity index 100%
rename from apps/cli/templates/examples/ai/apps/tanstack-router/src/routes/ai.tsx
rename to apps/cli/templates/examples/ai/web/tanstack-router/src/routes/ai.tsx
diff --git a/apps/cli/templates/examples/ai/apps/tanstack-start/src/routes/ai.tsx b/apps/cli/templates/examples/ai/web/tanstack-start/src/routes/ai.tsx
similarity index 100%
rename from apps/cli/templates/examples/ai/apps/tanstack-start/src/routes/ai.tsx
rename to apps/cli/templates/examples/ai/web/tanstack-start/src/routes/ai.tsx
diff --git a/apps/web/README.md b/apps/web/README.md
index 3c4f431..250b6ce 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -44,4 +44,4 @@ To learn more about the technologies used in this website:
 
 - [Next.js Documentation](https://nextjs.org/docs) - Next.js features and API
 - [Fumadocs](https://fumadocs.vercel.app) - The documentation framework used
-- [Better-T-Stack](https://better-t-stack.pages.dev) - Main project site
+- [Better-T-Stack](https://better-t-stack.amanv.dev) - Main project site
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index af3ac59..7e68ac6 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -38,7 +38,7 @@ export const metadata: Metadata = {
 		email: false,
 		telephone: false,
 	},
-	metadataBase: new URL("https://better-t-stack.pages.dev"),
+	metadataBase: new URL("https://better-t-stack.amanv.dev"),
 	alternates: {
 		canonical: "/",
 	},
@@ -46,7 +46,7 @@ export const metadata: Metadata = {
 		title: "Better-T Stack",
 		description:
 			"A modern CLI tool for scaffolding end-to-end type-safe TypeScript projects with best practices and customizable configurations",
-		url: "https://better-t-stack.pages.dev",
+		url: "https://better-t-stack.amanv.dev",
 		siteName: "Better-T Stack",
 		images: [
 			{