v3: src/ gets one layout rule and keeps to it — each layer holds one kind of module, and every layer is split into the same domains — the previous pass sorted components into folders but left hooks, helpers and a barrel inside them, kept hooks/, utils/ and contexts/ flat, and still grouped most tests by theme. The rule: components/ holds only components (.tsx), contexts/ holds FooContext.ts + FooProvider.tsx pairs, hooks/ every hook, utils/ every non-React module, pages/ one component per route and nothing else. Each of components/, contexts/, hooks/ and utils/ is split into the same domains — auth, category, chat, comment, dump, editor, feed, form, layout, player, playlist, profile, social, theme, ws — plus shared/ for what belongs to no one domain, so the chat is components/chat, contexts/chat, hooks/chat and utils/chat. components/ui becomes components/shared to match. Out of components/: useApiForm goes to hooks/form, chat's message.ts and time.ts to utils/chat (with chatDraft and chatText, now draft.ts and text.ts), the emoji skin tone to utils/editor, the remembered volume to utils/player; player/icons.tsx is PlayerIcons.tsx. components/form/index.ts is gone: everything is imported from its own file, FormProvider straight from react-hook-form, and expectOk sits beside friendlyFetchError in utils/shared/api.ts (apiError.ts), since pages that have no form used it too. Out of pages/: the index's feed views, tab bar and presence row move to components/feed; HotFeed and NewFeed, identical but for the sort, are one DumpFeed with an order prop, which also takes over MainFeedProps from pages/index/types.ts. App is a named export like everything else. Tests mirror the tree one file per module — test/<layer>/<domain>/<Module>.test.tsx — so the themed files (hooks/misc, data, editor, sync; utils/misc, text, storage, remote, journal; contexts/providers; pages/auth and UserSubpages; layout/Fabs) are split by subject, the setup each piece needs kept and the rest dropped; the floating-button test becomes one test per button, 627 tests now. The README states the rule. No behaviour changes; the catalogues only move their source references.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/components/dump/DumpCard.tsx

@@ -2,22 +2,22 @@ import { memo } from "react";
 import { Link } from "react-router";
 import { Plural, Trans } from "@lingui/react/macro";
 import type { Dump } from "../../model.ts";
-import { relativeTime } from "../../utils/relativeTime.ts";
-import { dumpThumbnailUrl, dumpUrl } from "../../utils/urls.ts";
-import { useAuth } from "../../hooks/useAuth.ts";
-import { useCategories } from "../../hooks/useCategories.ts";
-import { useDumpCardLink } from "../../hooks/useDumpCardLink.ts";
+import { relativeTime } from "../../utils/shared/relativeTime.ts";
+import { dumpThumbnailUrl, dumpUrl } from "../../utils/shared/urls.ts";
+import { useAuth } from "../../hooks/auth/useAuth.ts";
+import { useCategories } from "../../hooks/category/useCategories.ts";
+import { useDumpCardLink } from "../../hooks/dump/useDumpCardLink.ts";
 import {
   isDumpVisited,
   isRecent,
   markDumpVisited,
-} from "../../utils/visited.ts";
+} from "../../utils/shared/visited.ts";
 import { FilePreview } from "./FilePreview.tsx";
 import { RichContentCard } from "./RichContentCard.tsx";
-import { ThumbnailPlaceholder } from "../ui/ThumbnailPlaceholder.tsx";
+import { ThumbnailPlaceholder } from "../shared/ThumbnailPlaceholder.tsx";
 import { VoteButton } from "../social/VoteButton.tsx";
 import { Markdown } from "../editor/Markdown.tsx";
-import { Tooltip } from "../ui/Tooltip.tsx";
+import { Tooltip } from "../shared/Tooltip.tsx";
 
 interface DumpCardProps {
   dump: Dump;

src/components/dump/FilePreview.tsx

@@ -1,15 +1,19 @@
 import { useContext, useEffect, useState } from "react";
 import type { Dump } from "../../model.ts";
-import { formatBytes } from "../../utils/format.ts";
-import { dumpFileUrl, dumpThumbnailUrl, dumpUrl } from "../../utils/urls.ts";
-import { useAuth } from "../../hooks/useAuth.ts";
-import { IconPause, IconPlay } from "../player/icons.tsx";
+import { formatBytes } from "../../utils/shared/format.ts";
+import {
+  dumpFileUrl,
+  dumpThumbnailUrl,
+  dumpUrl,
+} from "../../utils/shared/urls.ts";
+import { useAuth } from "../../hooks/auth/useAuth.ts";
+import { IconPause, IconPlay } from "../player/PlayerIcons.tsx";
 import { MediaPlayer } from "../player/MediaPlayer.tsx";
 import {
   PlayerContext,
   type PlayerItem,
   PlayerTimeContext,
-} from "../../contexts/PlayerContext.ts";
+} from "../../contexts/player/PlayerContext.ts";
 import {
   BAR_GAP,
   BAR_W,
@@ -17,7 +21,7 @@ import {
   NUM_BARS,
   VIEWBOX_W,
   WAVEFORM_H,
-} from "../../utils/waveform.ts";
+} from "../../utils/player/waveform.ts";
 import { t } from "@lingui/core/macro";
 import { Trans } from "@lingui/react/macro";
 

src/components/dump/JournalCard.tsx

@@ -2,28 +2,28 @@ import { memo } from "react";
 import { Link } from "react-router";
 import { Plural, Trans } from "@lingui/react/macro";
 import type { Dump } from "../../model.ts";
