diff --git a/src/app/actionItems.ts b/src/app/actionItems.ts
new file mode 100644
index 00000000..418920b9
--- /dev/null
+++ b/src/app/actionItems.ts
@@ -0,0 +1,89 @@
+import {
+  REPORT,
+  ROOM_ADD_MEMBER,
+  ROOM_JOIN,
+  ROOM_LEAVE,
+  ROOM_MEMBERS,
+  ROOM_REMOVE_MEMBER,
+  getPubkeyTagValues,
+  getTagValue,
+  sortEventsDesc,
+} from "@welshman/util"
+import type {TrustedEvent} from "@welshman/util"
+import {first, groupBy, removeUndefined} from "@welshman/lib"
+import {derived} from "svelte/store"
+import {deriveEventsForUrl} from "@app/repository"
+import {getRoomMembers} from "@app/members"
+// Action items (admin review queue)
+
+export const deriveSpaceActionItems = (url: string) =>
+  derived(
+    deriveEventsForUrl(url, [
+      {
+        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
+      },
+    ]),
+    $events => {
+      const getRoomId = (e: TrustedEvent) =>
+        getTagValue(e.kind === ROOM_MEMBERS ? "d" : "h", e.tags)
+      const reports = $events.filter(e => e.kind === REPORT)
+      const pendingJoins: TrustedEvent[] = []
+
+      // Room-level join requests — most recent per pubkey+h
+      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
+        if (!h) continue
+
+        const roomJoins: TrustedEvent[] = []
+        const roomLeaves: TrustedEvent[] = []
+        const roomMembershipEvents: TrustedEvent[] = []
+
+        for (const event of roomEvents) {
+          switch (event.kind) {
+            case ROOM_JOIN:
+              roomJoins.push(event)
+              break
+            case ROOM_LEAVE:
+              roomLeaves.push(event)
+              break
+            case ROOM_MEMBERS:
+            case ROOM_ADD_MEMBER:
+            case ROOM_REMOVE_MEMBER:
+              roomMembershipEvents.push(event)
+              break
+          }
+        }
+
+        const roomMembers = new Set(getRoomMembers(url, h, roomMembershipEvents))
+
+        pendingJoins.push(
+          ...removeUndefined(
+            Array.from(groupBy(e => e.pubkey, roomJoins).values()).map(events =>
+              first(sortEventsDesc(events)),
+            ),
+          ).filter(({pubkey, created_at}) => {
+            if (roomMembers.has(pubkey)) return false
+            if (
+              roomMembershipEvents.some(event => {
+                if (event.created_at <= created_at) {
+                  return false
+                }
+
+                if (event.kind === ROOM_MEMBERS) {
+                  return true
+                }
+
+                return getPubkeyTagValues(event.tags).includes(pubkey)
+              })
+            ) {
+              return false
+            }
+            if (roomLeaves.some(e => e.pubkey === pubkey && e.created_at > created_at)) return false
+
+            return true
+          }),
+        )
+      }
+
+      return sortEventsDesc([...reports, ...pendingJoins])
+    },
+  )
diff --git a/src/app/analytics.ts b/src/app/analytics.ts
index 7bdae02a..d0c22d43 100644
--- a/src/app/analytics.ts
+++ b/src/app/analytics.ts
@@ -1,7 +1,7 @@
 /* eslint prefer-rest-params: 0 */
 
 import {page} from "$app/stores"
-import {getSetting} from "@app/core/state"
+import {getSetting} from "@app/settings"
 
 const w = window as any
 
diff --git a/src/app/call/stores.ts b/src/app/call/stores.ts
index 01053486..d7e4adff 100644
--- a/src/app/call/stores.ts
+++ b/src/app/call/stores.ts
@@ -1,6 +1,6 @@
 import {Room as LiveKitRoom} from "livekit-client"
 import {derived, writable} from "svelte/store"
-import {type Room} from "@app/core/state"
+import type {Room} from "@app/groups"
 
 export type VoiceSession = {
   url: string
diff --git a/src/app/call/voice.ts b/src/app/call/voice.ts
index 7eafbe39..57796c45 100644
--- a/src/app/call/voice.ts
+++ b/src/app/call/voice.ts
@@ -36,7 +36,8 @@ import {
   voiceState,
 } from "@app/call/stores"
 import {resetVideoCallLayout, triggerVideoFeedCount, videoPrimaryTileKey} from "@app/call/video"
-import {deriveLatestEventForUrl, deriveRoom, makeRoomId} from "@app/core/state"
+import {deriveLatestEventForUrl} from "@app/repository"
+import {deriveRoom, makeRoomId} from "@app/groups"
 import {pushToast} from "@app/toast"
 
 export const LIVEKIT_PARTICIPANTS = 39004
diff --git a/src/app/chats.ts b/src/app/chats.ts
new file mode 100644
index 00000000..bdb088cd
--- /dev/null
+++ b/src/app/chats.ts
@@ -0,0 +1,139 @@
+import {DELETE, PROFILE, getPubkeyTagValues} from "@welshman/util"
+import type {TrustedEvent} from "@welshman/util"
+import {append, call, on, reject, remove, sort, sortBy, spec, uniq, uniqBy} from "@welshman/lib"
+import type {Override} from "@welshman/lib"
+import {createSearch, displayProfileByPubkey, pubkey, repository} from "@welshman/app"
+import {derived, readable} from "svelte/store"
+import {DM_KINDS} from "@app/content"
+import type {RepositoryUpdate} from "@welshman/net"
+import {makeDeriveItem, throttled} from "@welshman/store"
+export type Chat = {
+  id: string
+  pubkeys: string[]
+  messages: TrustedEvent[]
+  last_activity: number
+  search_text: string
+}
+
+export const getChatPubkeys = (pubkeys: string[]) => sort(uniq(append(pubkey.get()!, pubkeys)))
+
+export const getChatPubkeysFromEvent = (event: TrustedEvent) =>
+  getChatPubkeys(getPubkeyTagValues(event.tags).concat(event.pubkey))
+
+export const makeChatId = (pubkeys: string[]) => {
+  const userPubkey = pubkey.get()!
+  const otherPubkeys = remove(userPubkey, uniq(pubkeys))
+  const visiblePubkeys = otherPubkeys.length === 0 ? [userPubkey] : otherPubkeys
+
+  return sort(visiblePubkeys).join(",")
+}
+
+export const splitChatId = (id: string) => getChatPubkeys(id.split(","))
+
+export const chatsById = call(() => {
+  const chatsById = new Map<string, Chat>()
+  const chatsByPubkey = new Map<string, string[]>()
+
+  const addSearchText = (chat: Override<Chat, {search_text?: string}>) => {
+    chat.search_text =
+      chat.pubkeys.length === 1
+        ? displayProfileByPubkey(chat.pubkeys[0]) + " note to self"
+        : remove(pubkey.get()!, chat.pubkeys).map(displayProfileByPubkey).join(" ")
+
+    return chat as Chat
+  }
+
+  return readable(chatsById, set => {
+    const indexChatByPubkeys = (chat: Chat) => {
+      for (const pubkey of chat.pubkeys) {
+        chatsByPubkey.set(pubkey, uniq(append(chat.id, chatsByPubkey.get(pubkey) || [])))
+      }
+    }
+
+    const addEvents = (events: TrustedEvent[]) => {
+      let dirty = false
+      for (const event of events) {
+        if (DM_KINDS.includes(event.kind)) {
+          const pubkeys = getChatPubkeysFromEvent(event)
+          const id = makeChatId(pubkeys)
+          const chat = chatsById.get(id)
+          const messages = sortBy(
+            e => -e.created_at,
+            uniqBy(e => e.id, append(event, chat?.messages || [])),
+          )
+          const last_activity = Math.max(chat?.last_activity || 0, event.created_at)
+          const updatedChat = addSearchText({id, pubkeys, messages, last_activity})
+
+          chatsById.set(id, updatedChat)
+          indexChatByPubkeys(updatedChat)
+
+          dirty = true
+        }
+
+        if (event.kind === PROFILE) {
+          for (const chatId of chatsByPubkey.get(event.pubkey) || []) {
+            const chat = chatsById.get(chatId)
+
+            if (chat) {
+              addSearchText(chat)
+              dirty = true
+            }
+          }
+        }
+      }
+
+      if (dirty) {
+        set(chatsById)
+      }
+    }
+
+    const removeEvents = (removed: Set<string>) => {
+      let dirty = false
+
+      for (const id of removed) {
+        const event = repository.getEvent(id)
+
+        if (event && DM_KINDS.includes(event.kind)) {
+          for (const chatId of chatsByPubkey.get(event.pubkey) || []) {
+            const chat = chatsById.get(chatId)
+
+            if (chat) {
+              chat.messages = reject(spec({id: event.id}), chat.messages)
+              dirty = true
+            }
+          }
+        }
+      }
+
+      if (dirty) {
+        set(chatsById)
+      }
+    }
+
+    addEvents(repository.query([{kinds: [...DM_KINDS, DELETE, PROFILE]}]))
+
+    const unsubscribers = [
+      on(repository, "update", ({added, removed}: RepositoryUpdate) => {
+        // Do this async so that profiles are populated
+        setTimeout(() => {
+          addEvents(added)
+          removeEvents(removed)
+        }, 200)
+      }),
+    ]
+
+    return () => unsubscribers.forEach(call)
+  })
+})
+
+export const deriveChat = makeDeriveItem(chatsById)
+
+export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
+  return createSearch(
+    sortBy(c => -c.last_activity, Array.from($chatsByPubkey.values())),
+    {
+      getValue: (chat: Chat) => chat.id,
+      fuseOptions: {keys: ["search_text"]},
+    },
+  )
+})
diff --git a/src/app/comments.ts b/src/app/comments.ts
new file mode 100644
index 00000000..b74fa5b1
--- /dev/null
+++ b/src/app/comments.ts
@@ -0,0 +1,16 @@
+import type {TrustedEvent} from "@welshman/util"
+import {COMMENT, makeEvent} from "@welshman/util"
+import {publishThunk, tagEventForComment} from "@welshman/app"
+
+export type CommentParams = {
+  event: TrustedEvent
+  content: string
+  tags?: string[][]
+  url?: string
+}
+
+export const makeComment = ({url, event, content, tags = []}: CommentParams) =>
+  makeEvent(COMMENT, {content, tags: [...tags, ...tagEventForComment(event, url)]})
+
+export const publishComment = ({relays, ...params}: CommentParams & {relays: string[]}) =>
+  publishThunk({event: makeComment({url: relays[0], ...params}), relays})
diff --git a/src/app/components/CalendarEventActions.svelte b/src/app/components/CalendarEventActions.svelte
index 6908083b..38a026b7 100644
--- a/src/app/components/CalendarEventActions.svelte
+++ b/src/app/components/CalendarEventActions.svelte
@@ -12,7 +12,9 @@
   import EventActivity from "@app/components/EventActivity.svelte"
   import EventActions from "@app/components/EventActions.svelte"
   import CalendarEventEdit from "@app/components/CalendarEventEdit.svelte"
-  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
   import {makeCalendarPath, makeSpacePath} from "@app/routes"
   import {pushModal} from "@app/modal"
 
diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte
index 71bfeacf..30b852d3 100644
--- a/src/app/components/CalendarEventForm.svelte
+++ b/src/app/components/CalendarEventForm.svelte
@@ -18,11 +18,11 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import DateTimeInput from "@lib/components/DateTimeInput.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
-  import {PROTECTED} from "@app/core/state"
+  import {PROTECTED, publishRoomQuote} from "@app/groups"
   import {makeEditor} from "@app/editor"
   import {DraftKey} from "@app/drafts"
   import {pushToast} from "@app/toast"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/relays"
 
   type Values = {
     d: string
diff --git a/src/app/components/Chat.svelte b/src/app/components/Chat.svelte
index 70f7bb62..fb3e2931 100644
--- a/src/app/components/Chat.svelte
+++ b/src/app/components/Chat.svelte
@@ -53,10 +53,12 @@
   import ChatComposeEdit from "@app/components/ChatComposeEdit.svelte"
   import ChatComposeParent from "@app/components/ChatComposeParent.svelte"
   import ThunkToast from "@app/components/ThunkToast.svelte"
-  import {userSettingsValues, deriveChat, makeChatId} from "@app/core/state"
+  import {userSettingsValues} from "@app/settings"
+  import {deriveChat, makeChatId} from "@app/chats"
   import {pushModal} from "@app/modal"
   import {DraftKey} from "@app/drafts"
-  import {makeDelete, prependParent} from "@app/core/commands"
+  import {makeDelete} from "@app/deletes"
+  import {prependParent} from "@app/groups"
   import {pushToast} from "@app/toast"
 
   type Props = {
diff --git a/src/app/components/ChatEnable.svelte b/src/app/components/ChatEnable.svelte
index 0da9c80b..c22d245e 100644
--- a/src/app/components/ChatEnable.svelte
+++ b/src/app/components/ChatEnable.svelte
@@ -12,7 +12,7 @@
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/core/state"
+  import {DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/env"
   import {pushToast} from "@app/toast"
 
   type Props = {
diff --git a/src/app/components/ChatMenu.svelte b/src/app/components/ChatMenu.svelte
index e4381bc8..b4ae57a5 100644
--- a/src/app/components/ChatMenu.svelte
+++ b/src/app/components/ChatMenu.svelte
@@ -8,7 +8,7 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import {setChecked} from "@app/notifications"
-  import {notificationSettings} from "@app/core/state"
+  import {notificationSettings} from "@app/settings"
 
   const markAsRead = () => {
     setChecked("/chat/*")
diff --git a/src/app/components/ChatMessage.svelte b/src/app/components/ChatMessage.svelte
index 8b9823d5..2293deb9 100644
--- a/src/app/components/ChatMessage.svelte
+++ b/src/app/components/ChatMessage.svelte
@@ -16,8 +16,9 @@
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
   import ChatMessageMenu from "@app/components/ChatMessageMenu.svelte"
   import ChatMessageMenuMobile from "@app/components/ChatMessageMenuMobile.svelte"
-  import {colors} from "@app/core/state"
-  import {makeDelete, makeReaction} from "@app/core/commands"
+  import {colors} from "@app/theme"
+  import {makeDelete} from "@app/deletes"
+  import {makeReaction} from "@app/reactions"
   import {pushModal} from "@app/modal"
 
   interface Props {
diff --git a/src/app/components/ChatMessageEmojiButton.svelte b/src/app/components/ChatMessageEmojiButton.svelte
index 0d438e01..9488a0d2 100644
--- a/src/app/components/ChatMessageEmojiButton.svelte
+++ b/src/app/components/ChatMessageEmojiButton.svelte
@@ -5,7 +5,7 @@
   import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import EmojiButton from "@lib/components/EmojiButton.svelte"
-  import {makeReaction} from "@app/core/commands"
+  import {makeReaction} from "@app/reactions"
 
   interface Props {
     event: TrustedEvent
diff --git a/src/app/components/ChatMessageMenuMobile.svelte b/src/app/components/ChatMessageMenuMobile.svelte
index e9a84ef5..c5452f63 100644
--- a/src/app/components/ChatMessageMenuMobile.svelte
+++ b/src/app/components/ChatMessageMenuMobile.svelte
@@ -13,7 +13,7 @@
   import Button from "@lib/components/Button.svelte"
   import EmojiPicker from "@lib/components/EmojiPicker.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
-  import {makeReaction} from "@app/core/commands"
+  import {makeReaction} from "@app/reactions"
   import {pushModal} from "@app/modal"
   import {clip} from "@app/toast"
 
diff --git a/src/app/components/ClassifiedActions.svelte b/src/app/components/ClassifiedActions.svelte
index e79ab04f..2de299d3 100644
--- a/src/app/components/ClassifiedActions.svelte
+++ b/src/app/components/ClassifiedActions.svelte
@@ -15,7 +15,9 @@
   import EventActivity from "@app/components/EventActivity.svelte"
   import EventActions from "@app/components/EventActions.svelte"
   import ClassifiedEdit from "@app/components/ClassifiedEdit.svelte"
-  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
   import {makeClassifiedPath, makeSpacePath} from "@app/routes"
   import {pushModal} from "@app/modal"
 
diff --git a/src/app/components/ClassifiedForm.svelte b/src/app/components/ClassifiedForm.svelte
index 3b26d317..d76ccd7f 100644
--- a/src/app/components/ClassifiedForm.svelte
+++ b/src/app/components/ClassifiedForm.svelte
@@ -18,10 +18,11 @@
   import TopicMultiSelect from "@app/components/TopicMultiSelect.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {pushToast} from "@app/toast"
-  import {PROTECTED} from "@app/core/state"
+  import {PROTECTED, publishRoomQuote} from "@app/groups"
   import {makeEditor} from "@app/editor"
   import {DraftKey} from "@app/drafts"
-  import {canEnforceNip70, publishRoomQuote, uploadFile} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/relays"
+  import {uploadFile} from "@app/uploads"
 
   type Values = {
     d: string
diff --git a/src/app/components/CommentActions.svelte b/src/app/components/CommentActions.svelte
index 380e6eb9..e6ed4db0 100644
--- a/src/app/components/CommentActions.svelte
+++ b/src/app/components/CommentActions.svelte
@@ -4,7 +4,9 @@
   import ThunkStatusOrDeleted from "@app/components/ThunkStatusOrDeleted.svelte"
   import EventActivity from "@app/components/EventActivity.svelte"
   import EventActions from "@app/components/EventActions.svelte"
-  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
   import {makeSpacePath} from "@app/routes"
 
   interface Props {
diff --git a/src/app/components/Content.svelte b/src/app/components/Content.svelte
index 722a3007..19c59eeb 100644
--- a/src/app/components/Content.svelte
+++ b/src/app/components/Content.svelte
@@ -35,7 +35,8 @@
   import ContentQuote from "@app/components/ContentQuote.svelte"
   import ContentTopic from "@app/components/ContentTopic.svelte"
   import ContentMention from "@app/components/ContentMention.svelte"
-  import {entityLink, userSettingsValues} from "@app/core/state"
+  import {entityLink} from "@app/env"
+  import {userSettingsValues} from "@app/settings"
 
   interface Props {
     event: any
diff --git a/src/app/components/ContentLinkBlock.svelte b/src/app/components/ContentLinkBlock.svelte
index 319510a1..e6dfc90b 100644
--- a/src/app/components/ContentLinkBlock.svelte
+++ b/src/app/components/ContentLinkBlock.svelte
@@ -8,14 +8,9 @@
   import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
   import ContentLinkBlockImage from "@app/components/ContentLinkBlockImage.svelte"
   import {pushModal} from "@app/modal"
-  import {
-    dufflepud,
-    IMAGE_CONTENT_TYPES,
-    PLATFORM_URL,
-    VIDEO_CONTENT_TYPES,
-    THUMBNAIL_URL,
-    isRoomId,
-  } from "@app/core/state"
+  import {dufflepud, PLATFORM_URL, THUMBNAIL_URL} from "@app/env"
+  import {IMAGE_CONTENT_TYPES, VIDEO_CONTENT_TYPES} from "@app/content"
+  import {isRoomId} from "@app/groups"
 
   const {value, event} = $props()
 
diff --git a/src/app/components/ContentLinkInline.svelte b/src/app/components/ContentLinkInline.svelte
index b894f1ce..ff2a661a 100644
--- a/src/app/components/ContentLinkInline.svelte
+++ b/src/app/components/ContentLinkInline.svelte
@@ -7,7 +7,7 @@
   import ContentLinkDetail from "@app/components/ContentLinkDetail.svelte"
   import ContentLinkUrl from "@app/components/ContentLinkUrl.svelte"
   import {pushModal} from "@app/modal"
-  import {IMAGE_CONTENT_TYPES} from "@app/core/state"
+  import {IMAGE_CONTENT_TYPES} from "@app/content"
 
   const {value, event} = $props()
 
diff --git a/src/app/components/ContentLinkUrl.svelte b/src/app/components/ContentLinkUrl.svelte
index ec46636e..0b786d5f 100644
--- a/src/app/components/ContentLinkUrl.svelte
+++ b/src/app/components/ContentLinkUrl.svelte
@@ -4,7 +4,8 @@
   import LinkRound from "@assets/icons/link-round.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Link from "@lib/components/Link.svelte"
-  import {PLATFORM_URL, displayRoom, isRoomId, splitRoomId} from "@app/core/state"
+  import {PLATFORM_URL} from "@app/env"
+  import {displayRoom, isRoomId, splitRoomId} from "@app/groups"
   import {makeRoomPath, makeSpacePath} from "@app/routes"
 
   const {
diff --git a/src/app/components/ContentMinimal.svelte b/src/app/components/ContentMinimal.svelte
index 100f6367..f35be776 100644
--- a/src/app/components/ContentMinimal.svelte
+++ b/src/app/components/ContentMinimal.svelte
@@ -31,7 +31,8 @@
   import ContentNewline from "@app/components/ContentNewline.svelte"
   import ContentTopic from "@app/components/ContentTopic.svelte"
   import ContentMention from "@app/components/ContentMention.svelte"
-  import {entityLink, userSettingsValues} from "@app/core/state"
+  import {entityLink} from "@app/env"
+  import {userSettingsValues} from "@app/settings"
 
   interface Props {
     event: any
diff --git a/src/app/components/ContentQuote.svelte b/src/app/components/ContentQuote.svelte
index 23e82d66..d02b3f10 100644
--- a/src/app/components/ContentQuote.svelte
+++ b/src/app/components/ContentQuote.svelte
@@ -7,7 +7,8 @@
   import Spinner from "@lib/components/Spinner.svelte"
   import NoteCard from "@app/components/NoteCard.svelte"
   import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte"
-  import {deriveEvent, entityLink} from "@app/core/state"
+  import {deriveEvent} from "@app/repository"
+  import {entityLink} from "@app/env"
   import {goToEvent} from "@app/routes"
 
   type Props = {
diff --git a/src/app/components/EventActions.svelte b/src/app/components/EventActions.svelte
index c4e27af6..6c12d463 100644
--- a/src/app/components/EventActions.svelte
+++ b/src/app/components/EventActions.svelte
@@ -12,8 +12,9 @@
   import ZapButton from "@app/components/ZapButton.svelte"
   import EmojiButton from "@lib/components/EmojiButton.svelte"
   import EventMenu from "@app/components/EventMenu.svelte"
-  import {ENABLE_ZAPS} from "@app/core/state"
-  import {publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {ENABLE_ZAPS} from "@app/env"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
 
   type Props = {
     url: string
diff --git a/src/app/components/EventDeleteConfirm.svelte b/src/app/components/EventDeleteConfirm.svelte
index e9e1931c..c2770f1e 100644
--- a/src/app/components/EventDeleteConfirm.svelte
+++ b/src/app/components/EventDeleteConfirm.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import type {TrustedEvent} from "@welshman/util"
   import Confirm from "@lib/components/Confirm.svelte"
-  import {publishDelete, canEnforceNip70} from "@app/core/commands"
+  import {publishDelete} from "@app/deletes"
+  import {canEnforceNip70} from "@app/relays"
   import {clearModals} from "@app/modal"
 
   type Props = {
diff --git a/src/app/components/EventMenu.svelte b/src/app/components/EventMenu.svelte
index 145b318c..3486f299 100644
--- a/src/app/components/EventMenu.svelte
+++ b/src/app/components/EventMenu.svelte
@@ -17,7 +17,8 @@
   import Report from "@app/components/Report.svelte"
   import EventShare from "@app/components/EventShare.svelte"
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {hasNip29, deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {hasNip29} from "@app/relays"
+  import {deriveUserIsSpaceAdmin} from "@app/members"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
   import {makeSpaceChatPath} from "@app/routes"
diff --git a/src/app/components/EventReply.svelte b/src/app/components/EventReply.svelte
index ba72d07b..765887be 100644
--- a/src/app/components/EventReply.svelte
+++ b/src/app/components/EventReply.svelte
@@ -7,8 +7,9 @@
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
-  import {publishComment, canEnforceNip70} from "@app/core/commands"
-  import {PROTECTED} from "@app/core/state"
+  import {publishComment} from "@app/comments"
+  import {canEnforceNip70} from "@app/relays"
+  import {PROTECTED} from "@app/groups"
   import {makeEditor} from "@app/editor"
   import {DraftKey} from "@app/drafts"
   import {pushToast} from "@app/toast"
diff --git a/src/app/components/EventShare.svelte b/src/app/components/EventShare.svelte
index e1e3130f..2ae7d64f 100644
--- a/src/app/components/EventShare.svelte
+++ b/src/app/components/EventShare.svelte
@@ -14,7 +14,7 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import RoomName from "@app/components/RoomName.svelte"
-  import {roomsByUrl} from "@app/core/state"
+  import {roomsByUrl} from "@app/groups"
   import {makeRoomPath} from "@app/routes"
 
   const {url, noun, event}: {url: string; noun: string; event: TrustedEvent} = $props()
diff --git a/src/app/components/GoalActions.svelte b/src/app/components/GoalActions.svelte
index 819fe0af..c5e3d1c4 100644
--- a/src/app/components/GoalActions.svelte
+++ b/src/app/components/GoalActions.svelte
@@ -7,7 +7,9 @@
   import EventActivity from "@app/components/EventActivity.svelte"
   import EventActions from "@app/components/EventActions.svelte"
   import RoomName from "@app/components/RoomName.svelte"
-  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
   import {makeGoalPath, makeSpacePath} from "@app/routes"
 
   interface Props {
diff --git a/src/app/components/GoalCreate.svelte b/src/app/components/GoalCreate.svelte
index d4f1234c..91c1264b 100644
--- a/src/app/components/GoalCreate.svelte
+++ b/src/app/components/GoalCreate.svelte
@@ -19,10 +19,10 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {pushToast} from "@app/toast"
-  import {PROTECTED} from "@app/core/state"
+  import {PROTECTED, publishRoomQuote} from "@app/groups"
   import {makeEditor} from "@app/editor"
   import {DraftKey} from "@app/drafts"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/relays"
 
   type Values = {
     title: string
diff --git a/src/app/components/InfoBunker.svelte b/src/app/components/InfoBunker.svelte
index c5d0d5de..e930a229 100644
--- a/src/app/components/InfoBunker.svelte
+++ b/src/app/components/InfoBunker.svelte
@@ -5,7 +5,7 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
-  import {PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_NAME} from "@app/env"
 </script>
 
 <Modal
diff --git a/src/app/components/InfoHandle.svelte b/src/app/components/InfoHandle.svelte
index 42acd9c5..79b166d7 100644
--- a/src/app/components/InfoHandle.svelte
+++ b/src/app/components/InfoHandle.svelte
@@ -5,7 +5,7 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
-  import {PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_NAME} from "@app/env"
 </script>
 
 <Modal
diff --git a/src/app/components/InfoKeys.svelte b/src/app/components/InfoKeys.svelte
index 4ba90efe..6c98e987 100644
--- a/src/app/components/InfoKeys.svelte
+++ b/src/app/components/InfoKeys.svelte
@@ -11,7 +11,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import KeyRecoveryRequest from "@app/components/KeyRecoveryRequest.svelte"
-  import {PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_NAME} from "@app/env"
   import {pushModal} from "@app/modal"
 
   const back = () => history.back()
diff --git a/src/app/components/InfoRelay.svelte b/src/app/components/InfoRelay.svelte
index e1ab12c1..00298a1b 100644
--- a/src/app/components/InfoRelay.svelte
+++ b/src/app/components/InfoRelay.svelte
@@ -6,7 +6,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
-  import {PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_NAME} from "@app/env"
 </script>
 
 <Modal>
diff --git a/src/app/components/InputProfilePicture.svelte b/src/app/components/InputProfilePicture.svelte
index 339300ed..91bc5f55 100644
--- a/src/app/components/InputProfilePicture.svelte
+++ b/src/app/components/InputProfilePicture.svelte
@@ -5,7 +5,7 @@
   import AddCircle from "@assets/icons/add-circle.svg?dataurl"
   import GallerySend from "@assets/icons/gallery-send.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
-  import {uploadFile} from "@app/core/commands"
+  import {uploadFile} from "@app/uploads"
 
   interface Props {
     file?: File | undefined
diff --git a/src/app/components/KeyDownload.svelte b/src/app/components/KeyDownload.svelte
index 4eae1df8..98af72b3 100644
--- a/src/app/components/KeyDownload.svelte
+++ b/src/app/components/KeyDownload.svelte
@@ -17,7 +17,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ProgressBar from "@app/components/ProgressBar.svelte"
   import {pushToast} from "@app/toast"
-  import {PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_NAME} from "@app/env"
 
   type Props = {
     secret: string
diff --git a/src/app/components/Landing.svelte b/src/app/components/Landing.svelte
index c2a4098f..f6c0d858 100644
--- a/src/app/components/Landing.svelte
+++ b/src/app/components/Landing.svelte
@@ -9,7 +9,7 @@
   import CardButton from "@lib/components/CardButton.svelte"
   import LogIn from "@app/components/LogIn.svelte"
   import SignUp from "@app/components/SignUp.svelte"
-  import {PLATFORM_TERMS, PLATFORM_PRIVACY, PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_TERMS, PLATFORM_PRIVACY, PLATFORM_NAME} from "@app/env"
   import {pushModal} from "@app/modal"
 
   const logIn = () => pushModal(LogIn)
diff --git a/src/app/components/LogIn.svelte b/src/app/components/LogIn.svelte
index e2458840..8aa30d87 100644
--- a/src/app/components/LogIn.svelte
+++ b/src/app/components/LogIn.svelte
@@ -19,7 +19,7 @@
   import LogInEmail from "@app/components/LogInEmail.svelte"
   import LogInKey from "@app/components/LogInKey.svelte"
   import {pushModal, clearModals} from "@app/modal"
-  import {PLATFORM_NAME, POMADE_SIGNERS} from "@app/core/state"
+  import {PLATFORM_NAME, POMADE_SIGNERS} from "@app/env"
   import {pushToast} from "@app/toast"
   import {setChecked} from "@app/notifications"
 
diff --git a/src/app/components/LogInBunker.svelte b/src/app/components/LogInBunker.svelte
index 8c538def..2471c09f 100644
--- a/src/app/components/LogInBunker.svelte
+++ b/src/app/components/LogInBunker.svelte
@@ -23,7 +23,8 @@
   import {clearModals} from "@app/modal"
   import {setChecked} from "@app/notifications"
   import {pushToast} from "@app/toast"
-  import {SIGNER_RELAYS, NIP46_PERMS} from "@app/core/state"
+  import {SIGNER_RELAYS} from "@app/env"
+  import {NIP46_PERMS} from "@app/nip46"
 
   const back = () => {
     if (mode === "connect") {
diff --git a/src/app/components/NewNotificationSound.svelte b/src/app/components/NewNotificationSound.svelte
index d0d6a803..ae4b1a20 100644
--- a/src/app/components/NewNotificationSound.svelte
+++ b/src/app/components/NewNotificationSound.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {notificationSettings} from "@app/core/state"
+  import {notificationSettings} from "@app/settings"
   import {onNotification} from "@app/push"
 
   let audioElement: HTMLAudioElement
diff --git a/src/app/components/NoteCard.svelte b/src/app/components/NoteCard.svelte
index c6694a86..6104b56c 100644
--- a/src/app/components/NoteCard.svelte
+++ b/src/app/components/NoteCard.svelte
@@ -9,7 +9,7 @@
   import Profile from "@app/components/Profile.svelte"
   import ProfileName from "@app/components/ProfileName.svelte"
   import {goToEvent} from "@app/routes"
-  import {isEventMuted} from "@app/core/state"
+  import {isEventMuted} from "@app/social"
 
   const {
     event,
diff --git a/src/app/components/NoteContentMinimalPoll.svelte b/src/app/components/NoteContentMinimalPoll.svelte
index 9b7a6ebd..6e357296 100644
--- a/src/app/components/NoteContentMinimalPoll.svelte
+++ b/src/app/components/NoteContentMinimalPoll.svelte
@@ -3,7 +3,7 @@
   import {derived} from "svelte/store"
   import {POLL_RESPONSE} from "@welshman/util"
   import ContentMinimal from "@app/components/ContentMinimal.svelte"
-  import {deriveEvents} from "@app/core/state"
+  import {deriveEvents} from "@app/repository"
   import {getPollResults} from "@app/polls"
 
   const props: ComponentProps<typeof ContentMinimal> = $props()
diff --git a/src/app/components/NoteItem.svelte b/src/app/components/NoteItem.svelte
index 9edddeeb..eb855f0a 100644
--- a/src/app/components/NoteItem.svelte
+++ b/src/app/components/NoteItem.svelte
@@ -9,7 +9,9 @@
   import NoteContent from "@app/components/NoteContent.svelte"
   import NoteCard from "@app/components/NoteCard.svelte"
   import ReactionSummary from "@app/components/ReactionSummary.svelte"
-  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
 
   type Props = {
     event: TrustedEvent
diff --git a/src/app/components/PollCreate.svelte b/src/app/components/PollCreate.svelte
index c0bdcad7..0cfbab53 100644
--- a/src/app/components/PollCreate.svelte
+++ b/src/app/components/PollCreate.svelte
@@ -20,8 +20,8 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import {pushToast} from "@app/toast"
-  import {PROTECTED} from "@app/core/state"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {PROTECTED, publishRoomQuote} from "@app/groups"
+  import {canEnforceNip70} from "@app/relays"
   import {DraftKey} from "@app/drafts"
   import type {PollType} from "@app/polls"
 
diff --git a/src/app/components/PollVotes.svelte b/src/app/components/PollVotes.svelte
index cd02c718..3ed5bd6d 100644
--- a/src/app/components/PollVotes.svelte
+++ b/src/app/components/PollVotes.svelte
@@ -4,9 +4,9 @@
   import {POLL_RESPONSE} from "@welshman/util"
   import {pubkey, publishThunk, abortThunk} from "@welshman/app"
   import {formatTimestampRelative} from "@welshman/lib"
-  import {deriveEvents} from "@app/core/state"
+  import {deriveEvents} from "@app/repository"
   import {pushToast} from "@app/toast"
-  import {makePollResponse} from "@app/core/commands"
+  import {makePollResponse} from "@app/polls"
   import PollOption from "@app/components/PollOption.svelte"
   import {
     getPollEndsAt,
diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte
index 89d297bd..bec49561 100644
--- a/src/app/components/PrimaryNav.svelte
+++ b/src/app/components/PrimaryNav.svelte
@@ -11,7 +11,8 @@
   import MenuSettings from "@app/components/MenuSettings.svelte"
   import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
   import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte"
-  import {userSpaceUrls, PLATFORM_RELAYS} from "@app/core/state"
+  import {userSpaceUrls} from "@app/groups"
+  import {PLATFORM_RELAYS} from "@app/env"
   import {pushModal} from "@app/modal"
   import {notifications} from "@app/notifications"
   import {goToChat, makeSpacePath} from "@app/routes"
diff --git a/src/app/components/PrimaryNavSpaces.svelte b/src/app/components/PrimaryNavSpaces.svelte
index 68edc743..89fb6aa5 100644
--- a/src/app/components/PrimaryNavSpaces.svelte
+++ b/src/app/components/PrimaryNavSpaces.svelte
@@ -5,7 +5,8 @@
   import Divider from "@lib/components/Divider.svelte"
   import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
   import PrimaryNavItemSpace from "@app/components/PrimaryNavItemSpace.svelte"
-  import {userSpaceUrls, PLATFORM_RELAYS, PLATFORM_LOGO} from "@app/core/state"
+  import {userSpaceUrls} from "@app/groups"
+  import {PLATFORM_RELAYS, PLATFORM_LOGO} from "@app/env"
   import {notifications} from "@app/notifications"
 
   let windowHeight = $state(0)
diff --git a/src/app/components/ProfileBadges.svelte b/src/app/components/ProfileBadges.svelte
index 09908156..ca89f00f 100644
--- a/src/app/components/ProfileBadges.svelte
+++ b/src/app/components/ProfileBadges.svelte
@@ -9,7 +9,7 @@
   import {repository, loadRelayList} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
-  import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/core/state"
+  import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/groups"
   import {goToEvent} from "@app/routes"
   import {pushModal} from "@app/modal"
 
diff --git a/src/app/components/ProfileDelete.svelte b/src/app/components/ProfileDelete.svelte
index a51ed343..9e7df587 100644
--- a/src/app/components/ProfileDelete.svelte
+++ b/src/app/components/ProfileDelete.svelte
@@ -22,7 +22,8 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
-  import {INDEXER_RELAYS, PLATFORM_NAME, userSpaceUrls} from "@app/core/state"
+  import {INDEXER_RELAYS, PLATFORM_NAME} from "@app/env"
+  import {userSpaceUrls} from "@app/groups"
   import {pushToast} from "@app/toast"
   import {logout} from "@app/session"
 
diff --git a/src/app/components/ProfileDetail.svelte b/src/app/components/ProfileDetail.svelte
index 5561153c..9f15133d 100644
--- a/src/app/components/ProfileDetail.svelte
+++ b/src/app/components/ProfileDetail.svelte
@@ -28,8 +28,8 @@
   import ProfileInfo from "@app/components/ProfileInfo.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
   import ProfileBadges from "@app/components/ProfileBadges.svelte"
-  import {pubkeyLink, deriveUserIsSpaceAdmin, deriveSpaceBannedPubkeyItems} from "@app/core/state"
-  import {addSpaceMembers} from "@app/core/commands"
+  import {pubkeyLink} from "@app/env"
+  import {deriveUserIsSpaceAdmin, deriveSpaceBannedPubkeyItems, addSpaceMembers} from "@app/members"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
   import {goToChat} from "@app/routes"
diff --git a/src/app/components/ProfileEdit.svelte b/src/app/components/ProfileEdit.svelte
index e51a3cec..6cb41493 100644
--- a/src/app/components/ProfileEdit.svelte
+++ b/src/app/components/ProfileEdit.svelte
@@ -10,7 +10,7 @@
   import ProfileEditForm from "@app/components/ProfileEditForm.svelte"
   import {clearModals} from "@app/modal"
   import {pushToast} from "@app/toast"
-  import {updateProfile} from "@app/core/commands"
+  import {updateProfile} from "@app/profiles"
 
   const profile = $profilesByPubkey.get($pubkey!) || makeProfile()
   const initialValues = {profile}
diff --git a/src/app/components/ProfileSpaces.svelte b/src/app/components/ProfileSpaces.svelte
index 7f2e566b..8da789fb 100644
--- a/src/app/components/ProfileSpaces.svelte
+++ b/src/app/components/ProfileSpaces.svelte
@@ -8,7 +8,7 @@
   import RelayIcon from "@app/components/RelayIcon.svelte"
   import RelayName from "@app/components/RelayName.svelte"
   import {makeSpacePath} from "@app/routes"
-  import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/core/state"
+  import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/groups"
 
   type Props = {
     pubkey: string
diff --git a/src/app/components/ReactionSummary.svelte b/src/app/components/ReactionSummary.svelte
index b7a6f3f2..96a9749d 100644
--- a/src/app/components/ReactionSummary.svelte
+++ b/src/app/components/ReactionSummary.svelte
@@ -23,7 +23,8 @@
   import Icon from "@lib/components/Icon.svelte"
   import Reaction from "@app/components/Reaction.svelte"
   import ReportDetails from "@app/components/ReportDetails.svelte"
-  import {REACTION_KINDS, deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {REACTION_KINDS} from "@app/content"
+  import {deriveUserIsSpaceAdmin} from "@app/members"
   import {pushModal} from "@app/modal"
 
   interface Props {
diff --git a/src/app/components/RelaySettingsHealthChecks.svelte b/src/app/components/RelaySettingsHealthChecks.svelte
index 2cb19bd4..9b8fc7a8 100644
--- a/src/app/components/RelaySettingsHealthChecks.svelte
+++ b/src/app/components/RelaySettingsHealthChecks.svelte
@@ -6,7 +6,7 @@
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import RelaySettingsHealthCheck from "@app/components/RelaySettingsHealthCheck.svelte"
-  import {PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_NAME} from "@app/env"
   import {pendingHealthChecks, applyHealthCheck} from "@app/healthChecks"
 
   const applyAll = () => {
diff --git a/src/app/components/RelaySummary.svelte b/src/app/components/RelaySummary.svelte
index b3e89042..89e8e70e 100644
--- a/src/app/components/RelaySummary.svelte
+++ b/src/app/components/RelaySummary.svelte
@@ -5,7 +5,7 @@
   import RelayIcon from "@app/components/RelayIcon.svelte"
   import RelayDescription from "@app/components/RelayDescription.svelte"
   import ProfileCircles from "@app/components/ProfileCircles.svelte"
-  import {deriveGroupListPubkeys, deriveUserRooms} from "@app/core/state"
+  import {deriveGroupListPubkeys, deriveUserRooms} from "@app/groups"
 
   type Props = {
     url: string
diff --git a/src/app/components/Report.svelte b/src/app/components/Report.svelte
index 682e6549..d8ca706b 100644
--- a/src/app/components/Report.svelte
+++ b/src/app/components/Report.svelte
@@ -13,7 +13,7 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import {pushToast} from "@app/toast"
-  import {publishReport} from "@app/core/commands"
+  import {publishReport} from "@app/reports"
 
   const {url, event} = $props()
 
diff --git a/src/app/components/ReportMenu.svelte b/src/app/components/ReportMenu.svelte
index 929283ed..d90c5a4c 100644
--- a/src/app/components/ReportMenu.svelte
+++ b/src/app/components/ReportMenu.svelte
@@ -12,8 +12,9 @@
   import Popover from "@lib/components/Popover.svelte"
   import Button from "@lib/components/Button.svelte"
   import Confirm from "@lib/components/Confirm.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
-  import {publishDelete, canEnforceNip70} from "@app/core/commands"
+  import {deriveUserIsSpaceAdmin} from "@app/members"
+  import {publishDelete} from "@app/deletes"
+  import {canEnforceNip70} from "@app/relays"
   import {pushToast} from "@app/toast"
   import {pushModal} from "@app/modal"
 
diff --git a/src/app/components/RoomAccess.svelte b/src/app/components/RoomAccess.svelte
index bc968a12..c42d6f58 100644
--- a/src/app/components/RoomAccess.svelte
+++ b/src/app/components/RoomAccess.svelte
@@ -4,7 +4,7 @@
   import Microphone from "@assets/icons/microphone.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
-  import {deriveRoom} from "@app/core/state"
+  import {deriveRoom} from "@app/groups"
 
   interface Props {
     h: any
diff --git a/src/app/components/RoomDetail.svelte b/src/app/components/RoomDetail.svelte
index eee2731f..cb091981 100644
--- a/src/app/components/RoomDetail.svelte
+++ b/src/app/components/RoomDetail.svelte
@@ -31,20 +31,14 @@
   import RoomEdit from "@app/components/RoomEdit.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import RoomImage from "@app/components/RoomImage.svelte"
+  import {deriveRoom, deriveUserRooms, addRoom, removeRoom} from "@app/groups"
   import {
-    deriveRoom,
     deriveRoomMembers,
     deriveUserIsRoomAdmin,
     deriveUserRoomMembershipStatus,
-    deriveUserRooms,
-    deriveShouldNotify,
     MembershipStatus,
-  } from "@app/core/state"
-  import {
-    addRoomMembership,
-    removeRoomMembership,
-    toggleRoomNotifications,
-  } from "@app/core/commands"
+  } from "@app/members"
+  import {deriveShouldNotify, toggleRoomNotifications} from "@app/settings"
   import {makeSpacePath} from "@app/routes"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
@@ -99,9 +93,9 @@
 
   const toggleFavorite = () => {
     if (isFavorite) {
-      removeRoomMembership(url, h)
+      removeRoom(url, h)
     } else {
-      addRoomMembership(url, h)
+      addRoom(url, h)
     }
   }
 
@@ -122,7 +116,7 @@
           repository.removeEvent(thunk.event.id)
           pushToast({theme: "error", message})
         } else {
-          await removeRoomMembership(url, h)
+          await removeRoom(url, h)
           goto(makeSpacePath(url))
         }
       },
diff --git a/src/app/components/RoomEdit.svelte b/src/app/components/RoomEdit.svelte
index e70a0247..a47f1a8e 100644
--- a/src/app/components/RoomEdit.svelte
+++ b/src/app/components/RoomEdit.svelte
@@ -11,7 +11,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import RoomForm from "@app/components/RoomForm.svelte"
-  import {deriveRoom} from "@app/core/state"
+  import {deriveRoom} from "@app/groups"
   import {makeSpacePath} from "@app/routes"
 
   type Props = {
diff --git a/src/app/components/RoomForm.svelte b/src/app/components/RoomForm.svelte
index 1ff19782..6ca6a674 100644
--- a/src/app/components/RoomForm.svelte
+++ b/src/app/components/RoomForm.svelte
@@ -15,8 +15,9 @@
   import Modal from "@lib/components/Modal.svelte"
   import ModalBody from "@lib/components/ModalBody.svelte"
   import {pushToast} from "@app/toast"
-  import {uploadFile} from "@app/core/commands"
-  import {deriveHasLivekit, getRoomType, RoomType} from "@app/core/state"
+  import {uploadFile} from "@app/uploads"
+  import {deriveHasLivekit} from "@app/relays"
+  import {getRoomType, RoomType} from "@app/groups"
 
   type Props = {
     url: string
diff --git a/src/app/components/RoomImage.svelte b/src/app/components/RoomImage.svelte
index 45134a4a..d91d3c64 100644
--- a/src/app/components/RoomImage.svelte
+++ b/src/app/components/RoomImage.svelte
@@ -3,7 +3,7 @@
   import Volume from "@assets/icons/volume.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import ImageIcon from "@lib/components/ImageIcon.svelte"
-  import {deriveRoom} from "@app/core/state"
+  import {deriveRoom} from "@app/groups"
 
   interface Props {
     h: string
diff --git a/src/app/components/RoomItem.svelte b/src/app/components/RoomItem.svelte
index 0d13542f..0b74db07 100644
--- a/src/app/components/RoomItem.svelte
+++ b/src/app/components/RoomItem.svelte
@@ -35,8 +35,12 @@
   import RoomItemMenuButton from "@app/components/RoomItemMenuButton.svelte"
   import RoomItemMenuMobile from "@app/components/RoomItemMenuMobile.svelte"
   import RoomItemContent from "@app/components/RoomItemContent.svelte"
-  import {colors, ENABLE_ZAPS, deriveEventsForUrl, deriveEvent} from "@app/core/state"
-  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {colors} from "@app/theme"
+  import {ENABLE_ZAPS} from "@app/env"
+  import {deriveEventsForUrl, deriveEvent} from "@app/repository"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
   import {getRoomItemPath} from "@app/routes"
   import {pushModal} from "@app/modal"
 
diff --git a/src/app/components/RoomItemEmojiButton.svelte b/src/app/components/RoomItemEmojiButton.svelte
index fc4c4f49..40bf4f1f 100644
--- a/src/app/components/RoomItemEmojiButton.svelte
+++ b/src/app/components/RoomItemEmojiButton.svelte
@@ -3,7 +3,8 @@
   import EmojiButton from "@lib/components/EmojiButton.svelte"
   import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
-  import {publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
 
   const {url, event} = $props()
 
diff --git a/src/app/components/RoomItemMenu.svelte b/src/app/components/RoomItemMenu.svelte
index d6b0318a..9d3da319 100644
--- a/src/app/components/RoomItemMenu.svelte
+++ b/src/app/components/RoomItemMenu.svelte
@@ -13,7 +13,7 @@
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/members"
 
   type Props = {
     url: string
diff --git a/src/app/components/RoomItemMenuMobile.svelte b/src/app/components/RoomItemMenuMobile.svelte
index 5090f239..9e790abf 100644
--- a/src/app/components/RoomItemMenuMobile.svelte
+++ b/src/app/components/RoomItemMenuMobile.svelte
@@ -17,8 +17,9 @@
   import ZapButton from "@app/components/ZapButton.svelte"
   import EventInfo from "@app/components/EventInfo.svelte"
   import EventDeleteConfirm from "@app/components/EventDeleteConfirm.svelte"
-  import {ENABLE_ZAPS} from "@app/core/state"
-  import {publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {ENABLE_ZAPS} from "@app/env"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
   import {getRoomItemPath} from "@app/routes"
   import {pushModal} from "@app/modal"
 
diff --git a/src/app/components/RoomJoinItem.svelte b/src/app/components/RoomJoinItem.svelte
index baf63856..4172ac6f 100644
--- a/src/app/components/RoomJoinItem.svelte
+++ b/src/app/components/RoomJoinItem.svelte
@@ -8,8 +8,8 @@
   import RoomName from "@app/components/RoomName.svelte"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
-  import {deriveRoom} from "@app/core/state"
-  import {addRoomMembers} from "@app/core/commands"
+  import {deriveRoom} from "@app/groups"
+  import {addRoomMembers} from "@app/members"
 
   type Props = {
     url: string
diff --git a/src/app/components/RoomMembers.svelte b/src/app/components/RoomMembers.svelte
index 71e7cb97..1009bdef 100644
--- a/src/app/components/RoomMembers.svelte
+++ b/src/app/components/RoomMembers.svelte
@@ -18,7 +18,8 @@
   import Profile from "@app/components/Profile.svelte"
   import RoomName from "@app/components/RoomName.svelte"
   import RoomMembersAdd from "@app/components/RoomMembersAdd.svelte"
-  import {deriveRoom, deriveRoomMembers, deriveUserIsRoomAdmin} from "@app/core/state"
+  import {deriveRoom} from "@app/groups"
+  import {deriveRoomMembers, deriveUserIsRoomAdmin} from "@app/members"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
 
diff --git a/src/app/components/RoomMembersAdd.svelte b/src/app/components/RoomMembersAdd.svelte
index c3d6a34c..6604631f 100644
--- a/src/app/components/RoomMembersAdd.svelte
+++ b/src/app/components/RoomMembersAdd.svelte
@@ -20,8 +20,8 @@
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
   import {pushToast} from "@app/toast"
   import {pushModal} from "@app/modal"
-  import {deriveRoom, deriveSpaceMembers} from "@app/core/state"
-  import {addRoomMembers} from "@app/core/commands"
+  import {deriveRoom} from "@app/groups"
+  import {deriveSpaceMembers, addRoomMembers} from "@app/members"
 
   interface Props {
     url: string
diff --git a/src/app/components/RoomName.svelte b/src/app/components/RoomName.svelte
index a65fb17f..29aa1afc 100644
--- a/src/app/components/RoomName.svelte
+++ b/src/app/components/RoomName.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {deriveRoom} from "@app/core/state"
+  import {deriveRoom} from "@app/groups"
 
   type Props = {
     url: string
diff --git a/src/app/components/SignUp.svelte b/src/app/components/SignUp.svelte
index 1ca19c7c..5fa9bc51 100644
--- a/src/app/components/SignUp.svelte
+++ b/src/app/components/SignUp.svelte
@@ -15,14 +15,14 @@
   import SignUpEmail from "@app/components/SignUpEmail.svelte"
   import SignUpProfile from "@app/components/SignUpProfile.svelte"
   import SignUpComplete from "@app/components/SignUpComplete.svelte"
-  import {initProfile} from "@app/core/commands"
+  import {initProfile} from "@app/profiles"
   import {
     POMADE_SIGNERS,
     PLATFORM_NAME,
     INDEXER_RELAYS,
     DEFAULT_RELAYS,
     DEFAULT_MESSAGING_RELAYS,
-  } from "@app/core/state"
+  } from "@app/env"
   import {setChecked} from "@app/notifications"
   import {loginWithPomade} from "@app/pomade"
   import {pushModal, clearModals} from "@app/modal"
diff --git a/src/app/components/SocketStatusIndicator.svelte b/src/app/components/SocketStatusIndicator.svelte
index be57cce7..b4ee6cd9 100644
--- a/src/app/components/SocketStatusIndicator.svelte
+++ b/src/app/components/SocketStatusIndicator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import StatusIndicator from "@lib/components/StatusIndicator.svelte"
-  import {deriveSocketStatus} from "@app/core/state"
+  import {deriveSocketStatus} from "@app/relays"
 
   type Props = {
     url: string
diff --git a/src/app/components/SpaceAccessRequest.svelte b/src/app/components/SpaceAccessRequest.svelte
index 8c15edbc..6e48ca7c 100644
--- a/src/app/components/SpaceAccessRequest.svelte
+++ b/src/app/components/SpaceAccessRequest.svelte
@@ -15,8 +15,8 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {pushToast} from "@app/toast"
-  import {attemptRelayAccess} from "@app/core/commands"
-  import {parseInviteLink} from "@app/core/state"
+  import {attemptRelayAccess} from "@app/relays"
+  import {parseInviteLink} from "@app/invites"
 
   type Props = {
     url: string
diff --git a/src/app/components/SpaceActionItems.svelte b/src/app/components/SpaceActionItems.svelte
index 55c45a24..4d1c3614 100644
--- a/src/app/components/SpaceActionItems.svelte
+++ b/src/app/components/SpaceActionItems.svelte
@@ -12,7 +12,7 @@
   import RoomJoinItem from "@app/components/RoomJoinItem.svelte"
   import RelayName from "@app/components/RelayName.svelte"
   import {REPORT} from "@welshman/util"
-  import {deriveSpaceActionItems} from "@app/core/state"
+  import {deriveSpaceActionItems} from "@app/actionItems"
 
   interface Props {
     url: string
diff --git a/src/app/components/SpaceAuthError.svelte b/src/app/components/SpaceAuthError.svelte
index 84d01146..324a2f0d 100644
--- a/src/app/components/SpaceAuthError.svelte
+++ b/src/app/components/SpaceAuthError.svelte
@@ -16,7 +16,9 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import SpaceAccessRequest from "@app/components/SpaceAccessRequest.svelte"
   import {pushModal, clearModals} from "@app/modal"
-  import {removeSpaceMembership, publishLeaveRequest, removeTrustedRelay} from "@app/core/commands"
+  import {removeSpace} from "@app/groups"
+  import {publishLeaveRequest} from "@app/relays"
+  import {removeTrustedRelay} from "@app/settings"
 
   const {url, error} = $props()
 
@@ -28,7 +30,7 @@
     loading = true
 
     try {
-      await removeSpaceMembership(url)
+      await removeSpace(url)
       await publishLeaveRequest({url})
       await removeTrustedRelay(url)
     } finally {
diff --git a/src/app/components/SpaceBar.svelte b/src/app/components/SpaceBar.svelte
index a1174699..67a4f2b2 100644
--- a/src/app/components/SpaceBar.svelte
+++ b/src/app/components/SpaceBar.svelte
@@ -8,7 +8,7 @@
   import Button from "@lib/components/Button.svelte"
   import PageBar from "@lib/components/PageBar.svelte"
   import RelayIcon from "@app/components/RelayIcon.svelte"
-  import {decodeRelay} from "@app/core/state"
+  import {decodeRelay} from "@app/relays"
   import {makeSpacePath} from "@app/routes"
 
   interface Props {
diff --git a/src/app/components/SpaceDetail.svelte b/src/app/components/SpaceDetail.svelte
index bfd06ff3..6b5b581b 100644
--- a/src/app/components/SpaceDetail.svelte
+++ b/src/app/components/SpaceDetail.svelte
@@ -18,7 +18,7 @@
   import SpaceRelayStatus from "@app/components/SpaceRelayStatus.svelte"
   import RelayDescription from "@app/components/RelayDescription.svelte"
   import ProfileLatest from "@app/components/ProfileLatest.svelte"
-  import {deriveUserIsSpaceAdmin} from "@app/core/state"
+  import {deriveUserIsSpaceAdmin} from "@app/members"
   import {pushModal} from "@app/modal"
 
   type Props = {
diff --git a/src/app/components/SpaceEdit.svelte b/src/app/components/SpaceEdit.svelte
index 5173fd21..8aaec671 100644
--- a/src/app/components/SpaceEdit.svelte
+++ b/src/app/components/SpaceEdit.svelte
@@ -21,7 +21,7 @@
   import IconPickerButton from "@lib/components/IconPickerButton.svelte"
   import {pushToast} from "@app/toast"
   import {clearModals} from "@app/modal"
-  import {uploadFile} from "@app/core/commands"
+  import {uploadFile} from "@app/uploads"
 
   type Props = {
     url: string
diff --git a/src/app/components/SpaceExit.svelte b/src/app/components/SpaceExit.svelte
index 19a8f84d..ec585baf 100644
--- a/src/app/components/SpaceExit.svelte
+++ b/src/app/components/SpaceExit.svelte
@@ -11,7 +11,9 @@
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {removeSpaceMembership, publishLeaveRequest, removeTrustedRelay} from "@app/core/commands"
+  import {removeSpace} from "@app/groups"
+  import {publishLeaveRequest} from "@app/relays"
+  import {removeTrustedRelay} from "@app/settings"
 
   const {url} = $props()
 
@@ -21,7 +23,7 @@
     loading = true
 
     try {
-      await removeSpaceMembership(url)
+      await removeSpace(url)
       await publishLeaveRequest({url})
       await removeTrustedRelay(url)
     } finally {
diff --git a/src/app/components/SpaceInvite.svelte b/src/app/components/SpaceInvite.svelte
index 8f296ab8..56901efe 100644
--- a/src/app/components/SpaceInvite.svelte
+++ b/src/app/components/SpaceInvite.svelte
@@ -19,8 +19,8 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import QRCode from "@app/components/QRCode.svelte"
   import {clip} from "@app/toast"
-  import {PLATFORM_URL} from "@app/core/state"
-  import {deriveRelayAuthError} from "@app/core/commands"
+  import {PLATFORM_URL} from "@app/env"
+  import {deriveRelayAuthError} from "@app/relays"
 
   const {url} = $props()
 
diff --git a/src/app/components/SpaceInviteAccept.svelte b/src/app/components/SpaceInviteAccept.svelte
index 16fe5fba..ab713516 100644
--- a/src/app/components/SpaceInviteAccept.svelte
+++ b/src/app/components/SpaceInviteAccept.svelte
@@ -23,14 +23,13 @@
   import SpaceJoinSettings from "@app/components/SpaceJoinSettings.svelte"
   import {pushToast} from "@app/toast"
   import {makeSpacePath} from "@app/routes"
-  import {relaysMostlyRestricted, notificationSettings, parseInviteLink} from "@app/core/state"
+  import {relaysMostlyRestricted} from "@app/policies"
+  import {notificationSettings, setSpaceNotifications} from "@app/settings"
+  import {parseInviteLink} from "@app/invites"
   import {Push} from "@app/push"
-  import {
-    attemptRelayAccess,
-    addSpaceMembership,
-    broadcastUserData,
-    setSpaceNotifications,
-  } from "@app/core/commands"
+  import {attemptRelayAccess} from "@app/relays"
+  import {addSpace} from "@app/groups"
+  import {broadcastUserData} from "@app/profiles"
 
   type Props = {
     invite: string
@@ -68,7 +67,7 @@
         await setSpaceNotifications(url, false)
       }
 
-      await addSpaceMembership(url)
+      await addSpace(url)
       await goto(makeSpacePath(url), {replaceState: true})
 
       broadcastUserData([url])
diff --git a/src/app/components/SpaceJoin.svelte b/src/app/components/SpaceJoin.svelte
index 36756365..5509dcc5 100644
--- a/src/app/components/SpaceJoin.svelte
+++ b/src/app/components/SpaceJoin.svelte
@@ -14,13 +14,12 @@
   import RelaySummary from "@app/components/RelaySummary.svelte"
   import SpaceAccessRequest from "@app/components/SpaceAccessRequest.svelte"
   import SpaceJoinSettings from "@app/components/SpaceJoinSettings.svelte"
-  import {
-    attemptRelayAccess,
-    addSpaceMembership,
-    broadcastUserData,
-    setSpaceNotifications,
-  } from "@app/core/commands"
-  import {relaysMostlyRestricted, notificationSettings} from "@app/core/state"
+  import {attemptRelayAccess} from "@app/relays"
+  import {addSpace} from "@app/groups"
+  import {broadcastUserData} from "@app/profiles"
+  import {setSpaceNotifications} from "@app/settings"
+  import {relaysMostlyRestricted} from "@app/policies"
+  import {notificationSettings} from "@app/settings"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
   import {makeSpacePath} from "@app/routes"
@@ -56,7 +55,7 @@
         await setSpaceNotifications(url, false)
       }
 
-      await addSpaceMembership(url)
+      await addSpace(url)
       await goto(makeSpacePath(url), {replaceState: true})
 
       broadcastUserData([url])
diff --git a/src/app/components/SpaceMembers.svelte b/src/app/components/SpaceMembers.svelte
index 8ffa26cd..0a1adbd7 100644
--- a/src/app/components/SpaceMembers.svelte
+++ b/src/app/components/SpaceMembers.svelte
@@ -25,8 +25,8 @@
     deriveSpaceMembers,
     deriveSpaceBannedPubkeyItems,
     deriveUserIsSpaceAdmin,
-    deriveSupportedMethods,
-  } from "@app/core/state"
+  } from "@app/members"
+  import {deriveSupportedMethods} from "@app/relays"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
 
diff --git a/src/app/components/SpaceMembersAdd.svelte b/src/app/components/SpaceMembersAdd.svelte
index 9fbc5122..3cd06aea 100644
--- a/src/app/components/SpaceMembersAdd.svelte
+++ b/src/app/components/SpaceMembersAdd.svelte
@@ -12,7 +12,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
-  import {addSpaceMembers} from "@app/core/commands"
+  import {addSpaceMembers} from "@app/members"
   import {pushToast} from "@app/toast"
 
   interface Props {
diff --git a/src/app/components/SpaceMembersBanned.svelte b/src/app/components/SpaceMembersBanned.svelte
index 843210f4..8e83f5b1 100644
--- a/src/app/components/SpaceMembersBanned.svelte
+++ b/src/app/components/SpaceMembersBanned.svelte
@@ -16,8 +16,8 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import Profile from "@app/components/Profile.svelte"
-  import {deriveSpaceBannedPubkeyItems, deriveSupportedMethods} from "@app/core/state"
-  import {addSpaceMembers} from "@app/core/commands"
+  import {deriveSpaceBannedPubkeyItems, addSpaceMembers} from "@app/members"
+  import {deriveSupportedMethods} from "@app/relays"
   import {pushToast} from "@app/toast"
 
   interface Props {
diff --git a/src/app/components/SpaceMenu.svelte b/src/app/components/SpaceMenu.svelte
index 9bdf8e2f..7b3b6f52 100644
--- a/src/app/components/SpaceMenu.svelte
+++ b/src/app/components/SpaceMenu.svelte
@@ -40,24 +40,20 @@
   import SpaceMenuRoomItem from "@app/components/SpaceMenuRoomItem.svelte"
   import VoiceWidget from "@app/components/VoiceWidget.svelte"
   import SocketStatusIndicator from "@app/components/SocketStatusIndicator.svelte"
+  import {ENABLE_ZAPS} from "@app/env"
+  import {CONTENT_KINDS} from "@app/content"
+  import {deriveSpaceMembers, deriveUserCanCreateRoom, deriveUserIsSpaceAdmin} from "@app/members"
   import {
-    ENABLE_ZAPS,
-    CONTENT_KINDS,
-    deriveSpaceMembers,
     deriveUserRooms,
     deriveOtherRooms,
     deriveOtherVoiceRooms,
     userSpaceUrls,
-    hasNip29,
-    deriveUserCanCreateRoom,
-    deriveUserIsSpaceAdmin,
-    deriveEventsForUrl,
-    deriveSpaceActionItems,
-    notificationSettings,
-    deriveShouldNotify,
     displayRoom,
-  } from "@app/core/state"
-  import {setSpaceNotifications} from "@app/core/commands"
+  } from "@app/groups"
+  import {hasNip29} from "@app/relays"
+  import {deriveEventsForUrl} from "@app/repository"
+  import {deriveSpaceActionItems} from "@app/actionItems"
+  import {notificationSettings, deriveShouldNotify, setSpaceNotifications} from "@app/settings"
   import {pushModal} from "@app/modal"
   import {makeSpacePath, goToChat} from "@app/routes"
   import {notifications} from "@app/notifications"
diff --git a/src/app/components/SpaceMenuRoomItem.svelte b/src/app/components/SpaceMenuRoomItem.svelte
index 19ab2451..3e6dc1e3 100644
--- a/src/app/components/SpaceMenuRoomItem.svelte
+++ b/src/app/components/SpaceMenuRoomItem.svelte
@@ -5,7 +5,8 @@
   import SecondaryNavItem from "@lib/components/SecondaryNavItem.svelte"
   import RoomNameWithImage from "@app/components/RoomNameWithImage.svelte"
   import VoiceRoomItem from "@app/components/VoiceRoomItem.svelte"
-  import {deriveRoom, deriveShouldNotify, getRoomType, RoomType} from "@app/core/state"
+  import {deriveRoom, getRoomType, RoomType} from "@app/groups"
+  import {deriveShouldNotify} from "@app/settings"
   import {notifications} from "@app/notifications"
   import {makeRoomPath} from "@app/routes"
 
diff --git a/src/app/components/SpaceReports.svelte b/src/app/components/SpaceReports.svelte
index ad901ccd..ed6f308d 100644
--- a/src/app/components/SpaceReports.svelte
+++ b/src/app/components/SpaceReports.svelte
@@ -11,7 +11,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import ReportItem from "@app/components/ReportItem.svelte"
   import RelayName from "@app/components/RelayName.svelte"
-  import {deriveEventsForUrl} from "@app/core/state"
+  import {deriveEventsForUrl} from "@app/repository"
 
   interface Props {
     url: string
diff --git a/src/app/components/SpaceSearch.svelte b/src/app/components/SpaceSearch.svelte
index bf5e7505..e701abe8 100644
--- a/src/app/components/SpaceSearch.svelte
+++ b/src/app/components/SpaceSearch.svelte
@@ -11,7 +11,7 @@
   import {fly} from "@lib/transition"
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
-  import {CONTENT_KINDS} from "@app/core/state"
+  import {CONTENT_KINDS} from "@app/content"
   import {goToEvent} from "@app/routes"
 
   type Props = {
diff --git a/src/app/components/SpaceTrustRelay.svelte b/src/app/components/SpaceTrustRelay.svelte
index e01e637d..f4e43883 100644
--- a/src/app/components/SpaceTrustRelay.svelte
+++ b/src/app/components/SpaceTrustRelay.svelte
@@ -15,8 +15,9 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import InfoSignatures from "@app/components/InfoSignatures.svelte"
-  import {relaysPendingTrust} from "@app/core/state"
-  import {removeSpaceMembership, addTrustedRelay, removeTrustedRelay} from "@app/core/commands"
+  import {relaysPendingTrust} from "@app/policies"
+  import {removeSpace} from "@app/groups"
+  import {addTrustedRelay, removeTrustedRelay} from "@app/settings"
   import {pushModal} from "@app/modal"
 
   type Props = {
@@ -31,7 +32,7 @@
     loading = true
 
     try {
-      await removeSpaceMembership(url)
+      await removeSpace(url)
       await removeTrustedRelay(url)
       goto("/home")
     } finally {
diff --git a/src/app/components/ThreadActions.svelte b/src/app/components/ThreadActions.svelte
index fee30726..ec5a5b7a 100644
--- a/src/app/components/ThreadActions.svelte
+++ b/src/app/components/ThreadActions.svelte
@@ -7,7 +7,9 @@
   import ThunkStatusOrDeleted from "@app/components/ThunkStatusOrDeleted.svelte"
   import EventActivity from "@app/components/EventActivity.svelte"
   import EventActions from "@app/components/EventActions.svelte"
-  import {publishDelete, publishReaction, canEnforceNip70} from "@app/core/commands"
+  import {publishDelete} from "@app/deletes"
+  import {publishReaction} from "@app/reactions"
+  import {canEnforceNip70} from "@app/relays"
   import {makeThreadPath, makeSpacePath} from "@app/routes"
 
   interface Props {
diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte
index 18e4d909..dee09c03 100644
--- a/src/app/components/ThreadCreate.svelte
+++ b/src/app/components/ThreadCreate.svelte
@@ -17,10 +17,10 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
   import {pushToast} from "@app/toast"
-  import {PROTECTED} from "@app/core/state"
+  import {PROTECTED, publishRoomQuote} from "@app/groups"
   import {makeEditor} from "@app/editor"
   import {DraftKey} from "@app/drafts"
-  import {canEnforceNip70, publishRoomQuote} from "@app/core/commands"
+  import {canEnforceNip70} from "@app/relays"
 
   type Values = {
     content?: string | object
diff --git a/src/app/components/VoiceRoomItem.svelte b/src/app/components/VoiceRoomItem.svelte
index 762ca311..510e3d5e 100644
--- a/src/app/components/VoiceRoomItem.svelte
+++ b/src/app/components/VoiceRoomItem.svelte
@@ -11,7 +11,7 @@
   import {pushModal} from "@app/modal"
   import VoiceRoomJoinDialog from "@app/components/VoiceRoomJoinDialog.svelte"
   import VoiceParticipantMediaBadges from "@app/components/VoiceParticipantMediaBadges.svelte"
-  import {makeRoomId} from "@app/core/state"
+  import {makeRoomId} from "@app/groups"
   import {
     VoiceState,
     currentVoiceRoom,
diff --git a/src/app/components/VoiceRoomJoinDialog.svelte b/src/app/components/VoiceRoomJoinDialog.svelte
index d58f8621..c2625e13 100644
--- a/src/app/components/VoiceRoomJoinDialog.svelte
+++ b/src/app/components/VoiceRoomJoinDialog.svelte
@@ -14,7 +14,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import {AbortError, TimeoutError} from "$lib/util"
   import ProfileCircles from "@app/components/ProfileCircles.svelte"
-  import {displayRoom} from "@app/core/state"
+  import {displayRoom} from "@app/groups"
   import {deriveVoiceParticipants, joinVoiceRoom, loadVoiceParticipants} from "@app/call/voice"
   import {popModal} from "@app/modal"
   import {pushToast} from "@app/toast"
diff --git a/src/app/components/VoiceWidget.svelte b/src/app/components/VoiceWidget.svelte
index 2058a1c3..615daf49 100644
--- a/src/app/components/VoiceWidget.svelte
+++ b/src/app/components/VoiceWidget.svelte
@@ -19,14 +19,9 @@
   import Button from "@lib/components/Button.svelte"
   import VoiceCallAudioSettingsDialog from "@app/components/VoiceCallAudioSettingsDialog.svelte"
   import VoiceRoomJoinDialog from "@app/components/VoiceRoomJoinDialog.svelte"
-  import {
-    decodeRelay,
-    deriveRoom,
-    displayRoom,
-    getRoomType,
-    RoomType,
-    type Room,
-  } from "@app/core/state"
+  import {decodeRelay} from "@app/relays"
+  import {deriveRoom, displayRoom, getRoomType, RoomType} from "@app/groups"
+  import type {Room} from "@app/groups"
   import {pushModal} from "@app/modal"
   import {notifications} from "@app/notifications"
   import {makeRoomPath} from "@app/routes"
diff --git a/src/app/components/WalletAsReceivingAddress.svelte b/src/app/components/WalletAsReceivingAddress.svelte
index f2f9aced..a64913e7 100644
--- a/src/app/components/WalletAsReceivingAddress.svelte
+++ b/src/app/components/WalletAsReceivingAddress.svelte
@@ -10,7 +10,7 @@
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {updateProfile} from "@app/core/commands"
+  import {updateProfile} from "@app/profiles"
   import {clearModals} from "@app/modal"
   import {pushToast} from "@app/toast"
 
diff --git a/src/app/components/WalletConnect.svelte b/src/app/components/WalletConnect.svelte
index 1beb3883..0eda8392 100644
--- a/src/app/components/WalletConnect.svelte
+++ b/src/app/components/WalletConnect.svelte
@@ -21,7 +21,7 @@
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
-  import {getWebLn} from "@app/core/commands"
+  import {getWebLn} from "@app/lightning"
   import {pushToast} from "@app/toast"
   import {pushModal} from "@app/modal"
   import WalletAsReceivingAddress from "@app/components/WalletAsReceivingAddress.svelte"
diff --git a/src/app/components/WalletPay.svelte b/src/app/components/WalletPay.svelte
index 5ec404f4..d19cd9a3 100644
--- a/src/app/components/WalletPay.svelte
+++ b/src/app/components/WalletPay.svelte
@@ -15,7 +15,7 @@
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {errorMessage} from "@lib/util"
-  import {payInvoice} from "@app/core/commands"
+  import {payInvoice} from "@app/lightning"
   import {pushToast} from "@app/toast"
   import {clearModals} from "@app/modal"
 
diff --git a/src/app/components/WalletReceive.svelte b/src/app/components/WalletReceive.svelte
index 0533dadd..62d09cb4 100644
--- a/src/app/components/WalletReceive.svelte
+++ b/src/app/components/WalletReceive.svelte
@@ -14,7 +14,7 @@
   import ModalFooter from "@lib/components/ModalFooter.svelte"
   import {errorMessage} from "@lib/util"
   import QRCode from "@app/components/QRCode.svelte"
-  import {createInvoice} from "@app/core/commands"
+  import {createInvoice} from "@app/lightning"
   import {pushToast} from "@app/toast"
 
   const back = () => history.back()
diff --git a/src/app/components/WalletUpdateReceivingAddress.svelte b/src/app/components/WalletUpdateReceivingAddress.svelte
index dee8e4f6..f3ddad49 100644
--- a/src/app/components/WalletUpdateReceivingAddress.svelte
+++ b/src/app/components/WalletUpdateReceivingAddress.svelte
@@ -12,7 +12,7 @@
   import ModalBody from "@lib/components/ModalBody.svelte"
   import Wallet from "@assets/icons/wallet.svg?dataurl"
   import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
-  import {updateProfile} from "@app/core/commands"
+  import {updateProfile} from "@app/profiles"
   import {pushToast} from "@app/toast"
 
   const back = () => history.back()
diff --git a/src/app/components/Zap.svelte b/src/app/components/Zap.svelte
index 7d85585f..56aa79a2 100644
--- a/src/app/components/Zap.svelte
+++ b/src/app/components/Zap.svelte
@@ -19,7 +19,7 @@
   import EmojiButton from "@lib/components/EmojiButton.svelte"
   import {errorMessage} from "@lib/util"
   import ProfileLink from "@app/components/ProfileLink.svelte"
-  import {payInvoice} from "@app/core/commands"
+  import {payInvoice} from "@app/lightning"
   import {pushToast} from "@app/toast"
 
   type Props = {
diff --git a/src/app/content.ts b/src/app/content.ts
new file mode 100644
index 00000000..78349ce2
--- /dev/null
+++ b/src/app/content.ts
@@ -0,0 +1,45 @@
+import {
+  CLASSIFIED,
+  COMMENT,
+  DELETE,
+  DIRECT_MESSAGE,
+  DIRECT_MESSAGE_FILE,
+  EVENT_TIME,
+  GENERIC_REPOST,
+  POLL,
+  REACTION,
+  REPORT,
+  REPOST,
+  THREAD,
+  ZAP_GOAL,
+  ZAP_RESPONSE,
+} from "@welshman/util"
+import type {Filter} from "@welshman/util"
+import {ENABLE_ZAPS} from "@app/env"
+export const IMAGE_CONTENT_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"]
+
+export const VIDEO_CONTENT_TYPES = ["video/quicktime", "video/webm", "video/mp4"]
+
+export const makeCommentFilter = (kinds: number[], extra: Filter = {}) => ({
+  kinds: [COMMENT],
+  "#K": kinds.map(String),
+  ...extra,
+})
+
+export const REPOST_KINDS = [REPOST, GENERIC_REPOST]
+
+export const REACTION_KINDS = [REPORT, DELETE, REACTION]
+
+if (ENABLE_ZAPS) {
+  REACTION_KINDS.push(ZAP_RESPONSE)
+}
+
+export const CONTENT_KINDS = [ZAP_GOAL, EVENT_TIME, THREAD, CLASSIFIED, POLL]
+
+export const DM_KINDS = [DIRECT_MESSAGE, DIRECT_MESSAGE_FILE]
+
+export const displayReaction = (content: string) => {
+  if (!content || content === "+") return "❤️"
+  if (content === "-") return "👎"
+  return content
+}
diff --git a/src/app/core/commands.ts b/src/app/core/commands.ts
deleted file mode 100644
index e20d92a1..00000000
--- a/src/app/core/commands.ts
+++ /dev/null
@@ -1,783 +0,0 @@
-import {nwc} from "@getalby/sdk"
-import * as nip19 from "nostr-tools/nip19"
-import {get, derived} from "svelte/store"
-import {
-  first,
-  sha256,
-  append,
-  remove,
-  poll,
-  uniq,
-  equals,
-  parseJson,
-  last,
-  simpleCache,
-  normalizeUrl,
-  nthNe,
-} from "@welshman/lib"
-import {Nip01Signer} from "@welshman/signer"
-import type {UploadTask} from "@welshman/editor"
-import type {TrustedEvent, EventContent, Profile, PublishedRoomMeta} from "@welshman/util"
-import {
-  DELETE,
-  REPORT,
-  MESSAGE,
-  PROFILE,
-  MESSAGING_RELAYS,
-  RELAYS,
-  FOLLOWS,
-  REACTION,
-  RELAY_JOIN,
-  RELAY_LEAVE,
-  ROOMS,
-  COMMENT,
-  APP_DATA,
-  POLL_RESPONSE,
-  isSignedEvent,
-  makeEvent,
-  normalizeRelayUrl,
-  makeList,
-  addToListPublicly,
-  removeFromListByPredicate,
-  updateList,
-  getTag,
-  getListTags,
-  getRelayTagValues,
-  toNostrURI,
-  RelayMode,
-  getTagValues,
-  uploadBlob,
-  canUploadBlob,
-  encryptFile,
-  makeBlossomAuthEvent,
-  isPublishedProfile,
-  editProfile,
-  createProfile,
-  ManagementMethod,
-} from "@welshman/util"
-import {Pool, AuthStatus, SocketStatus} from "@welshman/net"
-import {Router} from "@welshman/router"
-import {
-  pubkey,
-  sign,
-  signer,
-  session,
-  repository,
-  publishThunk,
-  tagEvent,
-  tagPubkey,
-  tagEventForReaction,
-  nip44EncryptToSelf,
-  tagEventForComment,
-  tagEventForQuote,
-  waitForThunkError,
-  getPubkeyRelays,
-  userBlossomServerList,
-  addRoomMember,
-  manageRelay,
-  getRelay,
-} from "@welshman/app"
-import {compressFile} from "@lib/html"
-import type {SettingsValues, SpaceNotificationSettings} from "@app/core/state"
-import {
-  SETTINGS,
-  PROTECTED,
-  INDEXER_RELAYS,
-  DEFAULT_RELAYS,
-  DEFAULT_BLOSSOM_SERVERS,
-  userSpaceUrls,
-  userSettingsValues,
-  getSetting,
-  getSettings,
-  userGroupList,
-  shouldIgnoreError,
-  stripPrefix,
-  relaysMostlyRestricted,
-  deriveSocket,
-  deriveSpaceMembers,
-} from "@app/core/state"
-
-// Utils
-
-export const getPubkeyHints = (pubkey: string) => {
-  const relays = getPubkeyRelays(pubkey, RelayMode.Write)
-  const hints = relays.length ? relays : INDEXER_RELAYS
-
-  return hints
-}
-
-export const prependParent = (
-  parent: TrustedEvent | undefined,
-  {content, tags}: EventContent,
-  url?: string,
-) => {
-  if (parent) {
-    const relays = url ? [url] : Router.get().Event(parent).limit(3).getUrls()
-    const nevent = nip19.neventEncode({...parent, relays})
-
-    tags = [...tags, tagEventForQuote(parent, url), tagPubkey(parent.pubkey)]
-    content = toNostrURI(nevent) + "\n\n" + content
-  }
-
-  return {content, tags}
-}
-
-export const publishRoomQuote = ({
-  url,
-  h,
-  parent,
-  protect,
-  delay,
-}: {
-  url: string
-  h?: string
-  parent: TrustedEvent
-  protect: boolean
-  delay?: number
-}) => {
-  const tags: string[][] = []
-
-  if (h) {
-    tags.push(["h", h])
-  }
-
-  if (protect) {
-    tags.push(PROTECTED)
-  }
-
-  const event = makeEvent(MESSAGE, prependParent(parent, {content: "", tags}, url))
-
-  return publishThunk({relays: [url], event, delay})
-}
-
-// Synchronization
-
-export const broadcastUserData = async (relays: string[]) => {
-  const authors = [pubkey.get()!]
-  const kinds = [RELAYS, MESSAGING_RELAYS, FOLLOWS, PROFILE]
-  const events = repository.query([{kinds, authors}])
-
-  for (const event of events) {
-    if (isSignedEvent(event)) {
-      await publishThunk({event, relays}).complete
-    }
-  }
-}
-
-// List updates
-
-export const addSpaceMembership = async (url: string) => {
-  const list = get(userGroupList) || makeList({kind: ROOMS})
-  const event = await addToListPublicly(list, ["r", url]).reconcile(nip44EncryptToSelf)
-  const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
-
-  return publishThunk({event, relays})
-}
-
-export const removeSpaceMembership = async (url: string) => {
-  const list = get(userGroupList) || makeList({kind: ROOMS})
-  const pred = (t: string[]) => normalizeRelayUrl(t[t[0] === "r" ? 1 : 2]) === url
-  const event = await removeFromListByPredicate(list, pred).reconcile(nip44EncryptToSelf)
-  const relays = uniq([url, ...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
-
-  return publishThunk({event, relays})
-}
-
-export const setSpaceMembershipOrder = async (urls: string[]) => {
-  const list = get(userGroupList) || makeList({kind: ROOMS})
-  const orderedUrls = uniq(urls.map(normalizeRelayUrl))
-  const relayTags = list.publicTags.filter(t => t[0] === "r")
-  const otherPublicTags = list.publicTags.filter(t => t[0] !== "r")
-  const relayTagByUrl = new Map(relayTags.map(t => [normalizeRelayUrl(t[1]), t]))
-  const orderedRelayTags = orderedUrls.map(url => relayTagByUrl.get(url) || ["r", url])
-  const publicTags = [...orderedRelayTags, ...otherPublicTags]
-  const event = await updateList(list, {publicTags}).reconcile(nip44EncryptToSelf)
-  const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
-
-  return publishThunk({event, relays})
-}
-
-export const addRoomMembership = async (url: string, h: string) => {
-  const list = get(userGroupList) || makeList({kind: ROOMS})
-  const newTags = [
-    ["r", url],
-    ["group", h, url],
-  ]
-  const event = await addToListPublicly(list, ...newTags).reconcile(nip44EncryptToSelf)
-  const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
-
-  return publishThunk({event, relays})
-}
-
-export const removeRoomMembership = async (url: string, h: string) => {
-  const list = get(userGroupList) || makeList({kind: ROOMS})
-  const pred = (t: string[]) => equals(["group", h, url], t.slice(0, 3))
-  const event = await removeFromListByPredicate(list, pred).reconcile(nip44EncryptToSelf)
-  const relays = uniq([url, ...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
-
-  return publishThunk({event, relays})
-}
-
-// Relay access
-
-export const canEnforceNip70 = async (url: string) => {
-  const socket = Pool.get().get(url)
-
-  await socket.auth.attemptAuth(sign)
-
-  return socket.auth.status !== AuthStatus.None
-}
-
-export const attemptRelayAccess = async (url: string, claim = "") => {
-  const socket = Pool.get().get(url)
-
-  socket.attemptToOpen()
-
-  await poll({
-    signal: AbortSignal.timeout(3000),
-    condition: () => socket.status === SocketStatus.Open,
-  })
-
-  if (socket.status !== SocketStatus.Open) {
-    return `Failed to connect`
-  }
-
-  await socket.auth.attemptAuth(sign)
-
-  // Only raise an error if it's not a timeout.
-  // If it is, odds are the problem is with our signer, not the relay
-  if (![AuthStatus.None, AuthStatus.Ok].includes(socket.auth.status)) {
-    if (socket.auth.details) {
-      return `Failed to authenticate (${socket.auth.details})`
-    } else {
-      return `Failed to authenticate (${last(socket.auth.status.split(":"))})`
-    }
-  }
-
-  const error = await waitForThunkError(publishJoinRequest({url, claim}))
-
-  if (shouldIgnoreError(error)) return
-
-  if (claim) {
-    if (error.includes("invite code")) {
-      return "join request rejected"
-    }
-  } else if (error.includes("invite code")) {
-    return
-  }
-
-  return stripPrefix(error)
-}
-
-export const deriveRelayAuthError = (url: string) => {
-  Pool.get().get(url).auth.attemptAuth(sign)
-
-  return derived(
-    [relaysMostlyRestricted, deriveSocket(url)],
-    ([$relaysMostlyRestricted, $socket]) => {
-      if ($socket.auth.status === AuthStatus.Forbidden && $socket.auth.details) {
-        return stripPrefix($socket.auth.details)
-      }
-
-      if ($relaysMostlyRestricted[url]) {
-        return stripPrefix($relaysMostlyRestricted[url])
-      }
-    },
-  )
-}
-
-// Deletions
-
-export type DeleteParams = {
-  protect: boolean
-  event: TrustedEvent
-  tags?: string[][]
-}
-
-export const makeDelete = ({protect, event, tags = []}: DeleteParams) => {
-  const thisTags = [["k", String(event.kind)], ...tagEvent(event), ...tags]
-  const groupTag = getTag("h", event.tags)
-
-  if (groupTag) {
-    thisTags.push(groupTag)
-  }
-
-  if (protect) {
-    thisTags.push(PROTECTED)
-  }
-
-  return makeEvent(DELETE, {tags: thisTags})
-}
-
-export const publishDelete = ({relays, ...params}: DeleteParams & {relays: string[]}) =>
-  publishThunk({event: makeDelete(params), relays})
-
-// Reports
-
-export type ReportParams = {
-  event: TrustedEvent
-  content: string
-  reason: string
-}
-
-export const makeReport = ({event, reason, content}: ReportParams) => {
-  const tags = [
-    ["p", event.pubkey],
-    ["e", event.id, reason],
-  ]
-
-  return makeEvent(REPORT, {content, tags})
-}
-
-export const publishReport = ({
-  relays,
-  event,
-  reason,
-  content,
-}: ReportParams & {relays: string[]}) =>
-  publishThunk({event: makeReport({event, reason, content}), relays})
-
-// Reactions
-
-export type ReactionParams = {
-  protect: boolean
-  event: TrustedEvent
-  content: string
-  url?: string
-  tags?: string[][]
-}
-
-export const makeReaction = ({
-  url,
-  protect,
-  content,
-  event,
-  tags: paramTags = [],
-}: ReactionParams) => {
-  const tags = [...paramTags, ...tagEventForReaction(event, url)]
-  const groupTag = getTag("h", event.tags)
-
-  if (groupTag) {
-    tags.push(groupTag)
-  }
-
-  if (protect) {
-    tags.push(PROTECTED)
-  }
-
-  return makeEvent(REACTION, {content, tags})
-}
-
-export const publishReaction = ({relays, ...params}: ReactionParams & {relays: string[]}) => {
-  publishThunk({event: makeReaction({url: relays[0], ...params}), relays})
-}
-
-// Polls
-
-export type PollResponseParams = {
-  event: TrustedEvent
-  selectedIds: string[]
-}
-
-export const makePollResponse = ({event, selectedIds}: PollResponseParams) =>
-  makeEvent(POLL_RESPONSE, {
-    content: "",
-    tags: [["e", event.id], ...selectedIds.map(selectedId => ["response", selectedId])],
-  })
-
-export const publishPollResponse = ({relays, ...params}: PollResponseParams & {relays: string[]}) =>
-  publishThunk({event: makePollResponse(params), relays})
-
-// Comments
-
-export type CommentParams = {
-  event: TrustedEvent
-  content: string
-  tags?: string[][]
-  url?: string
-}
-
-export const makeComment = ({url, event, content, tags = []}: CommentParams) =>
-  makeEvent(COMMENT, {content, tags: [...tags, ...tagEventForComment(event, url)]})
-
-export const publishComment = ({relays, ...params}: CommentParams & {relays: string[]}) =>
-  publishThunk({event: makeComment({url: relays[0], ...params}), relays})
-
-// Settings
-
-export const makeSettings = async (params: Partial<SettingsValues>) => {
-  const json = JSON.stringify({...get(userSettingsValues), ...params})
-  const content = await signer.get().nip44.encrypt(pubkey.get()!, json)
-  const tags = [["d", SETTINGS]]
-
-  return makeEvent(APP_DATA, {content, tags})
-}
-
-export const publishSettings = async (params: Partial<SettingsValues>) =>
-  publishThunk({event: await makeSettings(params), relays: Router.get().FromUser().getUrls()})
-
-export const addTrustedRelay = async (url: string) =>
-  publishSettings({trusted_relays: append(url, getSetting<string[]>("trusted_relays"))})
-
-export const removeTrustedRelay = async (url: string) =>
-  publishSettings({trusted_relays: remove(url, getSetting<string[]>("trusted_relays"))})
-
-// Space and room notification settings
-
-export const setSpaceNotifications = async (url: string, notify: boolean) => {
-  const {alerts} = getSettings()
-  const existing = alerts.find((s: SpaceNotificationSettings) => s.url === url)
-
-  let updated: typeof alerts
-
-  if (existing) {
-    // Clear exceptions when changing the space notification setting
-    updated = alerts.map((s: SpaceNotificationSettings) =>
-      s.url === url ? {...s, notify, exceptions: []} : s,
-    )
-  } else {
-    updated = [...alerts, {url, notify, exceptions: []}]
-  }
-
-  return publishSettings({alerts: updated})
-}
-
-export const toggleRoomNotifications = async (url: string, h: string) => {
-  const {alerts} = getSettings()
-  const existing = alerts.find((s: SpaceNotificationSettings) => s.url === url)
-
-  let updated: typeof alerts
-
-  if (!existing) {
-    updated = [...alerts, {url, notify: true, exceptions: [h]}]
-  } else {
-    const exceptions = existing.exceptions.includes(h)
-      ? remove(h, existing.exceptions)
-      : append(h, existing.exceptions)
-
-    updated = alerts.map((s: SpaceNotificationSettings) => (s.url === url ? {...s, exceptions} : s))
-  }
-
-  return publishSettings({alerts: updated})
-}
-
-// Join request
-
-export type JoinRequestParams = {
-  url: string
-  claim: string
-}
-
-export const makeJoinRequest = (params: JoinRequestParams) =>
-  makeEvent(RELAY_JOIN, {tags: [["claim", params.claim]]})
-
-export const publishJoinRequest = (params: JoinRequestParams) =>
-  publishThunk({event: makeJoinRequest(params), relays: [params.url]})
-
-// Leave request
-
-export type LeaveRequestParams = {
-  url: string
-}
-
-export const publishLeaveRequest = (params: LeaveRequestParams) =>
-  publishThunk({event: makeEvent(RELAY_LEAVE), relays: [params.url]})
-
-// Lightning
-
-export const getWebLn = () => (window as any).webln
-
-export const getNwcClient = () => {
-  const $session = session.get()
-
-  if (!$session?.wallet || $session.wallet.type !== "nwc") {
-    throw new Error("No NWC wallet is connected")
-  }
-
-  const {info} = $session.wallet
-
-  if (info.nostrWalletConnectUrl) {
-    return new nwc.NWCClient({nostrWalletConnectUrl: info.nostrWalletConnectUrl})
-  }
-
-  return new nwc.NWCClient(info)
-}
-
-export const payInvoice = async (invoice: string, msats?: number) => {
-  const $session = session.get()
-
-  if (!$session?.wallet) {
-    throw new Error("No wallet is connected")
-  }
-
-  if ($session.wallet.type === "nwc") {
-    const params: {invoice: string; amount?: number} = {invoice}
-    if (msats) params.amount = msats
-    return getNwcClient().payInvoice(params)
-  } else if ($session.wallet.type === "webln") {
-    if (msats) throw new Error("Unable to pay zero invoices with webln")
-    return getWebLn()
-      .enable()
-      .then(() => getWebLn().sendPayment(invoice))
-  }
-}
-
-export type CreateInvoiceParams = {
-  sats: number
-  description?: string
-}
-
-export const createInvoice = async ({
-  sats,
-  description = "Receive via lightning",
-}: CreateInvoiceParams) => {
-  const $session = session.get()
-
-  if (!$session?.wallet) {
-    throw new Error("No wallet is connected")
-  }
-
-  const satAmount = Math.floor(sats)
-
-  if (!Number.isFinite(satAmount) || satAmount <= 0) {
-    throw new Error("Invalid satoshi amount")
-  }
-
-  if ($session.wallet.type === "nwc") {
-    const createdInvoice = await getNwcClient().makeInvoice({
-      amount: satAmount * 1000,
-      description,
-    })
-
-    if (!createdInvoice.invoice) {
-      throw new Error("NWC wallet failed to return an invoice")
-    }
-
-    return createdInvoice.invoice
-  }
-
-  if ($session.wallet.type === "webln") {
-    const webLn = getWebLn()
-
-    if (!webLn) {
-      throw new Error("WebLN not available")
-    }
-
-    await webLn.enable()
-
-    const response = await webLn.makeInvoice({
-      amount: satAmount,
-      defaultMemo: description,
-    })
-
-    const paymentRequest =
-      typeof response === "string" ? response : response?.paymentRequest || response?.pr || ""
-
-    if (!paymentRequest) {
-      throw new Error("Invalid payment request returned from WebLN")
-    }
-
-    return paymentRequest
-  }
-
-  throw new Error("Unsupported wallet type")
-}
-
-// File upload
-
-export const normalizeBlossomUrl = (url: string) => normalizeUrl(url.replace(/^ws/, "http"))
-
-export const fetchHasBlossomSupport = async (url: string) => {
-  const relay = getRelay(url)
-
-  if (relay?.supported_nips?.map(String).includes("BUD-02")) {
-    return true
-  }
-
-  const server = normalizeBlossomUrl(url)
-  const $signer = signer.get() || Nip01Signer.ephemeral()
-  const headers: Record<string, string> = {
-    "X-Content-Type": "text/plain",
-    "X-Content-Length": "1",
-    "X-SHA-256": "73cb3858a687a8494ca3323053016282f3dad39d42cf62ca4e79dda2aac7d9ac",
-  }
-
-  try {
-    const authEvent = await $signer.sign(makeBlossomAuthEvent({action: "upload", server}))
-    const res = await canUploadBlob(server, {authEvent, headers})
-
-    return res.status === 200
-  } catch (e) {
-    if (!String(e).match(/Failed to fetch|NetworkError/)) {
-      console.error(e)
-    }
-  }
-
-  return false
-}
-
-export const hasBlossomSupport = simpleCache(([url]: [string]) => fetchHasBlossomSupport(url))
-
-export type GetBlossomServerOptions = {
-  url?: string
-}
-
-export const getBlossomServer = async (options: GetBlossomServerOptions = {}) => {
-  if (options.url) {
-    if (await hasBlossomSupport(options.url)) {
-      return normalizeBlossomUrl(options.url)
-    }
-  }
-
-  const userUrls = getTagValues("server", getListTags(get(userBlossomServerList)))
-
-  for (const url of userUrls) {
-    return normalizeBlossomUrl(url)
-  }
-
-  return first(DEFAULT_BLOSSOM_SERVERS)!
-}
-
-export type UploadFileOptions = {
-  url?: string
-  encrypt?: boolean
-  maxWidth?: number
-  maxHeight?: number
-}
-
-export type UploadFileResult = {
-  error?: string
-  result?: UploadTask
-}
-
-export const uploadFile = async (file: File, options: UploadFileOptions = {}) => {
-  try {
-    const {name, type} = file
-
-    if (!type.match("image/(webp|gif|svg)")) {
-      file = await compressFile(file, options)
-    }
-
-    const tags: string[][] = []
-
-    if (options.encrypt) {
-      const {ciphertext, key, nonce, algorithm} = await encryptFile(file)
-
-      tags.push(
-        ["decryption-key", key],
-        ["decryption-nonce", nonce],
-        ["encryption-algorithm", algorithm],
-      )
-
-      file = new File([new Uint8Array(ciphertext)], name, {
-        type: "application/octet-stream",
-      })
-    }
-
-    const ext = "." + type.split("/")[1]
-    const server = await getBlossomServer(options)
-    const hashes = [await sha256(await file.arrayBuffer())]
-    const $signer = signer.get() || Nip01Signer.ephemeral()
-    const authTemplate = makeBlossomAuthEvent({action: "upload", server, hashes})
-    const authEvent = await $signer.sign(authTemplate)
-    const res = await uploadBlob(server, file, {authEvent})
-    const text = await res.text()
-
-    let task
-    try {
-      task = parseJson(text)
-    } catch (e) {
-      return {error: text}
-    }
-
-    if (!task?.uploaded) {
-      return {error: text || `Failed to upload file (HTTP ${res.status})`}
-    }
-
-    // Always append correct file extension if we encrypted the file, or if it's missing
-    let url = task.url
-    if (options.encrypt) {
-      url = url.replace(/\.\w+$/, "") + ext
-    } else if (new URL(url).pathname.split(".").length === 1) {
-      url += ext
-    }
-
-    const result = {...task, tags, url}
-
-    return {result}
-  } catch (e: any) {
-    console.error("Error caught when uploading file:", e)
-
-    return {error: e.toString()}
-  }
-}
-
-// Update Profile
-
-export const initProfile = (profile: Profile) => {
-  const event = makeEvent(PROFILE, createProfile(profile))
-
-  return publishThunk({event, relays: DEFAULT_RELAYS})
-}
-
-export const updateProfile = ({profile}: {profile: Profile}) => {
-  const router = Router.get()
-  const template = isPublishedProfile(profile) ? editProfile(profile) : createProfile(profile)
-  const scenarios = [router.FromRelays(get(userSpaceUrls)), router.FromUser(), router.Index()]
-
-  // Remove protected tag, we used to add it
-  template.tags = template.tags.filter(nthNe(0, "-"))
-
-  const event = makeEvent(template.kind, template)
-  const relays = router.merge(scenarios).getUrls()
-
-  return publishThunk({event, relays})
-}
-
-// Admin actions
-
-export const addSpaceMembers = async (
-  url: string,
-  pubkeys: string[],
-): Promise<string | undefined> => {
-  const spaceMembers = get(deriveSpaceMembers(url))
-
-  const results = await Promise.all(
-    pubkeys
-      .filter(pubkey => !spaceMembers || !spaceMembers.includes(pubkey))
-      .map(pubkey =>
-        manageRelay(url, {
-          method: ManagementMethod.AllowPubkey,
-          params: [pubkey],
-        }),
-      ),
-  )
-
-  for (const {error} of results) {
-    if (error) {
-      return error
-    }
-  }
-}
-
-export const addRoomMembers = async (
-  url: string,
-  room: PublishedRoomMeta,
-  pubkeys: string[],
-): Promise<string | undefined> => {
-  const error = await addSpaceMembers(url, pubkeys)
-
-  if (error) {
-    return error
-  }
-
-  const errors = await Promise.all(
-    pubkeys.map(pubkey => waitForThunkError(addRoomMember(url, room, pubkey))),
-  )
-
-  for (const error of errors) {
-    if (error) {
-      return error
-    }
-  }
-}
diff --git a/src/app/core/state.ts b/src/app/core/state.ts
deleted file mode 100644
index 3053fa33..00000000
--- a/src/app/core/state.ts
+++ /dev/null
@@ -1,1392 +0,0 @@
-import twColors from "tailwindcss/colors"
-import {context as pomadeContext} from "@pomade/core"
-import {Capacitor} from "@capacitor/core"
-import {derived, readable, writable} from "svelte/store"
-import * as nip19 from "nostr-tools/nip19"
-import {
-  on,
-  gte,
-  max,
-  spec,
-  call,
-  first,
-  uniqBy,
-  sortBy,
-  append,
-  reject,
-  sort,
-  uniq,
-  indexBy,
-  partition,
-  shuffle,
-  parseJson,
-  memoize,
-  addToMapKey,
-  identity,
-  always,
-  randomId,
-  tryCatch,
-  fromPairs,
-  groupBy,
-  remove,
-  simpleCache,
-  removeUndefined,
-} from "@welshman/lib"
-import type {Override} from "@welshman/lib"
-import type {RepositoryUpdate} from "@welshman/net"
-import {
-  Pool,
-  load,
-  SocketStatus,
-  AuthStateEvent,
-  AuthStatus,
-  SocketEvent,
-  netContext,
-} from "@welshman/net"
-import {
-  getter,
-  throttled,
-  withGetter,
-  deriveArray,
-  makeDeriveEvent,
-  makeLoadItem,
-  makeDeriveItem,
-  deriveItems,
-  deriveItemsByKey,
-  deriveDeduplicated,
-  deriveEventsById,
-  deriveEventsByIdByUrl,
-  deriveEventsByIdForUrl,
-  getEventsByIdForUrl,
-  deriveEventsAsc,
-  deriveEventsDesc,
-} from "@welshman/store"
-import {
-  FEED,
-  FEEDS,
-  APP_DATA,
-  CLIENT_AUTH,
-  COMMENT,
-  DELETE,
-  DIRECT_MESSAGE_FILE,
-  DIRECT_MESSAGE,
-  EVENT_TIME,
-  MESSAGE,
-  REACTION,
-  RELAY_ADD_MEMBER,
-  RELAY_JOIN,
-  RELAY_LEAVE,
-  RELAY_MEMBERS,
-  RELAY_REMOVE_MEMBER,
-  REPORT,
-  ROOM_ADD_MEMBER,
-  ROOM_CREATE_PERMISSION,
-  ROOM_JOIN,
-  ROOM_LEAVE,
-  ROOM_MEMBERS,
-  ROOM_ADMINS,
-  ROOM_META,
-  ROOM_DELETE,
-  ROOM_REMOVE_MEMBER,
-  ROOMS,
-  THREAD,
-  CLASSIFIED,
-  WRAP,
-  POLL,
-  PROFILE,
-  ZAP_GOAL,
-  ZAP_REQUEST,
-  ZAP_RESPONSE,
-  REPOST,
-  GENERIC_REPOST,
-  asDecryptedEvent,
-  getTagValue,
-  getGroupTags,
-  getListTags,
-  getPubkeyTagValues,
-  getRelayTagValues,
-  getTagValues,
-  isRelayUrl,
-  normalizeRelayUrl,
-  readList,
-  verifyEvent,
-  readRoomMeta,
-  makeRoomMeta,
-  ManagementMethod,
-  sortEventsAsc,
-  sortEventsDesc,
-  getAddress,
-  Address,
-  getIdFilters,
-  getEventTagValues,
-  getAddressTagValues,
-  getParentIds,
-  getParentAddrs,
-} from "@welshman/util"
-import type {
-  TrustedEvent,
-  RelayProfile,
-  PublishedList,
-  PublishedRoomMeta,
-  RoomMeta,
-  List,
-  Filter,
-} from "@welshman/util"
-import {routerContext, Router} from "@welshman/router"
-import {
-  pubkey,
-  repository,
-  tracker,
-  createSearch,
-  userMuteList,
-  userFollowList,
-  ensurePlaintext,
-  makeOutboxLoader,
-  appContext,
-  deriveRelay,
-  makeUserData,
-  makeUserLoader,
-  manageRelay,
-  displayProfileByPubkey,
-  getProfile,
-} from "@welshman/app"
-import {checkRelayHasLivekit} from "$lib/livekit"
-import {readFeed} from "@lib/feeds"
-
-export const fromCsv = (s: string) => (s || "").split(",").filter(identity)
-
-export const ROOM = "h"
-
-export const PROTECTED = ["-"]
-
-export const IMAGE_CONTENT_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"]
-
-export const VIDEO_CONTENT_TYPES = ["video/quicktime", "video/webm", "video/mp4"]
-
-export const ENABLE_ZAPS = Capacitor.getPlatform() != "ios"
-
-export const PUSH_SERVER = import.meta.env.VITE_PUSH_SERVER
-
-export const PUSH_BRIDGE = normalizeRelayUrl(import.meta.env.VITE_PUSH_BRIDGE)
-
-export const VAPID_PUBLIC_KEY = import.meta.env.VITE_VAPID_PUBLIC_KEY
-
-export const SIGNER_RELAYS = fromCsv(import.meta.env.VITE_SIGNER_RELAYS).map(normalizeRelayUrl)
-
-export const BLOCKED_RELAYS = fromCsv(import.meta.env.VITE_BLOCKED_RELAYS).map(normalizeRelayUrl)
-
-export const INDEXER_RELAYS = fromCsv(import.meta.env.VITE_INDEXER_RELAYS).map(normalizeRelayUrl)
-
-export const DEFAULT_RELAYS = fromCsv(import.meta.env.VITE_DEFAULT_RELAYS).map(normalizeRelayUrl)
-
-export const DEFAULT_MESSAGING_RELAYS = fromCsv(import.meta.env.VITE_DEFAULT_MESSAGING_RELAYS).map(
-  normalizeRelayUrl,
-)
-
-export const PLATFORM_RELAYS = fromCsv(import.meta.env.VITE_PLATFORM_RELAYS).map(normalizeRelayUrl)
-
-export const PLATFORM_URL = import.meta.env.VITE_PLATFORM_URL
-
-export const PLATFORM_TERMS = import.meta.env.VITE_PLATFORM_TERMS
-
-export const PLATFORM_PRIVACY = import.meta.env.VITE_PLATFORM_PRIVACY
-
-export const PLATFORM_LOGO = import.meta.env.PROD
-  ? PLATFORM_URL + "/logo.png"
-  : import.meta.env.VITE_PLATFORM_LOGO.replace(/^static/, "") || PLATFORM_URL + "/logo.png"
-
-export const PLATFORM_NAME = import.meta.env.VITE_PLATFORM_NAME
-
-export const PLATFORM_ACCENT = import.meta.env.VITE_PLATFORM_ACCENT
-
-export const PLATFORM_DESCRIPTION = import.meta.env.VITE_PLATFORM_DESCRIPTION
-
-export const POMADE_SIGNERS = fromCsv(import.meta.env.VITE_POMADE_SIGNERS)
-
-export const DEFAULT_BLOSSOM_SERVERS = fromCsv(import.meta.env.VITE_DEFAULT_BLOSSOM_SERVERS)
-
-export const DEFAULT_PUBKEYS = import.meta.env.VITE_DEFAULT_PUBKEYS
-
-export const DUFFLEPUD_URL = "https://dufflepud.onrender.com"
-
-export const THUMBNAIL_URL = import.meta.env.VITE_THUMBNAIL_URL
-
-export const NIP46_PERMS =
-  "nip44_encrypt,nip44_decrypt," +
-  [
-    CLIENT_AUTH,
-    RELAY_JOIN,
-    MESSAGE,
-    THREAD,
-    CLASSIFIED,
-    COMMENT,
-    ROOMS,
-    WRAP,
-    REACTION,
-    ZAP_REQUEST,
-  ]
-    .map(k => `sign_event:${k}`)
-    .join(",")
-
-export const colors = [
-  ["amber", twColors.amber[600]],
-  ["blue", twColors.blue[600]],
-  ["cyan", twColors.cyan[600]],
-  ["emerald", twColors.emerald[600]],
-  ["fuchsia", twColors.fuchsia[600]],
-  ["green", twColors.green[600]],
-  ["indigo", twColors.indigo[600]],
-  ["sky", twColors.sky[600]],
-  ["lime", twColors.lime[600]],
-  ["orange", twColors.orange[600]],
-  ["pink", twColors.pink[600]],
-  ["purple", twColors.purple[600]],
-  ["red", twColors.red[600]],
-  ["rose", twColors.rose[600]],
-  ["sky", twColors.sky[600]],
-  ["teal", twColors.teal[600]],
-  ["violet", twColors.violet[600]],
-  ["yellow", twColors.yellow[600]],
-  ["zinc", twColors.zinc[600]],
-]
-
-export const dufflepud = (path: string) => DUFFLEPUD_URL + "/" + path
-
-export const entityLink = (entity: string) => `https://coracle.social/${entity}`
-
-export const pubkeyLink = (pubkey: string, relays = Router.get().FromPubkeys([pubkey]).getUrls()) =>
-  entityLink(nip19.nprofileEncode({pubkey, relays}))
-
-export const bootstrapPubkeys = derived(userFollowList, $userFollowList => {
-  const appPubkeys = DEFAULT_PUBKEYS.split(",")
-  const userPubkeys = shuffle(getPubkeyTagValues(getListTags($userFollowList)))
-
-  return userPubkeys.length > 5 ? userPubkeys : [...userPubkeys, ...appPubkeys]
-})
-
-export const deriveEvent = makeDeriveEvent({
-  repository,
-  includeDeleted: true,
-  onDerive: (filters: Filter[], relays: string[]) => load({filters, relays}),
-})
-
-export const deriveEvents = (filters: Filter[] = [{}]) =>
-  deriveEventsDesc(deriveEventsById({repository, filters}))
-
-export const getEventsForUrl = (url: string, filters: Filter[] = [{}]) =>
-  getEventsByIdForUrl({url, tracker, repository, filters}).values()
-
-export const deriveEventsForUrl = (url: string, filters: Filter[] = [{}]) =>
-  deriveArray(deriveEventsByIdForUrl({url, tracker, repository, filters}))
-
-export const deriveEventsForUrlAsc = (url: string, filters: Filter[] = [{}]) =>
-  deriveEventsAsc(deriveEventsByIdForUrl({url, tracker, repository, filters}))
-
-export const deriveEventsForUrlDesc = (url: string, filters: Filter[] = [{}]) =>
-  deriveEventsDesc(deriveEventsByIdForUrl({url, tracker, repository, filters}))
-
-export const deriveLatestEventForUrl = (url: string, filters: Filter[] = [{}]) =>
-  deriveDeduplicated(deriveEventsByIdForUrl({url, tracker, repository, filters}), $eventsById =>
-    first(sortEventsDesc($eventsById.values())),
-  )
-
-export const deriveRelaySignedEvents = (url: string, filters: Filter[] = [{}]) =>
-  derived(
-    [deriveRelay(url), deriveEventsForUrl(url, filters)],
-    ([relay, events]) => events,
-    // TODO: khatru doesn't support relay.self, uncomment when it's ready
-    // filter(spec({pubkey: relay.self}), events)
-  )
-
-// Context
-
-pomadeContext.setSignerUrls(POMADE_SIGNERS)
-
-pomadeContext.setArgonWorker(import("@pomade/core/argon-worker.js?worker"))
-
-appContext.dufflepudUrl = DUFFLEPUD_URL
-
-routerContext.getIndexerRelays = always(INDEXER_RELAYS)
-
-netContext.isEventValid = (event: TrustedEvent, url: string) =>
-  getSetting<string[]>("trusted_relays").includes(url) || verifyEvent(event)
-
-// Filters
-
-export const makeCommentFilter = (kinds: number[], extra: Filter = {}) => ({
-  kinds: [COMMENT],
-  "#K": kinds.map(String),
-  ...extra,
-})
-
-export const REPOST_KINDS = [REPOST, GENERIC_REPOST]
-
-export const REACTION_KINDS = [REPORT, DELETE, REACTION]
-
-if (ENABLE_ZAPS) {
-  REACTION_KINDS.push(ZAP_RESPONSE)
-}
-
-export const CONTENT_KINDS = [ZAP_GOAL, EVENT_TIME, THREAD, CLASSIFIED, POLL]
-
-export const DM_KINDS = [DIRECT_MESSAGE, DIRECT_MESSAGE_FILE]
-
-// Settings
-
-export const SETTINGS = "flotilla/settings"
-
-export enum RelayAuthMode {
-  Aggressive = "aggressive",
-  Conservative = "conservative",
-}
-
-export type SpaceNotificationSettings = {
-  url: string
-  notify: boolean
-  exceptions: string[]
-}
-
-export type SettingsValues = {
-  show_media: boolean
-  hide_sensitive: boolean
-  trusted_relays: string[]
-  report_usage: boolean
-  report_errors: boolean
-  relay_auth: RelayAuthMode
-  send_delay: number
-  font_size: number
-  alerts: SpaceNotificationSettings[]
-}
-
-export type Settings = {
-  event: TrustedEvent
-  values: SettingsValues
-}
-
-export const defaultSettings: SettingsValues = {
-  show_media: true,
-  hide_sensitive: true,
-  trusted_relays: [],
-  report_usage: true,
-  report_errors: true,
-  relay_auth: RelayAuthMode.Conservative,
-  send_delay: 0,
-  font_size: 1.1,
-  alerts: [],
-}
-
-export const settingsByPubkey = deriveItemsByKey({
-  repository,
-  getKey: settings => settings.event.pubkey,
-  filters: [{kinds: [APP_DATA], "#d": [SETTINGS]}],
-  eventToItem: async (event: TrustedEvent) => {
-    const values = {...defaultSettings, ...parseJson(await ensurePlaintext(event))}
-
-    return {event, values}
-  },
-})
-
-export const getSettingsByPubkey = getter(settingsByPubkey)
-
-export const loadSettings = makeLoadItem(
-  makeOutboxLoader(APP_DATA, {"#d": [SETTINGS]}),
-  (pubkey: string) => getSettingsByPubkey().get(pubkey),
-)
-
-export const userSettings = makeUserData(settingsByPubkey, loadSettings)
-
-export const loadUserSettings = makeUserLoader(loadSettings)
-
-export const userSettingsValues = derived(userSettings, $s => $s?.values || defaultSettings)
-
-export const getSettings = getter(userSettingsValues)
-
-export const getSetting = <T>(key: keyof Settings["values"]) => getSettings()[key] as T
-
-// Relays sending events with empty signatures that the user has to choose to trust
-
-export const relaysPendingTrust = writable<string[]>([])
-
-// Relays that mostly send restricted responses to requests and events
-
-export const relaysMostlyRestricted = writable<Record<string, string>>({})
-
-// Push notifications
-
-export const device = withGetter(writable(randomId()))
-
-export const notificationSettings = withGetter(
-  writable({
-    push: false,
-    sound: true,
-    badge: false,
-    spaces: true,
-    mentions: true,
-    messages: true,
-  }),
-)
-
-export type PushSubscription = {
-  key: string
-  callback: string
-}
-
-export type PushState = {
-  token?: string
-  useFallback?: boolean
-  subscription?: PushSubscription
-}
-
-export const pushState = withGetter(writable<PushState>({}))
-
-// Chats
-
-export type Chat = {
-  id: string
-  pubkeys: string[]
-  messages: TrustedEvent[]
-  last_activity: number
-  search_text: string
-}
-
-export const getChatPubkeys = (pubkeys: string[]) => sort(uniq(append(pubkey.get()!, pubkeys)))
-
-export const getChatPubkeysFromEvent = (event: TrustedEvent) =>
-  getChatPubkeys(getPubkeyTagValues(event.tags).concat(event.pubkey))
-
-export const makeChatId = (pubkeys: string[]) => {
-  const userPubkey = pubkey.get()!
-  const otherPubkeys = remove(userPubkey, uniq(pubkeys))
-  const visiblePubkeys = otherPubkeys.length === 0 ? [userPubkey] : otherPubkeys
-
-  return sort(visiblePubkeys).join(",")
-}
-
-export const splitChatId = (id: string) => getChatPubkeys(id.split(","))
-
-export const chatsById = call(() => {
-  const chatsById = new Map<string, Chat>()
-  const chatsByPubkey = new Map<string, string[]>()
-
-  const addSearchText = (chat: Override<Chat, {search_text?: string}>) => {
-    chat.search_text =
-      chat.pubkeys.length === 1
-        ? displayProfileByPubkey(chat.pubkeys[0]) + " note to self"
-        : remove(pubkey.get()!, chat.pubkeys).map(displayProfileByPubkey).join(" ")
-
-    return chat as Chat
-  }
-
-  return readable(chatsById, set => {
-    const indexChatByPubkeys = (chat: Chat) => {
-      for (const pubkey of chat.pubkeys) {
-        chatsByPubkey.set(pubkey, uniq(append(chat.id, chatsByPubkey.get(pubkey) || [])))
-      }
-    }
-
-    const addEvents = (events: TrustedEvent[]) => {
-      let dirty = false
-      for (const event of events) {
-        if (DM_KINDS.includes(event.kind)) {
-          const pubkeys = getChatPubkeysFromEvent(event)
-          const id = makeChatId(pubkeys)
-          const chat = chatsById.get(id)
-          const messages = sortBy(
-            e => -e.created_at,
-            uniqBy(e => e.id, append(event, chat?.messages || [])),
-          )
-          const last_activity = Math.max(chat?.last_activity || 0, event.created_at)
-          const updatedChat = addSearchText({id, pubkeys, messages, last_activity})
-
-          chatsById.set(id, updatedChat)
-          indexChatByPubkeys(updatedChat)
-
-          dirty = true
-        }
-
-        if (event.kind === PROFILE) {
-          for (const chatId of chatsByPubkey.get(event.pubkey) || []) {
-            const chat = chatsById.get(chatId)
-
-            if (chat) {
-              addSearchText(chat)
-              dirty = true
-            }
-          }
-        }
-      }
-
-      if (dirty) {
-        set(chatsById)
-      }
-    }
-
-    const removeEvents = (removed: Set<string>) => {
-      let dirty = false
-
-      for (const id of removed) {
-        const event = repository.getEvent(id)
-
-        if (event && DM_KINDS.includes(event.kind)) {
-          for (const chatId of chatsByPubkey.get(event.pubkey) || []) {
-            const chat = chatsById.get(chatId)
-
-            if (chat) {
-              chat.messages = reject(spec({id: event.id}), chat.messages)
-              dirty = true
-            }
-          }
-        }
-      }
-
-      if (dirty) {
-        set(chatsById)
-      }
-    }
-
-    addEvents(repository.query([{kinds: [...DM_KINDS, DELETE, PROFILE]}]))
-
-    const unsubscribers = [
-      on(repository, "update", ({added, removed}: RepositoryUpdate) => {
-        // Do this async so that profiles are populated
-        setTimeout(() => {
-          addEvents(added)
-          removeEvents(removed)
-        }, 200)
-      }),
-    ]
-
-    return () => unsubscribers.forEach(call)
-  })
-})
-
-export const deriveChat = makeDeriveItem(chatsById)
-
-export const chatSearch = derived(throttled(1500, chatsById), $chatsByPubkey => {
-  return createSearch(
-    sortBy(c => -c.last_activity, Array.from($chatsByPubkey.values())),
-    {
-      getValue: (chat: Chat) => chat.id,
-      fuseOptions: {keys: ["search_text"]},
-    },
-  )
-})
-
-// Rooms
-
-export enum RoomType {
-  Text = "text",
-  Voice = "voice",
-}
-
-export type Room = PublishedRoomMeta & {
-  id: string
-  url: string
-}
-
-export const getRoomType = (room: RoomMeta): RoomType =>
-  room.livekit ? RoomType.Voice : RoomType.Text
-
-export const makeRoomId = (url: string, h: string) => `${url}'${h}`
-
-export const isRoomId = (id: string) => id.includes("'")
-
-export const splitRoomId = (id: string) => id.split("'")
-
-export const hasNip29 = (relay?: RelayProfile) =>
-  Boolean(relay?.supported_nips?.map?.(String)?.includes?.("29"))
-
-export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
-  tracker,
-  repository,
-  filters: [{kinds: [ROOM_META, ROOM_DELETE]}],
-})
-
-export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByUrl => {
-  const result = new Map<string, Room[]>()
-
-  for (const [url, events] of roomMetaEventsByIdByUrl.entries()) {
-    const [metaEvents, deleteEvents] = partition(spec({kind: ROOM_META}), events.values())
-    const deletedByH = new Map<string, number>()
-
-    for (const event of deleteEvents) {
-      for (const h of getTagValues("h", event.tags)) {
-        deletedByH.set(h, max([deletedByH.get(h), event.created_at]))
-      }
-    }
-
-    const metaById = new Map<string, Room>()
-
-    for (const event of metaEvents) {
-      const meta = tryCatch(() => readRoomMeta(event))
-
-      if (!meta || gte(deletedByH.get(meta.h), meta.event.created_at)) {
-        continue
-      }
-
-      const id = makeRoomId(url, meta.h)
-
-      metaById.set(id, {...meta, url, id})
-    }
-
-    if (metaById.size > 0) {
-      result.set(url, Array.from(metaById.values()))
-    }
-  }
-
-  return result
-})
-
-export const roomsById = derived(roomsByUrl, roomsByUrl =>
-  indexBy(room => room.id, Array.from(roomsByUrl.values()).flatMap(identity)),
-)
-
-export const getRoomsById = getter(roomsById)
-
-export const getRoom = (id: string) => getRoomsById().get(id)
-
-export const loadRoom = call(() => {
-  const _fetchRoom = async (id: string) => {
-    const [url, h] = splitRoomId(id)
-
-    await load({
-      relays: [url],
-      filters: [
-        {kinds: [ROOM_META], "#d": [h]},
-        {kinds: [ROOM_DELETE], "#h": [h]},
-      ],
-    })
-  }
-
-  const _loadRoom = makeLoadItem(_fetchRoom, getRoom)
-
-  return (url: string, h: string) => _loadRoom(makeRoomId(url, h))
-})
-
-export const deriveRoom = call(() => {
-  const _deriveRoom = makeDeriveItem(roomsById, loadRoom)
-
-  return (url: string, h: string) =>
-    derived(
-      _deriveRoom(makeRoomId(url, h)),
-      room => (room || {url, id: makeRoomId(url, h), ...makeRoomMeta({h})}) as Room,
-    )
-})
-
-export const displayRoom = (url: string, h: string) => getRoom(makeRoomId(url, h))?.name || h
-
-export const roomComparator = (url: string) => (h: string) => displayRoom(url, h).toLowerCase()
-
-export const deriveVoiceRooms = (url: string) =>
-  derived(roomsById, $roomsById => {
-    const set = new Set<string>()
-    for (const room of $roomsById.values()) {
-      if (room.url === url && room.livekit) {
-        set.add(room.h)
-      }
-    }
-    return set
-  })
-
-export const deriveOtherVoiceRooms = (url: string) =>
-  derived([deriveVoiceRooms(url), deriveUserRooms(url)], ([$roomsWithLivekit, $userRooms]) => {
-    const rooms: string[] = []
-
-    for (const h of $roomsWithLivekit) {
-      if (!$userRooms.includes(h)) {
-        rooms.push(h)
-      }
-    }
-
-    return sortBy(roomComparator(url), uniq(rooms))
-  })
-
-// User space/room lists
-
-export const groupListsByPubkey = deriveItemsByKey({
-  repository,
-  filters: [{kinds: [ROOMS]}],
-  getKey: list => list.event.pubkey,
-  eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
-})
-
-export const getGroupListsByPubkey = getter(groupListsByPubkey)
-
-export const getGroupList = (pubkey: string) => getGroupListsByPubkey().get(pubkey)
-
-export const loadGroupList = makeLoadItem(makeOutboxLoader(ROOMS), getGroupList)
-
-export const deriveGroupList = makeDeriveItem(groupListsByPubkey, loadGroupList)
-
-export const groupListPubkeysByUrl = derived(groupListsByPubkey, $groupListsByPubkey => {
-  const result = new Map<string, Set<string>>()
-
-  for (const list of $groupListsByPubkey.values()) {
-    const tags = getListTags(list)
-
-    for (const url of getRelayTagValues(tags)) {
-      addToMapKey(result, url, list.event.pubkey)
-    }
-
-    for (const tag of getGroupTags(tags)) {
-      const url = tag[2] || ""
-
-      if (isRelayUrl(url)) {
-        addToMapKey(result, url, list.event.pubkey)
-      }
-    }
-  }
-
-  return result
-})
-
-export const deriveGroupListPubkeys = (url: string) =>
-  derived(groupListPubkeysByUrl, $groupListPubkeysByUrl => new Set($groupListPubkeysByUrl.get(url)))
-
-export const getSpaceUrlsFromGroupList = (groupList: List | undefined) => {
-  const tags = getListTags(groupList)
-  const urls = getRelayTagValues(tags)
-
-  for (const tag of getGroupTags(tags)) {
-    const url = tag[2] || ""
-
-    if (isRelayUrl(url)) {
-      urls.push(url)
-    }
-  }
-
-  return uniqBy(normalizeRelayUrl, urls)
-}
-
-export const getSpaceRoomsFromGroupList = (url: string, groupList: List | undefined) => {
-  const rooms: string[] = []
-
-  for (const [_, h, relay] of getGroupTags(getListTags(groupList))) {
-    if (url === relay) {
-      rooms.push(h)
-    }
-  }
-
-  return sortBy(roomComparator(url), uniq(rooms))
-}
-
-export const userGroupList = makeUserData(groupListsByPubkey, loadGroupList)
-
-export const loadUserGroupList = makeUserLoader(loadGroupList)
-
-export const userSpaceUrls = derived(userGroupList, getSpaceUrlsFromGroupList)
-
-export const deriveUserRooms = (url: string) =>
-  derived([userGroupList, roomsById], ([$userGroupList, $roomsById]) => {
-    const rooms: string[] = []
-
-    for (const h of getSpaceRoomsFromGroupList(url, $userGroupList)) {
-      if ($roomsById.has(makeRoomId(url, h))) {
-        rooms.push(h)
-      }
-    }
-
-    return sortBy(roomComparator(url), rooms)
-  })
-
-export const deriveOtherRooms = (url: string) =>
-  derived(
-    [deriveUserRooms(url), deriveVoiceRooms(url), roomsByUrl],
-    ([$userRooms, voiceRooms, $roomsByUrl]) => {
-      const rooms: string[] = []
-
-      for (const {h} of $roomsByUrl.get(url) || []) {
-        if (!$userRooms.includes(h) && !voiceRooms.has(h)) {
-          rooms.push(h)
-        }
-      }
-
-      return sortBy(roomComparator(url), uniq(rooms))
-    },
-  )
-
-// Space/room memberships
-
-export const deriveSpaceMembers = (url: string) =>
-  derived(deriveRelaySignedEvents(url, [{kinds: [RELAY_MEMBERS]}]), ([event]) =>
-    uniq(getTagValues("member", event?.tags ?? [])),
-  )
-
-export const deriveRoomMembers = (url: string, h: string) => {
-  const filters: Filter[] = [{kinds: [ROOM_MEMBERS], "#d": [h]}]
-
-  return derived(deriveEventsForUrl(url, filters), ([event]) =>
-    uniq(getPubkeyTagValues(event?.tags ?? [])),
-  )
-}
-
-export type BannedPubkeyItem = {
-  pubkey: string
-  reason: string
-}
-
-export const spaceBannedPubkeyItems = new Map<string, BannedPubkeyItem[]>()
-
-export const deriveSpaceBannedPubkeyItems = (url: string) => {
-  const store = writable(spaceBannedPubkeyItems.get(url) || [])
-
-  manageRelay(url, {method: ManagementMethod.ListBannedPubkeys, params: []}).then(res => {
-    spaceBannedPubkeyItems.set(url, res.result)
-    store.set(res.result)
-  })
-
-  return store
-}
-
-export const deriveRoomAdmins = (url: string, h: string) => {
-  const filters: Filter[] = [{kinds: [ROOM_ADMINS], "#d": [h]}]
-
-  return derived(deriveEventsForUrl(url, filters), $events => {
-    const adminsEvent = first($events)
-
-    if (adminsEvent) {
-      return getPubkeyTagValues(adminsEvent.tags)
-    }
-
-    return []
-  })
-}
-
-const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
-  const members = new Set<string>()
-
-  for (const event of sortEventsAsc(events)) {
-    if (event.kind === ROOM_MEMBERS && getTagValue("d", event.tags) === h) {
-      members.clear()
-
-      for (const pubkey of uniq(getPubkeyTagValues(event.tags))) {
-        members.add(pubkey)
-      }
-
-      continue
-    }
-
-    if (getTagValue("h", event.tags) !== h) {
-      continue
-    }
-
-    const pubkeys = getPubkeyTagValues(event.tags)
-
-    if (event.kind === ROOM_ADD_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.add(pubkey)
-      }
-    }
-
-    if (event.kind === ROOM_REMOVE_MEMBER) {
-      for (const pubkey of pubkeys) {
-        members.delete(pubkey)
-      }
-    }
-  }
-
-  return Array.from(members)
-}
-
-// Action items (admin review queue)
-// const pendingJoins: TrustedEvent[] = []
-
-export const deriveSpaceActionItems = (url: string) =>
-  derived(
-    deriveEventsForUrl(url, [
-      {
-        kinds: [REPORT, ROOM_JOIN, ROOM_LEAVE, ROOM_MEMBERS, ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER],
-      },
-    ]),
-    $events => {
-      const getRoomId = (e: TrustedEvent) =>
-        getTagValue(e.kind === ROOM_MEMBERS ? "d" : "h", e.tags)
-      const reports = $events.filter(e => e.kind === REPORT)
-      const pendingJoins: TrustedEvent[] = []
-
-      // Room-level join requests — most recent per pubkey+h
-      for (const [h, roomEvents] of groupBy(getRoomId, $events)) {
-        if (!h) continue
-
-        const roomJoins: TrustedEvent[] = []
-        const roomLeaves: TrustedEvent[] = []
-        const roomMembershipEvents: TrustedEvent[] = []
-
-        for (const event of roomEvents) {
-          switch (event.kind) {
-            case ROOM_JOIN:
-              roomJoins.push(event)
-              break
-            case ROOM_LEAVE:
-              roomLeaves.push(event)
-              break
-            case ROOM_MEMBERS:
-            case ROOM_ADD_MEMBER:
-            case ROOM_REMOVE_MEMBER:
-              roomMembershipEvents.push(event)
-              break
-          }
-        }
-
-        const roomMembers = new Set(getRoomMembers(url, h, roomMembershipEvents))
-
-        pendingJoins.push(
-          ...removeUndefined(
-            Array.from(groupBy(e => e.pubkey, roomJoins).values()).map(events =>
-              first(sortEventsDesc(events)),
-            ),
-          ).filter(({pubkey, created_at}) => {
-            if (roomMembers.has(pubkey)) return false
-            if (
-              roomMembershipEvents.some(event => {
-                if (event.created_at <= created_at) {
-                  return false
-                }
-
-                if (event.kind === ROOM_MEMBERS) {
-                  return true
-                }
-
-                return getPubkeyTagValues(event.tags).includes(pubkey)
-              })
-            ) {
-              return false
-            }
-            if (roomLeaves.some(e => e.pubkey === pubkey && e.created_at > created_at)) return false
-
-            return true
-          }),
-        )
-      }
-
-      return sortEventsDesc([...reports, ...pendingJoins])
-    },
-  )
-
-// User membership status
-
-export enum MembershipStatus {
-  Initial,
-  Pending,
-  Granted,
-}
-
-export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
-  const store = writable(false)
-
-  if (url) {
-    manageRelay(url, {method: ManagementMethod.SupportedMethods, params: []}).then(res =>
-      store.set(Boolean(res.result?.length)),
-    )
-  }
-
-  return store
-})
-
-export const deriveUserSpaceMembershipStatus = (url: string) => {
-  // Fetch member list and user add/remove events directly in this derivation.
-  const memberListFilters: Filter[] = [{kinds: [RELAY_MEMBERS]}]
-  const userEventFilters: Filter[] = [{kinds: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER]}]
-
-  return derived(
-    [
-      pubkey,
-      deriveRelaySignedEvents(url, memberListFilters),
-      deriveRelaySignedEvents(url, userEventFilters),
-      deriveEventsForUrl(url, [{kinds: [RELAY_JOIN, RELAY_LEAVE]}]),
-      deriveUserIsSpaceAdmin(url),
-    ],
-    ([$pubkey, $memberListEvents, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
-      // If admin, always granted.
-      if ($isAdmin) {
-        return MembershipStatus.Granted
-      }
-
-      const membersEvent = $memberListEvents.find(spec({kind: RELAY_MEMBERS}))
-      const memberList = membersEvent ? uniq(getTagValues("member", membersEvent.tags)) : undefined
-
-      let isMember = false
-
-      if (memberList) {
-        // Member list exists - check if user is in it.
-        isMember = memberList.includes($pubkey!)
-      } else {
-        // No member list available - replay the user's add/remove history.
-        for (const event of sortBy(e => e.created_at, $userAddRemoveEvents)) {
-          if (event.pubkey !== $pubkey) {
-            continue
-          }
-
-          if (event.kind === RELAY_ADD_MEMBER) {
-            isMember = true
-          } else if (event.kind === RELAY_REMOVE_MEMBER) {
-            isMember = false
-          }
-        }
-      }
-
-      for (const event of $joinLeaveEvents) {
-        // Join events indicate pending or granted status, leave resets to initial.
-        if (event.pubkey !== $pubkey) {
-          continue
-        }
-
-        if (event.kind === RELAY_JOIN) {
-          return isMember ? MembershipStatus.Granted : MembershipStatus.Pending
-        }
-
-        if (event.kind === RELAY_LEAVE) {
-          return MembershipStatus.Initial
-        }
-      }
-
-      return isMember ? MembershipStatus.Granted : MembershipStatus.Initial
-    },
-  )
-}
-
-export const deriveUserIsRoomAdmin = (url: string, h: string) =>
-  derived(
-    [pubkey, deriveRoomAdmins(url, h), deriveUserIsSpaceAdmin(url)],
-    ([$pubkey, $admins, $isSpaceAdmin]) => $isSpaceAdmin || $admins.includes($pubkey!),
-  )
-
-export const deriveUserRoomMembershipStatus = (url: string, h: string) => {
-  // Fetch the room member list and the current user's add/remove events.
-  const userEventFilters: Filter[] = [{kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]}]
-  const joinLeaveFilters: Filter[] = [{kinds: [ROOM_JOIN, ROOM_LEAVE], "#h": [h]}]
-
-  return derived(
-    [
-      pubkey,
-      deriveRoomMembers(url, h),
-      deriveEventsForUrl(url, userEventFilters),
-      deriveEventsForUrl(url, joinLeaveFilters),
-      deriveUserIsRoomAdmin(url, h),
-    ],
-    ([$pubkey, $memberList, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
-      // If admin of this room's space, always granted.
-      if ($isAdmin) {
-        return MembershipStatus.Granted
-      }
-
-      let isMember = false
-
-      if ($memberList) {
-        // Member list exists - check if user is in it.
-        isMember = $memberList.includes($pubkey!)
-      } else {
-        // No member list available - replay the user's add/remove history.
-        for (const event of sortEventsAsc($userAddRemoveEvents)) {
-          if (event.pubkey !== $pubkey) {
-            continue
-          }
-
-          if (event.kind === ROOM_ADD_MEMBER) {
-            isMember = true
-          } else if (event.kind === ROOM_REMOVE_MEMBER) {
-            isMember = false
-          }
-        }
-      }
-
-      for (const event of $joinLeaveEvents) {
-        // Join events indicate pending or granted status, leave resets to initial.
-        if (event.pubkey !== $pubkey) {
-          continue
-        }
-
-        if (event.kind === ROOM_JOIN) {
-          return isMember ? MembershipStatus.Granted : MembershipStatus.Pending
-        }
-
-        if (event.kind === ROOM_LEAVE) {
-          return MembershipStatus.Initial
-        }
-      }
-
-      return isMember ? MembershipStatus.Granted : MembershipStatus.Initial
-    },
-  )
-}
-
-export const deriveUserCanCreateRoom = (url: string) => {
-  const filters: Filter[] = [{kinds: [ROOM_CREATE_PERMISSION]}]
-
-  return derived(
-    [pubkey, deriveEventsForUrl(url, filters), deriveUserIsSpaceAdmin(url)],
-    ([$pubkey, $events, $isAdmin]) => {
-      for (const event of $events) {
-        if (getPubkeyTagValues(event.tags).includes($pubkey!)) {
-          return true
-        }
-      }
-
-      return $isAdmin
-    },
-  )
-}
-
-// Feeds
-
-export const feedsByAddress = deriveItemsByKey({
-  repository,
-  getKey: feed => getAddress(feed.event),
-  filters: [{kinds: [FEED]}],
-  eventToItem: readFeed,
-})
-
-export const getFeedsByAddress = getter(feedsByAddress)
-
-export const feeds = deriveItems(feedsByAddress)
-
-export const getFeeds = getter(feeds)
-
-export const getFeed = (address: string) => getFeedsByAddress().get(address)
-
-export const fetchFeed = (address: string) => {
-  const {pubkey} = Address.from(address)
-
-  return load({
-    relays: Router.get().FromPubkey(pubkey).getUrls(),
-    filters: getIdFilters([address]),
-  })
-}
-
-export const loadFeed = makeLoadItem(fetchFeed, getFeed)
-
-export const deriveFeed = makeDeriveItem(feedsByAddress, loadFeed)
-
-// Feeds by pubkey
-
-export const feedsByPubkey = derived(feeds, $feeds => groupBy(f => f.event.pubkey, $feeds))
-
-export const getFeedsByPubkey = getter(feedsByPubkey)
-
-export const getFeedsForPubkey = (pubkey: string) => getFeedsByPubkey().get(pubkey)
-
-export const loadFeedsForPubkey = makeLoadItem(makeOutboxLoader(FEED), getFeedsForPubkey)
-
-export const userFeeds = makeUserData(feedsByPubkey, loadFeedsForPubkey)
-
-export const loadUserFeeds = makeUserLoader(loadFeedsForPubkey)
-
-// Feed favorites
-
-export const feedFavoritesByPubkey = deriveItemsByKey<PublishedList>({
-  repository,
-  getKey: list => list.event.pubkey,
-  filters: [{kinds: [FEEDS]}],
-  eventToItem: async event =>
-    readList(
-      asDecryptedEvent(event, {
-        content: await ensurePlaintext(event),
-      }),
-    ),
-})
-
-export const getFeedFavoritesByPubkey = getter(feedFavoritesByPubkey)
-
-export const getFeedFavorites = (pubkey: string) => getFeedFavoritesByPubkey().get(pubkey)
-
-export const loadFeedFavorites = makeLoadItem(makeOutboxLoader(FEEDS), getFeedFavorites)
-
-export const userFeedFavorites = makeUserData(feedFavoritesByPubkey, loadFeedFavorites)
-
-export const loadUserFeedFavorites = makeUserLoader(loadFeedFavorites)
-
-// Mutes
-
-export const isEventMuted = withGetter(
-  derived(userMuteList, $userMuteList => {
-    const pubkey = $userMuteList?.event.pubkey
-    const tags = getListTags($userMuteList)
-    const mutedEvents = new Set(getEventTagValues(tags))
-    const mutedPubkeys = new Set(getPubkeyTagValues(tags))
-    const mutedAddresses = new Set(getAddressTagValues(tags))
-    const mutedTopics = new Set(getTagValues("t", tags))
-    const mutedWords = getTagValues("word", tags)
-    const regex =
-      mutedWords.length > 0
-        ? new RegExp(`\\b(${mutedWords.map(w => w.toLowerCase().trim()).join("|")})\\b`)
-        : null
-
-    return (e: TrustedEvent) => {
-      if (!pubkey) return false
-      if (pubkey === e.pubkey) return false
-      if (mutedPubkeys.has(e.pubkey)) return true
-      if (mutedEvents.has(e.id)) return true
-      if (mutedAddresses.has(getAddress(e))) return true
-      if (getParentIds(e).some(id => mutedEvents.has(id))) return true
-      if (getParentAddrs(e).some(address => mutedAddresses.has(address))) return true
-      if (getTagValues("t", e.tags).some(t => mutedTopics.has(t))) return true
-
-      if (regex) {
-        if (e.content?.toLowerCase().match(regex)) return true
-        if (displayProfileByPubkey(e.pubkey).toLowerCase().match(regex)) return true
-        if (tryCatch(() => getProfile(e.pubkey)?.nip05?.match(regex))) return true
-      }
-
-      return false
-    }
-  }),
-)
-
-// Other utils
-
-export const encodeRelay = (url: string) =>
-  encodeURIComponent(
-    normalizeRelayUrl(url)
-      .replace(/^wss:\/\//, "")
-      .replace(/\/$/, ""),
-  )
-
-export const decodeRelay = (url: string) => normalizeRelayUrl(decodeURIComponent(url))
-
-export const displayReaction = (content: string) => {
-  if (!content || content === "+") return "❤️"
-  if (content === "-") return "👎"
-  return content
-}
-
-export const deriveSocket = (url: string) => {
-  const socket = Pool.get().get(url)
-
-  return readable(socket, set => {
-    const subs = [
-      on(socket, SocketEvent.Error, () => set(socket)),
-      on(socket, SocketEvent.Status, () => set(socket)),
-      on(socket.auth, AuthStateEvent.Status, () => set(socket)),
-    ]
-
-    return () => subs.forEach(call)
-  })
-}
-
-export const deriveSocketStatus = (url: string) =>
-  throttled(
-    800,
-    derived([deriveSocket(url), relaysMostlyRestricted], ([$socket, $relaysMostlyRestricted]) => {
-      if ($socket.status === SocketStatus.Opening) {
-        return {theme: "warning", title: "Connecting"}
-      }
-
-      if ($socket.status === SocketStatus.Closing) {
-        return {theme: "gray-500", title: "Not Connected"}
-      }
-
-      if ($socket.status === SocketStatus.Closed) {
-        return {theme: "gray-500", title: "Not Connected"}
-      }
-
-      if ($socket.status === SocketStatus.Error) {
-        return {theme: "error", title: "Failed to Connect"}
-      }
-
-      if ($socket.auth.status === AuthStatus.Requested) {
-        return {theme: "warning", title: "Authenticating"}
-      }
-
-      if ($socket.auth.status === AuthStatus.PendingSignature) {
-        return {theme: "warning", title: "Authenticating"}
-      }
-
-      if ($socket.auth.status === AuthStatus.DeniedSignature) {
-        return {theme: "error", title: "Failed to Authenticate"}
-      }
-
-      if ($socket.auth.status === AuthStatus.PendingResponse) {
-        return {theme: "warning", title: "Authenticating"}
-      }
-
-      if ($socket.auth.status === AuthStatus.Forbidden) {
-        return {theme: "error", title: "Access Denied"}
-      }
-
-      if ($relaysMostlyRestricted[url]) {
-        return {theme: "error", title: "Access Denied"}
-      }
-
-      return {theme: "success", title: "Connected"}
-    }),
-  )
-
-export const deriveSupportedMethods = simpleCache(([url]: [string]) => {
-  return readable<ManagementMethod[]>([], set => {
-    manageRelay(url, {
-      method: ManagementMethod.SupportedMethods,
-      params: [],
-    }).then(({result = []}) => set(result))
-  })
-})
-
-export const deriveHasLivekit = simpleCache(([url]: [string]) =>
-  readable<boolean | undefined>(undefined, set => {
-    checkRelayHasLivekit(url).then(has => set(has))
-  }),
-)
-
-export const deriveTimeout = (timeout: number) => {
-  const store = writable<boolean>(false)
-
-  setTimeout(() => store.set(true), timeout)
-
-  return derived(store, identity)
-}
-
-export const shouldIgnoreError = (error: string) => {
-  const isIgnored = error.startsWith("mute: ")
-  const isAborted = error.includes("Signing was aborted")
-  const isStrictNip29Relay = error.includes("missing group (`h`) tag")
-
-  return isIgnored || isAborted || isStrictNip29Relay
-}
-
-export const stripPrefix = (m: string) => m.replace(/^\w+: /, "")
-
-export type InviteData = {url: string; claim: string}
-
-export const parseInviteLink = (invite: string): InviteData | undefined => {
-  if (invite.length < 3 || !invite.includes(".")) {
-    return
-  }
-
-  return (
-    tryCatch(() => {
-      const {r: relay = "", c: claim = ""} = fromPairs(Array.from(new URL(invite).searchParams))
-      const url = normalizeRelayUrl(relay)
-
-      if (isRelayUrl(url)) {
-        return {url, claim}
-      }
-    }) ||
-    tryCatch(() => {
-      const url = normalizeRelayUrl(invite)
-
-      if (isRelayUrl(url)) {
-        return {url, claim: ""}
-      }
-    })
-  )
-}
-
-// Hierarchical notification helpers
-
-export const getShouldNotify = ({alerts}: SettingsValues, url: string, h?: string) => {
-  const pref = alerts.find(spec({url}))
-
-  if (!pref) return true
-  if (!h) return pref.notify
-  if (pref.notify) return !pref.exceptions.includes(h)
-  if (!pref.notify) return pref.exceptions.includes(h)
-}
-
-export const shouldNotify = (url: string, h?: string) => getShouldNotify(getSettings(), url, h)
-
-export const deriveShouldNotify = (url: string, h?: string) =>
-  derived(userSettingsValues, $settings => getShouldNotify($settings, url, h))
-
-// Whatever who cares
-
-export const hasNip50 = (relay?: RelayProfile) =>
-  Boolean(relay?.supported_nips?.map?.(String)?.includes?.("50"))
diff --git a/src/app/core/storage.ts b/src/app/core/storage.ts
deleted file mode 100644
index 32e05969..00000000
--- a/src/app/core/storage.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import {call} from "@welshman/lib"
-import {SecureStorage} from "@aparajita/capacitor-secure-storage"
-import {Preferences} from "@capacitor/preferences"
-import {IDB} from "@lib/indexeddb"
-
-export const kv = call(() => {
-  let p = Promise.resolve()
-
-  const get = async <T>(key: string): Promise<T | undefined> => {
-    const result = await Preferences.get({key})
-    if (!result.value) return undefined
-    try {
-      return JSON.parse(result.value)
-    } catch (e) {
-      return undefined
-    }
-  }
-
-  const set = async <T>(key: string, value: T): Promise<void> => {
-    p = p.then(() => Preferences.set({key, value: JSON.stringify(value)}))
-
-    await p
-  }
-
-  const clear = async () => {
-    p = p.then(() => Preferences.clear())
-
-    await p
-  }
-
-  return {get, set, clear}
-})
-
-export const ss = call(() => {
-  let p = Promise.resolve()
-
-  const get = async <T>(key: string): Promise<T | undefined> => {
-    let value = await SecureStorage.getItem(key)
-
-    if (!value) {
-      const legacy = await Preferences.get({key})
-
-      if (legacy.value) {
-        value = legacy.value
-        await SecureStorage.setItem(key, legacy.value)
-        await Preferences.remove({key})
-      }
-    }
-
-    if (!value) return undefined
-
-    try {
-      return JSON.parse(value)
-    } catch (e) {
-      return undefined
-    }
-  }
-
-  const set = async <T>(key: string, value: T): Promise<void> => {
-    p = p.then(() => SecureStorage.setItem(key, JSON.stringify(value)))
-
-    await p
-  }
-
-  const clear = async () => {
-    p = p.then(() => SecureStorage.clear())
-
-    await p
-  }
-
-  return {get, set, clear}
-})
-
-export const db = new IDB({
-  name: "flotilla-9gl",
-  version: 1,
-  stores: [
-    {name: "events", keyPath: "id"},
-    {name: "tracker", keyPath: "id"},
-    {name: "relays", keyPath: "url"},
-    {name: "relayStats", keyPath: "url"},
-    {name: "handles", keyPath: "nip05"},
-    {name: "zappers", keyPath: "lnurl"},
-    {name: "plaintext", keyPath: "key"},
-    {name: "wrapManager", keyPath: "id"},
-  ],
-})
diff --git a/src/app/deletes.ts b/src/app/deletes.ts
new file mode 100644
index 00000000..ad369714
--- /dev/null
+++ b/src/app/deletes.ts
@@ -0,0 +1,28 @@
+import type {TrustedEvent} from "@welshman/util"
+import {DELETE, getTag, makeEvent} from "@welshman/util"
+import {publishThunk, tagEvent} from "@welshman/app"
+import {PROTECTED} from "@app/groups"
+
+export type DeleteParams = {
+  protect: boolean
+  event: TrustedEvent
+  tags?: string[][]
+}
+
+export const makeDelete = ({protect, event, tags = []}: DeleteParams) => {
+  const thisTags = [["k", String(event.kind)], ...tagEvent(event), ...tags]
+  const groupTag = getTag("h", event.tags)
+
+  if (groupTag) {
+    thisTags.push(groupTag)
+  }
+
+  if (protect) {
+    thisTags.push(PROTECTED)
+  }
+
+  return makeEvent(DELETE, {tags: thisTags})
+}
+
+export const publishDelete = ({relays, ...params}: DeleteParams & {relays: string[]}) =>
+  publishThunk({event: makeDelete(params), relays})
diff --git a/src/app/device.ts b/src/app/device.ts
new file mode 100644
index 00000000..bd1f7154
--- /dev/null
+++ b/src/app/device.ts
@@ -0,0 +1,5 @@
+import {withGetter} from "@welshman/store"
+import {writable} from "svelte/store"
+import {randomId} from "@welshman/lib"
+
+export const device = withGetter(writable(randomId()))
diff --git a/src/app/editor/RoomReferenceNodeView.ts b/src/app/editor/RoomReferenceNodeView.ts
index 146e51f5..5c25bf58 100644
--- a/src/app/editor/RoomReferenceNodeView.ts
+++ b/src/app/editor/RoomReferenceNodeView.ts
@@ -1,6 +1,6 @@
 import type {NodeViewRendererProps} from "@tiptap/core"
 import {displayRelayUrl} from "@welshman/util"
-import {deriveRoom} from "@app/core/state"
+import {deriveRoom} from "@app/groups"
 
 export const RoomReferenceNodeView = ({node}: NodeViewRendererProps) => {
   const dom = document.createElement("span")
diff --git a/src/app/editor/RoomSuggestion.svelte b/src/app/editor/RoomSuggestion.svelte
index 89f4853f..b0182a4b 100644
--- a/src/app/editor/RoomSuggestion.svelte
+++ b/src/app/editor/RoomSuggestion.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import {displayRelayUrl} from "@welshman/util"
   import RoomNameWithImage from "@app/components/RoomNameWithImage.svelte"
-  import {splitRoomId} from "@app/core/state"
+  import {splitRoomId} from "@app/groups"
 
   type Props = {
     value: string
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index ef068772..ab5ef882 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -27,14 +27,9 @@ import ProfileSuggestion from "@app/editor/ProfileSuggestion.svelte"
 import {RoomReferenceExtension} from "@app/editor/RoomReferenceExtension"
 import RoomSuggestion from "@app/editor/RoomSuggestion.svelte"
 import {NativeClipboardPasteExtension} from "@app/editor/clipboard"
-import {uploadFile} from "@app/core/commands"
-import {
-  deriveSpaceMembers,
-  makeRoomId,
-  splitRoomId,
-  userSpaceUrls,
-  roomsByUrl,
-} from "@app/core/state"
+import {uploadFile} from "@app/uploads"
+import {deriveSpaceMembers} from "@app/members"
+import {makeRoomId, splitRoomId, userSpaceUrls, roomsByUrl} from "@app/groups"
 import {pushToast} from "@app/toast"
 
 export const makeEditor = async ({
diff --git a/src/app/env.ts b/src/app/env.ts
new file mode 100644
index 00000000..c37ecd89
--- /dev/null
+++ b/src/app/env.ts
@@ -0,0 +1,60 @@
+import {normalizeRelayUrl} from "@welshman/util"
+import {Capacitor} from "@capacitor/core"
+import {Router} from "@welshman/router"
+import * as nip19 from "nostr-tools/nip19"
+import {identity} from "@welshman/lib"
+
+const fromCsv = (s: string) => (s || "").split(",").filter(identity)
+
+export const PUSH_SERVER = import.meta.env.VITE_PUSH_SERVER
+
+export const PUSH_BRIDGE = normalizeRelayUrl(import.meta.env.VITE_PUSH_BRIDGE)
+
+export const ENABLE_ZAPS = Capacitor.getPlatform() != "ios"
+
+export const SIGNER_RELAYS = fromCsv(import.meta.env.VITE_SIGNER_RELAYS).map(normalizeRelayUrl)
+
+export const BLOCKED_RELAYS = fromCsv(import.meta.env.VITE_BLOCKED_RELAYS).map(normalizeRelayUrl)
+
+export const INDEXER_RELAYS = fromCsv(import.meta.env.VITE_INDEXER_RELAYS).map(normalizeRelayUrl)
+
+export const DEFAULT_RELAYS = fromCsv(import.meta.env.VITE_DEFAULT_RELAYS).map(normalizeRelayUrl)
+
+export const DEFAULT_MESSAGING_RELAYS = fromCsv(import.meta.env.VITE_DEFAULT_MESSAGING_RELAYS).map(
+  normalizeRelayUrl,
+)
+
+export const PLATFORM_RELAYS = fromCsv(import.meta.env.VITE_PLATFORM_RELAYS).map(normalizeRelayUrl)
+
+export const PLATFORM_URL = import.meta.env.VITE_PLATFORM_URL
+
+export const PLATFORM_TERMS = import.meta.env.VITE_PLATFORM_TERMS
+
+export const PLATFORM_PRIVACY = import.meta.env.VITE_PLATFORM_PRIVACY
+
+export const PLATFORM_LOGO = import.meta.env.PROD
+  ? PLATFORM_URL + "/logo.png"
+  : import.meta.env.VITE_PLATFORM_LOGO.replace(/^static/, "") || PLATFORM_URL + "/logo.png"
+
+export const PLATFORM_NAME = import.meta.env.VITE_PLATFORM_NAME
+
+export const PLATFORM_ACCENT = import.meta.env.VITE_PLATFORM_ACCENT
+
+export const PLATFORM_DESCRIPTION = import.meta.env.VITE_PLATFORM_DESCRIPTION
+
+export const POMADE_SIGNERS = fromCsv(import.meta.env.VITE_POMADE_SIGNERS)
+
+export const DEFAULT_BLOSSOM_SERVERS = fromCsv(import.meta.env.VITE_DEFAULT_BLOSSOM_SERVERS)
+
+export const DEFAULT_PUBKEYS = import.meta.env.VITE_DEFAULT_PUBKEYS
+
+export const DUFFLEPUD_URL = "https://dufflepud.onrender.com"
+
+export const THUMBNAIL_URL = import.meta.env.VITE_THUMBNAIL_URL
+
+export const dufflepud = (path: string) => DUFFLEPUD_URL + "/" + path
+
+export const entityLink = (entity: string) => `https://coracle.social/${entity}`
+
+export const pubkeyLink = (pubkey: string, relays = Router.get().FromPubkeys([pubkey]).getUrls()) =>
+  entityLink(nip19.nprofileEncode({pubkey, relays}))
diff --git a/src/app/core/requests.ts b/src/app/feeds.ts
similarity index 76%
rename from src/app/core/requests.ts
rename to src/app/feeds.ts
index b695cc3f..f743f19d 100644
--- a/src/app/core/requests.ts
+++ b/src/app/feeds.ts
@@ -1,39 +1,108 @@
-import {writable} from "svelte/store"
+import {deriveItems, deriveItemsByKey, getter, makeDeriveItem, makeLoadItem} from "@welshman/store"
+import {
+  ensurePlaintext,
+  makeOutboxLoader,
+  makeUserData,
+  makeUserLoader,
+  repository,
+  tracker,
+} from "@welshman/app"
+import {derived, writable} from "svelte/store"
 import {
   batch,
+  between,
   call,
-  uniq,
-  int,
-  YEAR,
-  WEEK,
+  groupBy,
   insertAt,
-  sortBy,
+  int,
   now,
   on,
-  between,
-  isDefined,
-  filterVals,
-  fromPairs,
+  sortBy,
+  WEEK,
+  YEAR,
 } from "@welshman/lib"
 import {
+  Address,
   EVENT_TIME,
-  RELAY_INVITE,
-  matchFilters,
-  getTagValue,
+  FEED,
+  FEEDS,
+  asDecryptedEvent,
   getAddress,
-  isShareableRelayUrl,
-  getRelaysFromList,
+  getIdFilters,
+  getTagValue,
+  matchFilters,
+  readList,
   sortEventsDesc,
 } from "@welshman/util"
-import type {TrustedEvent, Filter, List} from "@welshman/util"
-import {load, request, mergeRepositoryUpdates} from "@welshman/net"
+import type {Filter, PublishedList, TrustedEvent} from "@welshman/util"
+import {load, mergeRepositoryUpdates, request} from "@welshman/net"
 import type {RepositoryUpdate} from "@welshman/net"
-import {repository, loadRelay, tracker} from "@welshman/app"
+import {Router} from "@welshman/router"
 import {createScroller} from "@lib/html"
 import {daysBetween} from "@lib/util"
-import {getEventsForUrl} from "@app/core/state"
+import {readFeed} from "@lib/feeds"
+import {getEventsForUrl} from "@app/repository"
+export const feedsByAddress = deriveItemsByKey({
+  repository,
+  getKey: feed => getAddress(feed.event),
+  filters: [{kinds: [FEED]}],
+  eventToItem: readFeed,
+})
 
-// Utils
+export const getFeedsByAddress = getter(feedsByAddress)
+
+export const feeds = deriveItems(feedsByAddress)
+
+export const getFeeds = getter(feeds)
+
+export const getFeed = (address: string) => getFeedsByAddress().get(address)
+
+export const fetchFeed = (address: string) => {
+  const {pubkey} = Address.from(address)
+
+  return load({
+    relays: Router.get().FromPubkey(pubkey).getUrls(),
+    filters: getIdFilters([address]),
+  })
+}
+
+export const loadFeed = makeLoadItem(fetchFeed, getFeed)
+
+export const deriveFeed = makeDeriveItem(feedsByAddress, loadFeed)
+
+export const feedsByPubkey = derived(feeds, $feeds => groupBy(f => f.event.pubkey, $feeds))
+
+export const getFeedsByPubkey = getter(feedsByPubkey)
+
+export const getFeedsForPubkey = (pubkey: string) => getFeedsByPubkey().get(pubkey)
+
+export const loadFeedsForPubkey = makeLoadItem(makeOutboxLoader(FEED), getFeedsForPubkey)
+
+export const userFeeds = makeUserData(feedsByPubkey, loadFeedsForPubkey)
+
+export const loadUserFeeds = makeUserLoader(loadFeedsForPubkey)
+
+export const feedFavoritesByPubkey = deriveItemsByKey<PublishedList>({
+  repository,
+  getKey: list => list.event.pubkey,
+  filters: [{kinds: [FEEDS]}],
+  eventToItem: async event =>
+    readList(
+      asDecryptedEvent(event, {
+        content: await ensurePlaintext(event),
+      }),
+    ),
+})
+
+export const getFeedFavoritesByPubkey = getter(feedFavoritesByPubkey)
+
+export const getFeedFavorites = (pubkey: string) => getFeedFavoritesByPubkey().get(pubkey)
+
+export const loadFeedFavorites = makeLoadItem(makeOutboxLoader(FEEDS), getFeedFavorites)
+
+export const userFeedFavorites = makeUserData(feedFavoritesByPubkey, loadFeedFavorites)
+
+export const loadUserFeedFavorites = makeUserLoader(loadFeedFavorites)
 
 export const makeFeed = ({
   url,
@@ -344,27 +413,3 @@ export const makeCalendarFeed = ({
     },
   }
 }
-
-// Domain specific
-
-export const discoverRelays = (lists: List[]) =>
-  Promise.all(
-    uniq(lists.flatMap($l => getRelaysFromList($l)))
-      .filter(isShareableRelayUrl)
-      .map(url => loadRelay(url)),
-  )
-
-export const requestRelayClaim = async (url: string) => {
-  const filters = [{kinds: [RELAY_INVITE], limit: 1}]
-  const events = await load({filters, relays: [url]})
-
-  if (events.length > 0) {
-    return getTagValue("claim", events[0].tags)
-  }
-}
-
-export const requestRelayClaims = async (urls: string[]) =>
-  filterVals(
-    isDefined,
-    fromPairs(await Promise.all(urls.map(async url => [url, await requestRelayClaim(url)]))),
-  )
diff --git a/src/app/groups.ts b/src/app/groups.ts
new file mode 100644
index 00000000..6eb441de
--- /dev/null
+++ b/src/app/groups.ts
@@ -0,0 +1,398 @@
+import * as nip19 from "nostr-tools/nip19"
+import {
+  MESSAGE,
+  ROOMS,
+  ROOM_DELETE,
+  ROOM_META,
+  addToListPublicly,
+  asDecryptedEvent,
+  getGroupTags,
+  getListTags,
+  getRelayTagValues,
+  getTagValues,
+  isRelayUrl,
+  makeEvent,
+  makeList,
+  makeRoomMeta,
+  normalizeRelayUrl,
+  readList,
+  readRoomMeta,
+  removeFromListByPredicate,
+  toNostrURI,
+  updateList,
+  RelayMode,
+} from "@welshman/util"
+import type {EventContent, List, PublishedRoomMeta, RoomMeta, TrustedEvent} from "@welshman/util"
+import {
+  deriveEventsByIdByUrl,
+  deriveItemsByKey,
+  getter,
+  makeDeriveItem,
+  makeLoadItem,
+} from "@welshman/store"
+import {
+  getPubkeyRelays,
+  makeOutboxLoader,
+  makeUserData,
+  makeUserLoader,
+  nip44EncryptToSelf,
+  publishThunk,
+  repository,
+  tagEventForQuote,
+  tagPubkey,
+  tracker,
+} from "@welshman/app"
+import {derived, get} from "svelte/store"
+import {
+  addToMapKey,
+  call,
+  equals,
+  gte,
+  identity,
+  indexBy,
+  max,
+  partition,
+  sortBy,
+  spec,
+  tryCatch,
+  uniq,
+  uniqBy,
+} from "@welshman/lib"
+import {load} from "@welshman/net"
+import {Router} from "@welshman/router"
+import {INDEXER_RELAYS} from "@app/env"
+
+export const ROOM = "h"
+
+export const PROTECTED = ["-"]
+
+export enum RoomType {
+  Text = "text",
+  Voice = "voice",
+}
+
+export type Room = PublishedRoomMeta & {
+  id: string
+  url: string
+}
+
+export const getRoomType = (room: RoomMeta): RoomType =>
+  room.livekit ? RoomType.Voice : RoomType.Text
+
+export const makeRoomId = (url: string, h: string) => `${url}'${h}`
+
+export const isRoomId = (id: string) => id.includes("'")
+
+export const splitRoomId = (id: string) => id.split("'")
+
+export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
+  tracker,
+  repository,
+  filters: [{kinds: [ROOM_META, ROOM_DELETE]}],
+})
+
+export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByUrl => {
+  const result = new Map<string, Room[]>()
+
+  for (const [url, events] of roomMetaEventsByIdByUrl.entries()) {
+    const [metaEvents, deleteEvents] = partition(spec({kind: ROOM_META}), events.values())
+    const deletedByH = new Map<string, number>()
+
+    for (const event of deleteEvents) {
+      for (const h of getTagValues("h", event.tags)) {
+        deletedByH.set(h, max([deletedByH.get(h), event.created_at]))
+      }
+    }
+
+    const metaById = new Map<string, Room>()
+
+    for (const event of metaEvents) {
+      const meta = tryCatch(() => readRoomMeta(event))
+
+      if (!meta || gte(deletedByH.get(meta.h), meta.event.created_at)) {
+        continue
+      }
+
+      const id = makeRoomId(url, meta.h)
+
+      metaById.set(id, {...meta, url, id})
+    }
+
+    if (metaById.size > 0) {
+      result.set(url, Array.from(metaById.values()))
+    }
+  }
+
+  return result
+})
+
+export const roomsById = derived(roomsByUrl, roomsByUrl =>
+  indexBy(room => room.id, Array.from(roomsByUrl.values()).flatMap(identity)),
+)
+
+export const getRoomsById = getter(roomsById)
+
+export const getRoom = (id: string) => getRoomsById().get(id)
+
+export const loadRoom = call(() => {
+  const _fetchRoom = async (id: string) => {
+    const [url, h] = splitRoomId(id)
+
+    await load({
+      relays: [url],
+      filters: [
+        {kinds: [ROOM_META], "#d": [h]},
+        {kinds: [ROOM_DELETE], "#h": [h]},
+      ],
+    })
+  }
+
+  const _loadRoom = makeLoadItem(_fetchRoom, getRoom)
+
+  return (url: string, h: string) => _loadRoom(makeRoomId(url, h))
+})
+
+export const deriveRoom = call(() => {
+  const _deriveRoom = makeDeriveItem(roomsById, loadRoom)
+
+  return (url: string, h: string) =>
+    derived(
+      _deriveRoom(makeRoomId(url, h)),
+      room => (room || {url, id: makeRoomId(url, h), ...makeRoomMeta({h})}) as Room,
+    )
+})
+
+export const displayRoom = (url: string, h: string) => getRoom(makeRoomId(url, h))?.name || h
+
+export const roomComparator = (url: string) => (h: string) => displayRoom(url, h).toLowerCase()
+
+export const deriveVoiceRooms = (url: string) =>
+  derived(roomsById, $roomsById => {
+    const set = new Set<string>()
+    for (const room of $roomsById.values()) {
+      if (room.url === url && room.livekit) {
+        set.add(room.h)
+      }
+    }
+    return set
+  })
+
+export const deriveOtherVoiceRooms = (url: string) =>
+  derived([deriveVoiceRooms(url), deriveUserRooms(url)], ([$roomsWithLivekit, $userRooms]) => {
+    const rooms: string[] = []
+
+    for (const h of $roomsWithLivekit) {
+      if (!$userRooms.includes(h)) {
+        rooms.push(h)
+      }
+    }
+
+    return sortBy(roomComparator(url), uniq(rooms))
+  })
+
+// User space/room lists
+
+export const groupListsByPubkey = deriveItemsByKey({
+  repository,
+  filters: [{kinds: [ROOMS]}],
+  getKey: list => list.event.pubkey,
+  eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
+})
+
+export const getGroupListsByPubkey = getter(groupListsByPubkey)
+
+export const getGroupList = (pubkey: string) => getGroupListsByPubkey().get(pubkey)
+
+export const loadGroupList = makeLoadItem(makeOutboxLoader(ROOMS), getGroupList)
+
+export const deriveGroupList = makeDeriveItem(groupListsByPubkey, loadGroupList)
+
+export const groupListPubkeysByUrl = derived(groupListsByPubkey, $groupListsByPubkey => {
+  const result = new Map<string, Set<string>>()
+
+  for (const list of $groupListsByPubkey.values()) {
+    const tags = getListTags(list)
+
+    for (const url of getRelayTagValues(tags)) {
+      addToMapKey(result, url, list.event.pubkey)
+    }
+
+    for (const tag of getGroupTags(tags)) {
+      const url = tag[2] || ""
+
+      if (isRelayUrl(url)) {
+        addToMapKey(result, url, list.event.pubkey)
+      }
+    }
+  }
+
+  return result
+})
+
+export const deriveGroupListPubkeys = (url: string) =>
+  derived(groupListPubkeysByUrl, $groupListPubkeysByUrl => new Set($groupListPubkeysByUrl.get(url)))
+
+export const getSpaceUrlsFromGroupList = (groupList: List | undefined) => {
+  const tags = getListTags(groupList)
+  const urls = getRelayTagValues(tags)
+
+  for (const tag of getGroupTags(tags)) {
+    const url = tag[2] || ""
+
+    if (isRelayUrl(url)) {
+      urls.push(url)
+    }
+  }
+
+  return uniqBy(normalizeRelayUrl, urls)
+}
+
+export const getSpaceRoomsFromGroupList = (url: string, groupList: List | undefined) => {
+  const rooms: string[] = []
+
+  for (const [_, h, relay] of getGroupTags(getListTags(groupList))) {
+    if (url === relay) {
+      rooms.push(h)
+    }
+  }
+
+  return sortBy(roomComparator(url), uniq(rooms))
+}
+
+export const userGroupList = makeUserData(groupListsByPubkey, loadGroupList)
+
+export const loadUserGroupList = makeUserLoader(loadGroupList)
+
+export const userSpaceUrls = derived(userGroupList, getSpaceUrlsFromGroupList)
+
+export const deriveUserRooms = (url: string) =>
+  derived([userGroupList, roomsById], ([$userGroupList, $roomsById]) => {
+    const rooms: string[] = []
+
+    for (const h of getSpaceRoomsFromGroupList(url, $userGroupList)) {
+      if ($roomsById.has(makeRoomId(url, h))) {
+        rooms.push(h)
+      }
+    }
+
+    return sortBy(roomComparator(url), rooms)
+  })
+
+export const deriveOtherRooms = (url: string) =>
+  derived(
+    [deriveUserRooms(url), deriveVoiceRooms(url), roomsByUrl],
+    ([$userRooms, voiceRooms, $roomsByUrl]) => {
+      const rooms: string[] = []
+
+      for (const {h} of $roomsByUrl.get(url) || []) {
+        if (!$userRooms.includes(h) && !voiceRooms.has(h)) {
+          rooms.push(h)
+        }
+      }
+
+      return sortBy(roomComparator(url), uniq(rooms))
+    },
+  )
+
+export const addSpace = async (url: string) => {
+  const list = get(userGroupList) || makeList({kind: ROOMS})
+  const event = await addToListPublicly(list, ["r", url]).reconcile(nip44EncryptToSelf)
+  const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
+
+  return publishThunk({event, relays})
+}
+
+export const removeSpace = async (url: string) => {
+  const list = get(userGroupList) || makeList({kind: ROOMS})
+  const pred = (t: string[]) => normalizeRelayUrl(t[t[0] === "r" ? 1 : 2]) === url
+  const event = await removeFromListByPredicate(list, pred).reconcile(nip44EncryptToSelf)
+  const relays = uniq([url, ...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
+
+  return publishThunk({event, relays})
+}
+
+export const setSpaceOrder = async (urls: string[]) => {
+  const list = get(userGroupList) || makeList({kind: ROOMS})
+  const orderedUrls = uniq(urls.map(normalizeRelayUrl))
+  const relayTags = list.publicTags.filter(t => t[0] === "r")
+  const otherPublicTags = list.publicTags.filter(t => t[0] !== "r")
+  const relayTagByUrl = new Map(relayTags.map(t => [normalizeRelayUrl(t[1]), t]))
+  const orderedRelayTags = orderedUrls.map(url => relayTagByUrl.get(url) || ["r", url])
+  const publicTags = [...orderedRelayTags, ...otherPublicTags]
+  const event = await updateList(list, {publicTags}).reconcile(nip44EncryptToSelf)
+  const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
+
+  return publishThunk({event, relays})
+}
+
+export const addRoom = async (url: string, h: string) => {
+  const list = get(userGroupList) || makeList({kind: ROOMS})
+  const newTags = [
+    ["r", url],
+    ["group", h, url],
+  ]
+  const event = await addToListPublicly(list, ...newTags).reconcile(nip44EncryptToSelf)
+  const relays = uniq([...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
+
+  return publishThunk({event, relays})
+}
+
+export const removeRoom = async (url: string, h: string) => {
+  const list = get(userGroupList) || makeList({kind: ROOMS})
+  const pred = (t: string[]) => equals(["group", h, url], t.slice(0, 3))
+  const event = await removeFromListByPredicate(list, pred).reconcile(nip44EncryptToSelf)
+  const relays = uniq([url, ...Router.get().FromUser().getUrls(), ...getRelayTagValues(event.tags)])
+
+  return publishThunk({event, relays})
+}
+
+export const getPubkeyHints = (pubkey: string) => {
+  const relays = getPubkeyRelays(pubkey, RelayMode.Write)
+  const hints = relays.length ? relays : INDEXER_RELAYS
+
+  return hints
+}
+
+export const prependParent = (
+  parent: TrustedEvent | undefined,
+  {content, tags}: EventContent,
+  url?: string,
+) => {
+  if (parent) {
+    const relays = url ? [url] : Router.get().Event(parent).limit(3).getUrls()
+    const nevent = nip19.neventEncode({...parent, relays})
+
+    tags = [...tags, tagEventForQuote(parent, url), tagPubkey(parent.pubkey)]
+    content = toNostrURI(nevent) + "\n\n" + content
+  }
+
+  return {content, tags}
+}
+
+export const publishRoomQuote = ({
+  url,
+  h,
+  parent,
+  protect,
+  delay,
+}: {
+  url: string
+  h?: string
+  parent: TrustedEvent
+  protect: boolean
+  delay?: number
+}) => {
+  const tags: string[][] = []
+
+  if (h) {
+    tags.push(["h", h])
+  }
+
+  if (protect) {
+    tags.push(PROTECTED)
+  }
+
+  const event = makeEvent(MESSAGE, prependParent(parent, {content: "", tags}, url))
+
+  return publishThunk({relays: [url], event, delay})
+}
diff --git a/src/app/healthChecks.ts b/src/app/healthChecks.ts
index f9f6f61a..27e7eff2 100644
--- a/src/app/healthChecks.ts
+++ b/src/app/healthChecks.ts
@@ -11,7 +11,8 @@ import {
   userSearchRelayList,
   userMessagingRelayList,
 } from "@welshman/app"
-import {hasNip50, DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/core/state"
+import {hasNip50} from "@app/relays"
+import {DEFAULT_RELAYS, DEFAULT_MESSAGING_RELAYS} from "@app/env"
 
 export type HealthCheckContext = {
   readRelays: string[]
diff --git a/src/app/invites.ts b/src/app/invites.ts
new file mode 100644
index 00000000..a38a9ba2
--- /dev/null
+++ b/src/app/invites.ts
@@ -0,0 +1,27 @@
+import {fromPairs, tryCatch} from "@welshman/lib"
+import {isRelayUrl, normalizeRelayUrl} from "@welshman/util"
+export type InviteData = {url: string; claim: string}
+
+export const parseInviteLink = (invite: string): InviteData | undefined => {
+  if (invite.length < 3 || !invite.includes(".")) {
+    return
+  }
+
+  return (
+    tryCatch(() => {
+      const {r: relay = "", c: claim = ""} = fromPairs(Array.from(new URL(invite).searchParams))
+      const url = normalizeRelayUrl(relay)
+
+      if (isRelayUrl(url)) {
+        return {url, claim}
+      }
+    }) ||
+    tryCatch(() => {
+      const url = normalizeRelayUrl(invite)
+
+      if (isRelayUrl(url)) {
+        return {url, claim: ""}
+      }
+    })
+  )
+}
diff --git a/src/app/lightning.ts b/src/app/lightning.ts
new file mode 100644
index 00000000..d7f7fae2
--- /dev/null
+++ b/src/app/lightning.ts
@@ -0,0 +1,100 @@
+import {nwc} from "@getalby/sdk"
+import {session} from "@welshman/app"
+
+export const getWebLn = () => (window as any).webln
+
+export const getNwcClient = () => {
+  const $session = session.get()
+
+  if (!$session?.wallet || $session.wallet.type !== "nwc") {
+    throw new Error("No NWC wallet is connected")
+  }
+
+  const {info} = $session.wallet
+
+  if (info.nostrWalletConnectUrl) {
+    return new nwc.NWCClient({nostrWalletConnectUrl: info.nostrWalletConnectUrl})
+  }
+
+  return new nwc.NWCClient(info)
+}
+
+export const payInvoice = async (invoice: string, msats?: number) => {
+  const $session = session.get()
+
+  if (!$session?.wallet) {
+    throw new Error("No wallet is connected")
+  }
+
+  if ($session.wallet.type === "nwc") {
+    const params: {invoice: string; amount?: number} = {invoice}
+    if (msats) params.amount = msats
+    return getNwcClient().payInvoice(params)
+  } else if ($session.wallet.type === "webln") {
+    if (msats) throw new Error("Unable to pay zero invoices with webln")
+    return getWebLn()
+      .enable()
+      .then(() => getWebLn().sendPayment(invoice))
+  }
+}
+
+export type CreateInvoiceParams = {
+  sats: number
+  description?: string
+}
+
+export const createInvoice = async ({
+  sats,
+  description = "Receive via lightning",
+}: CreateInvoiceParams) => {
+  const $session = session.get()
+
+  if (!$session?.wallet) {
+    throw new Error("No wallet is connected")
+  }
+
+  const satAmount = Math.floor(sats)
+
+  if (!Number.isFinite(satAmount) || satAmount <= 0) {
+    throw new Error("Invalid satoshi amount")
+  }
+
+  if ($session.wallet.type === "nwc") {
+    const createdInvoice = await getNwcClient().makeInvoice({
+      amount: satAmount * 1000,
+      description,
+    })
+
+    if (!createdInvoice.invoice) {
+      throw new Error("NWC wallet failed to return an invoice")
+    }
+
+    return createdInvoice.invoice
+  }
+
+  if ($session.wallet.type === "webln") {
+    const webLn = getWebLn()
+
+    if (!webLn) {
+      throw new Error("WebLN not available")
+    }
+
+    await webLn.enable()
+
+    const response = await webLn.makeInvoice({
+      amount: satAmount,
+      defaultMemo: description,
+    })
+
+    const paymentRequest =
+      typeof response === "string" ? response : response?.paymentRequest || response?.pr || ""
+
+    if (!paymentRequest) {
+      throw new Error("Invalid payment request returned from WebLN")
+    }
+
+    return paymentRequest
+  }
+
+  throw new Error("Unsupported wallet type")
+}
diff --git a/src/app/members.ts b/src/app/members.ts
new file mode 100644
index 00000000..9b5704ed
--- /dev/null
+++ b/src/app/members.ts
@@ -0,0 +1,315 @@
+import {derived, writable} from "svelte/store"
+import {
+  ManagementMethod,
+  RELAY_ADD_MEMBER,
+  RELAY_JOIN,
+  RELAY_LEAVE,
+  RELAY_MEMBERS,
+  RELAY_REMOVE_MEMBER,
+  ROOM_ADD_MEMBER,
+  ROOM_ADMINS,
+  ROOM_CREATE_PERMISSION,
+  ROOM_JOIN,
+  ROOM_LEAVE,
+  ROOM_MEMBERS,
+  ROOM_REMOVE_MEMBER,
+  getPubkeyTagValues,
+  getTagValue,
+  getTagValues,
+  sortEventsAsc,
+} from "@welshman/util"
+import type {Filter, PublishedRoomMeta, TrustedEvent} from "@welshman/util"
+import {first, memoize, sortBy, spec, uniq} from "@welshman/lib"
+import {addRoomMember, manageRelay, pubkey, waitForThunkError} from "@welshman/app"
+import {get} from "svelte/store"
+import {deriveEventsForUrl, deriveRelaySignedEvents} from "@app/repository"
+export const deriveSpaceMembers = (url: string) =>
+  derived(deriveRelaySignedEvents(url, [{kinds: [RELAY_MEMBERS]}]), ([event]) =>
+    uniq(getTagValues("member", event?.tags ?? [])),
+  )
+
+export const deriveRoomMembers = (url: string, h: string) => {
+  const filters: Filter[] = [{kinds: [ROOM_MEMBERS], "#d": [h]}]
+
+  return derived(deriveEventsForUrl(url, filters), ([event]) =>
+    uniq(getPubkeyTagValues(event?.tags ?? [])),
+  )
+}
+
+export type BannedPubkeyItem = {
+  pubkey: string
+  reason: string
+}
+
+export const spaceBannedPubkeyItems = new Map<string, BannedPubkeyItem[]>()
+
+export const deriveSpaceBannedPubkeyItems = (url: string) => {
+  const store = writable(spaceBannedPubkeyItems.get(url) || [])
+
+  manageRelay(url, {method: ManagementMethod.ListBannedPubkeys, params: []}).then(res => {
+    spaceBannedPubkeyItems.set(url, res.result)
+    store.set(res.result)
+  })
+
+  return store
+}
+
+export const deriveRoomAdmins = (url: string, h: string) => {
+  const filters: Filter[] = [{kinds: [ROOM_ADMINS], "#d": [h]}]
+
+  return derived(deriveEventsForUrl(url, filters), $events => {
+    const adminsEvent = first($events)
+
+    if (adminsEvent) {
+      return getPubkeyTagValues(adminsEvent.tags)
+    }
+
+    return []
+  })
+}
+
+export const getRoomMembers = (_url: string, h: string, events: TrustedEvent[]) => {
+  const members = new Set<string>()
+
+  for (const event of sortEventsAsc(events)) {
+    if (event.kind === ROOM_MEMBERS && getTagValue("d", event.tags) === h) {
+      members.clear()
+
+      for (const pubkey of uniq(getPubkeyTagValues(event.tags))) {
+        members.add(pubkey)
+      }
+
+      continue
+    }
+
+    if (getTagValue("h", event.tags) !== h) {
+      continue
+    }
+
+    const pubkeys = getPubkeyTagValues(event.tags)
+
+    if (event.kind === ROOM_ADD_MEMBER) {
+      for (const pubkey of pubkeys) {
+        members.add(pubkey)
+      }
+    }
+
+    if (event.kind === ROOM_REMOVE_MEMBER) {
+      for (const pubkey of pubkeys) {
+        members.delete(pubkey)
+      }
+    }
+  }
+
+  return Array.from(members)
+}
+
+// User membership status
+
+export enum MembershipStatus {
+  Initial,
+  Pending,
+  Granted,
+}
+
+export const deriveUserIsSpaceAdmin = memoize((url?: string) => {
+  const store = writable(false)
+
+  if (url) {
+    manageRelay(url, {method: ManagementMethod.SupportedMethods, params: []}).then(res =>
+      store.set(Boolean(res.result?.length)),
+    )
+  }
+
+  return store
+})
+
+export const deriveUserSpaceMembershipStatus = (url: string) => {
+  // Fetch member list and user add/remove events directly in this derivation.
+  const memberListFilters: Filter[] = [{kinds: [RELAY_MEMBERS]}]
+  const userEventFilters: Filter[] = [{kinds: [RELAY_ADD_MEMBER, RELAY_REMOVE_MEMBER]}]
+
+  return derived(
+    [
+      pubkey,
+      deriveRelaySignedEvents(url, memberListFilters),
+      deriveRelaySignedEvents(url, userEventFilters),
+      deriveEventsForUrl(url, [{kinds: [RELAY_JOIN, RELAY_LEAVE]}]),
+      deriveUserIsSpaceAdmin(url),
+    ],
+    ([$pubkey, $memberListEvents, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
+      // If admin, always granted.
+      if ($isAdmin) {
+        return MembershipStatus.Granted
+      }
+
+      const membersEvent = $memberListEvents.find(spec({kind: RELAY_MEMBERS}))
+      const memberList = membersEvent ? uniq(getTagValues("member", membersEvent.tags)) : undefined
+
+      let isMember = false
+
+      if (memberList) {
+        // Member list exists - check if user is in it.
+        isMember = memberList.includes($pubkey!)
+      } else {
+        // No member list available - replay the user's add/remove history.
+        for (const event of sortBy(e => e.created_at, $userAddRemoveEvents)) {
+          if (event.pubkey !== $pubkey) {
+            continue
+          }
+
+          if (event.kind === RELAY_ADD_MEMBER) {
+            isMember = true
+          } else if (event.kind === RELAY_REMOVE_MEMBER) {
+            isMember = false
+          }
+        }
+      }
+
+      for (const event of $joinLeaveEvents) {
+        // Join events indicate pending or granted status, leave resets to initial.
+        if (event.pubkey !== $pubkey) {
+          continue
+        }
+
+        if (event.kind === RELAY_JOIN) {
+          return isMember ? MembershipStatus.Granted : MembershipStatus.Pending
+        }
+
+        if (event.kind === RELAY_LEAVE) {
+          return MembershipStatus.Initial
+        }
+      }
+
+      return isMember ? MembershipStatus.Granted : MembershipStatus.Initial
+    },
+  )
+}
+
+export const deriveUserIsRoomAdmin = (url: string, h: string) =>
+  derived(
+    [pubkey, deriveRoomAdmins(url, h), deriveUserIsSpaceAdmin(url)],
+    ([$pubkey, $admins, $isSpaceAdmin]) => $isSpaceAdmin || $admins.includes($pubkey!),
+  )
+
+export const deriveUserRoomMembershipStatus = (url: string, h: string) => {
+  // Fetch the room member list and the current user's add/remove events.
+  const userEventFilters: Filter[] = [{kinds: [ROOM_ADD_MEMBER, ROOM_REMOVE_MEMBER], "#h": [h]}]
+  const joinLeaveFilters: Filter[] = [{kinds: [ROOM_JOIN, ROOM_LEAVE], "#h": [h]}]
+
+  return derived(
+    [
+      pubkey,
+      deriveRoomMembers(url, h),
+      deriveEventsForUrl(url, userEventFilters),
+      deriveEventsForUrl(url, joinLeaveFilters),
+      deriveUserIsRoomAdmin(url, h),
+    ],
+    ([$pubkey, $memberList, $userAddRemoveEvents, $joinLeaveEvents, $isAdmin]) => {
+      // If admin of this room's space, always granted.
+      if ($isAdmin) {
+        return MembershipStatus.Granted
+      }
+
+      let isMember = false
+
+      if ($memberList) {
+        // Member list exists - check if user is in it.
+        isMember = $memberList.includes($pubkey!)
+      } else {
+        // No member list available - replay the user's add/remove history.
+        for (const event of sortEventsAsc($userAddRemoveEvents)) {
+          if (event.pubkey !== $pubkey) {
+            continue
+          }
+
+          if (event.kind === ROOM_ADD_MEMBER) {
+            isMember = true
+          } else if (event.kind === ROOM_REMOVE_MEMBER) {
+            isMember = false
+          }
+        }
+      }
+
+      for (const event of $joinLeaveEvents) {
+        // Join events indicate pending or granted status, leave resets to initial.
+        if (event.pubkey !== $pubkey) {
+          continue
+        }
+
+        if (event.kind === ROOM_JOIN) {
+          return isMember ? MembershipStatus.Granted : MembershipStatus.Pending
+        }
+
+        if (event.kind === ROOM_LEAVE) {
+          return MembershipStatus.Initial
+        }
+      }
+
+      return isMember ? MembershipStatus.Granted : MembershipStatus.Initial
+    },
+  )
+}
+
+export const deriveUserCanCreateRoom = (url: string) => {
+  const filters: Filter[] = [{kinds: [ROOM_CREATE_PERMISSION]}]
+
+  return derived(
+    [pubkey, deriveEventsForUrl(url, filters), deriveUserIsSpaceAdmin(url)],
+    ([$pubkey, $events, $isAdmin]) => {
+      for (const event of $events) {
+        if (getPubkeyTagValues(event.tags).includes($pubkey!)) {
+          return true
+        }
+      }
+
+      return $isAdmin
+    },
+  )
+}
+
+export const addSpaceMembers = async (
+  url: string,
+  pubkeys: string[],
+): Promise<string | undefined> => {
+  const spaceMembers = get(deriveSpaceMembers(url))
+
+  const results = await Promise.all(
+    pubkeys
+      .filter(pubkey => !spaceMembers || !spaceMembers.includes(pubkey))
+      .map(pubkey =>
+        manageRelay(url, {
+          method: ManagementMethod.AllowPubkey,
+          params: [pubkey],
+        }),
+      ),
+  )
+
+  for (const {error} of results) {
+    if (error) {
+      return error
+    }
+  }
+}
+
+export const addRoomMembers = async (
+  url: string,
+  room: PublishedRoomMeta,
+  pubkeys: string[],
+): Promise<string | undefined> => {
+  const error = await addSpaceMembers(url, pubkeys)
+
+  if (error) {
+    return error
+  }
+
+  const errors = await Promise.all(
+    pubkeys.map(pubkey => waitForThunkError(addRoomMember(url, room, pubkey))),
+  )
+
+  for (const error of errors) {
+    if (error) {
+      return error
+    }
+  }
+}
diff --git a/src/app/nip46.ts b/src/app/nip46.ts
index 16aa3723..5388c0dd 100644
--- a/src/app/nip46.ts
+++ b/src/app/nip46.ts
@@ -1,14 +1,20 @@
+import {
+  CLASSIFIED,
+  CLIENT_AUTH,
+  COMMENT,
+  MESSAGE,
+  REACTION,
+  RELAY_JOIN,
+  ROOMS,
+  THREAD,
+  WRAP,
+  ZAP_REQUEST,
+} from "@welshman/util"
 import {get, writable} from "svelte/store"
 import type {Nip46ResponseWithResult} from "@welshman/signer"
 import {Nip46Broker} from "@welshman/signer"
 import {makeSecret} from "@welshman/util"
-import {
-  PLATFORM_URL,
-  PLATFORM_NAME,
-  PLATFORM_LOGO,
-  SIGNER_RELAYS,
-  NIP46_PERMS,
-} from "@app/core/state"
+import {PLATFORM_URL, PLATFORM_NAME, PLATFORM_LOGO, SIGNER_RELAYS} from "@app/env"
 import {pushToast} from "@app/toast"
 
 const APP_SCHEME = "social.flotilla"
@@ -27,6 +33,23 @@ const makeSignerLaunchUrl = (nostrconnectUrl: string) => {
   return `nostrsigner://x-callback-url/auth/nip46?${params.toString()}`
 }
 
+export const NIP46_PERMS =
+  "nip44_encrypt,nip44_decrypt," +
+  [
+    CLIENT_AUTH,
+    RELAY_JOIN,
+    MESSAGE,
+    THREAD,
+    CLASSIFIED,
+    COMMENT,
+    ROOMS,
+    WRAP,
+    REACTION,
+    ZAP_REQUEST,
+  ]
+    .map(k => `sign_event:${k}`)
+    .join(",")
+
 export class Nip46Controller {
   url = writable("")
   bunker = writable("")
diff --git a/src/app/notifications.ts b/src/app/notifications.ts
index 2a61b8b0..f0beca2e 100644
--- a/src/app/notifications.ts
+++ b/src/app/notifications.ts
@@ -13,18 +13,13 @@ import {
   makeHttpAuthHeader,
 } from "@welshman/util"
 import {makeSpacePath, makeRoomPath, makeSpaceChatPath, makeChatPath} from "@app/routes"
-import {
-  CONTENT_KINDS,
-  notificationSettings,
-  chatsById,
-  userGroupList,
-  getSpaceUrlsFromGroupList,
-  makeCommentFilter,
-  hasNip29,
-  dufflepud,
-  DUFFLEPUD_URL,
-} from "@app/core/state"
-import {kv} from "@app/core/storage"
+import {CONTENT_KINDS, makeCommentFilter} from "@app/content"
+import {notificationSettings} from "@app/settings"
+import {chatsById} from "@app/chats"
+import {userGroupList, getSpaceUrlsFromGroupList} from "@app/groups"
+import {hasNip29} from "@app/relays"
+import {dufflepud, DUFFLEPUD_URL} from "@app/env"
+import {kv} from "@app/storage"
 import {page} from "$app/stores"
 
 // Checked state
diff --git a/src/app/policies.ts b/src/app/policies.ts
index 07830f11..94f6ff2c 100644
--- a/src/app/policies.ts
+++ b/src/app/policies.ts
@@ -1,4 +1,4 @@
-import {get} from "svelte/store"
+import {get, writable} from "svelte/store"
 import {on, call, dissoc, assoc, uniq} from "@welshman/lib"
 import {RelayMode} from "@welshman/util"
 import type {Socket, RelayMessage, ClientMessage} from "@welshman/net"
@@ -16,15 +16,15 @@ import {
   isClientNegClose,
 } from "@welshman/net"
 import {sign, pubkey, thunks, getPubkeyRelays} from "@welshman/app"
-import {
-  BLOCKED_RELAYS,
-  userSettingsValues,
-  getSetting,
-  relaysPendingTrust,
-  relaysMostlyRestricted,
-  RelayAuthMode,
-  userSpaceUrls,
-} from "@app/core/state"
+import {BLOCKED_RELAYS} from "@app/env"
+import {userSettingsValues, getSetting, RelayAuthMode} from "@app/settings"
+import {userSpaceUrls} from "@app/groups"
+
+// Relays sending events with empty signatures that the user has to choose to trust
+export const relaysPendingTrust = writable<string[]>([])
+
+// Relays that mostly send restricted responses to requests and events
+export const relaysMostlyRestricted = writable<Record<string, string>>({})
 
 export const authPolicy = makeSocketPolicyAuth({
   sign,
diff --git a/src/app/polls.ts b/src/app/polls.ts
index 6c0a7390..e66de38c 100644
--- a/src/app/polls.ts
+++ b/src/app/polls.ts
@@ -1,6 +1,7 @@
 import {now, removeUndefined, uniq} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
-import {getTagValue, getTags, getTagValues} from "@welshman/util"
+import {POLL_RESPONSE, getTagValue, getTags, getTagValues, makeEvent} from "@welshman/util"
+import {publishThunk} from "@welshman/app"
 
 export type PollType = "singlechoice" | "multiplechoice"
 
@@ -74,3 +75,17 @@ export const getPollResults = (event: TrustedEvent, responses: TrustedEvent[]) =
     voters: latestByPubkey.size,
   }
 }
+
+export type PollResponseParams = {
+  event: TrustedEvent
+  selectedIds: string[]
+}
+
+export const makePollResponse = ({event, selectedIds}: PollResponseParams) =>
+  makeEvent(POLL_RESPONSE, {
+    content: "",
+    tags: [["e", event.id], ...selectedIds.map(selectedId => ["response", selectedId])],
+  })
+
+export const publishPollResponse = ({relays, ...params}: PollResponseParams & {relays: string[]}) =>
+  publishThunk({event: makePollResponse(params), relays})
diff --git a/src/app/profiles.ts b/src/app/profiles.ts
new file mode 100644
index 00000000..0066fe08
--- /dev/null
+++ b/src/app/profiles.ts
@@ -0,0 +1,50 @@
+import {get} from "svelte/store"
+import {
+  FOLLOWS,
+  MESSAGING_RELAYS,
+  PROFILE,
+  RELAYS,
+  createProfile,
+  editProfile,
+  isPublishedProfile,
+  isSignedEvent,
+  makeEvent,
+} from "@welshman/util"
+import type {Profile} from "@welshman/util"
+import {nthNe} from "@welshman/lib"
+import {publishThunk, pubkey, repository} from "@welshman/app"
+import {Router} from "@welshman/router"
+import {DEFAULT_RELAYS} from "@app/env"
+import {userSpaceUrls} from "@app/groups"
+
+export const broadcastUserData = async (relays: string[]) => {
+  const authors = [pubkey.get()!]
+  const kinds = [RELAYS, MESSAGING_RELAYS, FOLLOWS, PROFILE]
+  const events = repository.query([{kinds, authors}])
+
+  for (const event of events) {
+    if (isSignedEvent(event)) {
+      await publishThunk({event, relays}).complete
+    }
+  }
+}
+
+export const initProfile = (profile: Profile) => {
+  const event = makeEvent(PROFILE, createProfile(profile))
+
+  return publishThunk({event, relays: DEFAULT_RELAYS})
+}
+
+export const updateProfile = ({profile}: {profile: Profile}) => {
+  const router = Router.get()
+  const template = isPublishedProfile(profile) ? editProfile(profile) : createProfile(profile)
+  const scenarios = [router.FromRelays(get(userSpaceUrls)), router.FromUser(), router.Index()]
+
+  // Remove protected tag, we used to add it
+  template.tags = template.tags.filter(nthNe(0, "-"))
+
+  const event = makeEvent(template.kind, template)
+  const relays = router.merge(scenarios).getUrls()
+
+  return publishThunk({event, relays})
+}
diff --git a/src/app/push/adapters/android.ts b/src/app/push/adapters/android.ts
index e9a310ce..ab2899ab 100644
--- a/src/app/push/adapters/android.ts
+++ b/src/app/push/adapters/android.ts
@@ -5,7 +5,7 @@ import {session} from "@welshman/app"
 import type {Session} from "@welshman/app"
 import {maybe, now} from "@welshman/lib"
 import type {Filter} from "@welshman/util"
-import {pushState} from "@app/core/state"
+import {pushState} from "@app/push/adapters/common"
 import type {IPushAdapter} from "@app/push/adapters/common"
 import {requestPermissions, syncRelaySubscriptions} from "@app/push/adapters/common"
 
diff --git a/src/app/push/adapters/capacitor.ts b/src/app/push/adapters/capacitor.ts
index f3950ea6..f1159ddc 100644
--- a/src/app/push/adapters/capacitor.ts
+++ b/src/app/push/adapters/capacitor.ts
@@ -12,7 +12,10 @@ import {assoc, hash, maybe} from "@welshman/lib"
 import type {Filter} from "@welshman/util"
 import {DELETE, getRelaysFromList, makeEvent, Address} from "@welshman/util"
 import {buildUrl} from "@lib/util"
-import {PUSH_BRIDGE, PUSH_SERVER, pushState, userSpaceUrls, device} from "@app/core/state"
+import {PUSH_BRIDGE, PUSH_SERVER} from "@app/env"
+import {pushState} from "@app/push/adapters/common"
+import {userSpaceUrls} from "@app/groups"
+import {device} from "@app/device"
 import type {IPushAdapter} from "@app/push/adapters/common"
 import {
   onPushNotificationAction,
diff --git a/src/app/push/adapters/common.ts b/src/app/push/adapters/common.ts
index 5a5ea5d3..6b3a9de2 100644
--- a/src/app/push/adapters/common.ts
+++ b/src/app/push/adapters/common.ts
@@ -1,3 +1,5 @@
+import {withGetter} from "@welshman/store"
+import {writable} from "svelte/store"
 import {goto} from "$app/navigation"
 import type {Subscriber, Unsubscriber} from "svelte/store"
 import {
@@ -21,18 +23,24 @@ import {
   type Filter,
   type TrustedEvent,
 } from "@welshman/util"
-import {
-  DM_KINDS,
-  CONTENT_KINDS,
-  notificationSettings,
-  pushState,
-  shouldNotify,
-  userSpaceUrls,
-  userSettingsValues,
-  makeCommentFilter,
-} from "@app/core/state"
+import {DM_KINDS, CONTENT_KINDS, makeCommentFilter} from "@app/content"
+import {notificationSettings, shouldNotify, userSettingsValues} from "@app/settings"
+import {userSpaceUrls} from "@app/groups"
 import {makeSpacePath, getEventPath} from "@app/routes"
 
+export type PushSubscription = {
+  key: string
+  callback: string
+}
+
+export type PushState = {
+  token?: string
+  useFallback?: boolean
+  subscription?: PushSubscription
+}
+
+export const pushState = withGetter(writable<PushState>({}))
+
 export interface IPushAdapter {
   request: (prompt?: boolean) => Promise<string>
   disable: () => Promise<void>
diff --git a/src/app/push/adapters/web.ts b/src/app/push/adapters/web.ts
index 9baadc3e..24c1a948 100644
--- a/src/app/push/adapters/web.ts
+++ b/src/app/push/adapters/web.ts
@@ -2,7 +2,8 @@ import {pubkey} from "@welshman/app"
 import {maybe} from "@welshman/lib"
 import type {Unsubscriber} from "svelte/store"
 import {getPubkeyTagValues, matchFilter, type TrustedEvent} from "@welshman/util"
-import {DM_KINDS, notificationSettings} from "@app/core/state"
+import {DM_KINDS} from "@app/content"
+import {notificationSettings} from "@app/settings"
 import type {IPushAdapter} from "@app/push/adapters/common"
 import {onNotification} from "@app/push/adapters/common"
 import {goToEvent} from "@app/routes"
diff --git a/src/app/push/index.ts b/src/app/push/index.ts
index 810bdd98..d0577024 100644
--- a/src/app/push/index.ts
+++ b/src/app/push/index.ts
@@ -1,5 +1,6 @@
 import {Capacitor} from "@capacitor/core"
-import {notificationSettings, pushState} from "@app/core/state"
+import {notificationSettings} from "@app/settings"
+import {pushState} from "@app/push/adapters/common"
 import {WebNotifications} from "@app/push/adapters/web"
 import {CapacitorNotifications} from "@app/push/adapters/capacitor"
 import {AndroidFallbackNotifications} from "@app/push/adapters/android"
diff --git a/src/app/reactions.ts b/src/app/reactions.ts
new file mode 100644
index 00000000..4ef54b18
--- /dev/null
+++ b/src/app/reactions.ts
@@ -0,0 +1,37 @@
+import type {TrustedEvent} from "@welshman/util"
+import {REACTION, getTag, makeEvent} from "@welshman/util"
+import {publishThunk, tagEventForReaction} from "@welshman/app"
+import {PROTECTED} from "@app/groups"
+
+export type ReactionParams = {
+  protect: boolean
+  event: TrustedEvent
+  content: string
+  url?: string
+  tags?: string[][]
+}
+
+export const makeReaction = ({
+  url,
+  protect,
+  content,
+  event,
+  tags: paramTags = [],
+}: ReactionParams) => {
+  const tags = [...paramTags, ...tagEventForReaction(event, url)]
+  const groupTag = getTag("h", event.tags)
+
+  if (groupTag) {
+    tags.push(groupTag)
+  }
+
+  if (protect) {
+    tags.push(PROTECTED)
+  }
+
+  return makeEvent(REACTION, {content, tags})
+}
+
+export const publishReaction = ({relays, ...params}: ReactionParams & {relays: string[]}) => {
+  publishThunk({event: makeReaction({url: relays[0], ...params}), relays})
+}
diff --git a/src/app/relays.ts b/src/app/relays.ts
new file mode 100644
index 00000000..53e57302
--- /dev/null
+++ b/src/app/relays.ts
@@ -0,0 +1,234 @@
+import {
+  RELAY_INVITE,
+  RELAY_JOIN,
+  RELAY_LEAVE,
+  ManagementMethod,
+  getRelaysFromList,
+  getTagValue,
+  isShareableRelayUrl,
+  makeEvent,
+  normalizeRelayUrl,
+} from "@welshman/util"
+import type {List, RelayProfile} from "@welshman/util"
+import {AuthStateEvent, AuthStatus, Pool, SocketEvent, SocketStatus, load} from "@welshman/net"
+import {derived, readable} from "svelte/store"
+import {
+  call,
+  filterVals,
+  fromPairs,
+  isDefined,
+  last,
+  on,
+  poll,
+  simpleCache,
+  uniq,
+} from "@welshman/lib"
+import {throttled} from "@welshman/store"
+import {loadRelay, manageRelay, publishThunk, sign, waitForThunkError} from "@welshman/app"
+import {checkRelayHasLivekit} from "$lib/livekit"
+import {stripPrefix} from "@lib/util"
+import {relaysMostlyRestricted} from "@app/policies"
+
+export const hasNip29 = (relay?: RelayProfile) =>
+  Boolean(relay?.supported_nips?.map?.(String)?.includes?.("29"))
+
+export const hasNip50 = (relay?: RelayProfile) =>
+  Boolean(relay?.supported_nips?.map?.(String)?.includes?.("50"))
+
+export const encodeRelay = (url: string) =>
+  encodeURIComponent(
+    normalizeRelayUrl(url)
+      .replace(/^wss:\/\//, "")
+      .replace(/\/$/, ""),
+  )
+
+export const decodeRelay = (url: string) => normalizeRelayUrl(decodeURIComponent(url))
+
+export const deriveSocket = (url: string) => {
+  const socket = Pool.get().get(url)
+
+  return readable(socket, set => {
+    const subs = [
+      on(socket, SocketEvent.Error, () => set(socket)),
+      on(socket, SocketEvent.Status, () => set(socket)),
+      on(socket.auth, AuthStateEvent.Status, () => set(socket)),
+    ]
+
+    return () => subs.forEach(call)
+  })
+}
+
+export const deriveSocketStatus = (url: string) =>
+  throttled(
+    800,
+    derived([deriveSocket(url), relaysMostlyRestricted], ([$socket, $relaysMostlyRestricted]) => {
+      if ($socket.status === SocketStatus.Opening) {
+        return {theme: "warning", title: "Connecting"}
+      }
+
+      if ($socket.status === SocketStatus.Closing) {
+        return {theme: "gray-500", title: "Not Connected"}
+      }
+
+      if ($socket.status === SocketStatus.Closed) {
+        return {theme: "gray-500", title: "Not Connected"}
+      }
+
+      if ($socket.status === SocketStatus.Error) {
+        return {theme: "error", title: "Failed to Connect"}
+      }
+
+      if ($socket.auth.status === AuthStatus.Requested) {
+        return {theme: "warning", title: "Authenticating"}
+      }
+
+      if ($socket.auth.status === AuthStatus.PendingSignature) {
+        return {theme: "warning", title: "Authenticating"}
+      }
+
+      if ($socket.auth.status === AuthStatus.DeniedSignature) {
+        return {theme: "error", title: "Failed to Authenticate"}
+      }
+
+      if ($socket.auth.status === AuthStatus.PendingResponse) {
+        return {theme: "warning", title: "Authenticating"}
+      }
+
+      if ($socket.auth.status === AuthStatus.Forbidden) {
+        return {theme: "error", title: "Access Denied"}
+      }
+
+      if ($relaysMostlyRestricted[url]) {
+        return {theme: "error", title: "Access Denied"}
+      }
+
+      return {theme: "success", title: "Connected"}
+    }),
+  )
+
+export const deriveSupportedMethods = simpleCache(([url]: [string]) => {
+  return readable<ManagementMethod[]>([], set => {
+    manageRelay(url, {
+      method: ManagementMethod.SupportedMethods,
+      params: [],
+    }).then(({result = []}) => set(result))
+  })
+})
+
+export const deriveHasLivekit = simpleCache(([url]: [string]) =>
+  readable<boolean | undefined>(undefined, set => {
+    checkRelayHasLivekit(url).then(has => set(has))
+  }),
+)
+
+export const shouldIgnoreError = (error: string) => {
+  const isIgnored = error.startsWith("mute: ")
+  const isAborted = error.includes("Signing was aborted")
+  const isStrictNip29Relay = error.includes("missing group (`h`) tag")
+
+  return isIgnored || isAborted || isStrictNip29Relay
+}
+
+export const discoverRelays = (lists: List[]) =>
+  Promise.all(
+    uniq(lists.flatMap($l => getRelaysFromList($l)))
+      .filter(isShareableRelayUrl)
+      .map(url => loadRelay(url)),
+  )
+
+export const requestRelayClaim = async (url: string) => {
+  const filters = [{kinds: [RELAY_INVITE], limit: 1}]
+  const events = await load({filters, relays: [url]})
+
+  if (events.length > 0) {
+    return getTagValue("claim", events[0].tags)
+  }
+}
+
+export const requestRelayClaims = async (urls: string[]) =>
+  filterVals(
+    isDefined,
+    fromPairs(await Promise.all(urls.map(async url => [url, await requestRelayClaim(url)]))),
+  )
+
+export const canEnforceNip70 = async (url: string) => {
+  const socket = Pool.get().get(url)
+
+  await socket.auth.attemptAuth(sign)
+
+  return socket.auth.status !== AuthStatus.None
+}
+
+export const attemptRelayAccess = async (url: string, claim = "") => {
+  const socket = Pool.get().get(url)
+
+  socket.attemptToOpen()
+
+  await poll({
+    signal: AbortSignal.timeout(3000),
+    condition: () => socket.status === SocketStatus.Open,
+  })
+
+  if (socket.status !== SocketStatus.Open) {
+    return `Failed to connect`
+  }
+
+  await socket.auth.attemptAuth(sign)
+
+  if (![AuthStatus.None, AuthStatus.Ok].includes(socket.auth.status)) {
+    if (socket.auth.details) {
+      return `Failed to authenticate (${socket.auth.details})`
+    } else {
+      return `Failed to authenticate (${last(socket.auth.status.split(":"))})`
+    }
+  }
+
+  const error = await waitForThunkError(publishJoinRequest({url, claim}))
+
+  if (shouldIgnoreError(error)) return
+
+  if (claim) {
+    if (error.includes("invite code")) {
+      return "join request rejected"
+    }
+  } else if (error.includes("invite code")) {
+    return
+  }
+
+  return stripPrefix(error)
+}
+
+export const deriveRelayAuthError = (url: string) => {
+  Pool.get().get(url).auth.attemptAuth(sign)
+
+  return derived(
+    [relaysMostlyRestricted, deriveSocket(url)],
+    ([$relaysMostlyRestricted, $socket]) => {
+      if ($socket.auth.status === AuthStatus.Forbidden && $socket.auth.details) {
+        return stripPrefix($socket.auth.details)
+      }
+
+      if ($relaysMostlyRestricted[url]) {
+        return stripPrefix($relaysMostlyRestricted[url])
+      }
+    },
+  )
+}
+
+export type JoinRequestParams = {
+  url: string
+  claim: string
+}
+
+export const makeJoinRequest = (params: JoinRequestParams) =>
+  makeEvent(RELAY_JOIN, {tags: [["claim", params.claim]]})
+
+export const publishJoinRequest = (params: JoinRequestParams) =>
+  publishThunk({event: makeJoinRequest(params), relays: [params.url]})
+
+export type LeaveRequestParams = {
+  url: string
+}
+
+export const publishLeaveRequest = (params: LeaveRequestParams) =>
+  publishThunk({event: makeEvent(RELAY_LEAVE), relays: [params.url]})
diff --git a/src/app/reports.ts b/src/app/reports.ts
new file mode 100644
index 00000000..eaffb8dd
--- /dev/null
+++ b/src/app/reports.ts
@@ -0,0 +1,26 @@
+import type {TrustedEvent} from "@welshman/util"
+import {REPORT, makeEvent} from "@welshman/util"
+import {publishThunk} from "@welshman/app"
+
+export type ReportParams = {
+  event: TrustedEvent
+  content: string
+  reason: string
+}
+
+export const makeReport = ({event, reason, content}: ReportParams) => {
+  const tags = [
+    ["p", event.pubkey],
+    ["e", event.id, reason],
+  ]
+
+  return makeEvent(REPORT, {content, tags})
+}
+
+export const publishReport = ({
+  relays,
+  event,
+  reason,
+  content,
+}: ReportParams & {relays: string[]}) =>
+  publishThunk({event: makeReport({event, reason, content}), relays})
diff --git a/src/app/repository.ts b/src/app/repository.ts
new file mode 100644
index 00000000..c7904aff
--- /dev/null
+++ b/src/app/repository.ts
@@ -0,0 +1,49 @@
+import {
+  deriveArray,
+  deriveDeduplicated,
+  deriveEventsAsc,
+  deriveEventsById,
+  deriveEventsByIdForUrl,
+  deriveEventsDesc,
+  getEventsByIdForUrl,
+  makeDeriveEvent,
+} from "@welshman/store"
+import {deriveRelay, repository, tracker} from "@welshman/app"
+import {sortEventsDesc} from "@welshman/util"
+import type {Filter} from "@welshman/util"
+import {load} from "@welshman/net"
+import {first} from "@welshman/lib"
+import {derived} from "svelte/store"
+export const deriveEvent = makeDeriveEvent({
+  repository,
+  includeDeleted: true,
+  onDerive: (filters: Filter[], relays: string[]) => load({filters, relays}),
+})
+
+export const deriveEvents = (filters: Filter[] = [{}]) =>
+  deriveEventsDesc(deriveEventsById({repository, filters}))
+
+export const getEventsForUrl = (url: string, filters: Filter[] = [{}]) =>
+  getEventsByIdForUrl({url, tracker, repository, filters}).values()
+
+export const deriveEventsForUrl = (url: string, filters: Filter[] = [{}]) =>
+  deriveArray(deriveEventsByIdForUrl({url, tracker, repository, filters}))
+
+export const deriveEventsForUrlAsc = (url: string, filters: Filter[] = [{}]) =>
+  deriveEventsAsc(deriveEventsByIdForUrl({url, tracker, repository, filters}))
+
+export const deriveEventsForUrlDesc = (url: string, filters: Filter[] = [{}]) =>
+  deriveEventsDesc(deriveEventsByIdForUrl({url, tracker, repository, filters}))
+
+export const deriveLatestEventForUrl = (url: string, filters: Filter[] = [{}]) =>
+  deriveDeduplicated(deriveEventsByIdForUrl({url, tracker, repository, filters}), $eventsById =>
+    first(sortEventsDesc($eventsById.values())),
+  )
+
+export const deriveRelaySignedEvents = (url: string, filters: Filter[] = [{}]) =>
+  derived(
+    [deriveRelay(url), deriveEventsForUrl(url, filters)],
+    ([relay, events]) => events,
+    // TODO: khatru doesn't support relay.self, uncomment when it's ready
+    // filter(spec({pubkey: relay.self}), events)
+  )
diff --git a/src/app/rooms.ts b/src/app/rooms.ts
new file mode 100644
index 00000000..875da0bc
--- /dev/null
+++ b/src/app/rooms.ts
@@ -0,0 +1,275 @@
+import {
+  ROOMS,
+  ROOM_DELETE,
+  ROOM_META,
+  asDecryptedEvent,
+  getGroupTags,
+  getListTags,
+  getRelayTagValues,
+  getTagValues,
+  isRelayUrl,
+  makeRoomMeta,
+  normalizeRelayUrl,
+  readList,
+  readRoomMeta,
+} from "@welshman/util"
+import type {List, PublishedRoomMeta, RelayProfile, RoomMeta, TrustedEvent} from "@welshman/util"
+import {
+  deriveEventsByIdByUrl,
+  deriveItemsByKey,
+  getter,
+  makeDeriveItem,
+  makeLoadItem,
+} from "@welshman/store"
+import {makeOutboxLoader, makeUserData, makeUserLoader, repository, tracker} from "@welshman/app"
+import {derived} from "svelte/store"
+import {
+  addToMapKey,
+  call,
+  gte,
+  identity,
+  indexBy,
+  max,
+  partition,
+  sortBy,
+  spec,
+  tryCatch,
+  uniq,
+  uniqBy,
+} from "@welshman/lib"
+import {load} from "@welshman/net"
+
+export const ROOM = "h"
+
+export const PROTECTED = ["-"]
+
+export enum RoomType {
+  Text = "text",
+  Voice = "voice",
+}
+
+export type Room = PublishedRoomMeta & {
+  id: string
+  url: string
+}
+
+export const getRoomType = (room: RoomMeta): RoomType =>
+  room.livekit ? RoomType.Voice : RoomType.Text
+
+export const makeRoomId = (url: string, h: string) => `${url}'${h}`
+
+export const isRoomId = (id: string) => id.includes("'")
+
+export const splitRoomId = (id: string) => id.split("'")
+
+export const hasNip29 = (relay?: RelayProfile) =>
+  Boolean(relay?.supported_nips?.map?.(String)?.includes?.("29"))
+
+export const roomMetaEventsByIdByUrl = deriveEventsByIdByUrl({
+  tracker,
+  repository,
+  filters: [{kinds: [ROOM_META, ROOM_DELETE]}],
+})
+
+export const roomsByUrl = derived(roomMetaEventsByIdByUrl, roomMetaEventsByIdByUrl => {
+  const result = new Map<string, Room[]>()
+
+  for (const [url, events] of roomMetaEventsByIdByUrl.entries()) {
+    const [metaEvents, deleteEvents] = partition(spec({kind: ROOM_META}), events.values())
+    const deletedByH = new Map<string, number>()
+
+    for (const event of deleteEvents) {
+      for (const h of getTagValues("h", event.tags)) {
+        deletedByH.set(h, max([deletedByH.get(h), event.created_at]))
+      }
+    }
+
+    const metaById = new Map<string, Room>()
+
+    for (const event of metaEvents) {
+      const meta = tryCatch(() => readRoomMeta(event))
+
+      if (!meta || gte(deletedByH.get(meta.h), meta.event.created_at)) {
+        continue
+      }
+
+      const id = makeRoomId(url, meta.h)
+
+      metaById.set(id, {...meta, url, id})
+    }
+
+    if (metaById.size > 0) {
+      result.set(url, Array.from(metaById.values()))
+    }
+  }
+
+  return result
+})
+
+export const roomsById = derived(roomsByUrl, roomsByUrl =>
+  indexBy(room => room.id, Array.from(roomsByUrl.values()).flatMap(identity)),
+)
+
+export const getRoomsById = getter(roomsById)
+
+export const getRoom = (id: string) => getRoomsById().get(id)
+
+export const loadRoom = call(() => {
+  const _fetchRoom = async (id: string) => {
+    const [url, h] = splitRoomId(id)
+
+    await load({
+      relays: [url],
+      filters: [
+        {kinds: [ROOM_META], "#d": [h]},
+        {kinds: [ROOM_DELETE], "#h": [h]},
+      ],
+    })
+  }
+
+  const _loadRoom = makeLoadItem(_fetchRoom, getRoom)
+
+  return (url: string, h: string) => _loadRoom(makeRoomId(url, h))
+})
+
+export const deriveRoom = call(() => {
+  const _deriveRoom = makeDeriveItem(roomsById, loadRoom)
+
+  return (url: string, h: string) =>
+    derived(
+      _deriveRoom(makeRoomId(url, h)),
+      room => (room || {url, id: makeRoomId(url, h), ...makeRoomMeta({h})}) as Room,
+    )
+})
+
+export const displayRoom = (url: string, h: string) => getRoom(makeRoomId(url, h))?.name || h
+
+export const roomComparator = (url: string) => (h: string) => displayRoom(url, h).toLowerCase()
+
+export const deriveVoiceRooms = (url: string) =>
+  derived(roomsById, $roomsById => {
+    const set = new Set<string>()
+    for (const room of $roomsById.values()) {
+      if (room.url === url && room.livekit) {
+        set.add(room.h)
+      }
+    }
+    return set
+  })
+
+export const deriveOtherVoiceRooms = (url: string) =>
+  derived([deriveVoiceRooms(url), deriveUserRooms(url)], ([$roomsWithLivekit, $userRooms]) => {
+    const rooms: string[] = []
+
+    for (const h of $roomsWithLivekit) {
+      if (!$userRooms.includes(h)) {
+        rooms.push(h)
+      }
+    }
+
+    return sortBy(roomComparator(url), uniq(rooms))
+  })
+
+// User space/room lists
+
+export const groupListsByPubkey = deriveItemsByKey({
+  repository,
+  filters: [{kinds: [ROOMS]}],
+  getKey: list => list.event.pubkey,
+  eventToItem: (event: TrustedEvent) => readList(asDecryptedEvent(event)),
+})
+
+export const getGroupListsByPubkey = getter(groupListsByPubkey)
+
+export const getGroupList = (pubkey: string) => getGroupListsByPubkey().get(pubkey)
+
+export const loadGroupList = makeLoadItem(makeOutboxLoader(ROOMS), getGroupList)
+
+export const deriveGroupList = makeDeriveItem(groupListsByPubkey, loadGroupList)
+
+export const groupListPubkeysByUrl = derived(groupListsByPubkey, $groupListsByPubkey => {
+  const result = new Map<string, Set<string>>()
+
+  for (const list of $groupListsByPubkey.values()) {
+    const tags = getListTags(list)
+
+    for (const url of getRelayTagValues(tags)) {
+      addToMapKey(result, url, list.event.pubkey)
+    }
+
+    for (const tag of getGroupTags(tags)) {
+      const url = tag[2] || ""
+
+      if (isRelayUrl(url)) {
+        addToMapKey(result, url, list.event.pubkey)
+      }
+    }
+  }
+
+  return result
+})
+
+export const deriveGroupListPubkeys = (url: string) =>
+  derived(groupListPubkeysByUrl, $groupListPubkeysByUrl => new Set($groupListPubkeysByUrl.get(url)))
+
+export const getSpaceUrlsFromGroupList = (groupList: List | undefined) => {
+  const tags = getListTags(groupList)
+  const urls = getRelayTagValues(tags)
+
+  for (const tag of getGroupTags(tags)) {
+    const url = tag[2] || ""
+
+    if (isRelayUrl(url)) {
+      urls.push(url)
+    }
+  }
+
+  return uniqBy(normalizeRelayUrl, urls)
+}
+
+export const getSpaceRoomsFromGroupList = (url: string, groupList: List | undefined) => {
+  const rooms: string[] = []
+
+  for (const [_, h, relay] of getGroupTags(getListTags(groupList))) {
+    if (url === relay) {
+      rooms.push(h)
+    }
+  }
+
+  return sortBy(roomComparator(url), uniq(rooms))
+}
+
+export const userGroupList = makeUserData(groupListsByPubkey, loadGroupList)
+
+export const loadUserGroupList = makeUserLoader(loadGroupList)
+
+export const userSpaceUrls = derived(userGroupList, getSpaceUrlsFromGroupList)
+
+export const deriveUserRooms = (url: string) =>
+  derived([userGroupList, roomsById], ([$userGroupList, $roomsById]) => {
+    const rooms: string[] = []
+
+    for (const h of getSpaceRoomsFromGroupList(url, $userGroupList)) {
+      if ($roomsById.has(makeRoomId(url, h))) {
+        rooms.push(h)
+      }
+    }
+
+    return sortBy(roomComparator(url), rooms)
+  })
+
+export const deriveOtherRooms = (url: string) =>
+  derived(
+    [deriveUserRooms(url), deriveVoiceRooms(url), roomsByUrl],
+    ([$userRooms, voiceRooms, $roomsByUrl]) => {
+      const rooms: string[] = []
+
+      for (const {h} of $roomsByUrl.get(url) || []) {
+        if (!$userRooms.includes(h) && !voiceRooms.has(h)) {
+          rooms.push(h)
+        }
+      }
+
+      return sortBy(roomComparator(url), uniq(rooms))
+    },
+  )
diff --git a/src/app/routes.ts b/src/app/routes.ts
index 1d323b75..396f9c39 100644
--- a/src/app/routes.ts
+++ b/src/app/routes.ts
@@ -19,7 +19,11 @@ import {
   getPubkeyTagValues,
   getRelaysFromList,
 } from "@welshman/util"
-import {makeChatId, entityLink, encodeRelay, DM_KINDS, ROOM} from "@app/core/state"
+import {makeChatId} from "@app/chats"
+import {entityLink} from "@app/env"
+import {encodeRelay} from "@app/relays"
+import {DM_KINDS} from "@app/content"
+import {ROOM} from "@app/groups"
 import {pushModal} from "@app/modal"
 import ChatEnable from "@app/components/ChatEnable.svelte"
 
diff --git a/src/app/session.ts b/src/app/session.ts
index 4630d81d..2518fc99 100644
--- a/src/app/session.ts
+++ b/src/app/session.ts
@@ -1,4 +1,4 @@
-import {db, kv, ss} from "@app/core/storage"
+import {db, kv, ss} from "@app/storage"
 import {deactivateCurrentPomadeSession} from "@app/pomade"
 import {Push} from "@app/push"
 
diff --git a/src/app/settings.ts b/src/app/settings.ts
new file mode 100644
index 00000000..71e6c006
--- /dev/null
+++ b/src/app/settings.ts
@@ -0,0 +1,163 @@
+import {APP_DATA, makeEvent} from "@welshman/util"
+import type {TrustedEvent} from "@welshman/util"
+import {deriveItemsByKey, getter, makeLoadItem, withGetter} from "@welshman/store"
+import {
+  ensurePlaintext,
+  makeOutboxLoader,
+  makeUserData,
+  makeUserLoader,
+  publishThunk,
+  pubkey,
+  repository,
+  signer,
+} from "@welshman/app"
+import {append, parseJson, remove, spec} from "@welshman/lib"
+import {derived, get, writable} from "svelte/store"
+import {Router} from "@welshman/router"
+export const SETTINGS = "flotilla/settings"
+
+export enum RelayAuthMode {
+  Aggressive = "aggressive",
+  Conservative = "conservative",
+}
+
+export type SpaceNotificationSettings = {
+  url: string
+  notify: boolean
+  exceptions: string[]
+}
+
+export type SettingsValues = {
+  show_media: boolean
+  hide_sensitive: boolean
+  trusted_relays: string[]
+  report_usage: boolean
+  report_errors: boolean
+  relay_auth: RelayAuthMode
+  send_delay: number
+  font_size: number
+  alerts: SpaceNotificationSettings[]
+}
+
+export type Settings = {
+  event: TrustedEvent
+  values: SettingsValues
+}
+
+export const defaultSettings: SettingsValues = {
+  show_media: true,
+  hide_sensitive: true,
+  trusted_relays: [],
+  report_usage: true,
+  report_errors: true,
+  relay_auth: RelayAuthMode.Conservative,
+  send_delay: 0,
+  font_size: 1.1,
+  alerts: [],
+}
+
+export const settingsByPubkey = deriveItemsByKey({
+  repository,
+  getKey: settings => settings.event.pubkey,
+  filters: [{kinds: [APP_DATA], "#d": [SETTINGS]}],
+  eventToItem: async (event: TrustedEvent) => {
+    const values = {...defaultSettings, ...parseJson(await ensurePlaintext(event))}
+
+    return {event, values}
+  },
+})
+
+export const getSettingsByPubkey = getter(settingsByPubkey)
+
+export const loadSettings = makeLoadItem(
+  makeOutboxLoader(APP_DATA, {"#d": [SETTINGS]}),
+  (pubkey: string) => getSettingsByPubkey().get(pubkey),
+)
+
+export const userSettings = makeUserData(settingsByPubkey, loadSettings)
+
+export const loadUserSettings = makeUserLoader(loadSettings)
+
+export const userSettingsValues = derived(userSettings, $s => $s?.values || defaultSettings)
+
+export const getSettings = getter(userSettingsValues)
+
+export const getSetting = <T>(key: keyof Settings["values"]) => getSettings()[key] as T
+
+export const getShouldNotify = ({alerts}: SettingsValues, url: string, h?: string) => {
+  const pref = alerts.find(spec({url}))
+
+  if (!pref) return true
+  if (!h) return pref.notify
+  if (pref.notify) return !pref.exceptions.includes(h)
+  if (!pref.notify) return pref.exceptions.includes(h)
+}
+
+export const shouldNotify = (url: string, h?: string) => getShouldNotify(getSettings(), url, h)
+
+export const deriveShouldNotify = (url: string, h?: string) =>
+  derived(userSettingsValues, $settings => getShouldNotify($settings, url, h))
+
+export const notificationSettings = withGetter(
+  writable({
+    push: false,
+    sound: true,
+    badge: false,
+    spaces: true,
+    mentions: true,
+    messages: true,
+  }),
+)
+
+export const makeSettings = async (params: Partial<SettingsValues>) => {
+  const json = JSON.stringify({...get(userSettingsValues), ...params})
+  const content = await signer.get().nip44.encrypt(pubkey.get()!, json)
+  const tags = [["d", SETTINGS]]
+
+  return makeEvent(APP_DATA, {content, tags})
+}
+
+export const publishSettings = async (params: Partial<SettingsValues>) =>
+  publishThunk({event: await makeSettings(params), relays: Router.get().FromUser().getUrls()})
+
+export const addTrustedRelay = async (url: string) =>
+  publishSettings({trusted_relays: append(url, getSetting<string[]>("trusted_relays"))})
+
+export const removeTrustedRelay = async (url: string) =>
+  publishSettings({trusted_relays: remove(url, getSetting<string[]>("trusted_relays"))})
+
+export const setSpaceNotifications = async (url: string, notify: boolean) => {
+  const {alerts} = getSettings()
+  const existing = alerts.find((s: SpaceNotificationSettings) => s.url === url)
+
+  let updated: typeof alerts
+
+  if (existing) {
+    updated = alerts.map((s: SpaceNotificationSettings) =>
+      s.url === url ? {...s, notify, exceptions: []} : s,
+    )
+  } else {
+    updated = [...alerts, {url, notify, exceptions: []}]
+  }
+
+  return publishSettings({alerts: updated})
+}
+
+export const toggleRoomNotifications = async (url: string, h: string) => {
+  const {alerts} = getSettings()
+  const existing = alerts.find((s: SpaceNotificationSettings) => s.url === url)
+
+  let updated: typeof alerts
+
+  if (!existing) {
+    updated = [...alerts, {url, notify: true, exceptions: [h]}]
+  } else {
+    const exceptions = existing.exceptions.includes(h)
+      ? remove(h, existing.exceptions)
+      : append(h, existing.exceptions)
+
+    updated = alerts.map((s: SpaceNotificationSettings) => (s.url === url ? {...s, exceptions} : s))
+  }
+
+  return publishSettings({alerts: updated})
+}
diff --git a/src/app/social.ts b/src/app/social.ts
new file mode 100644
index 00000000..e4e6ca04
--- /dev/null
+++ b/src/app/social.ts
@@ -0,0 +1,57 @@
+import {derived} from "svelte/store"
+import {displayProfileByPubkey, getProfile, userFollowList, userMuteList} from "@welshman/app"
+import {shuffle, tryCatch} from "@welshman/lib"
+import {
+  getAddress,
+  getAddressTagValues,
+  getEventTagValues,
+  getListTags,
+  getParentAddrs,
+  getParentIds,
+  getPubkeyTagValues,
+  getTagValues,
+} from "@welshman/util"
+import type {TrustedEvent} from "@welshman/util"
+import {withGetter} from "@welshman/store"
+import {DEFAULT_PUBKEYS} from "@app/env"
+export const bootstrapPubkeys = derived(userFollowList, $userFollowList => {
+  const appPubkeys = DEFAULT_PUBKEYS.split(",")
+  const userPubkeys = shuffle(getPubkeyTagValues(getListTags($userFollowList)))
+
+  return userPubkeys.length > 5 ? userPubkeys : [...userPubkeys, ...appPubkeys]
+})
+
+export const isEventMuted = withGetter(
+  derived(userMuteList, $userMuteList => {
+    const pubkey = $userMuteList?.event.pubkey
+    const tags = getListTags($userMuteList)
+    const mutedEvents = new Set(getEventTagValues(tags))
+    const mutedPubkeys = new Set(getPubkeyTagValues(tags))
+    const mutedAddresses = new Set(getAddressTagValues(tags))
+    const mutedTopics = new Set(getTagValues("t", tags))
+    const mutedWords = getTagValues("word", tags)
+    const regex =
+      mutedWords.length > 0
+        ? new RegExp(`\\b(${mutedWords.map(w => w.toLowerCase().trim()).join("|")})\\b`)
+        : null
+
+    return (e: TrustedEvent) => {
+      if (!pubkey) return false
+      if (pubkey === e.pubkey) return false
+      if (mutedPubkeys.has(e.pubkey)) return true
+      if (mutedEvents.has(e.id)) return true
+      if (mutedAddresses.has(getAddress(e))) return true
+      if (getParentIds(e).some(id => mutedEvents.has(id))) return true
+      if (getParentAddrs(e).some(address => mutedAddresses.has(address))) return true
+      if (getTagValues("t", e.tags).some(t => mutedTopics.has(t))) return true
+
+      if (regex) {
+        if (e.content?.toLowerCase().match(regex)) return true
+        if (displayProfileByPubkey(e.pubkey).toLowerCase().match(regex)) return true
+        if (tryCatch(() => getProfile(e.pubkey)?.nip05?.match(regex))) return true
+      }
+
+      return false
+    }
+  }),
+)
diff --git a/src/app/storage.ts b/src/app/storage.ts
index 1b65bc25..da007b46 100644
--- a/src/app/storage.ts
+++ b/src/app/storage.ts
@@ -1,4 +1,4 @@
-import {on, throttle, indexBy, fromPairs, batch} from "@welshman/lib"
+import {on, throttle, indexBy, fromPairs, batch, call} from "@welshman/lib"
 import {throttled} from "@welshman/store"
 import {
   ALERT_ANDROID,
@@ -46,12 +46,95 @@ import {
   onRelay,
 } from "@welshman/app"
 import type {Unsubscriber} from "svelte/store"
-import {db} from "@app/core/storage"
+import {SecureStorage} from "@aparajita/capacitor-secure-storage"
+import {Preferences} from "@capacitor/preferences"
+import {IDB} from "@lib/indexeddb"
+
+export const kv = call(() => {
+  let p = Promise.resolve()
+
+  const get = async <T>(key: string): Promise<T | undefined> => {
+    const result = await Preferences.get({key})
+    if (!result.value) return undefined
+    try {
+      return JSON.parse(result.value)
+    } catch (e) {
+      return undefined
+    }
+  }
+
+  const set = async <T>(key: string, value: T): Promise<void> => {
+    p = p.then(() => Preferences.set({key, value: JSON.stringify(value)}))
+
+    await p
+  }
+
+  const clear = async () => {
+    p = p.then(() => Preferences.clear())
+
+    await p
+  }
+
+  return {get, set, clear}
+})
+
+export const ss = call(() => {
+  let p = Promise.resolve()
+
+  const get = async <T>(key: string): Promise<T | undefined> => {
+    let value = await SecureStorage.getItem(key)
+
+    if (!value) {
+      const legacy = await Preferences.get({key})
+
+      if (legacy.value) {
+        value = legacy.value
+        await SecureStorage.setItem(key, legacy.value)
+        await Preferences.remove({key})
+      }
+    }
+
+    if (!value) return undefined
+
+    try {
+      return JSON.parse(value)
+    } catch (e) {
+      return undefined
+    }
+  }
+
+  const set = async <T>(key: string, value: T): Promise<void> => {
+    p = p.then(() => SecureStorage.setItem(key, JSON.stringify(value)))
+
+    await p
+  }
+
+  const clear = async () => {
+    p = p.then(() => SecureStorage.clear())
+
+    await p
+  }
+
+  return {get, set, clear}
+})
+
+export const db = new IDB({
+  name: "flotilla-9gl",
+  version: 1,
+  stores: [
+    {name: "events", keyPath: "id"},
+    {name: "tracker", keyPath: "id"},
+    {name: "relays", keyPath: "url"},
+    {name: "relayStats", keyPath: "url"},
+    {name: "handles", keyPath: "nip05"},
+    {name: "zappers", keyPath: "lnurl"},
+    {name: "plaintext", keyPath: "key"},
+    {name: "wrapManager", keyPath: "id"},
+  ],
+})
 
-// Shared interval for all non-critical store flushes, so they batch on the same cadence
 const FLUSH_INTERVAL = 3000
 
-// Wraps a write callback to run during idle time (non-critical persistence)
 const idleWrite = <T>(f: (xs: T[]) => void): ((xs: T[]) => void) => {
   if (typeof requestIdleCallback !== "undefined") {
     return (xs: T[]) => requestIdleCallback(() => f(xs))
diff --git a/src/app/core/sync.ts b/src/app/sync.ts
similarity index 97%
rename from src/app/core/sync.ts
rename to src/app/sync.ts
index 483d495a..1b4abfbf 100644
--- a/src/app/core/sync.ts
+++ b/src/app/sync.ts
@@ -41,21 +41,19 @@ import {
   shouldUnwrap,
   hasNegentropy,
 } from "@welshman/app"
+import {REACTION_KINDS, CONTENT_KINDS, makeCommentFilter} from "@app/content"
+import {INDEXER_RELAYS} from "@app/env"
+import {loadSettings} from "@app/settings"
 import {
-  REACTION_KINDS,
-  CONTENT_KINDS,
-  INDEXER_RELAYS,
-  loadSettings,
   loadGroupList,
   userSpaceUrls,
   userGroupList,
-  decodeRelay,
   getSpaceUrlsFromGroupList,
   getSpaceRoomsFromGroupList,
-  makeCommentFilter,
-  loadFeedsForPubkey,
-} from "@app/core/state"
-import {hasBlossomSupport} from "@app/core/commands"
+} from "@app/groups"
+import {decodeRelay} from "@app/relays"
+import {loadFeedsForPubkey} from "@app/feeds"
+import {hasBlossomSupport} from "@app/uploads"
 import {LIVEKIT_PARTICIPANTS} from "@app/call/voice"
 
 // Utils
diff --git a/src/app/theme.ts b/src/app/theme.ts
index 66371b23..3a80c0d4 100644
--- a/src/app/theme.ts
+++ b/src/app/theme.ts
@@ -1,6 +1,29 @@
-import {kv} from "@app/core/storage"
+import twColors from "tailwindcss/colors"
+import {kv} from "@app/storage"
 import {synced} from "@welshman/store"
 
+export const colors = [
+  ["amber", twColors.amber[600]],
+  ["blue", twColors.blue[600]],
+  ["cyan", twColors.cyan[600]],
+  ["emerald", twColors.emerald[600]],
+  ["fuchsia", twColors.fuchsia[600]],
+  ["green", twColors.green[600]],
+  ["indigo", twColors.indigo[600]],
+  ["sky", twColors.sky[600]],
+  ["lime", twColors.lime[600]],
+  ["orange", twColors.orange[600]],
+  ["pink", twColors.pink[600]],
+  ["purple", twColors.purple[600]],
+  ["red", twColors.red[600]],
+  ["rose", twColors.rose[600]],
+  ["sky", twColors.sky[600]],
+  ["teal", twColors.teal[600]],
+  ["violet", twColors.violet[600]],
+  ["yellow", twColors.yellow[600]],
+  ["zinc", twColors.zinc[600]],
+]
+
 export const theme = synced({
   key: "theme",
   defaultValue: window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light",
diff --git a/src/app/title.ts b/src/app/title.ts
index ac60ac26..fdc29f16 100644
--- a/src/app/title.ts
+++ b/src/app/title.ts
@@ -1,7 +1,10 @@
 import {append, identity, uniq} from "@welshman/lib"
 import {repository} from "@welshman/app"
 import {displayPubkey, getTagValue} from "@welshman/util"
-import {PLATFORM_NAME, decodeRelay, getRoom, makeRoomId, splitChatId} from "@app/core/state"
+import {PLATFORM_NAME} from "@app/env"
+import {decodeRelay} from "@app/relays"
+import {getRoom, makeRoomId} from "@app/groups"
+import {splitChatId} from "@app/chats"
 
 const FALLBACK_APP_NAME = "Flotilla"
 
diff --git a/src/app/uploads.ts b/src/app/uploads.ts
new file mode 100644
index 00000000..56a44a11
--- /dev/null
+++ b/src/app/uploads.ts
@@ -0,0 +1,142 @@
+import {Nip01Signer} from "@welshman/signer"
+import type {UploadTask} from "@welshman/editor"
+import {
+  canUploadBlob,
+  encryptFile,
+  getListTags,
+  getTagValues,
+  makeBlossomAuthEvent,
+  uploadBlob,
+} from "@welshman/util"
+import {getRelay, signer, userBlossomServerList} from "@welshman/app"
+import {first, normalizeUrl, parseJson, sha256, simpleCache} from "@welshman/lib"
+import {get} from "svelte/store"
+import {compressFile} from "@lib/html"
+import {DEFAULT_BLOSSOM_SERVERS} from "@app/env"
+
+export const normalizeBlossomUrl = (url: string) => normalizeUrl(url.replace(/^ws/, "http"))
+
+export const fetchHasBlossomSupport = async (url: string) => {
+  const relay = getRelay(url)
+
+  if (relay?.supported_nips?.map(String).includes("BUD-02")) {
+    return true
+  }
+
+  const server = normalizeBlossomUrl(url)
+  const $signer = signer.get() || Nip01Signer.ephemeral()
+  const headers: Record<string, string> = {
+    "X-Content-Type": "text/plain",
+    "X-Content-Length": "1",
+    "X-SHA-256": "73cb3858a687a8494ca3323053016282f3dad39d42cf62ca4e79dda2aac7d9ac",
+  }
+
+  try {
+    const authEvent = await $signer.sign(makeBlossomAuthEvent({action: "upload", server}))
+    const res = await canUploadBlob(server, {authEvent, headers})
+
+    return res.status === 200
+  } catch (e) {
+    if (!String(e).match(/Failed to fetch|NetworkError/)) {
+      console.error(e)
+    }
+  }
+
+  return false
+}
+
+export const hasBlossomSupport = simpleCache(([url]: [string]) => fetchHasBlossomSupport(url))
+
+export type GetBlossomServerOptions = {
+  url?: string
+}
+
+export const getBlossomServer = async (options: GetBlossomServerOptions = {}) => {
+  if (options.url) {
+    if (await hasBlossomSupport(options.url)) {
+      return normalizeBlossomUrl(options.url)
+    }
+  }
+
+  const userUrls = getTagValues("server", getListTags(get(userBlossomServerList)))
+
+  for (const url of userUrls) {
+    return normalizeBlossomUrl(url)
+  }
+
+  return first(DEFAULT_BLOSSOM_SERVERS)!
+}
+
+export type UploadFileOptions = {
+  url?: string
+  encrypt?: boolean
+  maxWidth?: number
+  maxHeight?: number
+}
+
+export type UploadFileResult = {
+  error?: string
+  result?: UploadTask
+}
+
+export const uploadFile = async (file: File, options: UploadFileOptions = {}) => {
+  try {
+    const {name, type} = file
+
+    if (!type.match("image/(webp|gif|svg)")) {
+      file = await compressFile(file, options)
+    }
+
+    const tags: string[][] = []
+
+    if (options.encrypt) {
+      const {ciphertext, key, nonce, algorithm} = await encryptFile(file)
+
+      tags.push(
+        ["decryption-key", key],
+        ["decryption-nonce", nonce],
+        ["encryption-algorithm", algorithm],
+      )
+
+      file = new File([new Uint8Array(ciphertext)], name, {
+        type: "application/octet-stream",
+      })
+    }
+
+    const ext = "." + type.split("/")[1]
+    const server = await getBlossomServer(options)
+    const hashes = [await sha256(await file.arrayBuffer())]
+    const $signer = signer.get() || Nip01Signer.ephemeral()
+    const authTemplate = makeBlossomAuthEvent({action: "upload", server, hashes})
+    const authEvent = await $signer.sign(authTemplate)
+    const res = await uploadBlob(server, file, {authEvent})
+    const text = await res.text()
+
+    let task
+    try {
+      task = parseJson(text)
+    } catch (e) {
+      return {error: text}
+    }
+
+    if (!task?.uploaded) {
+      return {error: text || `Failed to upload file (HTTP ${res.status})`}
+    }
+
+    // Always append correct file extension if we encrypted the file, or if it's missing
+    let url = task.url
+    if (options.encrypt) {
+      url = url.replace(/\.\w+$/, "") + ext
+    } else if (new URL(url).pathname.split(".").length === 1) {
+      url += ext
+    }
+
+    const result = {...task, tags, url}
+
+    return {result}
+  } catch (e: any) {
+    console.error("Error caught when uploading file:", e)
+
+    return {error: e.toString()}
+  }
+}
diff --git a/src/lib/util.ts b/src/lib/util.ts
index a61b3bc9..3c48238a 100644
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -1,3 +1,4 @@
+import {identity} from "@welshman/lib"
 import * as nip19 from "nostr-tools/nip19"
 import {range, DAY, hexToBytes, bytesToHex} from "@welshman/lib"
 
@@ -66,3 +67,7 @@ export const buildUrl = (base: string | URL, ...pathname: string[]) => {
 export const addPeriod = (s: string) => (s + ".").replace(/\.+$/, ".")
 
 export const normalizeTopic = (topic: string) => topic.trim().replace(/^#+/, "").toLowerCase()
+
+export const fromCsv = (s: string) => (s || "").split(",").filter(identity)
+
+export const stripPrefix = (m: string) => m.replace(/^\w+: /, "")
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index af10ee67..210610a0 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -10,9 +10,13 @@
   import {goto} from "$app/navigation"
   import {page} from "$app/stores"
   import {sync, throttled} from "@welshman/store"
-  import {call} from "@welshman/lib"
-  import {defaultSocketPolicies} from "@welshman/net"
-  import {pubkey, sessions, signerLog, shouldUnwrap} from "@welshman/app"
+  import {always, call} from "@welshman/lib"
+  import {defaultSocketPolicies, netContext} from "@welshman/net"
+  import {appContext, pubkey, sessions, signerLog, shouldUnwrap} from "@welshman/app"
+  import {routerContext} from "@welshman/router"
+  import {verifyEvent} from "@welshman/util"
+  import type {TrustedEvent} from "@welshman/util"
+  import {context as pomadeContext} from "@pomade/core"
   import * as lib from "@welshman/lib"
   import * as util from "@welshman/util"
   import * as feeds from "@welshman/feeds"
@@ -29,12 +33,34 @@
   import {setupHistory} from "@app/routes"
   import {setupAnalytics} from "@app/analytics"
   import {authPolicy, blockPolicy, trustPolicy, mostlyRestrictedPolicy} from "@app/policies"
-  import {db, kv, ss} from "@app/core/storage"
-  import {device, userSettingsValues, notificationSettings, pushState} from "@app/core/state"
-  import {syncApplicationData} from "@app/core/sync"
-  import * as commands from "@app/core/commands"
-  import * as requests from "@app/core/requests"
-  import * as appState from "@app/core/state"
+  import {db, kv, ss} from "@app/storage"
+  import {device} from "@app/device"
+  import {getSetting, userSettingsValues, notificationSettings} from "@app/settings"
+  import {DUFFLEPUD_URL, INDEXER_RELAYS, POMADE_SIGNERS} from "@app/env"
+  import {pushState} from "@app/push/adapters/common"
+  import {syncApplicationData} from "@app/sync"
+  import * as groups from "@app/groups"
+  import * as comments from "@app/comments"
+  import * as deletes from "@app/deletes"
+  import * as reactions from "@app/reactions"
+  import * as profiles from "@app/profiles"
+  import * as lightning from "@app/lightning"
+  import * as uploads from "@app/uploads"
+  import * as appPolls from "@app/polls"
+  import * as reports from "@app/reports"
+  import * as relays from "@app/relays"
+  import * as settings from "@app/settings"
+  import * as members from "@app/members"
+  import * as chats from "@app/chats"
+  import * as content from "@app/content"
+  import * as env from "@app/env"
+  import * as repository from "@app/repository"
+  import * as social from "@app/social"
+  import * as appDevice from "@app/device"
+  import * as actionItems from "@app/actionItems"
+  import * as appFeeds from "@app/feeds"
+  import * as invites from "@app/invites"
+  import * as healthChecks from "@app/healthChecks"
   import {theme} from "@app/theme"
   import {toast, pushToast} from "@app/toast"
   import * as notifications from "@app/notifications"
@@ -69,12 +95,39 @@
     ...feeds,
     ...net,
     ...app,
-    ...appState,
-    ...commands,
-    ...requests,
+    ...groups,
+    ...relays,
+    ...settings,
+    ...members,
+    ...chats,
+    ...content,
+    ...env,
+    ...repository,
+    ...social,
+    ...appDevice,
+    ...actionItems,
+    ...appFeeds,
+    ...invites,
+    ...healthChecks,
+    ...comments,
+    ...deletes,
+    ...reactions,
+    ...profiles,
+    ...lightning,
+    ...uploads,
+    ...appPolls,
+    ...reports,
     ...notifications,
   })
 
+  // Set up context for various modules
+  pomadeContext.setSignerUrls(POMADE_SIGNERS)
+  pomadeContext.setArgonWorker(import("@pomade/core/argon-worker.js?worker"))
+  appContext.dufflepudUrl = DUFFLEPUD_URL
+  routerContext.getIndexerRelays = always(INDEXER_RELAYS)
+  netContext.isEventValid = (event: TrustedEvent, url: string) =>
+    getSetting<string[]>("trusted_relays").includes(url) || verifyEvent(event)
+
   // Listen for deep link events
   App.addListener("appUrlOpen", async (event: URLOpenListenerEvent) => {
     const url = new URL(event.url)
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 42128a56..574a2184 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -2,7 +2,7 @@
   import {onMount} from "svelte"
   import {goto} from "$app/navigation"
   import {goToSpace} from "@app/routes"
-  import {PLATFORM_RELAYS} from "@app/core/state"
+  import {PLATFORM_RELAYS} from "@app/env"
 
   onMount(async () => {
     if (PLATFORM_RELAYS.length > 0) {
diff --git a/src/routes/chat/+layout.svelte b/src/routes/chat/+layout.svelte
index 4d104251..234a50a9 100644
--- a/src/routes/chat/+layout.svelte
+++ b/src/routes/chat/+layout.svelte
@@ -18,7 +18,7 @@
   import ChatMenu from "@app/components/ChatMenu.svelte"
   import ChatStart from "@app/components/ChatStart.svelte"
   import ChatItem from "@app/components/ChatItem.svelte"
-  import {chatSearch} from "@app/core/state"
+  import {chatSearch} from "@app/chats"
   import {pushModal} from "@app/modal"
 
   type Props = {
diff --git a/src/routes/chat/+page.svelte b/src/routes/chat/+page.svelte
index 41f145c1..52fee0c1 100644
--- a/src/routes/chat/+page.svelte
+++ b/src/routes/chat/+page.svelte
@@ -9,7 +9,7 @@
   import ChatItem from "@app/components/ChatItem.svelte"
   import ChatStart from "@app/components/ChatStart.svelte"
   import ChatMenu from "@app/components/ChatMenu.svelte"
-  import {chatSearch} from "@app/core/state"
+  import {chatSearch} from "@app/chats"
   import {pushModal} from "@app/modal"
 
   let term = $state("")
diff --git a/src/routes/chat/[chat]/+page.svelte b/src/routes/chat/[chat]/+page.svelte
index b6f27633..cc0d51e2 100644
--- a/src/routes/chat/[chat]/+page.svelte
+++ b/src/routes/chat/[chat]/+page.svelte
@@ -1,6 +1,6 @@
 <script context="module" lang="ts">
   import {synced} from "@welshman/store"
-  import {kv} from "@app/core/storage"
+  import {kv} from "@app/storage"
 
   const dmNotificationsPrompted = synced({
     key: "dmNotificationsPrompted",
@@ -16,8 +16,8 @@
   import {append, uniq} from "@welshman/lib"
   import {pubkey} from "@welshman/app"
   import Chat from "@app/components/Chat.svelte"
-  import {splitChatId} from "@app/core/state"
-  import {notificationSettings} from "@app/core/state"
+  import {splitChatId} from "@app/chats"
+  import {notificationSettings} from "@app/settings"
   import {pushToast} from "@app/toast"
   import {Push} from "@app/push"
 
diff --git a/src/routes/home/+page.svelte b/src/routes/home/+page.svelte
index 876603b0..15191a27 100644
--- a/src/routes/home/+page.svelte
+++ b/src/routes/home/+page.svelte
@@ -8,7 +8,7 @@
   import Button from "@lib/components/Button.svelte"
   import CardButton from "@lib/components/CardButton.svelte"
   import {goToSpace} from "@app/routes"
-  import {PLATFORM_NAME, PLATFORM_RELAYS} from "@app/core/state"
+  import {PLATFORM_NAME, PLATFORM_RELAYS} from "@app/env"
 
   const openChat = () => goto("/chat")
 
diff --git a/src/routes/people/+page.svelte b/src/routes/people/+page.svelte
index 66d90acf..4722b5ab 100644
--- a/src/routes/people/+page.svelte
+++ b/src/routes/people/+page.svelte
@@ -8,7 +8,7 @@
   import Page from "@lib/components/Page.svelte"
   import ContentSearch from "@lib/components/ContentSearch.svelte"
   import PeopleItem from "@app/components/PeopleItem.svelte"
-  import {bootstrapPubkeys} from "@app/core/state"
+  import {bootstrapPubkeys} from "@app/social"
 
   let term = $state("")
   let limit = $state(10)
diff --git a/src/routes/settings/about/+page.svelte b/src/routes/settings/about/+page.svelte
index f9fa3181..1de5a699 100644
--- a/src/routes/settings/about/+page.svelte
+++ b/src/routes/settings/about/+page.svelte
@@ -4,7 +4,7 @@
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
-  import {PLATFORM_NAME} from "@app/core/state"
+  import {PLATFORM_NAME} from "@app/env"
   import {pushModal} from "@app/modal"
   import Code from "@assets/icons/code-2.svg?dataurl"
   import Global from "@assets/icons/global.svg?dataurl"
diff --git a/src/routes/settings/alerts/+page.svelte b/src/routes/settings/alerts/+page.svelte
index 8dd63aae..a323ca21 100644
--- a/src/routes/settings/alerts/+page.svelte
+++ b/src/routes/settings/alerts/+page.svelte
@@ -12,7 +12,7 @@
   import {pushToast} from "@app/toast"
   import {clearBadges} from "@app/notifications"
   import {Push} from "@app/push"
-  import {notificationSettings} from "@app/core/state"
+  import {notificationSettings} from "@app/settings"
 
   const reset = () => {
     settings = {...notificationSettings.get()}
diff --git a/src/routes/settings/content/+page.svelte b/src/routes/settings/content/+page.svelte
index f1138341..acc66efc 100644
--- a/src/routes/settings/content/+page.svelte
+++ b/src/routes/settings/content/+page.svelte
@@ -20,8 +20,8 @@
   import Button from "@lib/components/Button.svelte"
   import ProfileMultiSelect from "@app/components/ProfileMultiSelect.svelte"
   import {pushToast} from "@app/toast"
-  import {PLATFORM_NAME, userSettingsValues} from "@app/core/state"
-  import {publishSettings} from "@app/core/commands"
+  import {PLATFORM_NAME} from "@app/env"
+  import {userSettingsValues, publishSettings} from "@app/settings"
 
   const reset = () => {
     settings = {...$userSettingsValues}
diff --git a/src/routes/settings/privacy/+page.svelte b/src/routes/settings/privacy/+page.svelte
index 8f6de5d5..acd5c3a8 100644
--- a/src/routes/settings/privacy/+page.svelte
+++ b/src/routes/settings/privacy/+page.svelte
@@ -5,8 +5,8 @@
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import {pushToast} from "@app/toast"
-  import {PLATFORM_NAME, RelayAuthMode, userSettingsValues} from "@app/core/state"
-  import {publishSettings} from "@app/core/commands"
+  import {PLATFORM_NAME} from "@app/env"
+  import {RelayAuthMode, userSettingsValues, publishSettings} from "@app/settings"
 
   const reset = () => {
     settings = {...$userSettingsValues}
diff --git a/src/routes/settings/relays/+page.svelte b/src/routes/settings/relays/+page.svelte
index 4352c455..0be1d92f 100644
--- a/src/routes/settings/relays/+page.svelte
+++ b/src/routes/settings/relays/+page.svelte
@@ -24,8 +24,8 @@
   import Icon from "@lib/components/Icon.svelte"
   import RelaySettingsItem from "@app/components/RelaySettingsItem.svelte"
   import RelaySettingsHealthChecks from "@app/components/RelaySettingsHealthChecks.svelte"
-  import {hasNip50} from "@app/core/state"
-  import {discoverRelays} from "@app/core/requests"
+  import {hasNip50} from "@app/relays"
+  import {discoverRelays} from "@app/relays"
 
   const readRelayUrls = derivePubkeyRelays($pubkey!, RelayMode.Read)
   const writeRelayUrls = derivePubkeyRelays($pubkey!, RelayMode.Write)
diff --git a/src/routes/settings/wallet/+page.svelte b/src/routes/settings/wallet/+page.svelte
index 9c116885..a3119af6 100644
--- a/src/routes/settings/wallet/+page.svelte
+++ b/src/routes/settings/wallet/+page.svelte
@@ -13,7 +13,7 @@
   import WalletDisconnect from "@app/components/WalletDisconnect.svelte"
   import WalletUpdateReceivingAddress from "@app/components/WalletUpdateReceivingAddress.svelte"
   import {pushModal} from "@app/modal"
-  import {getNwcClient, getWebLn} from "@app/core/commands"
+  import {getNwcClient, getWebLn} from "@app/lightning"
   import Wallet2 from "@assets/icons/wallet.svg?dataurl"
   import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
   import AddCircle from "@assets/icons/add-circle.svg?dataurl"
diff --git a/src/routes/spaces/+page.svelte b/src/routes/spaces/+page.svelte
index 078afe2f..0ccba90f 100644
--- a/src/routes/spaces/+page.svelte
+++ b/src/routes/spaces/+page.svelte
@@ -26,16 +26,10 @@
   import SpaceAdd from "@app/components/SpaceAdd.svelte"
   import SpaceInviteAccept from "@app/components/SpaceInviteAccept.svelte"
   import SpaceJoin from "@app/components/SpaceJoin.svelte"
-  import {
-    userSpaceUrls,
-    loadUserGroupList,
-    PLATFORM_RELAYS,
-    DEFAULT_RELAYS,
-    groupListPubkeysByUrl,
-    bootstrapPubkeys,
-    parseInviteLink,
-  } from "@app/core/state"
-  import {setSpaceMembershipOrder} from "@app/core/commands"
+  import {userSpaceUrls, loadUserGroupList, groupListPubkeysByUrl, setSpaceOrder} from "@app/groups"
+  import {PLATFORM_RELAYS, DEFAULT_RELAYS} from "@app/env"
+  import {bootstrapPubkeys} from "@app/social"
+  import {parseInviteLink} from "@app/invites"
   import {pushModal} from "@app/modal"
   import {goToSpace, makeSpacePath} from "@app/routes"
   import {notifications} from "@app/notifications"
@@ -134,7 +128,7 @@
     lastDragTarget = undefined
 
     if (dragStartOrder && !isSameOrder(dragStartOrder, orderedSpaceUrls)) {
-      void setSpaceMembershipOrder(orderedSpaceUrls).catch(console.error)
+      void setSpaceOrder(orderedSpaceUrls).catch(console.error)
     }
 
     dragStartOrder = undefined
diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte
index 16d13ea1..b1e26e21 100644
--- a/src/routes/spaces/[relay]/+layout.svelte
+++ b/src/routes/spaces/[relay]/+layout.svelte
@@ -15,8 +15,9 @@
   import SpaceJoin from "@app/components/SpaceJoin.svelte"
   import {pushModal} from "@app/modal"
   import {makeSpacePath} from "@app/routes"
-  import {decodeRelay, userGroupList, relaysPendingTrust, userSpaceUrls} from "@app/core/state"
-  import {deriveRelayAuthError} from "@app/core/commands"
+  import {decodeRelay, deriveRelayAuthError} from "@app/relays"
+  import {userGroupList, userSpaceUrls} from "@app/groups"
+  import {relaysPendingTrust} from "@app/policies"
 
   type Props = {
     children?: Snippet
diff --git a/src/routes/spaces/[relay]/+page.svelte b/src/routes/spaces/[relay]/+page.svelte
index 85fc2a53..ccdf9d65 100644
--- a/src/routes/spaces/[relay]/+page.svelte
+++ b/src/routes/spaces/[relay]/+page.svelte
@@ -2,7 +2,7 @@
   import {page} from "$app/stores"
   import theme from "tailwindcss/defaultTheme"
   import SecondaryNav from "@lib/components/SecondaryNav.svelte"
-  import {decodeRelay} from "@app/core/state"
+  import {decodeRelay} from "@app/relays"
   import {goToSpace} from "@app/routes"
   import PrimaryNavSpaces from "@app/components/PrimaryNavSpaces.svelte"
   import SpaceMenu from "@app/components/SpaceMenu.svelte"
diff --git a/src/routes/spaces/[relay]/[h]/+page.svelte b/src/routes/spaces/[relay]/[h]/+page.svelte
index 5b43b523..8fb4cb79 100644
--- a/src/routes/spaces/[relay]/[h]/+page.svelte
+++ b/src/routes/spaces/[relay]/[h]/+page.svelte
@@ -32,22 +32,17 @@
   import ThunkToast from "@app/components/ThunkToast.svelte"
   import RoomItemAddMember from "@src/app/components/RoomItemAddMember.svelte"
   import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
-  import {canEnforceNip70, prependParent, publishDelete} from "@app/core/commands"
-  import {
-    decodeRelay,
-    deriveRoom,
-    deriveUserRoomMembershipStatus,
-    getRoomType,
-    MembershipStatus,
-    PROTECTED,
-    RoomType,
-    userSettingsValues,
-  } from "@app/core/state"
+  import {canEnforceNip70} from "@app/relays"
+  import {prependParent, deriveRoom, getRoomType, PROTECTED, RoomType} from "@app/groups"
+  import {publishDelete} from "@app/deletes"
+  import {decodeRelay} from "@app/relays"
+  import {deriveUserRoomMembershipStatus, MembershipStatus} from "@app/members"
+  import {userSettingsValues} from "@app/settings"
   import VoiceWidget from "@app/components/VoiceWidget.svelte"
   import VideoCallContent from "@app/components/VideoCallContent.svelte"
   import {VoiceState, currentVoiceRoom, voiceState} from "@app/call/stores"
   import {VideoCallLayout, videoCallLayout, videoTileCount} from "@app/call/video"
-  import {makeFeed} from "@app/core/requests"
+  import {makeFeed} from "@app/feeds"
   import {popKey} from "@lib/implicit"
   import {checked, deferredRoomPath, setChecked} from "@app/notifications"
   import {makeRoomPath} from "@app/routes"
diff --git a/src/routes/spaces/[relay]/calendar/+page.svelte b/src/routes/spaces/[relay]/calendar/+page.svelte
index 161b4988..b1815195 100644
--- a/src/routes/spaces/[relay]/calendar/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/+page.svelte
@@ -18,8 +18,9 @@
   import CalendarEventItem from "@app/components/CalendarEventItem.svelte"
   import CalendarEventCreate from "@app/components/CalendarEventCreate.svelte"
   import {pushModal} from "@app/modal"
-  import {decodeRelay, makeCommentFilter} from "@app/core/state"
-  import {makeCalendarFeed} from "@app/core/requests"
+  import {decodeRelay} from "@app/relays"
+  import {makeCommentFilter} from "@app/content"
+  import {makeCalendarFeed} from "@app/feeds"
 
   const url = decodeRelay($page.params.relay!)
 
diff --git a/src/routes/spaces/[relay]/calendar/[address]/+page.svelte b/src/routes/spaces/[relay]/calendar/[address]/+page.svelte
index 55c6dbf8..de5bf4e3 100644
--- a/src/routes/spaces/[relay]/calendar/[address]/+page.svelte
+++ b/src/routes/spaces/[relay]/calendar/[address]/+page.svelte
@@ -22,7 +22,8 @@
   import CalendarEventMeta from "@app/components/CalendarEventMeta.svelte"
   import CalendarEventDate from "@app/components/CalendarEventDate.svelte"
   import EventReply from "@app/components/EventReply.svelte"
-  import {deriveEvent, decodeRelay} from "@app/core/state"
+  import {deriveEvent} from "@app/repository"
+  import {decodeRelay} from "@app/relays"
 
   const {relay, address} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)
diff --git a/src/routes/spaces/[relay]/chat/+page.svelte b/src/routes/spaces/[relay]/chat/+page.svelte
index 1e446e2a..8edf5f1b 100644
--- a/src/routes/spaces/[relay]/chat/+page.svelte
+++ b/src/routes/spaces/[relay]/chat/+page.svelte
@@ -26,11 +26,13 @@
   import RoomCompose from "@app/components/RoomCompose.svelte"
   import RoomComposeEdit from "@src/app/components/RoomComposeEdit.svelte"
   import RoomComposeParent from "@app/components/RoomComposeParent.svelte"
-  import {userSettingsValues, decodeRelay, PROTECTED} from "@app/core/state"
-  import {prependParent, canEnforceNip70, publishDelete} from "@app/core/commands"
+  import {userSettingsValues} from "@app/settings"
+  import {decodeRelay, canEnforceNip70} from "@app/relays"
+  import {PROTECTED, prependParent} from "@app/groups"
+  import {publishDelete} from "@app/deletes"
   import {checked} from "@app/notifications"
   import {pushToast} from "@app/toast"
-  import {makeFeed} from "@app/core/requests"
+  import {makeFeed} from "@app/feeds"
   import {popKey} from "@lib/implicit"
 
   const mounted = now()
diff --git a/src/routes/spaces/[relay]/classifieds/+page.svelte b/src/routes/spaces/[relay]/classifieds/+page.svelte
index f9e7b5b7..b6115817 100644
--- a/src/routes/spaces/[relay]/classifieds/+page.svelte
+++ b/src/routes/spaces/[relay]/classifieds/+page.svelte
@@ -16,9 +16,9 @@
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import ClassifiedItem from "@app/components/ClassifiedItem.svelte"
   import ClassifiedCreate from "@app/components/ClassifiedCreate.svelte"
-  import {decodeRelay} from "@app/core/state"
-  import {makeCommentFilter} from "@app/core/state"
-  import {makeFeed} from "@app/core/requests"
+  import {decodeRelay} from "@app/relays"
+  import {makeCommentFilter} from "@app/content"
+  import {makeFeed} from "@app/feeds"
   import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)
diff --git a/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte b/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte
index 3d76cc20..1266e969 100644
--- a/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte
+++ b/src/routes/spaces/[relay]/classifieds/[address]/+page.svelte
@@ -19,7 +19,8 @@
   import ClassifiedActions from "@app/components/ClassifiedActions.svelte"
   import CommentActions from "@app/components/CommentActions.svelte"
   import EventReply from "@app/components/EventReply.svelte"
-  import {deriveEvent, decodeRelay} from "@app/core/state"
+  import {deriveEvent} from "@app/repository"
+  import {decodeRelay} from "@app/relays"
 
   const {relay, address} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)
diff --git a/src/routes/spaces/[relay]/goals/+page.svelte b/src/routes/spaces/[relay]/goals/+page.svelte
index 4322b947..cf21a559 100644
--- a/src/routes/spaces/[relay]/goals/+page.svelte
+++ b/src/routes/spaces/[relay]/goals/+page.svelte
@@ -16,8 +16,9 @@
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import GoalItem from "@app/components/GoalItem.svelte"
   import GoalCreate from "@app/components/GoalCreate.svelte"
-  import {decodeRelay, makeCommentFilter} from "@app/core/state"
-  import {makeFeed} from "@app/core/requests"
+  import {decodeRelay} from "@app/relays"
+  import {makeCommentFilter} from "@app/content"
+  import {makeFeed} from "@app/feeds"
   import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)
diff --git a/src/routes/spaces/[relay]/goals/[id]/+page.svelte b/src/routes/spaces/[relay]/goals/[id]/+page.svelte
index 44be8900..79d5bb1f 100644
--- a/src/routes/spaces/[relay]/goals/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/goals/[id]/+page.svelte
@@ -19,7 +19,8 @@
   import GoalActions from "@app/components/GoalActions.svelte"
   import CommentActions from "@app/components/CommentActions.svelte"
   import EventReply from "@app/components/EventReply.svelte"
-  import {deriveEvent, decodeRelay} from "@app/core/state"
+  import {deriveEvent} from "@app/repository"
+  import {decodeRelay} from "@app/relays"
 
   const {relay, id} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)
diff --git a/src/routes/spaces/[relay]/polls/+page.svelte b/src/routes/spaces/[relay]/polls/+page.svelte
index 66ef4291..4438daac 100644
--- a/src/routes/spaces/[relay]/polls/+page.svelte
+++ b/src/routes/spaces/[relay]/polls/+page.svelte
@@ -16,8 +16,9 @@
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import PollItem from "@app/components/PollItem.svelte"
   import PollCreate from "@app/components/PollCreate.svelte"
-  import {decodeRelay, makeCommentFilter} from "@app/core/state"
-  import {makeFeed} from "@app/core/requests"
+  import {decodeRelay} from "@app/relays"
+  import {makeCommentFilter} from "@app/content"
+  import {makeFeed} from "@app/feeds"
   import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)
diff --git a/src/routes/spaces/[relay]/polls/[id]/+page.svelte b/src/routes/spaces/[relay]/polls/[id]/+page.svelte
index 44f86701..684f2142 100644
--- a/src/routes/spaces/[relay]/polls/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/polls/[id]/+page.svelte
@@ -17,7 +17,8 @@
   import NoteContent from "@app/components/NoteContent.svelte"
   import CommentActions from "@app/components/CommentActions.svelte"
   import EventReply from "@app/components/EventReply.svelte"
-  import {deriveEvent, decodeRelay} from "@app/core/state"
+  import {deriveEvent} from "@app/repository"
+  import {decodeRelay} from "@app/relays"
 
   const {relay, id} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)
diff --git a/src/routes/spaces/[relay]/recent/+page.svelte b/src/routes/spaces/[relay]/recent/+page.svelte
index 16afce33..6930594e 100644
--- a/src/routes/spaces/[relay]/recent/+page.svelte
+++ b/src/routes/spaces/[relay]/recent/+page.svelte
@@ -49,7 +49,9 @@
   import CalendarEventItem from "@app/components/CalendarEventItem.svelte"
   import PollItem from "@app/components/PollItem.svelte"
   import RecentConversation from "@app/components/RecentConversation.svelte"
-  import {decodeRelay, deriveEventsForUrl, CONTENT_KINDS} from "@app/core/state"
+  import {decodeRelay} from "@app/relays"
+  import {deriveEventsForUrl} from "@app/repository"
+  import {CONTENT_KINDS} from "@app/content"
   import {goToEvent} from "@app/routes"
 
   const url = decodeRelay($page.params.relay!)
diff --git a/src/routes/spaces/[relay]/threads/+page.svelte b/src/routes/spaces/[relay]/threads/+page.svelte
index 00e2c9e4..c36c3542 100644
--- a/src/routes/spaces/[relay]/threads/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/+page.svelte
@@ -16,9 +16,9 @@
   import SpaceBar from "@app/components/SpaceBar.svelte"
   import ThreadItem from "@app/components/ThreadItem.svelte"
   import ThreadCreate from "@app/components/ThreadCreate.svelte"
-  import {decodeRelay} from "@app/core/state"
-  import {makeCommentFilter} from "@app/core/state"
-  import {makeFeed} from "@app/core/requests"
+  import {decodeRelay} from "@app/relays"
+  import {makeCommentFilter} from "@app/content"
+  import {makeFeed} from "@app/feeds"
   import {pushModal} from "@app/modal"
 
   const url = decodeRelay($page.params.relay!)
diff --git a/src/routes/spaces/[relay]/threads/[id]/+page.svelte b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
index 44489319..5196ed9b 100644
--- a/src/routes/spaces/[relay]/threads/[id]/+page.svelte
+++ b/src/routes/spaces/[relay]/threads/[id]/+page.svelte
@@ -19,7 +19,8 @@
   import ThreadActions from "@app/components/ThreadActions.svelte"
   import CommentActions from "@app/components/CommentActions.svelte"
   import EventReply from "@app/components/EventReply.svelte"
-  import {deriveEvent, decodeRelay} from "@app/core/state"
+  import {deriveEvent} from "@app/repository"
+  import {decodeRelay} from "@app/relays"
 
   const {relay, id} = $page.params as MakeNonOptional<typeof $page.params>
   const url = decodeRelay(relay)