diff --git a/web/src/lib/components/kit/CatalogGroup.svelte b/web/src/lib/components/CatalogGroup.svelte
similarity index 100%
rename from web/src/lib/components/kit/CatalogGroup.svelte
rename to web/src/lib/components/CatalogGroup.svelte
diff --git a/web/src/lib/components/kit/CatalogHeader.svelte b/web/src/lib/components/CatalogHeader.svelte
similarity index 100%
rename from web/src/lib/components/kit/CatalogHeader.svelte
rename to web/src/lib/components/CatalogHeader.svelte
diff --git a/web/src/lib/components/kit/CatalogToolbar.svelte b/web/src/lib/components/CatalogToolbar.svelte
similarity index 100%
rename from web/src/lib/components/kit/CatalogToolbar.svelte
rename to web/src/lib/components/CatalogToolbar.svelte
diff --git a/web/src/lib/components/kit/CheckerCanvas.svelte b/web/src/lib/components/CheckerCanvas.svelte
similarity index 100%
rename from web/src/lib/components/kit/CheckerCanvas.svelte
rename to web/src/lib/components/CheckerCanvas.svelte
diff --git a/web/src/lib/components/kit/CodeBlock.svelte b/web/src/lib/components/CodeBlock.svelte
similarity index 100%
rename from web/src/lib/components/kit/CodeBlock.svelte
rename to web/src/lib/components/CodeBlock.svelte
diff --git a/web/src/lib/components/kit/Dropzone.svelte b/web/src/lib/components/Dropzone.svelte
similarity index 100%
rename from web/src/lib/components/kit/Dropzone.svelte
rename to web/src/lib/components/Dropzone.svelte
diff --git a/web/src/lib/components/kit/EmptyState.svelte b/web/src/lib/components/EmptyState.svelte
similarity index 100%
rename from web/src/lib/components/kit/EmptyState.svelte
rename to web/src/lib/components/EmptyState.svelte
diff --git a/web/src/lib/components/kit/ImageCard.svelte b/web/src/lib/components/ImageCard.svelte
similarity index 100%
rename from web/src/lib/components/kit/ImageCard.svelte
rename to web/src/lib/components/ImageCard.svelte
diff --git a/web/src/lib/components/kit/MetaList.svelte b/web/src/lib/components/MetaList.svelte
similarity index 100%
rename from web/src/lib/components/kit/MetaList.svelte
rename to web/src/lib/components/MetaList.svelte
diff --git a/web/src/lib/components/kit/MetaRow.svelte b/web/src/lib/components/MetaRow.svelte
similarity index 100%
rename from web/src/lib/components/kit/MetaRow.svelte
rename to web/src/lib/components/MetaRow.svelte
diff --git a/web/src/lib/components/kit/MonoLabel.svelte b/web/src/lib/components/MonoLabel.svelte
similarity index 100%
rename from web/src/lib/components/kit/MonoLabel.svelte
rename to web/src/lib/components/MonoLabel.svelte
diff --git a/web/src/lib/components/kit/PanelHeading.svelte b/web/src/lib/components/PanelHeading.svelte
similarity index 100%
rename from web/src/lib/components/kit/PanelHeading.svelte
rename to web/src/lib/components/PanelHeading.svelte
diff --git a/web/src/lib/components/kit/SchemaActions.svelte b/web/src/lib/components/SchemaActions.svelte
similarity index 100%
rename from web/src/lib/components/kit/SchemaActions.svelte
rename to web/src/lib/components/SchemaActions.svelte
diff --git a/web/src/lib/components/kit/SchemaFields.svelte b/web/src/lib/components/SchemaFields.svelte
similarity index 100%
rename from web/src/lib/components/kit/SchemaFields.svelte
rename to web/src/lib/components/SchemaFields.svelte
diff --git a/web/src/lib/components/kit/SchemaPreview.svelte b/web/src/lib/components/SchemaPreview.svelte
similarity index 90%
rename from web/src/lib/components/kit/SchemaPreview.svelte
rename to web/src/lib/components/SchemaPreview.svelte
index 64ef0f1..66a163b 100644
--- a/web/src/lib/components/kit/SchemaPreview.svelte
+++ b/web/src/lib/components/SchemaPreview.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import MetaList from "$lib/components/kit/MetaList.svelte";
-	import SchemaActions from "$lib/components/kit/SchemaActions.svelte";
-	import SchemaResultTile from "$lib/components/kit/SchemaResultTile.svelte";
-	import SchemaSourceTile from "$lib/components/kit/SchemaSourceTile.svelte";
+	import MetaList from "$lib/components/MetaList.svelte";
+	import SchemaActions from "$lib/components/SchemaActions.svelte";
+	import SchemaResultTile from "$lib/components/SchemaResultTile.svelte";
+	import SchemaSourceTile from "$lib/components/SchemaSourceTile.svelte";
 	import type { PixelImage } from "$lib/core/types";
 	import type { InputMode, ResultKind } from "$lib/registry-new";
 
