diff --git a/web/src/App.tsx b/web/src/App.tsx
index 51466e5..3645092 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -16,12 +16,12 @@ import { LoginPage } from "@/views/Login";
 import { AppShell } from "@/views/AppShell";
 import { MailView } from "@/views/mail/MailView";
 import { ComposerDock } from "@/views/compose/ComposerDock";
-import { setUnreadBadge } from "@/lib/notify";
-import { publishWorkerFacts } from "@/lib/swFacts";
+import { setUnreadBadge } from "@/lib/notify/notify";
+import { publishWorkerFacts } from "@/lib/sw/swFacts";
 import { PAINTED_FROM_CACHE, useSettings, syncedPart } from "@/store/settings";
 import { armSettingsSync, loadRemoteSettings, queueSettingsPush, settingsAlreadyLoadedFor, settingsSyncAvailable } from "@/lib/settingsSync";
 import { loadSettingsPolicy } from "@/lib/settingsPolicy";
-import { listenForVerification, renewWebPush } from "@/lib/webpushEnable";
+import { listenForVerification, renewWebPush } from "@/lib/notify/webpushEnable";
 import { plural, t, useLanguageVersion, whenLanguageReady } from "@/lib/i18n";
 import { confirmLeaveUnsaved, hasUnsavedChanges } from "@/lib/unsavedChanges";
 import { BASE_PATH, withBase } from "@/lib/basePath";
