diff --git a/llama_stack/ui/app/auth/signin/page.tsx b/llama_stack/ui/app/auth/signin/page.tsx
index 596186b9b..c9510fd6b 100644
--- a/llama_stack/ui/app/auth/signin/page.tsx
+++ b/llama_stack/ui/app/auth/signin/page.tsx
@@ -1,14 +1,14 @@
 "use client";
 
 import { signIn, signOut, useSession } from "next-auth/react";
-import { Button } from "@/components/chat/button";
+import { Button } from "@/components/ui/button";
 import {
   Card,
   CardContent,
   CardDescription,
   CardHeader,
   CardTitle,
-} from "@/components/chat/card";
+} from "@/components/ui/card";
 import { Copy, Check, Home, Github } from "lucide-react";
 import { useState } from "react";
 import { useRouter } from "next/navigation";
diff --git a/llama_stack/ui/app/chat-playground/page.tsx b/llama_stack/ui/app/chat-playground/page.tsx
index 3344416d3..c31248b78 100644
--- a/llama_stack/ui/app/chat-playground/page.tsx
+++ b/llama_stack/ui/app/chat-playground/page.tsx
@@ -151,7 +151,7 @@ const handleSubmitWithContent = async (content: string) => {
   }
 };
   const suggestions = [
-    "What is the weather in San Francisco?",
+    "Write a Python function that prints 'Hello, World!'",
     "Explain step-by-step how to solve this math problem: If x² + 6x + 9 = 25, what is x?",
     "Design a simple algorithm to find the longest palindrome in a string.",
   ];