diff --git a/web/src/lib/components/kit/SchemaResultTile.svelte b/web/src/lib/components/SchemaResultTile.svelte
similarity index 100%
rename from web/src/lib/components/kit/SchemaResultTile.svelte
rename to web/src/lib/components/SchemaResultTile.svelte
diff --git a/web/src/lib/components/kit/SchemaSourceTile.svelte b/web/src/lib/components/SchemaSourceTile.svelte
similarity index 100%
rename from web/src/lib/components/kit/SchemaSourceTile.svelte
rename to web/src/lib/components/SchemaSourceTile.svelte
diff --git a/web/src/lib/components/kit/SchemaTextResult.svelte b/web/src/lib/components/SchemaTextResult.svelte
similarity index 100%
rename from web/src/lib/components/kit/SchemaTextResult.svelte
rename to web/src/lib/components/SchemaTextResult.svelte
diff --git a/web/src/lib/components/kit/SchemaTextSource.svelte b/web/src/lib/components/SchemaTextSource.svelte
similarity index 100%
rename from web/src/lib/components/kit/SchemaTextSource.svelte
rename to web/src/lib/components/SchemaTextSource.svelte
diff --git a/web/src/lib/components/kit/SchemaToolView.svelte b/web/src/lib/components/SchemaToolView.svelte
similarity index 97%
rename from web/src/lib/components/kit/SchemaToolView.svelte
rename to web/src/lib/components/SchemaToolView.svelte
index 1c904ec..fb7b5f8 100644
--- a/web/src/lib/components/kit/SchemaToolView.svelte
+++ b/web/src/lib/components/SchemaToolView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-	import SchemaFields from "$lib/components/kit/SchemaFields.svelte";
-	import SchemaPreview from "$lib/components/kit/SchemaPreview.svelte";
+	import SchemaFields from "$lib/components/SchemaFields.svelte";
+	import SchemaPreview from "$lib/components/SchemaPreview.svelte";
 	import { debounce } from "$lib/core/debounce";
 	import { ToolError } from "$lib/core/errors";
 	import { decodeFile, encode } from "$lib/core/io";
