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/contexts/auth/AuthContext.ts

@@ -1,6 +1,6 @@
 import { createContext, type Dispatch, type SetStateAction } from "react";
 
-import { type AuthResponse } from "../model.ts";
+import { type AuthResponse } from "../../model.ts";
 
 export interface AuthContextValue {
   authResponse: AuthResponse | null;

src/contexts/auth/AuthProvider.tsx

@@ -2,14 +2,14 @@ import { type ReactNode, useEffect, useState } from "react";
 
 import { AuthContext, type AuthContextValue } from "./AuthContext.ts";
 
-import { type AuthResponse, deserializePublicUser } from "../model.ts";
-import { API_URL } from "../config/api.ts";
+import { type AuthResponse, deserializePublicUser } from "../../model.ts";
+import { API_URL } from "../../config/api.ts";
 import {
   AUTH_STORAGE_KEY,
   forgetStoredSession,
   readStoredSession,
   storeSession,
-} from "../utils/authStorage.ts";
+} from "../../utils/auth/storage.ts";
 
 export function AuthProvider({ children }: { children: ReactNode }) {
   const [authResponse, setAuthResponse] = useState<AuthResponse | null>(

src/contexts/category/CategoriesContext.ts

@@ -1,5 +1,5 @@
 import { createContext } from "react";
-import type { Category } from "../model.ts";
+import type { Category } from "../../model.ts";
 
 export interface CategoriesContextValue {
   categories: Category[];

src/contexts/category/CategoriesProvider.tsx

@@ -9,12 +9,12 @@ import {
   CategoriesContext,
   type CategoriesContextValue,
 } from "./CategoriesContext.ts";
-import { API_URL } from "../config/api.ts";
+import { API_URL } from "../../config/api.ts";
 import {
   type Category,
   deserializeCategory,
   type RawCategory,
-} from "../model.ts";
+} from "../../model.ts";
 
 async function fetchCategories(
   signal?: AbortSignal,

src/contexts/chat/ChatProvider.tsx

@@ -7,11 +7,11 @@ import {
   useState,
 } from "react";
 import { useSearchParams } from "react-router";
-import { useAuth } from "../hooks/useAuth.ts";
+import { useAuth } from "../../hooks/auth/useAuth.ts";
 import { ChatContext, type ChatContextValue } from "./ChatContext.ts";
 
 const ChatModal = lazy(() =>
-  import("../components/chat/ChatModal.tsx").then((m) => ({
+  import("../../components/chat/ChatModal.tsx").then((m) => ({
     default: m.ChatModal,
   }))
 );

src/contexts/player/PlayerProvider.tsx

@@ -5,8 +5,11 @@ import {
   playerItemKey,
   PlayerTimeContext,
 } from "./PlayerContext.ts";
-import { isStreamStale, resolveStreamQueue } from "../utils/streamSources.ts";
-import { useAuth } from "../hooks/useAuth.ts";
+import {
+  isStreamStale,
+  resolveStreamQueue,
+} from "../../utils/player/streamSources.ts";
+import { useAuth } from "../../hooks/auth/useAuth.ts";
 
 const STORAGE_KEY = "player";
 

src/contexts/social/FollowProvider.tsx

@@ -6,9 +6,9 @@ import {
   useState,
 } from "react";
 import { FollowContext, type FollowContextValue } from "./FollowContext.ts";
-import { API_URL } from "../config/api.ts";
-import { useAuth } from "../hooks/useAuth.ts";
-import type { FollowStatus } from "../model.ts";
+import { API_URL } from "../../config/api.ts";
+import { useAuth } from "../../hooks/auth/useAuth.ts";
+import type { FollowStatus } from "../../model.ts";
 
 export function FollowProvider({ children }: { children: ReactNode }) {
   const { token, authFetch } = useAuth();

src/contexts/ws/WSContext.ts

@@ -7,7 +7,7 @@ import type {
   OnlineUser,
   Playlist,
   PublicUser,
-} from "../model.ts";
+} from "../../model.ts";
 
 export interface VoteEvent {
   dumpId: string;

src/contexts/ws/WSProvider.tsx

@@ -27,7 +27,7 @@ import {
   type AvatarOverride,
   AvatarOverrideContext,
 } from "./AvatarOverrideContext.ts";
-import { WS_URL } from "../config/api.ts";
+import { WS_URL } from "../../config/api.ts";
 import type {
   ChatMessage,
   Dump,
@@ -35,7 +35,7 @@ import type {
   Notification,
   OnlineUser,
   OutgoingWSMessage,
-} from "../model.ts";
+} from "../../model.ts";
 import {
   deserializeChatMessage,
   deserializeComment,
@@ -43,12 +43,12 @@ import {
   deserializeNotification,
   deserializePlaylist,
   deserializePublicUser,
-} from "../model.ts";
+} from "../../model.ts";
 import { t } from "@lingui/core/macro";
-import { useAuth } from "../hooks/useAuth.ts";
-import { setTitleBadge } from "../hooks/useDocumentTitle.ts";
-import { playChime } from "../utils/sound.ts";
-import { mentionsUser } from "../utils/chatText.ts";
+import { useAuth } from "../../hooks/auth/useAuth.ts";
+import { setTitleBadge } from "../../hooks/shared/useDocumentTitle.ts";
+import { playChime } from "../../utils/shared/sound.ts";
+import { mentionsUser } from "../../utils/chat/text.ts";
 
 interface WSProviderProps {
   children: ReactNode;