@@ -260,7 +260,7 @@ function AuthedApp() {
   });
   const appName = useSession((s) => s.session?.ihasmail?.appName) || DEFAULT_APP_NAME;
   useEffect(() => {
-    void import("@/lib/notify").then((m) => {
+    void import("@/lib/notify/notify").then((m) => {
       m.setBaseTitle(appName);
       setUnreadBadge(inboxUnread);
     });
@@ -284,7 +284,7 @@ function AuthedApp() {
   // Request notification permission lazily when enabled
   const notif = useSettings((s) => s.settings.desktopNotifications);
   useEffect(() => {
-    if (notif) void import("@/lib/notify").then((m) => m.requestNotificationPermission());
+    if (notif) void import("@/lib/notify/notify").then((m) => m.requestNotificationPermission());
   }, [notif]);
 
   // Nothing worth painting until the account's settings are in force; see the
diff --git a/web/src/lib/__tests__/describeRules.test.ts b/web/src/lib/__tests__/describeRules.test.ts
index a09d79f..e33cbff 100644
--- a/web/src/lib/__tests__/describeRules.test.ts
+++ b/web/src/lib/__tests__/describeRules.test.ts
@@ -6,7 +6,7 @@
  * the joining is Intl's rather than a hardcoded " and ".
  */
 import { describe, expect, it } from "vitest";
-import { describeRule as describeSieve } from "../sieve";
+import { describeRule as describeSieve } from "../sieve/sieve";
 import { describeRule as describeRecurrence, weekdayOptions } from "../calendar/recurrence";
 import { setUiLanguageForFormatting } from "../datetime";
 import { setCatalog } from "../i18n";
diff --git a/web/src/lib/__tests__/htmlAlternative.test.ts b/web/src/lib/__tests__/htmlAlternative.test.ts
index 8e9ccb3..d0d6f8c 100644
--- a/web/src/lib/__tests__/htmlAlternative.test.ts
+++ b/web/src/lib/__tests__/htmlAlternative.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { hasHtmlAlternative } from "../html";
+import { hasHtmlAlternative } from "../text/html";
 
 /*
  * The rule: `htmlBody` is derived, so its presence proves nothing. Only the
diff --git a/web/src/lib/__tests__/keyboardFocus.test.ts b/web/src/lib/__tests__/keyboardFocus.test.ts
index 8497b3b..84f9273 100644
--- a/web/src/lib/__tests__/keyboardFocus.test.ts
+++ b/web/src/lib/__tests__/keyboardFocus.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { isTextEntry, keyboard } from "@/lib/keyboard";
+import { isTextEntry, keyboard } from "@/lib/input/keyboard";
 
 /*
  * Shortcuts after a click on a checkbox (#260).
diff --git a/web/src/lib/__tests__/keyboardKeyless.test.ts b/web/src/lib/__tests__/keyboardKeyless.test.ts
index be127f3..d542a8f 100644
--- a/web/src/lib/__tests__/keyboardKeyless.test.ts
+++ b/web/src/lib/__tests__/keyboardKeyless.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { comboOf, keyboard } from "@/lib/keyboard";
+import { comboOf, keyboard } from "@/lib/input/keyboard";
 
 /*
  * A "keydown" that carries no key. Chrome's password autofill dispatches one
diff --git a/web/src/lib/__tests__/keyboardSequence.test.ts b/web/src/lib/__tests__/keyboardSequence.test.ts
index dbb1dc0..ababc0c 100644
--- a/web/src/lib/__tests__/keyboardSequence.test.ts
+++ b/web/src/lib/__tests__/keyboardSequence.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { keyboard } from "@/lib/keyboard";
+import { keyboard } from "@/lib/input/keyboard";
 
 /*
  * Two-key sequences against the single keys they start with.
diff --git a/web/src/lib/__tests__/shareTarget.test.ts b/web/src/lib/__tests__/shareTarget.test.ts
index acd651d..d126833 100644
--- a/web/src/lib/__tests__/shareTarget.test.ts
+++ b/web/src/lib/__tests__/shareTarget.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { collectShare, shareBody, SHARE_MAX_AGE_MS } from "@/lib/shareTarget";
-import { SW_CACHE_NAME } from "@/lib/swCache";
+import { SW_CACHE_NAME } from "@/lib/sw/swCache";
 
 /**
  * The handoff, from the tab's side. The worker's half cannot be exercised here
diff --git a/web/src/lib/__tests__/swipeNav.test.ts b/web/src/lib/__tests__/swipeNav.test.ts
index 03041bc..98db357 100644
--- a/web/src/lib/__tests__/swipeNav.test.ts
+++ b/web/src/lib/__tests__/swipeNav.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { navSwipeThreshold, swipeNavDirection, swipeThreshold, lockAxis } from "@/lib/touch";
+import { navSwipeThreshold, swipeNavDirection, swipeThreshold, lockAxis } from "@/lib/input/touch";
 
 describe("navSwipeThreshold", () => {
   it("asks for more travel than a row swipe does, at every width", () => {
diff --git a/web/src/lib/calendar/appointment.ts b/web/src/lib/calendar/appointment.ts
index 5162eee..2a272fc 100644
--- a/web/src/lib/calendar/appointment.ts
+++ b/web/src/lib/calendar/appointment.ts
@@ -3,7 +3,7 @@ import { useCalendar, type EventDraft } from "@/store/calendar";
 import { useMail } from "@/store/mail";
 import { uniqueAddresses } from "../address";
 import { toLocalDateOnly } from "../dates";
-import { htmlToText } from "../text";
+import { htmlToText } from "../text/text";
 
 /**
  * How much of a message body is copied into an event description.
diff --git a/web/src/lib/filenode.ts b/web/src/lib/filenode.ts
index 0ed68e9..6ba9290 100644
--- a/web/src/lib/filenode.ts
+++ b/web/src/lib/filenode.ts
@@ -9,7 +9,7 @@
  * so a node has one shape and there is nothing left to detect.
  */
 import type { FileNode, Id } from "@/jmap/types";
-import { descendantIds } from "./folderMove";
+import { descendantIds } from "./mailbox/folderMove";
 
 /** Properties to request for a node. */
 export function fileNodeProps(): string[] {
diff --git a/web/src/lib/__tests__/dropUpload.test.ts b/web/src/lib/input/__tests__/dropUpload.test.ts
similarity index 97%
rename from web/src/lib/__tests__/dropUpload.test.ts
rename to web/src/lib/input/__tests__/dropUpload.test.ts
index f818b3e..fc9c671 100644
--- a/web/src/lib/__tests__/dropUpload.test.ts
+++ b/web/src/lib/input/__tests__/dropUpload.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { foldersNeeded, hasDirectory, planUpload } from "@/lib/dropUpload";
+import { foldersNeeded, hasDirectory, planUpload } from "@/lib/input/dropUpload";
 
 /**
  * Dropping a folder in, reduced to the two things the DataTransfer entry API
diff --git a/web/src/lib/__tests__/listSelection.test.ts b/web/src/lib/input/__tests__/listSelection.test.ts
similarity index 98%
rename from web/src/lib/__tests__/listSelection.test.ts
rename to web/src/lib/input/__tests__/listSelection.test.ts
index 203d8eb..513a134 100644
--- a/web/src/lib/__tests__/listSelection.test.ts
+++ b/web/src/lib/input/__tests__/listSelection.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { rowClick, type RowClick } from "@/lib/listSelection";
+import { rowClick, type RowClick } from "@/lib/input/listSelection";
 
 const IDS = ["a", "b", "c", "d", "e"];
 const click = (over: Partial<Parameters<typeof rowClick>[0]> = {}): RowClick =>
diff --git a/web/src/lib/__tests__/swipe.test.ts b/web/src/lib/input/__tests__/swipe.test.ts
similarity index 100%
rename from web/src/lib/__tests__/swipe.test.ts
rename to web/src/lib/input/__tests__/swipe.test.ts
diff --git a/web/src/lib/__tests__/touch.test.ts b/web/src/lib/input/__tests__/touch.test.ts
similarity index 100%
rename from web/src/lib/__tests__/touch.test.ts
rename to web/src/lib/input/__tests__/touch.test.ts
diff --git a/web/src/lib/dropUpload.ts b/web/src/lib/input/dropUpload.ts
similarity index 100%
rename from web/src/lib/dropUpload.ts
rename to web/src/lib/input/dropUpload.ts
diff --git a/web/src/lib/keyboard.ts b/web/src/lib/input/keyboard.ts
similarity index 100%
rename from web/src/lib/keyboard.ts
rename to web/src/lib/input/keyboard.ts
diff --git a/web/src/lib/listSelection.ts b/web/src/lib/input/listSelection.ts
similarity index 100%
rename from web/src/lib/listSelection.ts
rename to web/src/lib/input/listSelection.ts
diff --git a/web/src/lib/swipe.ts b/web/src/lib/input/swipe.ts
similarity index 100%
rename from web/src/lib/swipe.ts
rename to web/src/lib/input/swipe.ts
diff --git a/web/src/lib/touch.ts b/web/src/lib/input/touch.ts
similarity index 100%
rename from web/src/lib/touch.ts
rename to web/src/lib/input/touch.ts
diff --git a/web/src/lib/__tests__/archiveDate.test.ts b/web/src/lib/mailbox/__tests__/archiveDate.test.ts
similarity index 99%
rename from web/src/lib/__tests__/archiveDate.test.ts
rename to web/src/lib/mailbox/__tests__/archiveDate.test.ts
index ee9304c..f7dac1f 100644
--- a/web/src/lib/__tests__/archiveDate.test.ts
+++ b/web/src/lib/mailbox/__tests__/archiveDate.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { archiveSegments, archivePath, groupByArchivePath } from "@/lib/archiveDate";
+import { archiveSegments, archivePath, groupByArchivePath } from "@/lib/mailbox/archiveDate";
 
 /**
  * The dates below are written as local-time strings on purpose. The segments
diff --git a/web/src/lib/__tests__/emptyFolder.test.ts b/web/src/lib/mailbox/__tests__/emptyFolder.test.ts
similarity index 96%
rename from web/src/lib/__tests__/emptyFolder.test.ts
rename to web/src/lib/mailbox/__tests__/emptyFolder.test.ts
index 9fd8d6b..d301524 100644
--- a/web/src/lib/__tests__/emptyFolder.test.ts
+++ b/web/src/lib/mailbox/__tests__/emptyFolder.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { canEmpty, emptyLabel } from "@/lib/emptyFolder";
+import { canEmpty, emptyLabel } from "@/lib/mailbox/emptyFolder";
 import type { MailboxRole } from "@/jmap/types";
 
 /**
diff --git a/web/src/lib/__tests__/folderMove.test.ts b/web/src/lib/mailbox/__tests__/folderMove.test.ts
similarity index 100%
rename from web/src/lib/__tests__/folderMove.test.ts
rename to web/src/lib/mailbox/__tests__/folderMove.test.ts
diff --git a/web/src/lib/__tests__/labelTree.test.ts b/web/src/lib/mailbox/__tests__/labelTree.test.ts
similarity index 99%
rename from web/src/lib/__tests__/labelTree.test.ts
rename to web/src/lib/mailbox/__tests__/labelTree.test.ts
index 8416a58..ff7773d 100644
--- a/web/src/lib/__tests__/labelTree.test.ts
+++ b/web/src/lib/mailbox/__tests__/labelTree.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { labelTree, visibleLabels, descendantKeywords } from "@/lib/labelTree";
+import { labelTree, visibleLabels, descendantKeywords } from "@/lib/mailbox/labelTree";
 import type { Label } from "@/store/settings";
 
 const L = (keyword: string, over: Partial<Label> = {}): Label => ({ keyword, name: keyword, color: "#000", ...over });
diff --git a/web/src/lib/__tests__/mailboxName.test.ts b/web/src/lib/mailbox/__tests__/mailboxName.test.ts
similarity index 98%
rename from web/src/lib/__tests__/mailboxName.test.ts
rename to web/src/lib/mailbox/__tests__/mailboxName.test.ts
index 9d51c70..dc4c65c 100644
--- a/web/src/lib/__tests__/mailboxName.test.ts
+++ b/web/src/lib/mailbox/__tests__/mailboxName.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from "vitest";
-import { isLocalizedName, mailboxDisplayName, mailboxDisplayPath } from "@/lib/mailboxName";
+import { isLocalizedName, mailboxDisplayName, mailboxDisplayPath } from "@/lib/mailbox/mailboxName";
 import { setCatalog, type Catalog } from "@/lib/i18n";
 import type { Mailbox } from "@/jmap/types";
 
diff --git a/web/src/lib/__tests__/mailboxRoute.test.ts b/web/src/lib/mailbox/__tests__/mailboxRoute.test.ts
similarity index 97%
rename from web/src/lib/__tests__/mailboxRoute.test.ts
rename to web/src/lib/mailbox/__tests__/mailboxRoute.test.ts
index a7357e3..f8744c3 100644
--- a/web/src/lib/__tests__/mailboxRoute.test.ts
+++ b/web/src/lib/mailbox/__tests__/mailboxRoute.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { isUnknownMailbox } from "@/lib/mailboxRoute";
+import { isUnknownMailbox } from "@/lib/mailbox/mailboxRoute";
 import type { Mailbox } from "@/jmap/types";
 
 /**
diff --git a/web/src/lib/archiveDate.ts b/web/src/lib/mailbox/archiveDate.ts
similarity index 100%
rename from web/src/lib/archiveDate.ts
rename to web/src/lib/mailbox/archiveDate.ts
diff --git a/web/src/lib/emptyFolder.tsx b/web/src/lib/mailbox/emptyFolder.tsx
similarity index 100%
rename from web/src/lib/emptyFolder.tsx
rename to web/src/lib/mailbox/emptyFolder.tsx
diff --git a/web/src/lib/folderMove.ts b/web/src/lib/mailbox/folderMove.ts
similarity index 100%
rename from web/src/lib/folderMove.ts
rename to web/src/lib/mailbox/folderMove.ts
diff --git a/web/src/lib/labelTree.ts b/web/src/lib/mailbox/labelTree.ts
similarity index 100%
rename from web/src/lib/labelTree.ts
rename to web/src/lib/mailbox/labelTree.ts
diff --git a/web/src/lib/mailboxName.ts b/web/src/lib/mailbox/mailboxName.ts
similarity index 100%
rename from web/src/lib/mailboxName.ts
rename to web/src/lib/mailbox/mailboxName.ts
diff --git a/web/src/lib/mailboxRoute.ts b/web/src/lib/mailbox/mailboxRoute.ts
similarity index 100%
rename from web/src/lib/mailboxRoute.ts
rename to web/src/lib/mailbox/mailboxRoute.ts
diff --git a/web/src/lib/__tests__/webpush.test.ts b/web/src/lib/notify/__tests__/webpush.test.ts
similarity index 99%
rename from web/src/lib/__tests__/webpush.test.ts
rename to web/src/lib/notify/__tests__/webpush.test.ts
index c3250e3..2845675 100644
--- a/web/src/lib/__tests__/webpush.test.ts
+++ b/web/src/lib/notify/__tests__/webpush.test.ts
@@ -14,7 +14,7 @@ import {
   unsubscribeThisDevice,
   webPushAvailable,
   type JmapPushSubscription,
-} from "@/lib/webpush";
+} from "@/lib/notify/webpush";
 import { setDeviceTrusted } from "@/lib/storage";
 import type { JmapSession } from "@/jmap/types";
 
diff --git a/web/src/lib/notify.ts b/web/src/lib/notify/notify.ts
similarity index 99%
rename from web/src/lib/notify.ts
rename to web/src/lib/notify/notify.ts
index 4d69819..2762e69 100644
--- a/web/src/lib/notify.ts
+++ b/web/src/lib/notify/notify.ts
@@ -1,4 +1,4 @@
-import { withBase } from "./basePath";
+import { withBase } from "../basePath";
 
 let baseTitle = "ihasmail";
 let faviconCanvas: HTMLCanvasElement | null = null;
diff --git a/web/src/lib/webpush.ts b/web/src/lib/notify/webpush.ts
similarity index 100%
rename from web/src/lib/webpush.ts
rename to web/src/lib/notify/webpush.ts
diff --git a/web/src/lib/webpushEnable.ts b/web/src/lib/notify/webpushEnable.ts
similarity index 98%
rename from web/src/lib/webpushEnable.ts
rename to web/src/lib/notify/webpushEnable.ts
index 6653116..3f40dbe 100644
--- a/web/src/lib/webpushEnable.ts
+++ b/web/src/lib/notify/webpushEnable.ts
@@ -6,8 +6,8 @@
  * permission prompt, none of which exists under a test runner.
  */
 import { CAP } from "@/jmap/client";
-import { withBase } from "./basePath";
-import { SW_CACHE_NAME } from "./swCache";
+import { withBase } from "../basePath";
+import { SW_CACHE_NAME } from "../sw/swCache";
 import { isDeviceTrusted } from "@/lib/storage";
 import { useSession } from "@/store/session";
 import { useMail } from "@/store/mail";
@@ -25,7 +25,7 @@ import {
   unsubscribeThisDevice,
   verifySubscription,
   webPushAvailable,
-} from "@/lib/webpush";
+} from "@/lib/notify/webpush";
 
 let listening = false;
 
diff --git a/web/src/lib/shareTarget.ts b/web/src/lib/shareTarget.ts
index 7115a24..8e5fbc0 100644
--- a/web/src/lib/shareTarget.ts
+++ b/web/src/lib/shareTarget.ts
@@ -12,7 +12,7 @@
  * has to find the payload lying somewhere.
  */
 import { withBase } from "./basePath";
-import { SW_CACHE_NAME } from "./swCache";
+import { SW_CACHE_NAME } from "./sw/swCache";
 
 export interface SharedContent {
   title: string;
diff --git a/web/src/lib/__tests__/sieve.test.ts b/web/src/lib/sieve/__tests__/sieve.test.ts
similarity index 100%
rename from web/src/lib/__tests__/sieve.test.ts
rename to web/src/lib/sieve/__tests__/sieve.test.ts
diff --git a/web/src/lib/__tests__/sieveApply.test.ts b/web/src/lib/sieve/__tests__/sieveApply.test.ts
similarity index 100%
rename from web/src/lib/__tests__/sieveApply.test.ts
rename to web/src/lib/sieve/__tests__/sieveApply.test.ts
diff --git a/web/src/lib/__tests__/sieveFolders.test.ts b/web/src/lib/sieve/__tests__/sieveFolders.test.ts
similarity index 100%
rename from web/src/lib/__tests__/sieveFolders.test.ts
rename to web/src/lib/sieve/__tests__/sieveFolders.test.ts
diff --git a/web/src/lib/sieve.ts b/web/src/lib/sieve/sieve.ts
similarity index 99%
rename from web/src/lib/sieve.ts
rename to web/src/lib/sieve/sieve.ts
index cd22be1..8391c7a 100644
--- a/web/src/lib/sieve.ts
+++ b/web/src/lib/sieve/sieve.ts
@@ -6,7 +6,7 @@
  * Sieve below each comment is what the server actually runs.
  */
 
-import { formatList } from "./datetime";
+import { formatList } from "../datetime";
 import { t } from "@/lib/i18n";
 
 export type HeaderOp = "contains" | "notcontains" | "is" | "notis" | "matches" | "notmatches" | "regex" | "notregex" | "exists" | "notexists";
diff --git a/web/src/lib/sieveApply.ts b/web/src/lib/sieve/sieveApply.ts
similarity index 99%
rename from web/src/lib/sieveApply.ts
rename to web/src/lib/sieve/sieveApply.ts
index c81e73e..19d2e0d 100644
--- a/web/src/lib/sieveApply.ts
+++ b/web/src/lib/sieve/sieveApply.ts
@@ -7,7 +7,7 @@ import { client, chunk } from "@/jmap/client";
 import type { Email, GetResponse, Id, QueryResponse } from "@/jmap/types";
 import { LIST_PROPS, useMail } from "@/store/mail";
 import type { SieveRule, SieveTest } from "./sieve";
-import { domainOf } from "./address";
+import { domainOf } from "../address";
 
 function headerValues(e: Email, header: string): string[] {
   const h = header.toLowerCase();
diff --git a/web/src/lib/sieveFolders.ts b/web/src/lib/sieve/sieveFolders.ts
similarity index 100%
rename from web/src/lib/sieveFolders.ts
rename to web/src/lib/sieve/sieveFolders.ts
diff --git a/web/src/lib/signatureHtml.ts b/web/src/lib/signatureHtml.ts
index 1dbc3f4..2cc7247 100644
--- a/web/src/lib/signatureHtml.ts
+++ b/web/src/lib/signatureHtml.ts
@@ -4,7 +4,7 @@
  *  - marker signatures: when still too big, the full HTML lives in Files and the
  *    identity only stores `<!--ihasmail:sig=<blobId>-->` + a plain-text fallback.
  */
-import { escapeHtml, htmlToText } from "./text";
+import { escapeHtml, htmlToText } from "./text/text";
 
 /**
  * Stalwart accepts a signature of `value.len() < 2048` — and that is Rust's
diff --git a/web/src/lib/__tests__/staleBuild.test.ts b/web/src/lib/sw/__tests__/staleBuild.test.ts
similarity index 99%
rename from web/src/lib/__tests__/staleBuild.test.ts
rename to web/src/lib/sw/__tests__/staleBuild.test.ts
index 2064f82..e738cda 100644
--- a/web/src/lib/__tests__/staleBuild.test.ts
+++ b/web/src/lib/sw/__tests__/staleBuild.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { reloadIfServerRebuilt, makeConnectionWatcher, startBuildWatch } from "@/lib/staleBuild";
+import { reloadIfServerRebuilt, makeConnectionWatcher, startBuildWatch } from "@/lib/sw/staleBuild";
 import { APP_VERSION } from "@/lib/version";
 
 function healthReplies(body: unknown, ok = true) {
diff --git a/web/src/lib/__tests__/swFacts.test.ts b/web/src/lib/sw/__tests__/swFacts.test.ts
similarity index 98%
rename from web/src/lib/__tests__/swFacts.test.ts
rename to web/src/lib/sw/__tests__/swFacts.test.ts
index f2edfc5..d7640ce 100644
--- a/web/src/lib/__tests__/swFacts.test.ts
+++ b/web/src/lib/sw/__tests__/swFacts.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { publishWorkerFacts, FACTS_KEY, type WorkerFacts } from "@/lib/swFacts";
-import { SW_CACHE_NAME } from "@/lib/swCache";
+import { publishWorkerFacts, FACTS_KEY, type WorkerFacts } from "@/lib/sw/swFacts";
+import { SW_CACHE_NAME } from "@/lib/sw/swCache";
 import { setCatalog } from "@/lib/i18n";
 import { catalog as de } from "@/locales/de";
 
diff --git a/web/src/lib/staleBuild.ts b/web/src/lib/sw/staleBuild.ts
similarity index 98%
rename from web/src/lib/staleBuild.ts
rename to web/src/lib/sw/staleBuild.ts
index c333147..34c929c 100644
--- a/web/src/lib/staleBuild.ts
+++ b/web/src/lib/sw/staleBuild.ts
@@ -1,5 +1,5 @@
-import { APP_VERSION } from "./version";
-import { withBase } from "./basePath";
+import { APP_VERSION } from "../version";
+import { withBase } from "../basePath";
 import { push, type PushState } from "@/jmap/push";
 
 /**
diff --git a/web/src/lib/swCache.ts b/web/src/lib/sw/swCache.ts
similarity index 100%
rename from web/src/lib/swCache.ts
rename to web/src/lib/sw/swCache.ts
diff --git a/web/src/lib/swFacts.ts b/web/src/lib/sw/swFacts.ts
similarity index 97%
rename from web/src/lib/swFacts.ts
rename to web/src/lib/sw/swFacts.ts
index 3a680d1..c9e2ad6 100644
--- a/web/src/lib/swFacts.ts
+++ b/web/src/lib/sw/swFacts.ts
@@ -16,9 +16,9 @@
  * was installed, which is the same condition background notifications already
  * carry — a push subscription has to be renewed from a tab too.
  */
-import { withBase } from "./basePath";
+import { withBase } from "../basePath";
 import { SW_CACHE_NAME } from "./swCache";
-import { t } from "./i18n";
+import { t } from "../i18n";
 
 export const FACTS_KEY = "/ihasmail-worker-facts";
 
diff --git a/web/src/lib/templatePlaceholders.ts b/web/src/lib/templatePlaceholders.ts
index a6482bc..08a3ccc 100644
--- a/web/src/lib/templatePlaceholders.ts
+++ b/web/src/lib/templatePlaceholders.ts
@@ -18,7 +18,7 @@
  * so a template follows the same date order and clock the rest of the app was
  * told to use.
  */
-import { escapeHtml } from "./text";
+import { escapeHtml } from "./text/text";
 import { formatDate, formatClock } from "./datetime";
 import type { EmailAddress } from "@/jmap/types";
 
diff --git a/web/src/lib/__tests__/emlName.test.ts b/web/src/lib/text/__tests__/emlName.test.ts
similarity index 96%
rename from web/src/lib/__tests__/emlName.test.ts
rename to web/src/lib/text/__tests__/emlName.test.ts
index 9d3bd7d..742ea4b 100644
--- a/web/src/lib/__tests__/emlName.test.ts
+++ b/web/src/lib/text/__tests__/emlName.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { emlFilename, sanitizeFilename } from "@/lib/emlName";
+import { emlFilename, sanitizeFilename } from "@/lib/text/emlName";
 
 describe("emlFilename", () => {
   it("keeps an ordinary subject, with spaces as underscores", () => {
diff --git a/web/src/lib/__tests__/html.test.ts b/web/src/lib/text/__tests__/html.test.ts
similarity index 100%
rename from web/src/lib/__tests__/html.test.ts
rename to web/src/lib/text/__tests__/html.test.ts
diff --git a/web/src/lib/__tests__/markdown.test.ts b/web/src/lib/text/__tests__/markdown.test.ts
similarity index 97%
rename from web/src/lib/__tests__/markdown.test.ts
rename to web/src/lib/text/__tests__/markdown.test.ts
index ff63577..80150f1 100644
--- a/web/src/lib/__tests__/markdown.test.ts
+++ b/web/src/lib/text/__tests__/markdown.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { isMarkdown, renderMarkdown } from "@/lib/markdown";
+import { isMarkdown, renderMarkdown } from "@/lib/text/markdown";
 
 describe("isMarkdown", () => {
   it("takes the type when there is one", () => {
diff --git a/web/src/lib/__tests__/text.test.ts b/web/src/lib/text/__tests__/text.test.ts
similarity index 100%
rename from web/src/lib/__tests__/text.test.ts
rename to web/src/lib/text/__tests__/text.test.ts
diff --git a/web/src/lib/emlName.ts b/web/src/lib/text/emlName.ts
similarity index 100%
rename from web/src/lib/emlName.ts
rename to web/src/lib/text/emlName.ts
diff --git a/web/src/lib/html.ts b/web/src/lib/text/html.ts
similarity index 100%
rename from web/src/lib/html.ts
rename to web/src/lib/text/html.ts
diff --git a/web/src/lib/markdown.ts b/web/src/lib/text/markdown.ts
similarity index 100%
rename from web/src/lib/markdown.ts
rename to web/src/lib/text/markdown.ts
diff --git a/web/src/lib/text.ts b/web/src/lib/text/text.ts
similarity index 100%
rename from web/src/lib/text.ts
rename to web/src/lib/text/text.ts
diff --git a/web/src/main.tsx b/web/src/main.tsx
index 51aa2ee..3842d90 100644
--- a/web/src/main.tsx
+++ b/web/src/main.tsx
@@ -2,7 +2,7 @@ import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import "./styles/app.css";
 import { App } from "./App";
-import { startBuildWatch } from "@/lib/staleBuild";
+import { startBuildWatch } from "@/lib/sw/staleBuild";
 import { BASE_PATH, withBase } from "@/lib/basePath";
 
 startBuildWatch();
diff --git a/web/src/store/__tests__/sieve-overwrite.test.ts b/web/src/store/__tests__/sieve-overwrite.test.ts
index 29a7797..bee8115 100644
--- a/web/src/store/__tests__/sieve-overwrite.test.ts
+++ b/web/src/store/__tests__/sieve-overwrite.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from "vitest";
 import { useSieve } from "@/store/sieve";
-import { newRule, rulesToSieve } from "@/lib/sieve";
+import { newRule, rulesToSieve } from "@/lib/sieve/sieve";
 import type { SieveScript } from "@/jmap/types";
 
 /**
diff --git a/web/src/store/compose.ts b/web/src/store/compose.ts
index 1154676..ffe74bf 100644
--- a/web/src/store/compose.ts
+++ b/web/src/store/compose.ts
@@ -3,8 +3,8 @@ import { client, setErrorMessage } from "@/jmap/client";
 import type { Email, EmailAddress, EmailBodyPart, Id, Identity, SetResponse } from "@/jmap/types";
 import { formatFullDate, uid } from "@/lib/format";
 import { formatAddress, parseMailto, sameAddress, uniqueAddresses } from "@/lib/address";
-import { escapeHtml, htmlToText, quoteText, replySubject, textToHtml } from "@/lib/text";
-import { sanitizeEmailHtml, sanitizeEditorHtml } from "@/lib/html";
+import { escapeHtml, htmlToText, quoteText, replySubject, textToHtml } from "@/lib/text/text";
+import { sanitizeEmailHtml, sanitizeEditorHtml } from "@/lib/text/html";
 import { toast } from "@/ui/toast";
 import { useMail, FULL_PROPS, BODY_PROPS } from "./mail";
 import { ensureScheduledMailbox, useScheduled } from "./scheduled";
@@ -12,7 +12,7 @@ import { formatScheduleTime, holdUntil } from "@/lib/schedule";
 import { t as translate } from "@/lib/i18n";
 import { BASE_PATH } from "@/lib/basePath";
 import { settings } from "./settings";
-import { emlFilename } from "@/lib/emlName";
+import { emlFilename } from "@/lib/text/emlName";
 import { fillPlaceholders, type PlaceholderContext } from "@/lib/templatePlaceholders";
 import { shareBody, type SharedContent } from "@/lib/shareTarget";
 
diff --git a/web/src/store/files.ts b/web/src/store/files.ts
index bb2cf2e..9290806 100644
--- a/web/src/store/files.ts
+++ b/web/src/store/files.ts
@@ -1,7 +1,7 @@
 import { create } from "zustand";
 import { CAP, client, setErrorMessage } from "@/jmap/client";
 import { directoryCreate, fileCreate, fileNodeProps } from "@/lib/filenode";
-import { foldersNeeded, type PlannedUpload } from "@/lib/dropUpload";
+import { foldersNeeded, type PlannedUpload } from "@/lib/input/dropUpload";
 import { isAppFolder } from "@/lib/appFolder";
 import type { FileNode, GetResponse, Id, QueryResponse, SetResponse } from "@/jmap/types";
 import { useSession } from "./session";
diff --git a/web/src/store/mail/index.ts b/web/src/store/mail/index.ts
index 5dbe583..eeb13f1 100644
--- a/web/src/store/mail/index.ts
+++ b/web/src/store/mail/index.ts
@@ -1,6 +1,6 @@
 import { create } from "zustand";
-import type { FolderRef } from "@/lib/sieveFolders";
-import { groupByArchivePath, archivePath } from "@/lib/archiveDate";
+import type { FolderRef } from "@/lib/sieve/sieveFolders";
+import { groupByArchivePath, archivePath } from "@/lib/mailbox/archiveDate";
 import { isOptionalSort, withoutOptionalSorts } from "@/lib/listSort";
 import { JmapMethodError, chunk, client, setErrorMessage } from "@/jmap/client";
 import type {
@@ -23,7 +23,7 @@ import type {
 import { toast } from "@/ui/toast";
 import { settings, useSettings } from "../settings";
 import { useSession } from "../session";
-import { mailboxDisplayName } from "@/lib/mailboxName";
+import { mailboxDisplayName } from "@/lib/mailbox/mailboxName";
 import { plural, t } from "@/lib/i18n";
 import { withBase } from "@/lib/basePath";
 import { MAILBOX_PROPS, LIST_PROPS, FULL_PROPS, BODY_PROPS } from "./props";
@@ -1148,7 +1148,7 @@ async function notifyNewMail(created: Id[], get: () => MailState) {
   const emails = await get().getEmails(created);
   const fresh = emails.filter((e) => e.mailboxIds[inbox] && !e.keywords.$seen && !e.keywords.$draft);
   if (!fresh.length) return;
-  const { showNotification, playNewMailSound } = await import("@/lib/notify");
+  const { showNotification, playNewMailSound } = await import("@/lib/notify/notify");
   if (s.notificationSound) playNewMailSound();
   if (s.desktopNotifications) {
     for (const e of fresh.slice(0, 3)) {
@@ -1246,7 +1246,7 @@ async function followFolders(before: FolderRef[]): Promise<void> {
       else gone.push(ref);
     }
 
-    const { retargetRules, detachFolders } = await import("@/lib/sieveFolders");
+    const { retargetRules, detachFolders } = await import("@/lib/sieve/sieveFolders");
     const retargeted = retargetRules(rules, moves);
     const detached = detachFolders(retargeted.rules, gone);
     if (!retargeted.changed && !detached.edited.length && !detached.removed.length) return;
diff --git a/web/src/store/mail/types.ts b/web/src/store/mail/types.ts
index afb3d11..929d9b7 100644
--- a/web/src/store/mail/types.ts
+++ b/web/src/store/mail/types.ts
@@ -1,4 +1,4 @@
-import type { ArchiveGranularity } from "@/lib/archiveDate";
+import type { ArchiveGranularity } from "@/lib/mailbox/archiveDate";
 import type {
   Comparator,
   Email,
diff --git a/web/src/store/session.ts b/web/src/store/session.ts
index cabf71f..259d285 100644
--- a/web/src/store/session.ts
+++ b/web/src/store/session.ts
@@ -5,8 +5,8 @@ import { push, type PushState } from "@/jmap/push";
 import { accountForCapability, ownAccountForCapability } from "@/lib/accountRouting";
 import { setServerLocale } from "@/lib/datetime";
 import { flushSettingsPush, stopSettingsSync } from "@/lib/settingsSync";
-import { reloadIfServerRebuilt } from "@/lib/staleBuild";
-import { unsubscribeThisDevice } from "@/lib/webpush";
+import { reloadIfServerRebuilt } from "@/lib/sw/staleBuild";
+import { unsubscribeThisDevice } from "@/lib/notify/webpush";
 import { clearAllData, clearSignedInData, setDeviceTrusted } from "@/lib/storage";
 import { startIdleLogout, stopIdleLogout } from "@/lib/idleLogout";
 
diff --git a/web/src/store/settings.ts b/web/src/store/settings.ts
index cf59f01..952c93e 100644
--- a/web/src/store/settings.ts
+++ b/web/src/store/settings.ts
@@ -6,7 +6,7 @@ import type { SortLevel, SortPreset } from "@/lib/listSort";
 import { pendingSettingsKeys, queueSettingsPush } from "@/lib/settingsSync";
 import { policyChanges, policyDefaults, policyEnforced, type PolicyChange } from "@/lib/settingsPolicy";
 import { setDateTimePrefs, setUiLanguageForFormatting, type DateFormat, type TimeFormat } from "@/lib/datetime";
-import type { SwipeAction } from "@/lib/swipe";
+import type { SwipeAction } from "@/lib/input/swipe";
 import { resolveUiLanguage } from "@/lib/languages";
 import { loadLanguage } from "@/lib/i18n";
 
diff --git a/web/src/store/sieve.ts b/web/src/store/sieve.ts
index 82aabdd..2f041e1 100644
--- a/web/src/store/sieve.ts
+++ b/web/src/store/sieve.ts
@@ -1,7 +1,7 @@
 import { create } from "zustand";
 import { CAP, client, setErrorMessage } from "@/jmap/client";
 import type { GetResponse, Id, SetResponse, SieveScript } from "@/jmap/types";
-import { rulesToSieve, scriptDamage, sieveToRules, type SieveRule } from "@/lib/sieve";
+import { rulesToSieve, scriptDamage, sieveToRules, type SieveRule } from "@/lib/sieve/sieve";
 import { useSession } from "./session";
 
 export const IHASMAIL_SCRIPT = "ihasmail";
diff --git a/web/src/ui/filepreview.tsx b/web/src/ui/filepreview.tsx
index 74cc0f2..d7b17c7 100644
--- a/web/src/ui/filepreview.tsx
+++ b/web/src/ui/filepreview.tsx
@@ -3,7 +3,7 @@ import { Code2, Download, Eye, Pencil, Printer, Save, Share2, X } from "lucide-r
 import { confirmDialog, Dialog } from "./dialog";
 import { formatSize } from "@/lib/format";
 import { previewKind, TEXT_PREVIEW_CHARS, TEXT_PREVIEW_MAX } from "@/lib/preview";
-import { isMarkdown, renderMarkdown } from "@/lib/markdown";
+import { isMarkdown, renderMarkdown } from "@/lib/text/markdown";
 import { canShareFiles, shareFile } from "@/lib/share";
 import { t, tc } from "@/lib/i18n";
 
diff --git a/web/src/views/SearchBar.tsx b/web/src/views/SearchBar.tsx
index ac77141..69b6886 100644
--- a/web/src/views/SearchBar.tsx
+++ b/web/src/views/SearchBar.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, useState, type FormEvent } from "react";
 import { useLocation, useSearch } from "wouter";
 import { Search, SlidersHorizontal, X } from "lucide-react";
 import { useMail } from "@/store/mail";
-import { keyboard } from "@/lib/keyboard";
+import { keyboard } from "@/lib/input/keyboard";
 import { DateField } from "@/ui/datefield";
 import { t } from "@/lib/i18n";
 
diff --git a/web/src/views/Shortcuts.tsx b/web/src/views/Shortcuts.tsx
index 22bcd34..eabd425 100644
--- a/web/src/views/Shortcuts.tsx
+++ b/web/src/views/Shortcuts.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo } from "react";
 import { useLocation } from "wouter";
-import { keyboard } from "@/lib/keyboard";
+import { keyboard } from "@/lib/input/keyboard";
 import { useMail } from "@/store/mail";
 import { useCompose } from "@/store/compose";
 import { Dialog } from "@/ui/dialog";
diff --git a/web/src/views/admin/TenantSheet.tsx b/web/src/views/admin/TenantSheet.tsx
index 7d2ab6f..a35abc5 100644
--- a/web/src/views/admin/TenantSheet.tsx
+++ b/web/src/views/admin/TenantSheet.tsx
@@ -21,7 +21,7 @@ import {
   type TenantRoles,
 } from "@/lib/admin/adminTenants";
 import { formatSize } from "@/lib/format";
-import { proxiedImageUrl } from "@/lib/html";
+import { proxiedImageUrl } from "@/lib/text/html";
 import { plural, t } from "@/lib/i18n";
 import { Dialog } from "@/ui/dialog";
 import { Spinner } from "@/ui/misc";
diff --git a/web/src/views/admin/TenantsAdmin.tsx b/web/src/views/admin/TenantsAdmin.tsx
index e1fbf41..a29aa8d 100644
--- a/web/src/views/admin/TenantsAdmin.tsx
+++ b/web/src/views/admin/TenantsAdmin.tsx
@@ -5,7 +5,7 @@ import { can, type RoleDef } from "@/lib/admin/adminAccess";
 import { describeDirectoryError, listRoles } from "@/lib/admin/adminDirectory";
 import { drawableLogo, getTenants, queryTenants, type DirectoryTenant } from "@/lib/admin/adminTenants";
 import { formatSize } from "@/lib/format";
-import { proxiedImageUrl } from "@/lib/html";
+import { proxiedImageUrl } from "@/lib/text/html";
 import { plural, t } from "@/lib/i18n";
 import { useSession } from "@/store/session";
 import { Empty, Spinner } from "@/ui/misc";
diff --git a/web/src/views/calendar/CalendarView.tsx b/web/src/views/calendar/CalendarView.tsx
index ff517a7..4be9910 100644
--- a/web/src/views/calendar/CalendarView.tsx
+++ b/web/src/views/calendar/CalendarView.tsx
@@ -4,11 +4,11 @@ import { ChevronLeft, ChevronRight, Plus, Calendar as CalIcon } from "lucide-rea
 import { useCalendar, participantAddresses, type EventInstance } from "@/store/calendar";
 import { useSettings } from "@/store/settings";
 import { addDays, addMonths, DAY_MS, endOfDay, isSameDay, isToday, monthGrid, roundToNext, startOfDay, startOfWeek, toLocalDateOnly, weekDays} from "@/lib/dates";
-import { useSwipeNav } from "@/lib/touch";
+import { useSwipeNav } from "@/lib/input/touch";
 import { formatMonthYear, formatTime } from "@/lib/format";
 import { formatDate, formatDateLong, formatDayMonth, formatHourLabel, formatWeekday, formatWeekdayDate } from "@/lib/datetime";
 import { Empty, useIsMobile, useIsTouch } from "@/ui/misc";
-import { keyboard } from "@/lib/keyboard";
+import { keyboard } from "@/lib/input/keyboard";
 import { EventPopover } from "./EventPopover";
 import { EventEditor, type EditorInit } from "./EventEditor";
 import type { Anchor } from "@/ui/popover";
diff --git a/web/src/views/compose/Composer.tsx b/web/src/views/compose/Composer.tsx
index ea43ee1..f81b5e4 100644
--- a/web/src/views/compose/Composer.tsx
+++ b/web/src/views/compose/Composer.tsx
@@ -9,14 +9,14 @@ import { RichEditor, type RichEditorHandle } from "./RichEditor";
 import { MenuItem, MenuSep, MenuTitle, Popover, useMenu } from "@/ui/popover";
 import { confirmDialog, promptDialog } from "@/ui/dialog";
 import { formatSize, formatRelative } from "@/lib/format";
-import { htmlToText, textToHtml } from "@/lib/text";
+import { htmlToText, textToHtml } from "@/lib/text/text";
 import { isValidEmail, uniqueAddresses } from "@/lib/address";
 import { crossesRecipientThreshold, externalRecipients, internalDomains } from "@/lib/warnings";
 import { attachmentIcon } from "../mail/MessageView";
 import { FilePicker } from "./FilePicker";
 import { RecipientPicker, type Field } from "./RecipientPicker";
 import { useFiles } from "@/store/files";
-import { keyboard } from "@/lib/keyboard";
+import { keyboard } from "@/lib/input/keyboard";
 import { useIsMobile } from "@/ui/misc";
 import { toast } from "@/ui/toast";
 import { ScheduleDialog, ScheduleMenuItems } from "./SchedulePicker";
diff --git a/web/src/views/compose/RichEditor.tsx b/web/src/views/compose/RichEditor.tsx
index 15f2f76..b4f8388 100644
--- a/web/src/views/compose/RichEditor.tsx
+++ b/web/src/views/compose/RichEditor.tsx
@@ -1,6 +1,6 @@
 import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState, type ClipboardEvent, type ReactNode } from "react";
 import { AlignCenter, AlignLeft, AlignRight, Bold, Code, Eraser, Image as ImageIcon, Indent, Italic, Link as LinkIcon, List, ListOrdered, Outdent, Quote, Redo, Smile, Strikethrough, Underline, Undo, Palette, Highlighter, Type } from "lucide-react";
-import { sanitizeEditorHtml } from "@/lib/html";
+import { sanitizeEditorHtml } from "@/lib/text/html";
 import { Popover, useMenu } from "@/ui/popover";
 import { t as translate } from "@/lib/i18n";
 
diff --git a/web/src/views/files/FilesTree.tsx b/web/src/views/files/FilesTree.tsx
index 58f9eea..0c491ae 100644
--- a/web/src/views/files/FilesTree.tsx
+++ b/web/src/views/files/FilesTree.tsx
@@ -5,7 +5,7 @@ import { useFiles } from "@/store/files";
 import { useSession } from "@/store/session";
 import type { FileNode, Id } from "@/jmap/types";
 import { canDropFileNodes, NODE_MIME, readDraggedIds, isShared } from "@/lib/filenode";
-import { entriesFromDrop, hasDirectory, planUpload } from "@/lib/dropUpload";
+import { entriesFromDrop, hasDirectory, planUpload } from "@/lib/input/dropUpload";
 import { MenuItem, MenuSep, Popover, useMenu } from "@/ui/popover";
 import { confirmDialog, promptDialog } from "@/ui/dialog";
 import { toast } from "@/ui/toast";
diff --git a/web/src/views/files/FilesView.tsx b/web/src/views/files/FilesView.tsx
index 8aee1ad..d8031ae 100644
--- a/web/src/views/files/FilesView.tsx
+++ b/web/src/views/files/FilesView.tsx
@@ -7,7 +7,7 @@ import type { FileNode, Id } from "@/jmap/types";
 import { formatSize, formatListDate } from "@/lib/format";
 import { canDropFileNodes, isShared, NODE_MIME, readDraggedIds } from "@/lib/filenode";
 import { previewKind } from "@/lib/preview";
-import { entriesFromDrop, hasDirectory, planUpload } from "@/lib/dropUpload";
+import { entriesFromDrop, hasDirectory, planUpload } from "@/lib/input/dropUpload";
 import { ShareDialog } from "../settings/ShareDialog";
 import { Empty, Spinner } from "@/ui/misc";
 import { MenuItem, MenuSep, Popover, useMenu } from "@/ui/popover";
diff --git a/web/src/views/mail/FilterFromMessage.tsx b/web/src/views/mail/FilterFromMessage.tsx
index 23a3694..b6d571c 100644
--- a/web/src/views/mail/FilterFromMessage.tsx
+++ b/web/src/views/mail/FilterFromMessage.tsx
@@ -2,8 +2,8 @@ import { useEffect, useState } from "react";
 import type { Email, Id } from "@/jmap/types";
 import { useSieve } from "@/store/sieve";
 import { useMail } from "@/store/mail";
-import { ruleFromEmail, applyRuleToMailbox } from "@/lib/sieveApply";
-import { upsertRule, type SieveRule } from "@/lib/sieve";
+import { ruleFromEmail, applyRuleToMailbox } from "@/lib/sieve/sieveApply";
+import { upsertRule, type SieveRule } from "@/lib/sieve/sieve";
 import { RuleDialog } from "../settings/RuleDialog";
 import { toast } from "@/ui/toast";
 import { Spinner } from "@/ui/misc";
diff --git a/web/src/views/mail/MailView.tsx b/web/src/views/mail/MailView.tsx
index 92befcd..e40ba3d 100644
--- a/web/src/views/mail/MailView.tsx
+++ b/web/src/views/mail/MailView.tsx
@@ -7,7 +7,7 @@ import { useSettings } from "@/store/settings";
 import { withBase } from "@/lib/basePath";
 import { useCompose } from "@/store/compose";
 import { buildFilter, describeFilter, parseQuery } from "@/lib/search";
-import { keyboard } from "@/lib/keyboard";
+import { keyboard } from "@/lib/input/keyboard";
 import { useIsNarrow } from "@/ui/misc";
 import { Splitter } from "@/ui/Splitter";
 import { MessageList } from "./MessageList";
@@ -17,10 +17,10 @@ import { LabelPicker } from "./LabelPicker";
 import type { Id } from "@/jmap/types";
 import { confirmDialog } from "@/ui/dialog";
 import { toast } from "@/ui/toast";
-import { isUnknownMailbox } from "@/lib/mailboxRoute";
+import { isUnknownMailbox } from "@/lib/mailbox/mailboxRoute";
 import { scheduledMailboxIdFrom, useScheduled } from "@/store/scheduled";
 import { plural, t as translate, tNode } from "@/lib/i18n";
-import { mailboxDisplayName } from "@/lib/mailboxName";
+import { mailboxDisplayName } from "@/lib/mailbox/mailboxName";
 
 export function MailView({ mailboxId, threadId, search }: { mailboxId?: string; threadId?: string; search?: boolean }) {
   const [, navigate] = useLocation();
diff --git a/web/src/views/mail/MailboxPicker.tsx b/web/src/views/mail/MailboxPicker.tsx
index dc2b91d..43eece7 100644
--- a/web/src/views/mail/MailboxPicker.tsx
+++ b/web/src/views/mail/MailboxPicker.tsx
@@ -4,7 +4,7 @@ import { useMail } from "@/store/mail";
 import { Dialog } from "@/ui/dialog";
 import type { Id, Mailbox } from "@/jmap/types";
 import { t } from "@/lib/i18n";
-import { mailboxDisplayPath } from "@/lib/mailboxName";
+import { mailboxDisplayPath } from "@/lib/mailbox/mailboxName";
 
 /**
  * @param need which right a folder has to grant to be worth offering.
diff --git a/web/src/views/mail/MailboxTree.tsx b/web/src/views/mail/MailboxTree.tsx
index 131cce1..9e64aef 100644
--- a/web/src/views/mail/MailboxTree.tsx
+++ b/web/src/views/mail/MailboxTree.tsx
@@ -2,8 +2,8 @@ import { useEffect, useMemo, useState, type DragEvent, type ReactNode } from "re
 import { Link, useLocation } from "wouter";
 import { AlertOctagon, Archive, ChevronDown, ChevronLeft, Clock, ChevronRight, File, Folder, FolderPlus, Inbox, Mail, MoreVertical, Palette, Send, Star, Tag, Trash2, Plus, Pencil, Eye, EyeOff, CheckCheck, Eraser, Share2, X, FolderInput } from "lucide-react";
 import { useMail } from "@/store/mail";
-import { canEmpty, confirmAndEmpty, emptyLabel } from "@/lib/emptyFolder";
-import { labelTree, visibleLabels } from "@/lib/labelTree";
+import { canEmpty, confirmAndEmpty, emptyLabel } from "@/lib/mailbox/emptyFolder";
+import { labelTree, visibleLabels } from "@/lib/mailbox/labelTree";
 import { isScheduledMailbox } from "@/store/scheduled";
 import { useSettings } from "@/store/settings";
 import type { Id, Mailbox } from "@/jmap/types";
@@ -14,10 +14,10 @@ import { toast } from "@/ui/toast";
 import { ShareDialog } from "../settings/ShareDialog";
 import { MailboxPicker } from "./MailboxPicker";
 import { loadRaw, saveJson } from "@/lib/storage";
-import { canDropFolder, canMoveFolderTo, folderColor, movable } from "@/lib/folderMove";
-import { haptic, useTouchRow } from "@/lib/touch";
+import { canDropFolder, canMoveFolderTo, folderColor, movable } from "@/lib/mailbox/folderMove";
+import { haptic, useTouchRow } from "@/lib/input/touch";
 import { plural, t } from "@/lib/i18n";
-import { mailboxDisplayName } from "@/lib/mailboxName";
+import { mailboxDisplayName } from "@/lib/mailbox/mailboxName";
 
 const ROLE_ICONS: Record<string, ReactNode> = {
   inbox: <Inbox size={20} />,
diff --git a/web/src/views/mail/MessageList.tsx b/web/src/views/mail/MessageList.tsx
index 82dae14..0e4890e 100644
--- a/web/src/views/mail/MessageList.tsx
+++ b/web/src/views/mail/MessageList.tsx
@@ -6,20 +6,20 @@ import { useMail, type ListState } from "@/store/mail";
 import { dateTimeKey, useSettings } from "@/store/settings";
 import type { Email, Id } from "@/jmap/types";
 import { formatListDate } from "@/lib/format";
-import { mailboxDisplayName } from "@/lib/mailboxName";
-import { groupByArchivePath, archivePath, type ArchiveGranularity } from "@/lib/archiveDate";
-import { canEmpty, confirmAndEmpty, emptyLabel } from "@/lib/emptyFolder";
+import { mailboxDisplayName } from "@/lib/mailbox/mailboxName";
+import { groupByArchivePath, archivePath, type ArchiveGranularity } from "@/lib/mailbox/archiveDate";
+import { canEmpty, confirmAndEmpty, emptyLabel } from "@/lib/mailbox/emptyFolder";
 import { rowIsOpen } from "@/lib/openMessage";
 import { displayName, shortName } from "@/lib/address";
 import { Avatar, Empty, useIsMobile, useIsTouch } from "@/ui/misc";
-import { rowClick } from "@/lib/listSelection";
+import { rowClick } from "@/lib/input/listSelection";
 import { MenuItem, MenuSep, MenuTitle, Popover, useMenu } from "@/ui/popover";
 import { useCompose } from "@/store/compose";
 import { useCalendar } from "@/store/calendar";
 import { startAppointment } from "@/lib/calendar/appointment";
 import { toast } from "@/ui/toast";
-import { haptic, usePullToRefresh, useTouchRow, PULL_TRIGGER } from "@/lib/touch";
-import { describeSwipe, type SwipeAction, type SwipeDescriptor, type SwipeIcon } from "@/lib/swipe";
+import { haptic, usePullToRefresh, useTouchRow, PULL_TRIGGER } from "@/lib/input/touch";
+import { describeSwipe, type SwipeAction, type SwipeDescriptor, type SwipeIcon } from "@/lib/input/swipe";
 import { FilterFromMessageDialog } from "./FilterFromMessage";
 import { plural, t } from "@/lib/i18n";
 
diff --git a/web/src/views/mail/MessageView.tsx b/web/src/views/mail/MessageView.tsx
index 86cfd67..32c2274 100644
--- a/web/src/views/mail/MessageView.tsx
+++ b/web/src/views/mail/MessageView.tsx
@@ -12,16 +12,16 @@ import { startAppointment } from "@/lib/calendar/appointment";
 import { client } from "@/jmap/client";
 import { SignatureBanner } from "./SignatureBanner";
 import { useSignature } from "@/lib/smime/useSignature";
-import { emlFilename } from "@/lib/emlName";
+import { emlFilename } from "@/lib/text/emlName";
 import { isTnef, parseTnef, type TnefAttachment } from "@/lib/tnef";
 import { internalDomains, isExternalSender, linkVerdict } from "@/lib/warnings";
 import { spamReport, type SpamReport } from "@/lib/spamScore";
 import { formatFullDate, formatListDate, formatSize } from "@/lib/format";
 import { displayName, domainOf, formatAddress } from "@/lib/address";
-import { EMAIL_BASE_CSS, TEXT_EMAIL_CSS, hasHtmlAlternative, htmlDeclaresColors, markKeptSurfaces, sanitizeEmailHtml } from "@/lib/html";
+import { EMAIL_BASE_CSS, TEXT_EMAIL_CSS, hasHtmlAlternative, htmlDeclaresColors, markKeptSurfaces, sanitizeEmailHtml } from "@/lib/text/html";
 import { openableInTab, previewKind } from "@/lib/preview";
 import { FilePreviewDialog } from "@/ui/filepreview";
-import { findQuoteStart, htmlToText, textToHtml } from "@/lib/text";
+import { findQuoteStart, htmlToText, textToHtml } from "@/lib/text/text";
 import { canShare, canShareFiles, shareFile, shareText } from "@/lib/share";
 import { Avatar } from "@/ui/misc";
 import { MenuItem, MenuSep, Popover, useMenu } from "@/ui/popover";
diff --git a/web/src/views/mail/ThreadView.tsx b/web/src/views/mail/ThreadView.tsx
index 8e030b1..a9dfc65 100644
--- a/web/src/views/mail/ThreadView.tsx
+++ b/web/src/views/mail/ThreadView.tsx
@@ -12,7 +12,7 @@ import { Spinner, useIsNarrow, useIsTouch } from "@/ui/misc";
 import { client } from "@/jmap/client";
 import { LabelPicker } from "./LabelPicker";
 import { threadScrollTarget } from "@/lib/threadScroll";
-import { useEdgeBack } from "@/lib/touch";
+import { useEdgeBack } from "@/lib/input/touch";
 import { plural, t } from "@/lib/i18n";
 
 /** How long the opening scroll keeps its place while bodies and images land. */
diff --git a/web/src/views/settings/AppearanceSettings.tsx b/web/src/views/settings/AppearanceSettings.tsx
index 8472b4e..c6d2f5d 100644
--- a/web/src/views/settings/AppearanceSettings.tsx
+++ b/web/src/views/settings/AppearanceSettings.tsx
@@ -1,7 +1,7 @@
 import { useSettings } from "@/store/settings";
 import { PALETTES, effectiveMode, type Mode, type PaletteId } from "@/lib/palette";
 import { Switch, useIsTouch } from "@/ui/misc";
-import { SWIPE_CHOICES, type SwipeAction } from "@/lib/swipe";
+import { SWIPE_CHOICES, type SwipeAction } from "@/lib/input/swipe";
 import { TRANSLATION_ISSUE_URL, UI_LANGUAGES } from "@/lib/languages";
 import { t as translate, tNode } from "@/lib/i18n";
 import { isEnforced } from "@/lib/settingsPolicy";
diff --git a/web/src/views/settings/FiltersSettings.tsx b/web/src/views/settings/FiltersSettings.tsx
index f510e3c..d511a52 100644
--- a/web/src/views/settings/FiltersSettings.tsx
+++ b/web/src/views/settings/FiltersSettings.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react";
 import { ArrowDown, ArrowUp, Code, GripVertical, Plus, Trash2, Wand2, Play, AlertTriangle, Power } from "lucide-react";
 import { useSieve } from "@/store/sieve";
 import { useMail } from "@/store/mail";
-import { describeRule, newRule, reorderRules, rulesToSieve, upsertRule, type SieveRule } from "@/lib/sieve";
+import { describeRule, newRule, reorderRules, rulesToSieve, upsertRule, type SieveRule } from "@/lib/sieve/sieve";
 import { RuleDialog } from "./RuleDialog";
 import { saveAndApply } from "../mail/FilterFromMessage";
 import { confirmDialog, promptDialog } from "@/ui/dialog";
diff --git a/web/src/views/settings/FoldersSettings.tsx b/web/src/views/settings/FoldersSettings.tsx
index 690c0cf..d95899b 100644
--- a/web/src/views/settings/FoldersSettings.tsx
+++ b/web/src/views/settings/FoldersSettings.tsx
@@ -7,7 +7,7 @@ import { formatSize } from "@/lib/format";
 import { ShareDialog } from "./ShareDialog";
 import type { Mailbox, MailboxRole } from "@/jmap/types";
 import { plural, t } from "@/lib/i18n";
-import { mailboxDisplayPath } from "@/lib/mailboxName";
+import { mailboxDisplayPath } from "@/lib/mailbox/mailboxName";
 
 /*
  * Roles a folder can be given here.
diff --git a/web/src/views/settings/IdentitiesSettings.tsx b/web/src/views/settings/IdentitiesSettings.tsx
index 6424ad7..9978eed 100644
--- a/web/src/views/settings/IdentitiesSettings.tsx
+++ b/web/src/views/settings/IdentitiesSettings.tsx
@@ -8,8 +8,8 @@ import { Dialog, confirmDialog } from "@/ui/dialog";
 import { RichEditor, type RichEditorHandle } from "../compose/RichEditor";
 import { toast } from "@/ui/toast";
 import { parseAddressList, formatAddressList } from "@/lib/address";
-import { htmlToText } from "@/lib/text";
-import { sanitizeEditorHtml } from "@/lib/html";
+import { htmlToText } from "@/lib/text/text";
+import { sanitizeEditorHtml } from "@/lib/text/html";
 import { externalizeDataImages, storeSignatureHtml, uploadSignatureImage } from "@/lib/signatureImages";
 import { buildMarkerSignature, byteLength, compactHtml, signatureTooLong, SIGNATURE_LIMIT } from "@/lib/signatureHtml";
 import { t } from "@/lib/i18n";
diff --git a/web/src/views/settings/LabelsSettings.tsx b/web/src/views/settings/LabelsSettings.tsx
index 4246b79..a48f5c3 100644
--- a/web/src/views/settings/LabelsSettings.tsx
+++ b/web/src/views/settings/LabelsSettings.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { Plus, Trash2 } from "lucide-react";
 import { useSettings, type LabelVisibility } from "@/store/settings";
-import { labelTree, descendantKeywords } from "@/lib/labelTree";
+import { labelTree, descendantKeywords } from "@/lib/mailbox/labelTree";
 import { useMemo } from "react";
 import { CALENDAR_COLORS, ColorSwatches } from "@/ui/misc";
 import { promptDialog } from "@/ui/dialog";
diff --git a/web/src/views/settings/NotificationsSettings.tsx b/web/src/views/settings/NotificationsSettings.tsx
index ae12bac..57b1d3f 100644
--- a/web/src/views/settings/NotificationsSettings.tsx
+++ b/web/src/views/settings/NotificationsSettings.tsx
@@ -1,10 +1,10 @@
 import { useEffect, useState } from "react";
 import { useSettings } from "@/store/settings";
 import { Switch } from "@/ui/misc";
-import { requestNotificationPermission, showNotification, playNewMailSound } from "@/lib/notify";
+import { requestNotificationPermission, showNotification, playNewMailSound } from "@/lib/notify/notify";
 import { useSession } from "@/store/session";
-import { disableWebPush, enableWebPush, webPushActive } from "@/lib/webpushEnable";
-import { supportsEmailPush, webPushAvailable } from "@/lib/webpush";
+import { disableWebPush, enableWebPush, webPushActive } from "@/lib/notify/webpushEnable";
+import { supportsEmailPush, webPushAvailable } from "@/lib/notify/webpush";
 import { toast } from "@/ui/toast";
 import { t } from "@/lib/i18n";
 import { isEnforced } from "@/lib/settingsPolicy";
diff --git a/web/src/views/settings/RuleDialog.tsx b/web/src/views/settings/RuleDialog.tsx
index 02f6cc2..aa71edd 100644
--- a/web/src/views/settings/RuleDialog.tsx
+++ b/web/src/views/settings/RuleDialog.tsx
@@ -1,7 +1,7 @@
 import { useMemo, useState } from "react";
 import { Plus, Trash2 } from "lucide-react";
 import { useMail } from "@/store/mail";
-import { HEADER_CHOICES, HEADER_OPS, type SieveAction, type SieveRule, type SieveTest } from "@/lib/sieve";
+import { HEADER_CHOICES, HEADER_OPS, type SieveAction, type SieveRule, type SieveTest } from "@/lib/sieve/sieve";
 import { Dialog, promptDialog } from "@/ui/dialog";
 import { toast } from "@/ui/toast";
 import type { Id } from "@/jmap/types";
diff --git a/web/src/views/settings/ShortcutsSettings.tsx b/web/src/views/settings/ShortcutsSettings.tsx
index 0d1b827..7581018 100644
--- a/web/src/views/settings/ShortcutsSettings.tsx
+++ b/web/src/views/settings/ShortcutsSettings.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { keyboard } from "@/lib/keyboard";
+import { keyboard } from "@/lib/input/keyboard";
 import { Kbd } from "@/ui/misc";
 import { t, tNode } from "@/lib/i18n";
 
diff --git a/web/src/views/settings/TemplatesSettings.tsx b/web/src/views/settings/TemplatesSettings.tsx
index 5339125..c48e7d5 100644
--- a/web/src/views/settings/TemplatesSettings.tsx
+++ b/web/src/views/settings/TemplatesSettings.tsx
@@ -3,7 +3,7 @@ import { Plus, Trash2 } from "lucide-react";
 import { useSettings, type Template } from "@/store/settings";
 import { Dialog } from "@/ui/dialog";
 import { RichEditor } from "../compose/RichEditor";
-import { htmlToText } from "@/lib/text";
+import { htmlToText } from "@/lib/text/text";
 import { t as translate } from "@/lib/i18n";
 import { PLACEHOLDER_NAMES } from "@/lib/templatePlaceholders";
 
diff --git a/web/src/views/settings/__tests__/filters-unsaved-guard.test.tsx b/web/src/views/settings/__tests__/filters-unsaved-guard.test.tsx
index c145a56..1d40edb 100644
--- a/web/src/views/settings/__tests__/filters-unsaved-guard.test.tsx
+++ b/web/src/views/settings/__tests__/filters-unsaved-guard.test.tsx
@@ -5,7 +5,7 @@ import { FiltersSettings } from "../FiltersSettings";
 import { ConfirmHost } from "@/ui/dialog";
 import { useSieve } from "@/store/sieve";
 import { hasUnsavedChanges } from "@/lib/unsavedChanges";
-import { newRule, rulesToSieve } from "@/lib/sieve";
+import { newRule, rulesToSieve } from "@/lib/sieve/sieve";
 
 (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
 
diff --git a/web/src/views/settings/__tests__/rule-dialog-header.test.tsx b/web/src/views/settings/__tests__/rule-dialog-header.test.tsx
index 8022f4b..9803bb5 100644
--- a/web/src/views/settings/__tests__/rule-dialog-header.test.tsx
+++ b/web/src/views/settings/__tests__/rule-dialog-header.test.tsx
@@ -2,7 +2,7 @@ import { act } from "react";
 import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { RuleDialog } from "../RuleDialog";
-import { newRule } from "@/lib/sieve";
+import { newRule } from "@/lib/sieve/sieve";
 
 (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
 
diff --git a/web/src/views/settings/__tests__/rule-drag-reorder.test.tsx b/web/src/views/settings/__tests__/rule-drag-reorder.test.tsx
index 11bb8c4..2c12d19 100644
--- a/web/src/views/settings/__tests__/rule-drag-reorder.test.tsx
+++ b/web/src/views/settings/__tests__/rule-drag-reorder.test.tsx
@@ -3,7 +3,7 @@ import { createRoot, type Root } from "react-dom/client";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { FiltersSettings } from "../FiltersSettings";
 import { useSieve } from "@/store/sieve";
-import { newRule, rulesToSieve } from "@/lib/sieve";
+import { newRule, rulesToSieve } from "@/lib/sieve/sieve";
 
 (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;