diff --git a/web/src/lib/components/kit/SettingGroup.svelte b/web/src/lib/components/SettingGroup.svelte
similarity index 100%
rename from web/src/lib/components/kit/SettingGroup.svelte
rename to web/src/lib/components/SettingGroup.svelte
diff --git a/web/src/lib/components/kit/SettingsFooter.svelte b/web/src/lib/components/SettingsFooter.svelte
similarity index 100%
rename from web/src/lib/components/kit/SettingsFooter.svelte
rename to web/src/lib/components/SettingsFooter.svelte
diff --git a/web/src/lib/components/kit/StatusDot.svelte b/web/src/lib/components/StatusDot.svelte
similarity index 100%
rename from web/src/lib/components/kit/StatusDot.svelte
rename to web/src/lib/components/StatusDot.svelte
diff --git a/web/src/lib/components/kit/StatusLine.svelte b/web/src/lib/components/StatusLine.svelte
similarity index 100%
rename from web/src/lib/components/kit/StatusLine.svelte
rename to web/src/lib/components/StatusLine.svelte
diff --git a/web/src/lib/components/kit/StepCard.svelte b/web/src/lib/components/StepCard.svelte
similarity index 100%
rename from web/src/lib/components/kit/StepCard.svelte
rename to web/src/lib/components/StepCard.svelte
diff --git a/web/src/lib/components/kit/ToolCard.svelte b/web/src/lib/components/ToolCard.svelte
similarity index 100%
rename from web/src/lib/components/kit/ToolCard.svelte
rename to web/src/lib/components/ToolCard.svelte
diff --git a/web/src/lib/components/kit/define.ts b/web/src/lib/components/define.ts
similarity index 100%
rename from web/src/lib/components/kit/define.ts
rename to web/src/lib/components/define.ts
diff --git a/web/src/lib/components/kit/fields/CheckboxField.svelte b/web/src/lib/components/fields/CheckboxField.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/CheckboxField.svelte
rename to web/src/lib/components/fields/CheckboxField.svelte
diff --git a/web/src/lib/components/kit/fields/ColorField.svelte b/web/src/lib/components/fields/ColorField.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/ColorField.svelte
rename to web/src/lib/components/fields/ColorField.svelte
diff --git a/web/src/lib/components/kit/fields/DimensionField.svelte b/web/src/lib/components/fields/DimensionField.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/DimensionField.svelte
rename to web/src/lib/components/fields/DimensionField.svelte
diff --git a/web/src/lib/components/kit/fields/Field.svelte b/web/src/lib/components/fields/Field.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/Field.svelte
rename to web/src/lib/components/fields/Field.svelte
diff --git a/web/src/lib/components/kit/fields/SelectField.svelte b/web/src/lib/components/fields/SelectField.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/SelectField.svelte
rename to web/src/lib/components/fields/SelectField.svelte
diff --git a/web/src/lib/components/kit/fields/SliderField.svelte b/web/src/lib/components/fields/SliderField.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/SliderField.svelte
rename to web/src/lib/components/fields/SliderField.svelte
diff --git a/web/src/lib/components/kit/fields/TextField.svelte b/web/src/lib/components/fields/TextField.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/TextField.svelte
rename to web/src/lib/components/fields/TextField.svelte
diff --git a/web/src/lib/components/kit/fields/schema/AngleControl.svelte b/web/src/lib/components/fields/schema/AngleControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/AngleControl.svelte
rename to web/src/lib/components/fields/schema/AngleControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/CheckboxControl.svelte b/web/src/lib/components/fields/schema/CheckboxControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/CheckboxControl.svelte
rename to web/src/lib/components/fields/schema/CheckboxControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/ColorControl.svelte b/web/src/lib/components/fields/schema/ColorControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/ColorControl.svelte
rename to web/src/lib/components/fields/schema/ColorControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/ColorPairControl.svelte b/web/src/lib/components/fields/schema/ColorPairControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/ColorPairControl.svelte
rename to web/src/lib/components/fields/schema/ColorPairControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/ColorsControl.svelte b/web/src/lib/components/fields/schema/ColorsControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/ColorsControl.svelte
rename to web/src/lib/components/fields/schema/ColorsControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/FontStyleControl.svelte b/web/src/lib/components/fields/schema/FontStyleControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/FontStyleControl.svelte
rename to web/src/lib/components/fields/schema/FontStyleControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/GradientControl.svelte b/web/src/lib/components/fields/schema/GradientControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/GradientControl.svelte
rename to web/src/lib/components/fields/schema/GradientControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/OffsetControl.svelte b/web/src/lib/components/fields/schema/OffsetControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/OffsetControl.svelte
rename to web/src/lib/components/fields/schema/OffsetControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/PlateControl.svelte b/web/src/lib/components/fields/schema/PlateControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/PlateControl.svelte
rename to web/src/lib/components/fields/schema/PlateControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/PositionControl.svelte b/web/src/lib/components/fields/schema/PositionControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/PositionControl.svelte
rename to web/src/lib/components/fields/schema/PositionControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/RangeControl.svelte b/web/src/lib/components/fields/schema/RangeControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/RangeControl.svelte
rename to web/src/lib/components/fields/schema/RangeControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/SelectControl.svelte b/web/src/lib/components/fields/schema/SelectControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/SelectControl.svelte
rename to web/src/lib/components/fields/schema/SelectControl.svelte
diff --git a/web/src/lib/components/kit/fields/schema/TextControl.svelte b/web/src/lib/components/fields/schema/TextControl.svelte
similarity index 100%
rename from web/src/lib/components/kit/fields/schema/TextControl.svelte
rename to web/src/lib/components/fields/schema/TextControl.svelte
diff --git a/web/src/lib/components/kit/layout/Footer.svelte b/web/src/lib/components/layout/Footer.svelte
similarity index 100%
rename from web/src/lib/components/kit/layout/Footer.svelte
rename to web/src/lib/components/layout/Footer.svelte
diff --git a/web/src/lib/components/kit/layout/Panel.svelte b/web/src/lib/components/layout/Panel.svelte
similarity index 100%
rename from web/src/lib/components/kit/layout/Panel.svelte
rename to web/src/lib/components/layout/Panel.svelte
diff --git a/web/src/lib/components/kit/layout/TopBar.svelte b/web/src/lib/components/layout/TopBar.svelte
similarity index 100%
rename from web/src/lib/components/kit/layout/TopBar.svelte
rename to web/src/lib/components/layout/TopBar.svelte
diff --git a/web/src/lib/components/kit/ui/Badge.svelte b/web/src/lib/components/ui/Badge.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/Badge.svelte
rename to web/src/lib/components/ui/Badge.svelte
diff --git a/web/src/lib/components/kit/ui/Button.svelte b/web/src/lib/components/ui/Button.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/Button.svelte
rename to web/src/lib/components/ui/Button.svelte
diff --git a/web/src/lib/components/kit/ui/DownloadButton.svelte b/web/src/lib/components/ui/DownloadButton.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/DownloadButton.svelte
rename to web/src/lib/components/ui/DownloadButton.svelte
diff --git a/web/src/lib/components/kit/ui/Icon.svelte b/web/src/lib/components/ui/Icon.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/Icon.svelte
rename to web/src/lib/components/ui/Icon.svelte
diff --git a/web/src/lib/components/kit/ui/IconButton.svelte b/web/src/lib/components/ui/IconButton.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/IconButton.svelte
rename to web/src/lib/components/ui/IconButton.svelte
diff --git a/web/src/lib/components/kit/ui/LangToggle.svelte b/web/src/lib/components/ui/LangToggle.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/LangToggle.svelte
rename to web/src/lib/components/ui/LangToggle.svelte
diff --git a/web/src/lib/components/kit/ui/Segmented.svelte b/web/src/lib/components/ui/Segmented.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/Segmented.svelte
rename to web/src/lib/components/ui/Segmented.svelte
diff --git a/web/src/lib/components/kit/ui/ThemeToggle.svelte b/web/src/lib/components/ui/ThemeToggle.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/ThemeToggle.svelte
rename to web/src/lib/components/ui/ThemeToggle.svelte
diff --git a/web/src/lib/components/kit/ui/Toggle.svelte b/web/src/lib/components/ui/Toggle.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/Toggle.svelte
rename to web/src/lib/components/ui/Toggle.svelte
diff --git a/web/src/lib/components/kit/ui/TopNav.svelte b/web/src/lib/components/ui/TopNav.svelte
similarity index 100%
rename from web/src/lib/components/kit/ui/TopNav.svelte
rename to web/src/lib/components/ui/TopNav.svelte
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 6aaedd0..fbd4b81 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { page } from "$app/state";
 	import favicon from "$lib/assets/favicon.svg";
