diff --git a/web/src/lib/auth/guards.ts b/web/src/lib/auth/guards.ts
index 3de3ec3d6..0fc509fc5 100644
--- a/web/src/lib/auth/guards.ts
+++ b/web/src/lib/auth/guards.ts
@@ -2,7 +2,7 @@ import { goto } from "$app/navigation";
 import { resolve } from "$app/paths";
 import { redirect, type RequestEvent } from "@sveltejs/kit";
 import { CURRENT_DID_KEY, CURRENT_HANDLE_KEY } from "./accounts";
-import type { Auth } from "../auth.svelte";
+import type { Auth } from "$lib/auth.svelte";
 
 export interface RequireAuthResult {
 	did: string;
diff --git a/web/src/lib/components/home/MarketingHome.svelte b/web/src/lib/components/home/MarketingHome.svelte
index 9219a6f2b..758148c59 100644
--- a/web/src/lib/components/home/MarketingHome.svelte
+++ b/web/src/lib/components/home/MarketingHome.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import ArrowRight from "$icon/arrow-right";
-	import Button from "../ui/Button.svelte";
-	import Input from "../ui/Input.svelte";
+	import Button from "$lib/components/ui/Button.svelte";
+	import Input from "$lib/components/ui/Input.svelte";
 </script>
 
 {#snippet signupForm(label: string, showArrow: boolean, formClass: string)}
diff --git a/web/src/lib/components/profile/tabs/OverviewTab.stories.svelte b/web/src/lib/components/profile/tabs/OverviewTab.stories.svelte
index 697b910a6..56cabbd5b 100644
--- a/web/src/lib/components/profile/tabs/OverviewTab.stories.svelte
+++ b/web/src/lib/components/profile/tabs/OverviewTab.stories.svelte
@@ -2,7 +2,7 @@
 	import { defineMeta, type StoryContext } from "@storybook/addon-svelte-csf";
 	import { expect } from "storybook/test";
 	import OverviewTab from "./OverviewTab.svelte";
-	import type { RepoCardData } from "../types";
+	import type { RepoCardData } from "$lib/components/profile/types";
 
 	const pinned: RepoCardData[] = Array.from({ length: 6 }, (_, index) => ({
 		name: `pinned-${index}`,
diff --git a/web/src/lib/components/profile/tabs/OverviewTab.svelte b/web/src/lib/components/profile/tabs/OverviewTab.svelte
index 6a6e42f39..d4977ac66 100644
--- a/web/src/lib/components/profile/tabs/OverviewTab.svelte
+++ b/web/src/lib/components/profile/tabs/OverviewTab.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import RepoCard from "$lib/components/repo/RepoCard.svelte";
 	import Section from "$lib/components/ui/Section.svelte";
-	import ActivityStub from "../ActivityStub.svelte";
-	import { repoKey, type RepoCardData } from "../types";
+	import ActivityStub from "$lib/components/profile/ActivityStub.svelte";
+	import { repoKey, type RepoCardData } from "$lib/components/profile/types";
 
 	interface Props {
 		pinned: RepoCardData[];
diff --git a/web/src/lib/components/profile/tabs/PeopleTab.svelte b/web/src/lib/components/profile/tabs/PeopleTab.svelte
index bd5c2294b..634c31045 100644
--- a/web/src/lib/components/profile/tabs/PeopleTab.svelte
+++ b/web/src/lib/components/profile/tabs/PeopleTab.svelte
@@ -2,12 +2,12 @@
 	import { untrack } from "svelte";
 	import { getAuth } from "$lib/auth.svelte";
 	import { createBobbinClient } from "$lib/api/client";
-	import FollowCard from "../FollowCard.svelte";
-	import PagedList from "../PagedList.svelte";
-	import { createOffsetPager, pageCount } from "../pagination.svelte";
-	import { PROFILE_PAGE_LIMIT, fetchPeoplePage } from "../pages";
+	import FollowCard from "$lib/components/profile/FollowCard.svelte";
+	import PagedList from "$lib/components/profile/PagedList.svelte";
+	import { createOffsetPager, pageCount } from "$lib/components/profile/pagination.svelte";
+	import { PROFILE_PAGE_LIMIT, fetchPeoplePage } from "$lib/components/profile/pages";
 	import profileFollowcardBordered from "$lib/bones/profile-followcard--bordered.bones.json";
-	import type { PersonData } from "../types";
+	import type { PersonData } from "$lib/components/profile/types";
 
 	interface Props {
 		initial: PersonData[];
diff --git a/web/src/lib/components/profile/tabs/RepoListTab.stories.svelte b/web/src/lib/components/profile/tabs/RepoListTab.stories.svelte
index 1156bb5a3..927bb2ef9 100644
--- a/web/src/lib/components/profile/tabs/RepoListTab.stories.svelte
+++ b/web/src/lib/components/profile/tabs/RepoListTab.stories.svelte
@@ -1,7 +1,7 @@
 <script module lang="ts">
 	import { defineMeta, type StoryContext } from "@storybook/addon-svelte-csf";
 	import { expect, userEvent, waitFor } from "storybook/test";
-	import type { RepoCardData } from "../types";
+	import type { RepoCardData } from "$lib/components/profile/types";
 	import RepoListTab from "./RepoListTab.svelte";
 
 	const repo = (name: string, index: number): RepoCardData => ({
diff --git a/web/src/lib/components/profile/tabs/RepoListTab.svelte b/web/src/lib/components/profile/tabs/RepoListTab.svelte
index ca43d0036..f4e10871a 100644
--- a/web/src/lib/components/profile/tabs/RepoListTab.svelte
+++ b/web/src/lib/components/profile/tabs/RepoListTab.svelte
@@ -6,11 +6,15 @@
 	import { createBobbinClient } from "$lib/api/client";
 	import Input from "$lib/components/ui/Input.svelte";
 	import RepoCard from "$lib/components/repo/RepoCard.svelte";
-	import PagedList from "../PagedList.svelte";
-	import { createOffsetPager, discoveredPageCount, pageCount } from "../pagination.svelte";
-	import { PROFILE_PAGE_LIMIT, fetchReposPage } from "../pages";
+	import PagedList from "$lib/components/profile/PagedList.svelte";
+	import {
+		createOffsetPager,
+		discoveredPageCount,
+		pageCount
+	} from "$lib/components/profile/pagination.svelte";
+	import { PROFILE_PAGE_LIMIT, fetchReposPage } from "$lib/components/profile/pages";
 	import repoRepocardWithStarButton from "$lib/bones/repo-repocard--with-star-button.bones.json";
-	import { repoKey, type RepoCardData } from "../types";
+	import { repoKey, type RepoCardData } from "$lib/components/profile/types";
 	import Search from "$icon/search";
 	import X from "$icon/x";
 
diff --git a/web/src/lib/components/profile/tabs/StarredTab.svelte b/web/src/lib/components/profile/tabs/StarredTab.svelte
index 95e525b01..a569b3ca5 100644
--- a/web/src/lib/components/profile/tabs/StarredTab.svelte
+++ b/web/src/lib/components/profile/tabs/StarredTab.svelte
@@ -5,11 +5,11 @@
 	import { createBobbinClient } from "$lib/api/client";
 	import RepoCard from "$lib/components/repo/RepoCard.svelte";
 	import Card from "$lib/components/ui/Card.svelte";
-	import PagedList from "../PagedList.svelte";
-	import { createOffsetPager, pageCount } from "../pagination.svelte";
-	import { PROFILE_PAGE_LIMIT, fetchStarredPage } from "../pages";
+	import PagedList from "$lib/components/profile/PagedList.svelte";
+	import { createOffsetPager, pageCount } from "$lib/components/profile/pagination.svelte";
+	import { PROFILE_PAGE_LIMIT, fetchStarredPage } from "$lib/components/profile/pages";
 	import repoRepocardWithStarButton from "$lib/bones/repo-repocard--with-star-button.bones.json";
-	import type { StarData } from "../types";
+	import type { StarData } from "$lib/components/profile/types";
 
 	interface Props {
 		initial: StarData[];
diff --git a/web/src/lib/components/profile/tabs/StringListTab.svelte b/web/src/lib/components/profile/tabs/StringListTab.svelte
index 5cbfd6b8a..1029ee694 100644
--- a/web/src/lib/components/profile/tabs/StringListTab.svelte
+++ b/web/src/lib/components/profile/tabs/StringListTab.svelte
@@ -2,12 +2,12 @@
 	import { untrack } from "svelte";
 	import { getAuth } from "$lib/auth.svelte";
 	import { createBobbinClient } from "$lib/api/client";
-	import StringCard from "../StringCard.svelte";
-	import PagedList from "../PagedList.svelte";
-	import { createOffsetPager, pageCount } from "../pagination.svelte";
-	import { PROFILE_PAGE_LIMIT, fetchStringsPage } from "../pages";
+	import StringCard from "$lib/components/profile/StringCard.svelte";
+	import PagedList from "$lib/components/profile/PagedList.svelte";
+	import { createOffsetPager, pageCount } from "$lib/components/profile/pagination.svelte";
+	import { PROFILE_PAGE_LIMIT, fetchStringsPage } from "$lib/components/profile/pages";
 	import profileStringcardDefault from "$lib/bones/profile-stringcard--default.bones.json";
-	import type { StringCardData } from "../types";
+	import type { StringCardData } from "$lib/components/profile/types";
 
 	interface Props {
 		initial: StringCardData[];
diff --git a/web/src/lib/components/profile/tabs/VouchTab.svelte b/web/src/lib/components/profile/tabs/VouchTab.svelte
index fa963fb57..7f5a0a090 100644
--- a/web/src/lib/components/profile/tabs/VouchTab.svelte
+++ b/web/src/lib/components/profile/tabs/VouchTab.svelte
@@ -2,12 +2,12 @@
 	import { getAuth } from "$lib/auth.svelte";
 	import { createBobbinClient } from "$lib/api/client";
 	import { IdentityCache } from "$lib/api/identity";
-	import VouchCard from "../VouchCard.svelte";
+	import VouchCard from "$lib/components/profile/VouchCard.svelte";
 	import Section from "$lib/components/ui/Section.svelte";
 	import Error from "$lib/components/ui/Error.svelte";
 	import EmptyState from "$lib/components/ui/EmptyState.svelte";
-	import { fetchVouchesPage } from "../pages";
-	import type { VouchData } from "../types";
+	import { fetchVouchesPage } from "$lib/components/profile/pages";
+	import type { VouchData } from "$lib/components/profile/types";
 
 	interface Props {
 		did: string;
diff --git a/web/src/lib/components/repo/CommitList.svelte b/web/src/lib/components/repo/CommitList.svelte
index 3a16c5b83..80f67999b 100644
--- a/web/src/lib/components/repo/CommitList.svelte
+++ b/web/src/lib/components/repo/CommitList.svelte
@@ -5,7 +5,7 @@
 	import TimeAgo from "$lib/components/ui/TimeAgo.svelte";
 	import Pending from "$lib/components/ui/Pending.svelte";
 	import User from "$lib/components/ui/User.svelte";
-	import Separator from "../ui/Separator.svelte";
+	import Separator from "$lib/components/ui/Separator.svelte";
 	import PipelineWorkflows from "./pipelines/PipelineWorkflows.svelte";
 	import type { CommitSummary } from "./types";
 	import type { CommitStatuses } from "$lib/api/commitStatuses";
diff --git a/web/src/lib/components/repo/CommitLogView.svelte b/web/src/lib/components/repo/CommitLogView.svelte
index 48c32175b..2e5a856cd 100644
--- a/web/src/lib/components/repo/CommitLogView.svelte
+++ b/web/src/lib/components/repo/CommitLogView.svelte
@@ -5,7 +5,7 @@
 	import CommitRows from "./CommitRows.svelte";
 	import CommitRow from "./CommitRow.svelte";
 	import type { CommitSummary } from "./types";
-	import TabPanel from "../ui/TabPanel.svelte";
+	import TabPanel from "$lib/components/ui/TabPanel.svelte";
 	import GitCommitVertical from "$icon/git-commit-vertical";
 
 	interface Props {
diff --git a/web/src/lib/components/repo/TreeHeader.svelte b/web/src/lib/components/repo/TreeHeader.svelte
index ac66235b8..1edf83712 100644
--- a/web/src/lib/components/repo/TreeHeader.svelte
+++ b/web/src/lib/components/repo/TreeHeader.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Separator from "../ui/Separator.svelte";
+	import Separator from "$lib/components/ui/Separator.svelte";
 	import RefChip from "./RefChip.svelte";
 	import RepoCrumbs from "./RepoCrumbs.svelte";
 	import type { TreeEntrySummary } from "./types";
diff --git a/web/src/lib/components/repo/pulls/PullCommitListInterdiff.svelte b/web/src/lib/components/repo/pulls/PullCommitListInterdiff.svelte
index e102bec3b..79e87c225 100644
--- a/web/src/lib/components/repo/pulls/PullCommitListInterdiff.svelte
+++ b/web/src/lib/components/repo/pulls/PullCommitListInterdiff.svelte
@@ -2,7 +2,7 @@
 	import { type Range } from "$lib/components/ui/RangeSelector.svelte";
 	import GraphCell, { type Band } from "$lib/components/ui/GraphCell.svelte";
 	import type { CommitStatuses } from "$lib/api/commitStatuses";
-	import type { CommitSummary } from "../types";
+	import type { CommitSummary } from "$lib/components/repo/types";
 	import PullCommitRow from "./PullCommitRow.svelte";
 	import Link from "$lib/components/ui/Link.svelte";
 	import Separator from "$lib/components/ui/Separator.svelte";
diff --git a/web/src/lib/components/repo/pulls/PullCommitRow.svelte b/web/src/lib/components/repo/pulls/PullCommitRow.svelte
index 5246e8b28..77eb9cc4b 100644
--- a/web/src/lib/components/repo/pulls/PullCommitRow.svelte
+++ b/web/src/lib/components/repo/pulls/PullCommitRow.svelte
@@ -8,8 +8,8 @@
 	import Separator from "$lib/components/ui/Separator.svelte";
 	import Tag from "$lib/components/ui/Tag.svelte";
 	import User from "$lib/components/ui/User.svelte";
-	import PipelineWorkflows from "../pipelines/PipelineWorkflows.svelte";
-	import type { CommitSummary } from "../types";
+	import PipelineWorkflows from "$lib/components/repo/pipelines/PipelineWorkflows.svelte";
+	import type { CommitSummary } from "$lib/components/repo/types";
 
 	interface Props {
 		commit: CommitSummary;
diff --git a/web/src/lib/components/repo/pulls/PullDiscussion.svelte b/web/src/lib/components/repo/pulls/PullDiscussion.svelte
index 0bf390bf3..fe2793179 100644
--- a/web/src/lib/components/repo/pulls/PullDiscussion.svelte
+++ b/web/src/lib/components/repo/pulls/PullDiscussion.svelte
@@ -11,7 +11,7 @@
 	import type { MarkupContext } from "$lib/markup";
 	import PullReviewComment from "./PullReviewComment.svelte";
 	import type { CommitStatuses } from "$lib/api/commitStatuses";
-	import PipelineWorkflows from "../pipelines/PipelineWorkflows.svelte";
+	import PipelineWorkflows from "$lib/components/repo/pipelines/PipelineWorkflows.svelte";
 	import Separator from "$lib/components/ui/Separator.svelte";
 
 	interface PullVersion {
diff --git a/web/src/lib/components/search/tabs/CodeSearchTab.svelte b/web/src/lib/components/search/tabs/CodeSearchTab.svelte
index 5aeec5df9..262b10e41 100644
--- a/web/src/lib/components/search/tabs/CodeSearchTab.svelte
+++ b/web/src/lib/components/search/tabs/CodeSearchTab.svelte
@@ -6,12 +6,12 @@
 	import EmptyState from "$lib/components/ui/EmptyState.svelte";
 	import ErrorBox from "$lib/components/ui/Error.svelte";
 	import Spinner from "$lib/components/ui/Spinner.svelte";
-	import CodeResultCard from "../CodeResultCard.svelte";
-	import SearchBar from "../SearchBar.svelte";
-	import SearchSidebar from "../SearchSidebar.svelte";
-	import { searchUrl } from "../SearchTabs.svelte";
-	import { matchCount } from "../chunks";
-	import { createCodeSearch } from "../codeSearch.svelte";
+	import CodeResultCard from "$lib/components/search/CodeResultCard.svelte";
+	import SearchBar from "$lib/components/search/SearchBar.svelte";
+	import SearchSidebar from "$lib/components/search/SearchSidebar.svelte";
+	import { searchUrl } from "$lib/components/search/SearchTabs.svelte";
+	import { matchCount } from "$lib/components/search/chunks";
+	import { createCodeSearch } from "$lib/components/search/codeSearch.svelte";
 
 	interface Props {
 		/** the committed query from the url */
diff --git a/web/src/lib/components/search/tabs/RepoSearchTab.svelte b/web/src/lib/components/search/tabs/RepoSearchTab.svelte
index c6436b2fc..1020a1c10 100644
--- a/web/src/lib/components/search/tabs/RepoSearchTab.svelte
+++ b/web/src/lib/components/search/tabs/RepoSearchTab.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import EmptyState from "$lib/components/ui/EmptyState.svelte";
-	import SearchBar from "../SearchBar.svelte";
-	import SearchSidebar from "../SearchSidebar.svelte";
-	import { searchUrl } from "../SearchTabs.svelte";
+	import SearchBar from "$lib/components/search/SearchBar.svelte";
+	import SearchSidebar from "$lib/components/search/SearchSidebar.svelte";
+	import { searchUrl } from "$lib/components/search/SearchTabs.svelte";
 
 	let { query }: { query: string } = $props();
 
diff --git a/web/src/lib/components/settings/tabs/EmailsTab.svelte b/web/src/lib/components/settings/tabs/EmailsTab.svelte
index 02679a471..b53e76fe6 100644
--- a/web/src/lib/components/settings/tabs/EmailsTab.svelte
+++ b/web/src/lib/components/settings/tabs/EmailsTab.svelte
@@ -17,11 +17,11 @@
 	import Button from "$lib/components/ui/Button.svelte";
 	import Tag from "$lib/components/ui/Tag.svelte";
 	import ErrorAlert from "$lib/components/ui/Error.svelte";
-	import SettingsEmpty from "../SettingsEmpty.svelte";
-	import SettingsHeader from "../SettingsHeader.svelte";
-	import SettingsToolbar from "../SettingsToolbar.svelte";
-	import SettingsList from "../SettingsList.svelte";
-	import SettingsRow from "../SettingsRow.svelte";
+	import SettingsEmpty from "$lib/components/settings/SettingsEmpty.svelte";
+	import SettingsHeader from "$lib/components/settings/SettingsHeader.svelte";
+	import SettingsToolbar from "$lib/components/settings/SettingsToolbar.svelte";
+	import SettingsList from "$lib/components/settings/SettingsList.svelte";
+	import SettingsRow from "$lib/components/settings/SettingsRow.svelte";
 	import TimeAgo from "$lib/components/ui/TimeAgo.svelte";
 	import Plus from "$icon/plus";
 	import Trash from "$icon/trash-2";
diff --git a/web/src/lib/components/settings/tabs/KeysTab.svelte b/web/src/lib/components/settings/tabs/KeysTab.svelte
index 5969f8f0d..013b67212 100644
--- a/web/src/lib/components/settings/tabs/KeysTab.svelte
+++ b/web/src/lib/components/settings/tabs/KeysTab.svelte
@@ -12,12 +12,12 @@
 	import Bones from "$lib/components/ui/Bones.svelte";
 	import settingsSettingspanelContentSkeletonFixture from "$lib/bones/settings-settingspanel--content-skeleton-fixture.bones.json";
 	import ErrorAlert from "$lib/components/ui/Error.svelte";
-	import SettingsEmpty from "../SettingsEmpty.svelte";
+	import SettingsEmpty from "$lib/components/settings/SettingsEmpty.svelte";
 	import TimeAgo from "$lib/components/ui/TimeAgo.svelte";
-	import SettingsHeader from "../SettingsHeader.svelte";
-	import SettingsToolbar from "../SettingsToolbar.svelte";
-	import SettingsList from "../SettingsList.svelte";
-	import SettingsRow from "../SettingsRow.svelte";
+	import SettingsHeader from "$lib/components/settings/SettingsHeader.svelte";
+	import SettingsToolbar from "$lib/components/settings/SettingsToolbar.svelte";
+	import SettingsList from "$lib/components/settings/SettingsList.svelte";
+	import SettingsRow from "$lib/components/settings/SettingsRow.svelte";
 	import { createAction, createLoad } from "$lib/action.svelte";
 	import Plus from "$icon/plus";
 	import Trash from "$icon/trash-2";
diff --git a/web/src/lib/components/settings/tabs/KnotsTab.svelte b/web/src/lib/components/settings/tabs/KnotsTab.svelte
index 7259ad0d3..acf0123f2 100644
--- a/web/src/lib/components/settings/tabs/KnotsTab.svelte
+++ b/web/src/lib/components/settings/tabs/KnotsTab.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
 	import Button from "$lib/components/ui/Button.svelte";
 	import Tag from "$lib/components/ui/Tag.svelte";
-	import SettingsEmpty from "../SettingsEmpty.svelte";
-	import SettingsHeader from "../SettingsHeader.svelte";
-	import SettingsToolbar from "../SettingsToolbar.svelte";
-	import SettingsList from "../SettingsList.svelte";
-	import SettingsRow from "../SettingsRow.svelte";
+	import SettingsEmpty from "$lib/components/settings/SettingsEmpty.svelte";
+	import SettingsHeader from "$lib/components/settings/SettingsHeader.svelte";
+	import SettingsToolbar from "$lib/components/settings/SettingsToolbar.svelte";
+	import SettingsList from "$lib/components/settings/SettingsList.svelte";
+	import SettingsRow from "$lib/components/settings/SettingsRow.svelte";
 	import Plus from "$icon/plus";
 	import Trash from "$icon/trash-2";
-	import DocsButton from "../DocsButton.svelte";
+	import DocsButton from "$lib/components/settings/DocsButton.svelte";
 	import Server from "$icon/server";
 	import Check from "$icon/check";
 	import X from "$icon/x";
diff --git a/web/src/lib/components/settings/tabs/NotificationsTab.svelte b/web/src/lib/components/settings/tabs/NotificationsTab.svelte
index b5eb3a132..bffe027b1 100644
--- a/web/src/lib/components/settings/tabs/NotificationsTab.svelte
+++ b/web/src/lib/components/settings/tabs/NotificationsTab.svelte
@@ -14,8 +14,8 @@
 	import Bones from "$lib/components/ui/Bones.svelte";
 	import uiToggleChecked from "$lib/bones/ui-toggle--checked.bones.json";
 	import ErrorAlert from "$lib/components/ui/Error.svelte";
-	import SettingsHeader from "../SettingsHeader.svelte";
-	import SettingsList from "../SettingsList.svelte";
+	import SettingsHeader from "$lib/components/settings/SettingsHeader.svelte";
+	import SettingsList from "$lib/components/settings/SettingsList.svelte";
 	import { createAction, createLoad } from "$lib/action.svelte";
 	import Save from "$icon/save";
 	import Star from "$icon/star";
diff --git a/web/src/lib/components/settings/tabs/ProfileTab.svelte b/web/src/lib/components/settings/tabs/ProfileTab.svelte
index bcf363883..87639db6d 100644
--- a/web/src/lib/components/settings/tabs/ProfileTab.svelte
+++ b/web/src/lib/components/settings/tabs/ProfileTab.svelte
@@ -7,11 +7,11 @@
 	import Input from "$lib/components/ui/Input.svelte";
 	import Select from "$lib/components/ui/Select.svelte";
 	import Toggle from "$lib/components/ui/Toggle.svelte";
-	import SettingsSection from "../SettingsSection.svelte";
-	import SettingsRow from "../SettingsRow.svelte";
-	import SettingsSaveBar from "../SettingsSaveBar.svelte";
-	import CodeChip from "../CodeChip.svelte";
-	import ThemePicker from "../ThemePicker.svelte";
+	import SettingsSection from "$lib/components/settings/SettingsSection.svelte";
+	import SettingsRow from "$lib/components/settings/SettingsRow.svelte";
+	import SettingsSaveBar from "$lib/components/settings/SettingsSaveBar.svelte";
+	import CodeChip from "$lib/components/settings/CodeChip.svelte";
+	import ThemePicker from "$lib/components/settings/ThemePicker.svelte";
 	import { createLoad } from "$lib/action.svelte";
 	import Pencil from "$icon/pencil";
 	import Key from "$icon/key";
diff --git a/web/src/lib/components/settings/tabs/SitesTab.svelte b/web/src/lib/components/settings/tabs/SitesTab.svelte
index 5bb981005..c79e01bed 100644
--- a/web/src/lib/components/settings/tabs/SitesTab.svelte
+++ b/web/src/lib/components/settings/tabs/SitesTab.svelte
@@ -10,13 +10,13 @@
 	import ErrorAlert from "$lib/components/ui/Error.svelte";
 	import Bones from "$lib/components/ui/Bones.svelte";
 	import settingsSettingspanelContentSkeletonFixture from "$lib/bones/settings-settingspanel--content-skeleton-fixture.bones.json";
-	import SettingsEmpty from "../SettingsEmpty.svelte";
-	import SettingsHeader from "../SettingsHeader.svelte";
-	import SettingsToolbar from "../SettingsToolbar.svelte";
-	import SettingsList from "../SettingsList.svelte";
-	import SettingsRow from "../SettingsRow.svelte";
-	import FormRow from "../FormRow.svelte";
-	import DocsButton from "../DocsButton.svelte";
+	import SettingsEmpty from "$lib/components/settings/SettingsEmpty.svelte";
+	import SettingsHeader from "$lib/components/settings/SettingsHeader.svelte";
+	import SettingsToolbar from "$lib/components/settings/SettingsToolbar.svelte";
+	import SettingsList from "$lib/components/settings/SettingsList.svelte";
+	import SettingsRow from "$lib/components/settings/SettingsRow.svelte";
+	import FormRow from "$lib/components/settings/FormRow.svelte";
+	import DocsButton from "$lib/components/settings/DocsButton.svelte";
 	import { createAction, createLoad } from "$lib/action.svelte";
 	import Globe from "$icon/globe";
 	import Check from "$icon/check";
diff --git a/web/src/lib/components/settings/tabs/SpindlesTab.svelte b/web/src/lib/components/settings/tabs/SpindlesTab.svelte
index 304bd2765..4ad1e3fd1 100644
--- a/web/src/lib/components/settings/tabs/SpindlesTab.svelte
+++ b/web/src/lib/components/settings/tabs/SpindlesTab.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
 	import Button from "$lib/components/ui/Button.svelte";
 	import Tag from "$lib/components/ui/Tag.svelte";
-	import SettingsEmpty from "../SettingsEmpty.svelte";
-	import SettingsHeader from "../SettingsHeader.svelte";
-	import SettingsToolbar from "../SettingsToolbar.svelte";
-	import SettingsList from "../SettingsList.svelte";
-	import SettingsRow from "../SettingsRow.svelte";
+	import SettingsEmpty from "$lib/components/settings/SettingsEmpty.svelte";
+	import SettingsHeader from "$lib/components/settings/SettingsHeader.svelte";
+	import SettingsToolbar from "$lib/components/settings/SettingsToolbar.svelte";
+	import SettingsList from "$lib/components/settings/SettingsList.svelte";
+	import SettingsRow from "$lib/components/settings/SettingsRow.svelte";
 	import Plus from "$icon/plus";
 	import Trash from "$icon/trash-2";
-	import DocsButton from "../DocsButton.svelte";
+	import DocsButton from "$lib/components/settings/DocsButton.svelte";
 	import Spool from "$icon/spool";
 	import Check from "$icon/check";
 	import X from "$icon/x";
diff --git a/web/src/lib/components/shell/Footer.svelte b/web/src/lib/components/shell/Footer.svelte
index 4ab9d8a8d..ba36cefb4 100644
--- a/web/src/lib/components/shell/Footer.svelte
+++ b/web/src/lib/components/shell/Footer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { resolve } from "$app/paths";
-	import Bluesky from "../icons/Bluesky.svelte";
-	import Logo from "../ui/Logo.svelte";
+	import Bluesky from "$lib/components/icons/Bluesky.svelte";
+	import Logo from "$lib/components/ui/Logo.svelte";
 
 	interface Props {
 		variant?: "full" | "minimal";
diff --git a/web/src/lib/components/shell/Topbar.svelte b/web/src/lib/components/shell/Topbar.svelte
index 609c03d47..60aa06bb8 100644
--- a/web/src/lib/components/shell/Topbar.svelte
+++ b/web/src/lib/components/shell/Topbar.svelte
@@ -36,9 +36,9 @@
 
 <script lang="ts">
 	import { resolve } from "$app/paths";
-	import Button from "../ui/Button.svelte";
-	import Dropdown from "../ui/Dropdown.svelte";
-	import DropdownItem from "../ui/DropdownItem.svelte";
+	import Button from "$lib/components/ui/Button.svelte";
+	import Dropdown from "$lib/components/ui/Dropdown.svelte";
+	import DropdownItem from "$lib/components/ui/DropdownItem.svelte";
 	import ArrowRight from "$icon/arrow-right";
 	import BookMarked from "$icon/book-marked";
 	import BookPlus from "$icon/book-plus";
@@ -48,13 +48,13 @@
 	import Plus from "$icon/plus";
 	import Search from "$icon/search";
 	import UserIcon from "$icon/user";
-	import Spinner from "../ui/Spinner.svelte";
-	import Logo from "../ui/Logo.svelte";
-	import User from "../ui/User.svelte";
+	import Spinner from "$lib/components/ui/Spinner.svelte";
+	import Logo from "$lib/components/ui/Logo.svelte";
+	import User from "$lib/components/ui/User.svelte";
 	import TopbarSearch from "./TopbarSearch.svelte";
-	import NotificationBell from "../notifications/NotificationBell.svelte";
+	import NotificationBell from "$lib/components/notifications/NotificationBell.svelte";
 	import type { AuthAccount, CurrentUser } from "$lib/auth.svelte";
-	import Separator from "../ui/Separator.svelte";
+	import Separator from "$lib/components/ui/Separator.svelte";
 
 	interface Props {
 		variant: NonNullable<TopbarVariants["variant"]>;
diff --git a/web/src/lib/components/shell/TopbarSearch.svelte b/web/src/lib/components/shell/TopbarSearch.svelte
index dcb6f8107..0da5f0c58 100644
--- a/web/src/lib/components/shell/TopbarSearch.svelte
+++ b/web/src/lib/components/shell/TopbarSearch.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { resolve } from "$app/paths";
 	import Search from "$icon/search";
-	import Input from "../ui/Input.svelte";
+	import Input from "$lib/components/ui/Input.svelte";
 
 	interface Props {
 		class?: string;
diff --git a/web/src/routes/oauth-client-metadata.json/+server.ts b/web/src/routes/oauth-client-metadata.json/+server.ts
index 8a9a6cb34..7bfce4184 100644
--- a/web/src/routes/oauth-client-metadata.json/+server.ts
+++ b/web/src/routes/oauth-client-metadata.json/+server.ts
@@ -1,5 +1,5 @@
 import { json } from "@sveltejs/kit";
-import metadata from "../../lib/oauth-client-metadata.json";
+import metadata from "$lib/oauth-client-metadata.json";
 
 export const GET = ({ url }) => {
 	const origin = url.origin;