-import { relativeTime } from "../../utils/relativeTime.ts";
-import { dumpThumbnailUrl, dumpUrl } from "../../utils/urls.ts";
-import { useAuth } from "../../hooks/useAuth.ts";
-import { useDumpCardLink } from "../../hooks/useDumpCardLink.ts";
+import { relativeTime } from "../../utils/shared/relativeTime.ts";
+import { dumpThumbnailUrl, dumpUrl } from "../../utils/shared/urls.ts";
+import { useAuth } from "../../hooks/auth/useAuth.ts";
+import { useDumpCardLink } from "../../hooks/dump/useDumpCardLink.ts";
 import {
   isDumpVisited,
   isRecent,
   markDumpVisited,
-} from "../../utils/visited.ts";
+} from "../../utils/shared/visited.ts";
 import {
   hasQuote,
   hasThumbnail,
   type JournalShape,
-} from "../../utils/journalLayout.ts";
+} from "../../utils/feed/journalLayout.ts";
 import { VoteButton } from "../social/VoteButton.tsx";
 import { Markdown } from "../editor/Markdown.tsx";
-import { Tooltip } from "../ui/Tooltip.tsx";
-import { Thumbnail } from "../ui/Thumbnail.tsx";
+import { Tooltip } from "../shared/Tooltip.tsx";
+import { Thumbnail } from "../shared/Thumbnail.tsx";
 import {
   canPlayRichContent,
   usePlayRichContent,
-} from "../../hooks/usePlayRichContent.ts";
+} from "../../hooks/player/usePlayRichContent.ts";
 
 export type { JournalShape };
 

src/components/dump/RichContentCard.tsx

@@ -1,12 +1,12 @@
 import { useContext } from "react";
 import { t } from "@lingui/core/macro";
 import type { RichContent } from "../../model.ts";
-import { PlayerContext } from "../../contexts/PlayerContext.ts";
+import { PlayerContext } from "../../contexts/player/PlayerContext.ts";
 import {
   canPlayRichContent,
   usePlayRichContent,
-} from "../../hooks/usePlayRichContent.ts";
-import { Thumbnail } from "../ui/Thumbnail.tsx";
+} from "../../hooks/player/usePlayRichContent.ts";
+import { Thumbnail } from "../shared/Thumbnail.tsx";
 
 interface RichContentCardProps {
   richContent: RichContent;

src/components/dump/create/DumpCreateModal.tsx

@@ -19,34 +19,32 @@ import {
   deserializeDumpUrlMatch,
   deserializePlaylistMembership,
 } from "../../../model.ts";
-import { useAuth } from "../../../hooks/useAuth.ts";
-import { useWS } from "../../../hooks/useWS.ts";
-import { dumpUrl, normalizeUrl } from "../../../utils/urls.ts";
-import { titleFromFileName } from "../../../utils/format.ts";
+import { useAuth } from "../../../hooks/auth/useAuth.ts";
+import { useWS } from "../../../hooks/ws/useWS.ts";
+import { dumpUrl, normalizeUrl } from "../../../utils/shared/urls.ts";
+import { titleFromFileName } from "../../../utils/shared/format.ts";
 import {
   clearDumpDraft,
   type DumpDraft,
   EMPTY_DUMP_DRAFT,
   loadDumpDraft,
   saveDumpDraft,
-} from "../../../utils/dumpDraft.ts";
+} from "../../../utils/dump/draft.ts";
 import { MAX_FILE_SIZE } from "../../../config/upload.ts";
 import { RichContentCard } from "../RichContentCard.tsx";
 import type { RichContent } from "../../../model.ts";
-import { Modal } from "../../ui/Modal.tsx";
+import { Modal } from "../../shared/Modal.tsx";
 import type { TextEditorHandle } from "../../editor/TextEditor.tsx";
 import { CategorySelect } from "../../category/CategorySelect.tsx";
 import { PlaylistMembershipPanel } from "../../playlist/PlaylistMembershipPanel.tsx";
-import {
-  expectOk,
-  FileField,
-  FormError,
-  FormProvider,
-  RichTextField,
-  SubmitButton,
-  useApiForm,
-  VisibilityToggle,
-} from "../../form/index.ts";
+import { expectOk } from "../../../utils/shared/api.ts";
+import { FileField } from "../../form/FileField.tsx";
+import { FormError } from "../../form/FormError.tsx";
+import { FormProvider } from "react-hook-form";
+import { RichTextField } from "../../form/RichTextField.tsx";
+import { SubmitButton } from "../../form/SubmitButton.tsx";
+import { useApiForm } from "../../../hooks/form/useApiForm.ts";
+import { VisibilityToggle } from "../../form/SegmentedField.tsx";
 import { DuplicateNotice } from "./DuplicateNotice.tsx";
 import { LocalFilePreview } from "./LocalFilePreview.tsx";
 import { type Step, StepIndicator } from "./StepIndicator.tsx";

src/components/dump/create/DuplicateNotice.tsx

@@ -1,8 +1,8 @@
 import { Link } from "react-router";
 import { Plural, Trans } from "@lingui/react/macro";
 import type { DumpUrlMatch } from "../../../model.ts";
-import { dumpUrl } from "../../../utils/urls.ts";
-import { relativeTime } from "../../../utils/relativeTime.ts";
+import { dumpUrl } from "../../../utils/shared/urls.ts";
+import { relativeTime } from "../../../utils/shared/relativeTime.ts";
 
 /** "Already dumped" hint — never blocking, since reposts are sometimes on purpose. */
 export function DuplicateNotice(