-	import Footer from "$lib/components/kit/layout/Footer.svelte";
-	import TopBar from "$lib/components/kit/layout/TopBar.svelte";
+	import Footer from "$lib/components/layout/Footer.svelte";
+	import TopBar from "$lib/components/layout/TopBar.svelte";
 	import { initLocale } from "$lib/i18n/locale.svelte";
 	import { getTheme, initTheme, setTheme } from "$lib/theme.svelte";
 	import type { Snippet } from "svelte";
diff --git a/web/src/routes/+page.svelte b/web/src/routes/+page.svelte
index 395780f..acef925 100644
--- a/web/src/routes/+page.svelte
+++ b/web/src/routes/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import CatalogGroup from "$lib/components/kit/CatalogGroup.svelte";
-	import CatalogHeader from "$lib/components/kit/CatalogHeader.svelte";
-	import CatalogToolbar from "$lib/components/kit/CatalogToolbar.svelte";
-	import ToolCard from "$lib/components/kit/ToolCard.svelte";
+	import CatalogGroup from "$lib/components/CatalogGroup.svelte";
+	import CatalogHeader from "$lib/components/CatalogHeader.svelte";
+	import CatalogToolbar from "$lib/components/CatalogToolbar.svelte";
+	import ToolCard from "$lib/components/ToolCard.svelte";
 	import { PREVIEW_GROUPS, PREVIEW_TOTAL } from "$lib/preview/catalog";
 	import { TOOL_ICONS } from "$lib/preview/tool-icons";
 
diff --git a/web/src/routes/kit/+page.svelte b/web/src/routes/kit/+page.svelte
index ac4898f..0b13dfa 100644
--- a/web/src/routes/kit/+page.svelte
+++ b/web/src/routes/kit/+page.svelte
@@ -1,26 +1,26 @@
 <script lang="ts">
