diff --git a/AGENTS.md b/AGENTS.md
index f335219..7c11689 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -27,6 +27,7 @@ CI order: **lint → typecheck** (no tests)
 ## Registry build
 
 `pnpm registry:build` runs `scripts/registry-build.ts`:
+
 1. `shadcn-vue-registry` generates registry.json from `app/registry/`
 2. `shadcn-vue build` outputs per-item JSON to `public/r/*.json`
 3. Intermediate file `app/registry/registry.json` is auto-deleted
diff --git a/app/components/demo/LucideIconComponent.vue b/app/components/demo/LucideIconComponent.vue
index a290446..db4ba89 100644
--- a/app/components/demo/LucideIconComponent.vue
+++ b/app/components/demo/LucideIconComponent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Heart } from "lucide-vue-next";
-import { LucideIcon } from "~/registry/blocks/lucide-icon";
+import { LucideIcon } from "~/registry/ui/lucide-icon";
 </script>
 
 <template>
diff --git a/app/components/demo/LucideIconDemo.vue b/app/components/demo/LucideIconDemo.vue
index 6522b8c..11f9889 100644
--- a/app/components/demo/LucideIconDemo.vue
+++ b/app/components/demo/LucideIconDemo.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { LucideIcon } from "~/registry/blocks/lucide-icon";
+import { LucideIcon } from "~/registry/ui/lucide-icon";
 </script>
 
 <template>
diff --git a/app/components/demo/LucideIconSize.vue b/app/components/demo/LucideIconSize.vue
index dcdd5ba..9422883 100644
--- a/app/components/demo/LucideIconSize.vue
+++ b/app/components/demo/LucideIconSize.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { LucideIcon } from "~/registry/blocks/lucide-icon";
+import { LucideIcon } from "~/registry/ui/lucide-icon";
 </script>
 
 <template>
diff --git a/app/components/ui/icon/index.ts b/app/components/ui/icon/index.ts
deleted file mode 100644
index 3acd8e4..0000000
--- a/app/components/ui/icon/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { LucideIcon, type LucideIconProps } from "~/registry/blocks/lucide-icon";
diff --git a/app/components/ui/lucide-icon/index.ts b/app/components/ui/lucide-icon/index.ts
new file mode 100644
index 0000000..b8639b3
--- /dev/null
+++ b/app/components/ui/lucide-icon/index.ts
@@ -0,0 +1 @@
+export { LucideIcon, type LucideIconProps } from "~/registry/ui/lucide-icon";
diff --git a/app/registry/blocks/chat-message/ChatMessage.vue b/app/registry/blocks/chat-message/ChatMessage.vue
index 4390f95..38b7555 100644
--- a/app/registry/blocks/chat-message/ChatMessage.vue
+++ b/app/registry/blocks/chat-message/ChatMessage.vue
@@ -3,7 +3,7 @@ import type { HTMLAttributes } from "vue";
 import type { UIMessage } from "ai";
 import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