diff --git a/llama_stack/ui/app/logs/vector-stores/page.tsx b/llama_stack/ui/app/logs/vector-stores/page.tsx
index c5a9ca664..29e1fabd6 100644
--- a/llama_stack/ui/app/logs/vector-stores/page.tsx
+++ b/llama_stack/ui/app/logs/vector-stores/page.tsx
@@ -16,8 +16,8 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from "@/components/chat/table";
-import { Skeleton } from "@/components/chat/skeleton";
+} from "@/components/ui/table";
+import { Skeleton } from "@/components/ui/skeleton";
 
 export default function VectorStoresPage() {
   const client = useAuthClient();
diff --git a/llama_stack/ui/components/chat-completions/chat-completion-detail.tsx b/llama_stack/ui/components/chat-completions/chat-completion-detail.tsx
index b950c3a2b..200807864 100644
--- a/llama_stack/ui/components/chat-completions/chat-completion-detail.tsx
+++ b/llama_stack/ui/components/chat-completions/chat-completion-detail.tsx
@@ -2,7 +2,7 @@
 
 import { ChatMessage, ChatCompletion } from "@/lib/types";
 import { ChatMessageItem } from "@/components/chat-completions/chat-messasge-item";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/chat/card";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import {
   DetailLoadingView,
   DetailErrorView,
diff --git a/llama_stack/ui/components/chat-completions/chat-messasge-item.tsx b/llama_stack/ui/components/chat-completions/chat-messasge-item.tsx
index 61ab2028c..6170e816e 100644
--- a/llama_stack/ui/components/chat-completions/chat-messasge-item.tsx
+++ b/llama_stack/ui/components/chat-completions/chat-messasge-item.tsx
@@ -7,7 +7,7 @@ import { extractTextFromContentPart } from "@/lib/format-message-content";
 import {
   MessageBlock,
   ToolCallBlock,
-} from "@/components/chat/message-components";
+} from "@/components/chat-playground/message-components";
 
 interface ChatMessageItemProps {
   message: ChatMessage;
diff --git a/llama_stack/ui/components/layout/detail-layout.tsx b/llama_stack/ui/components/layout/detail-layout.tsx
index b18d630fe..3013195a2 100644
--- a/llama_stack/ui/components/layout/detail-layout.tsx
+++ b/llama_stack/ui/components/layout/detail-layout.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/chat/card";
-import { Skeleton } from "@/components/chat/skeleton";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";
 
 export function DetailLoadingView({ title }: { title: string }) {
   return (
diff --git a/llama_stack/ui/components/layout/page-breadcrumb.tsx b/llama_stack/ui/components/layout/page-breadcrumb.tsx
index ebb477546..fdb561d68 100644
--- a/llama_stack/ui/components/layout/page-breadcrumb.tsx
+++ b/llama_stack/ui/components/layout/page-breadcrumb.tsx
@@ -9,7 +9,7 @@ import {
   BreadcrumbList,
   BreadcrumbPage,
   BreadcrumbSeparator,
-} from "@/components/chat/breadcrumb";
+} from "@/components/ui/breadcrumb";
 
 export interface BreadcrumbSegment {
   label: string;
diff --git a/llama_stack/ui/components/logs/logs-table.tsx b/llama_stack/ui/components/logs/logs-table.tsx
index bb0fb5804..3d4e609c7 100644
--- a/llama_stack/ui/components/logs/logs-table.tsx
+++ b/llama_stack/ui/components/logs/logs-table.tsx
@@ -13,8 +13,8 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from "@/components/chat/table";
-import { Skeleton } from "@/components/chat/skeleton";
+} from "@/components/ui/table";
+import { Skeleton } from "@/components/ui/skeleton";
 
 // Generic table row data interface
 export interface LogTableRow {
diff --git a/llama_stack/ui/components/responses/items/function-call-item.tsx b/llama_stack/ui/components/responses/items/function-call-item.tsx
index 495344d2e..1823487bc 100644
--- a/llama_stack/ui/components/responses/items/function-call-item.tsx
+++ b/llama_stack/ui/components/responses/items/function-call-item.tsx
@@ -1,7 +1,7 @@
 import {
   MessageBlock,
   ToolCallBlock,
-} from "@/components/chat/message-components";
+} from "@/components/chat-playground/message-components";
 import { FunctionCallItem } from "../utils/item-types";
 
 interface FunctionCallItemProps {
diff --git a/llama_stack/ui/components/responses/items/generic-item.tsx b/llama_stack/ui/components/responses/items/generic-item.tsx
index 7bf7a70df..a5f454169 100644
--- a/llama_stack/ui/components/responses/items/generic-item.tsx
+++ b/llama_stack/ui/components/responses/items/generic-item.tsx
@@ -1,7 +1,7 @@
 import {
   MessageBlock,
   ToolCallBlock,
-} from "@/components/chat/message-components";
+} from "@/components/chat-playground/message-components";
 import { BaseItem } from "../utils/item-types";
 
 interface GenericItemProps {
diff --git a/llama_stack/ui/components/responses/items/grouped-function-call-item.tsx b/llama_stack/ui/components/responses/items/grouped-function-call-item.tsx
index 065ea7573..5095f376d 100644
--- a/llama_stack/ui/components/responses/items/grouped-function-call-item.tsx
+++ b/llama_stack/ui/components/responses/items/grouped-function-call-item.tsx
@@ -1,7 +1,7 @@
 import {
   MessageBlock,
   ToolCallBlock,
-} from "@/components/chat/message-components";
+} from "@/components/chat-playground/message-components";
 import { FunctionCallItem, FunctionCallOutputItem } from "../utils/item-types";
 
 interface GroupedFunctionCallItemProps {
diff --git a/llama_stack/ui/components/responses/items/message-item.tsx b/llama_stack/ui/components/responses/items/message-item.tsx
index 77f4d2a2c..5590e4460 100644
--- a/llama_stack/ui/components/responses/items/message-item.tsx
+++ b/llama_stack/ui/components/responses/items/message-item.tsx
@@ -1,4 +1,4 @@
-import { MessageBlock } from "@/components/chat/message-components";
+import { MessageBlock } from "@/components/chat-playground/message-components";
 import { MessageItem } from "../utils/item-types";
 
 interface MessageItemProps {
diff --git a/llama_stack/ui/components/responses/items/web-search-item.tsx b/llama_stack/ui/components/responses/items/web-search-item.tsx
index 36f38ab25..68e9127b8 100644
--- a/llama_stack/ui/components/responses/items/web-search-item.tsx
+++ b/llama_stack/ui/components/responses/items/web-search-item.tsx
@@ -1,7 +1,7 @@
 import {
   MessageBlock,
   ToolCallBlock,
-} from "@/components/chat/message-components";
+} from "@/components/chat-playground/message-components";
 import { WebSearchCallItem } from "../utils/item-types";
 
 interface WebSearchItemProps {
diff --git a/llama_stack/ui/components/vector-stores/vector-store-detail.tsx b/llama_stack/ui/components/vector-stores/vector-store-detail.tsx
index 8a93fdbfa..7c5c91dd3 100644
--- a/llama_stack/ui/components/vector-stores/vector-store-detail.tsx
+++ b/llama_stack/ui/components/vector-stores/vector-store-detail.tsx
@@ -2,8 +2,8 @@
 
 import type { VectorStore } from "llama-stack-client/resources/vector-stores/vector-stores";
 import type { VectorStoreFile } from "llama-stack-client/resources/vector-stores/files";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/chat/card";
-import { Skeleton } from "@/components/chat/skeleton";
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Skeleton } from "@/components/ui/skeleton";
 import {
   DetailLoadingView,
   DetailErrorView,
@@ -20,7 +20,7 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from "@/components/chat/table";
+} from "@/components/ui/table";
 
 interface VectorStoreDetailViewProps {
   store: VectorStore | null;