-	import CheckerCanvas from "$lib/components/kit/CheckerCanvas.svelte";
-	import CodeBlock from "$lib/components/kit/CodeBlock.svelte";
-	import EmptyState from "$lib/components/kit/EmptyState.svelte";
-	import CheckboxField from "$lib/components/kit/fields/CheckboxField.svelte";
-	import ColorField from "$lib/components/kit/fields/ColorField.svelte";
-	import SelectField from "$lib/components/kit/fields/SelectField.svelte";
-	import SliderField from "$lib/components/kit/fields/SliderField.svelte";
-	import TextField from "$lib/components/kit/fields/TextField.svelte";
-	import ImageCard from "$lib/components/kit/ImageCard.svelte";
-	import Panel from "$lib/components/kit/layout/Panel.svelte";
-	import MetaList from "$lib/components/kit/MetaList.svelte";
-	import SettingGroup from "$lib/components/kit/SettingGroup.svelte";
-	import SettingsFooter from "$lib/components/kit/SettingsFooter.svelte";
-	import StatusLine from "$lib/components/kit/StatusLine.svelte";
-	import StepCard from "$lib/components/kit/StepCard.svelte";
-	import ToolCard from "$lib/components/kit/ToolCard.svelte";
-	import Badge from "$lib/components/kit/ui/Badge.svelte";
-	import Button from "$lib/components/kit/ui/Button.svelte";
-	import DownloadButton from "$lib/components/kit/ui/DownloadButton.svelte";
-	import IconButton from "$lib/components/kit/ui/IconButton.svelte";
-	import Segmented from "$lib/components/kit/ui/Segmented.svelte";
-	import Toggle from "$lib/components/kit/ui/Toggle.svelte";
+	import CheckerCanvas from "$lib/components/CheckerCanvas.svelte";
+	import CodeBlock from "$lib/components/CodeBlock.svelte";
+	import EmptyState from "$lib/components/EmptyState.svelte";
+	import CheckboxField from "$lib/components/fields/CheckboxField.svelte";
+	import ColorField from "$lib/components/fields/ColorField.svelte";
+	import SelectField from "$lib/components/fields/SelectField.svelte";
+	import SliderField from "$lib/components/fields/SliderField.svelte";
+	import TextField from "$lib/components/fields/TextField.svelte";
+	import ImageCard from "$lib/components/ImageCard.svelte";
+	import Panel from "$lib/components/layout/Panel.svelte";
+	import MetaList from "$lib/components/MetaList.svelte";
+	import SettingGroup from "$lib/components/SettingGroup.svelte";
+	import SettingsFooter from "$lib/components/SettingsFooter.svelte";
+	import StatusLine from "$lib/components/StatusLine.svelte";
+	import StepCard from "$lib/components/StepCard.svelte";
+	import ToolCard from "$lib/components/ToolCard.svelte";
+	import Badge from "$lib/components/ui/Badge.svelte";
+	import Button from "$lib/components/ui/Button.svelte";
+	import DownloadButton from "$lib/components/ui/DownloadButton.svelte";
+	import IconButton from "$lib/components/ui/IconButton.svelte";
+	import Segmented from "$lib/components/ui/Segmented.svelte";
+	import Toggle from "$lib/components/ui/Toggle.svelte";
 	import { Download, ImageOff, Plus, Trash2 } from "@lucide/svelte";
 
 	import { TOOL_ICONS } from "$lib/preview/tool-icons";
diff --git a/web/src/routes/list-tools/+page.svelte b/web/src/routes/list-tools/+page.svelte
index 9aee34a..0d8880f 100644
--- a/web/src/routes/list-tools/+page.svelte
+++ b/web/src/routes/list-tools/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import CatalogGroup from "$lib/components/kit/CatalogGroup.svelte";
-	import CatalogHeader from "$lib/components/kit/CatalogHeader.svelte";
-	import CatalogToolbar from "$lib/components/kit/CatalogToolbar.svelte";
-	import ToolCard from "$lib/components/kit/ToolCard.svelte";
+	import CatalogGroup from "$lib/components/CatalogGroup.svelte";
+	import CatalogHeader from "$lib/components/CatalogHeader.svelte";
+	import CatalogToolbar from "$lib/components/CatalogToolbar.svelte";
+	import ToolCard from "$lib/components/ToolCard.svelte";
 	import { PREVIEW_GROUPS, PREVIEW_TOTAL } from "$lib/preview/catalog";
 	import { TOOL_ICONS } from "$lib/preview/tool-icons";
 
diff --git a/web/src/routes/tools/[id]/+page.svelte b/web/src/routes/tools/[id]/+page.svelte
index a59ef0b..d08c1e5 100644
--- a/web/src/routes/tools/[id]/+page.svelte
+++ b/web/src/routes/tools/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
+	import EmptyState from "$lib/components/EmptyState.svelte";
+	import SchemaToolView from "$lib/components/SchemaToolView.svelte";
 	import { getTool } from "$lib/registry-new";
-	import SchemaToolView from "$lib/components/kit/SchemaToolView.svelte";
-	import EmptyState from "$lib/components/kit/EmptyState.svelte";
 	import { SlidersHorizontal as ToolIcon } from "@lucide/svelte";
 
 	interface Props {