-import { LucideIcon } from "@/components/ui/icon";
+import { LucideIcon } from "@/components/ui/lucide-icon";
 import { cn } from "@/lib/utils";
 
 export interface ChatMessageAction {
diff --git a/app/registry/blocks/hello-world/HelloWorld.vue b/app/registry/blocks/hello-world/HelloWorld.vue
deleted file mode 100644
index 28435e0..0000000
--- a/app/registry/blocks/hello-world/HelloWorld.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-  <h1 class="text-2xl font-bold">
-    Hello World
-  </h1>
-</template>
-
-<script lang="ts" setup>
-</script>
diff --git a/app/registry/blocks/hello-world/index.ts b/app/registry/blocks/hello-world/index.ts
deleted file mode 100644
index ef86ead..0000000
--- a/app/registry/blocks/hello-world/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as HelloWorld } from "./HelloWorld.vue";
diff --git a/app/registry/blocks/lucide-icon/LucideIcon.vue b/app/registry/ui/lucide-icon/LucideIcon.vue
similarity index 100%
rename from app/registry/blocks/lucide-icon/LucideIcon.vue
rename to app/registry/ui/lucide-icon/LucideIcon.vue
diff --git a/app/registry/blocks/lucide-icon/index.ts b/app/registry/ui/lucide-icon/index.ts
similarity index 100%
rename from app/registry/blocks/lucide-icon/index.ts
rename to app/registry/ui/lucide-icon/index.ts
diff --git a/public/r/chat-message.json b/public/r/chat-message.json
index 61500a0..030d0de 100644
--- a/public/r/chat-message.json
+++ b/public/r/chat-message.json
@@ -7,7 +7,7 @@
   ],
   "registryDependencies": [
     "button",
-    "icon",
+    "lucide-icon",
     "tooltip"
   ],
   "files": [
@@ -18,7 +18,7 @@
     },
     {
       "path": "blocks/chat-message/ChatMessage.vue",
-      "content": "<script setup lang=\"ts\">\nimport type { HTMLAttributes } from \"vue\";\nimport type { UIMessage } from \"ai\";\nimport { Button } from \"@/components/ui/button\";\nimport { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from \"@/components/ui/tooltip\";\nimport { LucideIcon } from \"@/components/ui/icon\";\nimport { cn } from \"@/lib/utils\";\n\nexport interface ChatMessageAction {\n  label: string;\n  icon: string;\n  onClick?: (e: MouseEvent, message: UIMessage) => void;\n}\n\nexport interface ChatMessageProps {\n  /** Message ID */\n  id?: string;\n  /** Message role */\n  role?: \"user\" | \"assistant\" | \"system\";\n  /** Message parts from AI SDK */\n  parts?: UIMessage[\"parts\"];\n  /** Which side to render the message */\n  side?: \"left\" | \"right\";\n  /** Action buttons shown on hover */\n  actions?: ChatMessageAction[];\n  /** Additional CSS classes */\n  class?: HTMLAttributes[\"class\"];\n}\n\nconst props = withDefaults(defineProps<ChatMessageProps>(), {\n  side: \"left\",\n  actions: () => [],\n});\n\nfunction handleAction(e: MouseEvent, action: ChatMessageAction) {\n  if (!props.id || !props.role || !props.parts) return;\n  action.onClick?.(e, { id: props.id, role: props.role, parts: props.parts } as UIMessage);\n}\n</script>\n\n<template>\n  <div\n    data-slot=\"chat-message\"\n    :class=\"cn(\n      'group flex gap-3',\n      side === 'right' ? 'flex-row-reverse' : 'flex-row',\n      props.class,\n    )\"\n  >\n    <div\n      v-if=\"$slots.leading\"\n      class=\"shrink-0\"\n    >\n      <slot name=\"leading\" />\n    </div>\n\n    <div :class=\"cn('flex flex-col gap-1', side === 'right' ? 'items-end' : 'items-start')\">\n      <div :class=\"cn('max-w-[80ch] space-y-2', side === 'right' && 'bg-muted rounded-xl px-4 py-2.5')\">\n        <slot\n          :id=\"id\"\n          name=\"content\"\n          :role=\"role\"\n          :parts=\"parts\"\n        >\n          <template\n            v-for=\"(part, index) in parts\"\n            :key=\"`${id}-${part.type}-${index}`\"\n          >\n            <p\n              v-if=\"part.type === 'text'\"\n              class=\"whitespace-pre-wrap\"\n            >\n              {{ part.text }}\n            </p>\n          </template>\n        </slot>\n      </div>\n\n      <div\n        v-if=\"actions.length > 0\"\n        class=\"flex gap-0.5 opacity-0 transition-opacity group-hover:opacity-100\"\n      >\n        <TooltipProvider>\n          <Tooltip\n            v-for=\"action in actions\"\n            :key=\"action.label\"\n          >\n            <TooltipTrigger as-child>\n              <Button\n                variant=\"ghost\"\n                size=\"icon-sm\"\n                @click=\"handleAction($event, action)\"\n              >\n                <LucideIcon\n                  :name=\"action.icon\"\n                  class=\"size-3.5\"\n                />\n              </Button>\n            </TooltipTrigger>\n            <TooltipContent>\n              {{ action.label }}\n            </TooltipContent>\n          </Tooltip>\n        </TooltipProvider>\n      </div>\n    </div>\n  </div>\n</template>\n",
+      "content": "<script setup lang=\"ts\">\nimport type { HTMLAttributes } from \"vue\";\nimport type { UIMessage } from \"ai\";\nimport { Button } from \"@/components/ui/button\";\nimport { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from \"@/components/ui/tooltip\";\nimport { LucideIcon } from \"@/components/ui/lucide-icon\";\nimport { cn } from \"@/lib/utils\";\n\nexport interface ChatMessageAction {\n  label: string;\n  icon: string;\n  onClick?: (e: MouseEvent, message: UIMessage) => void;\n}\n\nexport interface ChatMessageProps {\n  /** Message ID */\n  id?: string;\n  /** Message role */\n  role?: \"user\" | \"assistant\" | \"system\";\n  /** Message parts from AI SDK */\n  parts?: UIMessage[\"parts\"];\n  /** Which side to render the message */\n  side?: \"left\" | \"right\";\n  /** Action buttons shown on hover */\n  actions?: ChatMessageAction[];\n  /** Additional CSS classes */\n  class?: HTMLAttributes[\"class\"];\n}\n\nconst props = withDefaults(defineProps<ChatMessageProps>(), {\n  side: \"left\",\n  actions: () => [],\n});\n\nfunction handleAction(e: MouseEvent, action: ChatMessageAction) {\n  if (!props.id || !props.role || !props.parts) return;\n  action.onClick?.(e, { id: props.id, role: props.role, parts: props.parts } as UIMessage);\n}\n</script>\n\n<template>\n  <div\n    data-slot=\"chat-message\"\n    :class=\"cn(\n      'group flex gap-3',\n      side === 'right' ? 'flex-row-reverse' : 'flex-row',\n      props.class,\n    )\"\n  >\n    <div\n      v-if=\"$slots.leading\"\n      class=\"shrink-0\"\n    >\n      <slot name=\"leading\" />\n    </div>\n\n    <div :class=\"cn('flex flex-col gap-1', side === 'right' ? 'items-end' : 'items-start')\">\n      <div :class=\"cn('max-w-[80ch] space-y-2', side === 'right' && 'bg-muted rounded-xl px-4 py-2.5')\">\n        <slot\n          :id=\"id\"\n          name=\"content\"\n          :role=\"role\"\n          :parts=\"parts\"\n        >\n          <template\n            v-for=\"(part, index) in parts\"\n            :key=\"`${id}-${part.type}-${index}`\"\n          >\n            <p\n              v-if=\"part.type === 'text'\"\n              class=\"whitespace-pre-wrap\"\n            >\n              {{ part.text }}\n            </p>\n          </template>\n        </slot>\n      </div>\n\n      <div\n        v-if=\"actions.length > 0\"\n        class=\"flex gap-0.5 opacity-0 transition-opacity group-hover:opacity-100\"\n      >\n        <TooltipProvider>\n          <Tooltip\n            v-for=\"action in actions\"\n            :key=\"action.label\"\n          >\n            <TooltipTrigger as-child>\n              <Button\n                variant=\"ghost\"\n                size=\"icon-sm\"\n                @click=\"handleAction($event, action)\"\n              >\n                <LucideIcon\n                  :name=\"action.icon\"\n                  class=\"size-3.5\"\n                />\n              </Button>\n            </TooltipTrigger>\n            <TooltipContent>\n              {{ action.label }}\n            </TooltipContent>\n          </Tooltip>\n        </TooltipProvider>\n      </div>\n    </div>\n  </div>\n</template>\n",
       "type": "registry:block"
     }
   ]
diff --git a/public/r/lucide-icon.json b/public/r/lucide-icon.json
index fae9350..f0df410 100644
--- a/public/r/lucide-icon.json
+++ b/public/r/lucide-icon.json
@@ -1,20 +1,20 @@
 {
   "$schema": "https://shadcn-vue.com/schema/registry-item.json",
   "name": "lucide-icon",
-  "type": "registry:block",
+  "type": "registry:ui",
   "dependencies": [
     "lucide-vue-next"
   ],
   "files": [
     {
-      "path": "blocks/lucide-icon/index.ts",
+      "path": "ui/lucide-icon/index.ts",
       "content": "export { default as LucideIcon, type LucideIconProps } from \"./LucideIcon.vue\";\n",
-      "type": "registry:block"
+      "type": "registry:ui"
     },
     {
-      "path": "blocks/lucide-icon/LucideIcon.vue",
+      "path": "ui/lucide-icon/LucideIcon.vue",
       "content": "<script setup lang=\"ts\">\nimport type { Component } from \"vue\";\nimport { icons } from \"lucide-vue-next\";\n\nexport interface LucideIconProps {\n  /** Icon identifier - accepts `i-lucide-*` style names or Vue components */\n  name: string | Component;\n  /** Icon dimensions */\n  size?: string | number;\n  class?: string;\n}\n\nconst props = defineProps<LucideIconProps>();\n\nconst iconStyle = computed(() => {\n  if (!props.size) return {};\n  const s = typeof props.size === \"number\" ? `${props.size}px` : props.size;\n  return { width: s, height: s };\n});\n\nconst isLucide = computed(() => {\n  if (typeof props.name !== \"string\") return false;\n  return props.name.startsWith(\"i-lucide-\");\n});\n\nconst resolvedComponent = computed(() => {\n  if (typeof props.name !== \"string\") {\n    return props.name;\n  }\n\n  if (!isLucide.value) return null;\n\n  const pascalName = props.name\n    .replace(/^i-lucide-/, \"\")\n    .split(\"-\")\n    .map(part => part.charAt(0).toUpperCase() + part.slice(1))\n    .join(\"\");\n\n  return icons[pascalName as keyof typeof icons] ?? null;\n});\n</script>\n\n<template>\n  <component\n    :is=\"resolvedComponent\"\n    v-if=\"resolvedComponent\"\n    :class=\"props.class\"\n    :style=\"iconStyle\"\n  />\n</template>\n",
-      "type": "registry:block"
+      "type": "registry:ui"
     }
   ]
 }
\ No newline at end of file
diff --git a/public/r/registry.json b/public/r/registry.json
index cc837a2..0fe7236 100644
--- a/public/r/registry.json
+++ b/public/r/registry.json
@@ -5,35 +5,21 @@
   "items": [
     {
       "name": "lucide-icon",
-      "type": "registry:block",
+      "type": "registry:ui",
       "files": [
         {
-          "path": "blocks/lucide-icon/index.ts",
-          "type": "registry:block"
+          "path": "ui/lucide-icon/index.ts",
+          "type": "registry:ui"
         },
         {
-          "path": "blocks/lucide-icon/LucideIcon.vue",
-          "type": "registry:block"
+          "path": "ui/lucide-icon/LucideIcon.vue",
+          "type": "registry:ui"
         }
       ],
       "dependencies": [
         "lucide-vue-next"
       ]
     },
-    {
-      "name": "hello-world",
-      "type": "registry:block",
-      "files": [
-        {
-          "path": "blocks/hello-world/index.ts",
-          "type": "registry:block"
-        },
-        {
-          "path": "blocks/hello-world/HelloWorld.vue",
-          "type": "registry:block"
-        }
-      ]
-    },
     {
       "name": "chat-prompt-submit",
       "type": "registry:block",
@@ -107,7 +93,7 @@
       ],
       "registryDependencies": [
         "button",
-        "icon",
+        "lucide-icon",
         "tooltip"
       ]
     }