diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx
index 843ea3b..41e790b 100644
--- a/packages/app/src/Element/Bookmarks.tsx
+++ b/packages/app/src/Element/Bookmarks.tsx
@@ -4,7 +4,7 @@ import { HexKey, TaggedRawEvent } from "@snort/system";
 
 import Note from "Element/Note";
 import useLogin from "Hooks/useLogin";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 
 import messages from "./messages";
 
diff --git a/packages/app/src/Element/MediaElement.tsx b/packages/app/src/Element/MediaElement.tsx
index 6881c06..e008f12 100644
--- a/packages/app/src/Element/MediaElement.tsx
+++ b/packages/app/src/Element/MediaElement.tsx
@@ -10,7 +10,7 @@ import Icon from "Icons/Icon";
 import { kvToObject } from "SnortUtils";
 import AsyncButton from "Element/AsyncButton";
 import { useWallet } from "Wallet";
-import { PaymentsCache } from "Cache";
+import { PaymentsCache } from "cache";
 import { Payment } from "Db";
 import PageSpinner from "Element/PageSpinner";
 import { LiveVideoPlayer } from "Element/LiveVideoPlayer";
diff --git a/packages/app/src/Element/Nip5Service.tsx b/packages/app/src/Element/Nip5Service.tsx
index 678f700..c8560b6 100644
--- a/packages/app/src/Element/Nip5Service.tsx
+++ b/packages/app/src/Element/Nip5Service.tsx
@@ -22,7 +22,7 @@ import useEventPublisher from "Feed/EventPublisher";
 import { debounce } from "SnortUtils";
 import useLogin from "Hooks/useLogin";
 import SnortServiceProvider from "Nip05/SnortServiceProvider";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 
 import messages from "./messages";
 import { System } from "index";
diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Note.tsx
index 24af94c..9d379fa 100644
--- a/packages/app/src/Element/Note.tsx
+++ b/packages/app/src/Element/Note.tsx
@@ -24,7 +24,7 @@ import NoteFooter, { Translation } from "Element/NoteFooter";
 import NoteTime from "Element/NoteTime";
 import Reveal from "Element/Reveal";
 import useModeration from "Hooks/useModeration";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 import Poll from "Element/Poll";
 import useLogin from "Hooks/useLogin";
 import { setBookmarked, setPinned } from "Login";
diff --git a/packages/app/src/Element/PubkeyList.tsx b/packages/app/src/Element/PubkeyList.tsx
index 062562c..3be05e2 100644
--- a/packages/app/src/Element/PubkeyList.tsx
+++ b/packages/app/src/Element/PubkeyList.tsx
@@ -8,7 +8,7 @@ import AsyncButton from "Element/AsyncButton";
 import { useWallet } from "Wallet";
 import { Toastore } from "Toaster";
 import { getDisplayName } from "Element/ProfileImage";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 import useLogin from "Hooks/useLogin";
 import useEventPublisher from "Feed/EventPublisher";
 import { WalletInvoiceState } from "Wallet";
diff --git a/packages/app/src/Element/Textarea.tsx b/packages/app/src/Element/Textarea.tsx
index 4d17250..04ebd02 100644
--- a/packages/app/src/Element/Textarea.tsx
+++ b/packages/app/src/Element/Textarea.tsx
@@ -9,7 +9,7 @@ import { NostrPrefix, MetadataCache } from "@snort/system";
 import Avatar from "Element/Avatar";
 import Nip05 from "Element/Nip05";
 import { hexToBech32 } from "SnortUtils";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 
 import messages from "./messages";
 
diff --git a/packages/app/src/Element/Timeline.tsx b/packages/app/src/Element/Timeline.tsx
index 3ecc01c..788f363 100644
--- a/packages/app/src/Element/Timeline.tsx
+++ b/packages/app/src/Element/Timeline.tsx
@@ -15,7 +15,7 @@ import NoteReaction from "Element/NoteReaction";
 import useModeration from "Hooks/useModeration";
 import ProfilePreview from "Element/ProfilePreview";
 import Skeleton from "Element/Skeleton";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 
 export interface TimelineProps {
   postsOnly: boolean;
diff --git a/packages/app/src/Feed/LoginFeed.ts b/packages/app/src/Feed/LoginFeed.ts
index 2b8f3c8..5cbf7ea 100644
--- a/packages/app/src/Feed/LoginFeed.ts
+++ b/packages/app/src/Feed/LoginFeed.ts
@@ -12,7 +12,7 @@ import { addSubscription, setBlocked, setBookmarked, setFollows, setMuted, setPi
 import { SnortPubKey } from "Const";
 import { SubscriptionEvent } from "Subscription";
 import useRelaysFeedFollows from "./RelaysFeedFollows";
-import { UserRelays } from "Cache";
+import { UserRelays } from "cache";
 import { System } from "index";
 import { Nip29Chats, Nip4Chats } from "chat";
 
diff --git a/packages/app/src/Feed/RelaysFeedFollows.tsx b/packages/app/src/Feed/RelaysFeedFollows.tsx
index 57dc824..3f6c479 100644
--- a/packages/app/src/Feed/RelaysFeedFollows.tsx
+++ b/packages/app/src/Feed/RelaysFeedFollows.tsx
@@ -12,7 +12,7 @@ import { useRequestBuilder } from "@snort/system-react";
 import debug from "debug";
 
 import { sanitizeRelayUrl } from "SnortUtils";
-import { UserRelays } from "Cache";
+import { UserRelays } from "cache";
 import { System } from "index";
 
 interface RelayList {
diff --git a/packages/app/src/Feed/ZapsFeed.ts b/packages/app/src/Feed/ZapsFeed.ts
index 81ecec0..44fccc9 100644
--- a/packages/app/src/Feed/ZapsFeed.ts
+++ b/packages/app/src/Feed/ZapsFeed.ts
@@ -3,7 +3,7 @@ import { HexKey, EventKind, FlatNoteStore, RequestBuilder, parseZap } from "@sno
 import { useRequestBuilder } from "@snort/system-react";
 
 import { System } from "index";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 
 export default function useZapsFeed(pubkey?: HexKey) {
   const sub = useMemo(() => {
diff --git a/packages/app/src/Hooks/useInteractionCache.tsx b/packages/app/src/Hooks/useInteractionCache.tsx
index ab73a99..d136587 100644
--- a/packages/app/src/Hooks/useInteractionCache.tsx
+++ b/packages/app/src/Hooks/useInteractionCache.tsx
@@ -1,7 +1,7 @@
 import { useSyncExternalStore } from "react";
 import { HexKey, u256 } from "@snort/system";
 
-import { InteractionCache } from "Cache";
+import { InteractionCache } from "cache";
 import { EventInteraction } from "Db";
 import { sha256, unwrap } from "SnortUtils";
 
diff --git a/packages/app/src/Notifications.ts b/packages/app/src/Notifications.ts
index 37e6e83..3a3ee3c 100644
--- a/packages/app/src/Notifications.ts
+++ b/packages/app/src/Notifications.ts
@@ -4,7 +4,7 @@ import { TaggedRawEvent, EventKind, MetadataCache } from "@snort/system";
 import { getDisplayName } from "Element/ProfileImage";
 import { MentionRegex } from "Const";
 import { tagFilterOfTextRepost, unwrap } from "SnortUtils";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 import { LoginSession } from "Login";
 
 export interface NotificationRequest {
diff --git a/packages/app/src/Pages/new/ProfileSetup.tsx b/packages/app/src/Pages/new/ProfileSetup.tsx
index 0440efd..7079513 100644
--- a/packages/app/src/Pages/new/ProfileSetup.tsx
+++ b/packages/app/src/Pages/new/ProfileSetup.tsx
@@ -7,7 +7,7 @@ import { useUserProfile } from "@snort/system-react";
 import Logo from "Element/Logo";
 import useEventPublisher from "Feed/EventPublisher";
 import useLogin from "Hooks/useLogin";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 import AvatarEditor from "Element/AvatarEditor";
 import { DISCOVER } from ".";
 import { System } from "index";
diff --git a/packages/app/src/Pages/settings/Profile.tsx b/packages/app/src/Pages/settings/Profile.tsx
index 0fcb459..c9c1fbc 100644
--- a/packages/app/src/Pages/settings/Profile.tsx
+++ b/packages/app/src/Pages/settings/Profile.tsx
@@ -11,7 +11,7 @@ import useEventPublisher from "Feed/EventPublisher";
 import { openFile } from "SnortUtils";
 import useFileUpload from "Upload";
 import AsyncButton from "Element/AsyncButton";
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 import useLogin from "Hooks/useLogin";
 import AvatarEditor from "Element/AvatarEditor";
 import Icon from "Icons/Icon";
diff --git a/packages/app/src/ZapPoolController.ts b/packages/app/src/ZapPoolController.ts
index 0695b5d..f557e13 100644
--- a/packages/app/src/ZapPoolController.ts
+++ b/packages/app/src/ZapPoolController.ts
@@ -1,4 +1,4 @@
-import { UserCache } from "Cache";
+import { UserCache } from "cache";
 import { getDisplayName } from "Element/ProfileImage";
 import { LNURL, ExternalStore, unixNow } from "@snort/shared";
 import { Toastore } from "Toaster";
diff --git a/packages/app/src/chat/index.ts b/packages/app/src/chat/index.ts
index a458fb9..4539f36 100644
--- a/packages/app/src/chat/index.ts
+++ b/packages/app/src/chat/index.ts
@@ -2,7 +2,7 @@ import { useSyncExternalStore } from "react";
 import { Nip4ChatSystem } from "./nip4";
 import { EventKind, EventPublisher, NostrEvent, RequestBuilder, SystemInterface, UserMetadata } from "@snort/system";
 import { unwrap } from "@snort/shared";
-import { Chats } from "Cache";
+import { Chats } from "cache";
 import { findTag, unixNow } from "SnortUtils";
 import { Nip29ChatSystem } from "./nip29";
 
diff --git a/packages/app/src/index.tsx b/packages/app/src/index.tsx
index 348ad87..3d35d6e 100644
--- a/packages/app/src/index.tsx
+++ b/packages/app/src/index.tsx
@@ -34,7 +34,7 @@ import { SubscribeRoutes } from "Pages/subscribe";
 import ZapPoolPage from "Pages/ZapPool";
 import DebugPage from "Pages/Debug";
 import { db } from "Db";
-import { preload, RelayMetrics, UserCache, UserRelays } from "Cache";
+import { preload, RelayMetrics, UserCache, UserRelays } from "cache";
 import { LoginStore } from "Login";
 import { LivePage } from "Pages/LivePage";
 
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 8589a7b..c660de9 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snort/shared",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Shared components for Snort",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/shared/src/invoices.ts b/packages/shared/src/invoices.ts
index a9b5ed4..050a470 100644
--- a/packages/shared/src/invoices.ts
+++ b/packages/shared/src/invoices.ts
@@ -34,8 +34,8 @@ export function decodeInvoice(pr: string): InvoiceDetails | undefined {
             expire: timestamp && expire ? timestamp + expire : undefined,
             timestamp: timestamp,
             description: descriptionSection as string | undefined,
-            descriptionHash: descriptionHashSection ? bytesToHex(descriptionHashSection as Uint8Array) : undefined,
-            paymentHash: paymentHashSection ? bytesToHex(paymentHashSection as Uint8Array) : undefined,
+            descriptionHash: descriptionHashSection ? (typeof descriptionHashSection === "string" ? descriptionHashSection as string : bytesToHex(descriptionHashSection as Uint8Array)) : undefined,
+            paymentHash: paymentHashSection ? (typeof paymentHashSection === "string" ? paymentHashSection as string : bytesToHex(paymentHashSection as Uint8Array)) : undefined,
             expired: false,
         };
         if (ret.expire) {
diff --git a/packages/system-react/package.json b/packages/system-react/package.json
index fb3fcd3..fabc680 100644
--- a/packages/system-react/package.json
+++ b/packages/system-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snort/system-react",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "React hooks for @snort/system",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
     "dist"
   ],
   "dependencies": {
-    "@snort/system": "^1.0.9",
+    "@snort/system": "^1.0.12",
     "@snort/shared": "^1.0.2",
     "react": "^18.2.0"
   }
diff --git a/packages/system/package.json b/packages/system/package.json
index dca9bad..7aa8268 100644
--- a/packages/system/package.json
+++ b/packages/system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@snort/system",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "Snort nostr system package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@snort/shared": "^1.0.2",
+    "@snort/shared": "^1.0.3",
     "@noble/curves": "^1.0.0",
     "@scure/base": "^1.1.1",
     "@stablelib/xchacha20": "^1.0.1",
diff --git a/packages/system/src/Connection.ts b/packages/system/src/Connection.ts
index 1fdd261..ef8e118 100644
--- a/packages/system/src/Connection.ts
+++ b/packages/system/src/Connection.ts
@@ -2,10 +2,10 @@ import { v4 as uuid } from "uuid";
 import debug from "debug";
 import { unwrap, ExternalStore, unixNowMs } from "@snort/shared";
 
-import { DefaultConnectTimeout } from "./Const";
-import { ConnectionStats } from "./ConnectionStats";
-import { NostrEvent, ReqCommand, TaggedRawEvent, u256 } from "./Nostr";
-import { RelayInfo } from "./RelayInfo";
+import { DefaultConnectTimeout } from "./const";
+import { ConnectionStats } from "./connection-stats";
+import { NostrEvent, ReqCommand, TaggedRawEvent, u256 } from "./nostr";
+import { RelayInfo } from "./relay-info";
 
 export type AuthHandler = (challenge: string, relay: string) => Promise<NostrEvent | undefined>;
 
diff --git a/packages/system/src/Links.ts b/packages/system/src/Links.ts
index 7a0070b..0e385f7 100644
--- a/packages/system/src/Links.ts
+++ b/packages/system/src/Links.ts
@@ -1,6 +1,6 @@
 import * as utils from "@noble/curves/abstract/utils";
 import { bech32 } from "@scure/base";
-import { HexKey } from "./Nostr";
+import { HexKey } from "./nostr";
 
 export enum NostrPrefix {
   PublicKey = "npub",
diff --git a/packages/system/src/Nostr.ts b/packages/system/src/Nostr.ts
index 41808d9..336346d 100644
--- a/packages/system/src/Nostr.ts
+++ b/packages/system/src/Nostr.ts
@@ -1,4 +1,4 @@
-import { RelaySettings } from "./Connection";
+import { RelaySettings } from "./connection";
 
 export interface NostrEvent {
   id: u256;
diff --git a/packages/system/src/Query.ts b/packages/system/src/Query.ts
index 2d5f072..60866ae 100644
--- a/packages/system/src/Query.ts
+++ b/packages/system/src/Query.ts
@@ -3,11 +3,11 @@ import debug from "debug";
 import { unixNowMs, unwrap } from "@snort/shared";
 
 import { Connection, ReqFilter, Nips, TaggedRawEvent } from ".";
-import { reqFilterEq } from "./Utils";
-import { NoteStore } from "./NoteCollection";
-import { flatMerge } from "./RequestMerger";
-import { BuiltRawReqFilter } from "./RequestBuilder";
-import { expandFilter } from "./RequestExpander";
+import { reqFilterEq } from "./utisl";
+import { NoteStore } from "./note-collection";
+import { flatMerge } from "./request-merger";
+import { BuiltRawReqFilter } from "./request-builder";
+import { expandFilter } from "./request-expander";
 
 /**
  * Tracing for relay query status
diff --git a/packages/system/src/Zaps.ts b/packages/system/src/Zaps.ts
index a9b2478..d38f03f 100644
--- a/packages/system/src/Zaps.ts
+++ b/packages/system/src/Zaps.ts
@@ -1,8 +1,8 @@
 import { FeedCache } from "@snort/shared";
 import { sha256, decodeInvoice, InvoiceDetails } from "@snort/shared";
-import { HexKey, NostrEvent } from "Nostr";
-import { findTag } from "./Utils";
-import { MetadataCache } from "./Cache";
+import { HexKey, NostrEvent } from "./nostr";
+import { findTag } from "./utisl";
+import { MetadataCache } from "./cache";
 
 function getInvoice(zap: NostrEvent): InvoiceDetails | undefined {
     const bolt11 = findTag(zap, "bolt11");
diff --git a/packages/system/src/Cache/db.ts b/packages/system/src/cache/db.ts
similarity index 96%
rename from packages/system/src/Cache/db.ts
rename to packages/system/src/cache/db.ts
index 6201eaf..1a1d07f 100644
--- a/packages/system/src/Cache/db.ts
+++ b/packages/system/src/cache/db.ts
@@ -1,5 +1,5 @@
 import { MetadataCache, RelayMetrics, UsersRelays } from ".";
-import { NostrEvent } from "../Nostr";
+import { NostrEvent } from "../nostr";
 import Dexie, { Table } from "dexie";
 
 const NAME = "snort-system";
diff --git a/packages/system/src/Cache/index.ts b/packages/system/src/cache/index.ts
similarity index 100%
rename from packages/system/src/Cache/index.ts
rename to packages/system/src/cache/index.ts
diff --git a/packages/system/src/Cache/RelayMetricCache.ts b/packages/system/src/cache/relay-metric.ts
similarity index 100%
rename from packages/system/src/Cache/RelayMetricCache.ts
rename to packages/system/src/cache/relay-metric.ts
diff --git a/packages/system/src/Cache/UserCache.ts b/packages/system/src/cache/user-metadata.ts
similarity index 100%
rename from packages/system/src/Cache/UserCache.ts
rename to packages/system/src/cache/user-metadata.ts
diff --git a/packages/system/src/Cache/UserRelayCache.ts b/packages/system/src/cache/user-relays.ts
similarity index 100%
rename from packages/system/src/Cache/UserRelayCache.ts
rename to packages/system/src/cache/user-relays.ts
diff --git a/packages/system/src/ConnectionStats.ts b/packages/system/src/connection-stats.ts
similarity index 100%
rename from packages/system/src/ConnectionStats.ts
rename to packages/system/src/connection-stats.ts
diff --git a/packages/system/src/EventBuilder.ts b/packages/system/src/event-builder.ts
similarity index 94%
rename from packages/system/src/EventBuilder.ts
rename to packages/system/src/event-builder.ts
index 0aecd4b..54379fb 100644
--- a/packages/system/src/EventBuilder.ts
+++ b/packages/system/src/event-builder.ts
@@ -1,8 +1,8 @@
 import { EventKind, HexKey, NostrPrefix, NostrEvent } from ".";
-import { HashtagRegex } from "./Const";
+import { HashtagRegex } from "./const";
 import { getPublicKey, unixNow } from "@snort/shared";
-import { EventExt } from "./EventExt";
-import { tryParseNostrLink } from "./NostrLink";
+import { EventExt } from "./event-ext";
+import { tryParseNostrLink } from "./nostr-link";
 
 export class EventBuilder {
   #kind?: EventKind;
diff --git a/packages/system/src/EventExt.ts b/packages/system/src/event-ext.ts
similarity index 100%
rename from packages/system/src/EventExt.ts
rename to packages/system/src/event-ext.ts
diff --git a/packages/system/src/EventKind.ts b/packages/system/src/event-kind.ts
similarity index 100%
rename from packages/system/src/EventKind.ts
rename to packages/system/src/event-kind.ts
diff --git a/packages/system/src/EventPublisher.ts b/packages/system/src/event-publisher.ts
similarity index 98%
rename from packages/system/src/EventPublisher.ts
rename to packages/system/src/event-publisher.ts
index dfd3ad0..660e93c 100644
--- a/packages/system/src/EventPublisher.ts
+++ b/packages/system/src/event-publisher.ts
@@ -15,9 +15,9 @@ import {
   UserMetadata,
 } from ".";
 
-import { EventBuilder } from "./EventBuilder";
-import { EventExt } from "./EventExt";
-import { findTag } from "./Utils";
+import { EventBuilder } from "./event-builder";
+import { EventExt } from "./event-ext";
+import { findTag } from "./utisl";
 
 const Nip7Queue: Array<WorkQueueItem> = [];
 processWorkQueue(Nip7Queue);
diff --git a/packages/system/src/GossipModel.ts b/packages/system/src/gossip-model.ts
similarity index 100%
rename from packages/system/src/GossipModel.ts
rename to packages/system/src/gossip-model.ts
diff --git a/packages/system/src/index.ts b/packages/system/src/index.ts
index 2cee5b9..dab1541 100644
--- a/packages/system/src/index.ts
+++ b/packages/system/src/index.ts
@@ -1,32 +1,32 @@
-import { AuthHandler, RelaySettings, ConnectionStateSnapshot } from "./Connection";
-import { RequestBuilder } from "./RequestBuilder";
-import { NoteStore } from "./NoteCollection";
-import { Query } from "./Query";
-import { NostrEvent, ReqFilter } from "./Nostr";
+import { AuthHandler, RelaySettings, ConnectionStateSnapshot } from "./connection";
+import { RequestBuilder } from "./request-builder";
+import { NoteStore } from "./note-collection";
+import { Query } from "./query";
+import { NostrEvent, ReqFilter } from "./nostr";
 
-export * from "./NostrSystem";
-export { default as EventKind } from "./EventKind";
-export * from "./Nostr";
-export * from "./Links";
-export * from "./Nips";
-export * from "./RelayInfo";
-export * from "./EventExt";
-export * from "./Connection";
-export * from "./NoteCollection";
-export * from "./RequestBuilder";
-export * from "./EventPublisher";
-export * from "./EventBuilder";
-export * from "./NostrLink";
-export * from "./ProfileCache";
-export * from "./Zaps";
+export * from "./nostr-system";
+export { default as EventKind } from "./event-kind";
+export * from "./nostr";
+export * from "./links";
+export * from "./nips";
+export * from "./relay-info";
+export * from "./event-ext";
+export * from "./connection";
+export * from "./note-collection";
+export * from "./request-builder";
+export * from "./event-publisher";
+export * from "./event-builder";
+export * from "./nostr-link";
+export * from "./profile-cache";
+export * from "./zaps";
 
 export * from "./impl/nip4";
 export * from "./impl/nip44";
 
-export * from "./Cache";
-export * from "./Cache/UserRelayCache";
-export * from "./Cache/UserCache";
-export * from "./Cache/RelayMetricCache";
+export * from "./cache/index";
+export * from "./cache/user-relays";
+export * from "./cache/user-metadata";
+export * from "./cache/relay-metric";
 
 export interface SystemInterface {
   /**
diff --git a/packages/system/src/NostrLink.ts b/packages/system/src/nostr-link.ts
similarity index 100%
rename from packages/system/src/NostrLink.ts
rename to packages/system/src/nostr-link.ts
diff --git a/packages/system/src/NostrSystem.ts b/packages/system/src/nostr-system.ts
similarity index 95%
rename from packages/system/src/NostrSystem.ts
rename to packages/system/src/nostr-system.ts
index c2238f4..b4dc744 100644
--- a/packages/system/src/NostrSystem.ts
+++ b/packages/system/src/nostr-system.ts
@@ -1,13 +1,13 @@
 import debug from "debug";
 
 import { unwrap, sanitizeRelayUrl, ExternalStore, FeedCache } from "@snort/shared";
-import { NostrEvent, TaggedRawEvent } from "./Nostr";
-import { AuthHandler, Connection, RelaySettings, ConnectionStateSnapshot } from "./Connection";
-import { Query } from "./Query";
-import { RelayCache } from "./GossipModel";
-import { NoteStore } from "./NoteCollection";
-import { BuiltRawReqFilter, RequestBuilder } from "./RequestBuilder";
-import { RelayMetricHandler } from "./RelayMetricHandler";
+import { NostrEvent, TaggedRawEvent } from "./nostr";
+import { AuthHandler, Connection, RelaySettings, ConnectionStateSnapshot } from "./connection";
+import { Query } from "./query";
+import { RelayCache } from "./gossip-model";
+import { NoteStore } from "./note-collection";
+import { BuiltRawReqFilter, RequestBuilder } from "./request-builder";
+import { RelayMetricHandler } from "./relay-metric-handler";
 import {
   MetadataCache,
   ProfileLoaderService,
diff --git a/packages/system/src/NoteCollection.ts b/packages/system/src/note-collection.ts
similarity index 99%
rename from packages/system/src/NoteCollection.ts
rename to packages/system/src/note-collection.ts
index e8b8289..f5c5ef4 100644
--- a/packages/system/src/NoteCollection.ts
+++ b/packages/system/src/note-collection.ts
@@ -1,6 +1,6 @@
 import { appendDedupe } from "@snort/shared";
 import { TaggedRawEvent, u256 } from ".";
-import { findTag } from "./Utils";
+import { findTag } from "./utisl";
 
 export interface StoreSnapshot<TSnapshot> {
   data: TSnapshot | undefined;
diff --git a/packages/system/src/ProfileCache.ts b/packages/system/src/profile-cache.ts
similarity index 97%
rename from packages/system/src/ProfileCache.ts
rename to packages/system/src/profile-cache.ts
index 85c8ad2..647b120 100644
--- a/packages/system/src/ProfileCache.ts
+++ b/packages/system/src/profile-cache.ts
@@ -2,8 +2,8 @@
 import debug from "debug";
 import { unixNowMs, FeedCache } from "@snort/shared";
 import { EventKind, HexKey, SystemInterface, TaggedRawEvent, PubkeyReplaceableNoteStore, RequestBuilder } from ".";
-import { ProfileCacheExpire } from "./Const";
-import { mapEventToProfile, MetadataCache } from "./Cache";
+import { ProfileCacheExpire } from "./const";
+import { mapEventToProfile, MetadataCache } from "./cache";
 
 const MetadataRelays = [
   "wss://purplepag.es"
diff --git a/packages/system/src/RelayInfo.ts b/packages/system/src/relay-info.ts
similarity index 100%
rename from packages/system/src/RelayInfo.ts
rename to packages/system/src/relay-info.ts
diff --git a/packages/system/src/RelayMetricHandler.ts b/packages/system/src/relay-metric-handler.ts
similarity index 77%
rename from packages/system/src/RelayMetricHandler.ts
rename to packages/system/src/relay-metric-handler.ts
index e51b9d7..b5c723c 100644
--- a/packages/system/src/RelayMetricHandler.ts
+++ b/packages/system/src/relay-metric-handler.ts
@@ -1,6 +1,6 @@
 import { FeedCache } from "@snort/shared";
-import { Connection } from "Connection";
-import { RelayMetrics } from "Cache";
+import { Connection } from "connection";
+import { RelayMetrics } from "cache";
 
 export class RelayMetricHandler {
     readonly #cache: FeedCache<RelayMetrics>;
diff --git a/packages/system/src/RequestBuilder.ts b/packages/system/src/request-builder.ts
similarity index 96%
rename from packages/system/src/RequestBuilder.ts
rename to packages/system/src/request-builder.ts
index 45d43e4..b744f4a 100644
--- a/packages/system/src/RequestBuilder.ts
+++ b/packages/system/src/request-builder.ts
@@ -3,10 +3,10 @@ import { v4 as uuid } from "uuid";
 import { appendDedupe, sanitizeRelayUrl, unixNowMs } from "@snort/shared";
 
 import { ReqFilter, u256, HexKey, EventKind } from ".";
-import { diffFilters } from "./RequestSplitter";
-import { RelayCache, splitAllByWriteRelays, splitByWriteRelays } from "./GossipModel";
-import { mergeSimilar } from "./RequestMerger";
-import { FlatReqFilter, expandFilter } from "./RequestExpander";
+import { diffFilters } from "./request-splitter";
+import { RelayCache, splitAllByWriteRelays, splitByWriteRelays } from "./gossip-model";
+import { mergeSimilar } from "./request-merger";
+import { FlatReqFilter, expandFilter } from "./request-expander";
 
 /**
  * Which strategy is used when building REQ filters
diff --git a/packages/system/src/RequestExpander.ts b/packages/system/src/request-expander.ts
similarity index 96%
rename from packages/system/src/RequestExpander.ts
rename to packages/system/src/request-expander.ts
index 7b58260..978a0a1 100644
--- a/packages/system/src/RequestExpander.ts
+++ b/packages/system/src/request-expander.ts
@@ -1,4 +1,4 @@
-import { ReqFilter } from "./Nostr";
+import { ReqFilter } from "./nostr";
 
 export interface FlatReqFilter {
   keys: number
diff --git a/packages/system/src/RequestMatcher.ts b/packages/system/src/request-matcher.ts
similarity index 90%
rename from packages/system/src/RequestMatcher.ts
rename to packages/system/src/request-matcher.ts
index 8845702..d6e0ab1 100644
--- a/packages/system/src/RequestMatcher.ts
+++ b/packages/system/src/request-matcher.ts
@@ -1,4 +1,4 @@
-import { NostrEvent, ReqFilter } from "./Nostr";
+import { NostrEvent, ReqFilter } from "./nostr";
 
 export function eventMatchesFilter(ev: NostrEvent, filter: ReqFilter) {
   if (!(filter.ids?.includes(ev.id) ?? false)) {
diff --git a/packages/system/src/RequestMerger.ts b/packages/system/src/request-merger.ts
similarity index 98%
rename from packages/system/src/RequestMerger.ts
rename to packages/system/src/request-merger.ts
index b6766f0..f32f151 100644
--- a/packages/system/src/RequestMerger.ts
+++ b/packages/system/src/request-merger.ts
@@ -1,6 +1,6 @@
 import { distance } from "@snort/shared";
 import { ReqFilter } from ".";
-import { FlatReqFilter } from "./RequestExpander";
+import { FlatReqFilter } from "./request-expander";
 
 /**
  * Keys which can change the entire meaning of the filter outside the array types
diff --git a/packages/system/src/RequestSplitter.ts b/packages/system/src/request-splitter.ts
similarity index 84%
rename from packages/system/src/RequestSplitter.ts
rename to packages/system/src/request-splitter.ts
index d3cee5c..7d63c6d 100644
--- a/packages/system/src/RequestSplitter.ts
+++ b/packages/system/src/request-splitter.ts
@@ -1,6 +1,6 @@
-import { flatFilterEq } from "./Utils";
-import { FlatReqFilter } from "./RequestExpander";
-import { flatMerge } from "./RequestMerger";
+import { flatFilterEq } from "./utisl";
+import { FlatReqFilter } from "./request-expander";
+import { flatMerge } from "./request-merger";
 
 export function diffFilters(prev: Array<FlatReqFilter>, next: Array<FlatReqFilter>, calcRemoved?: boolean) {
   const added = [];
diff --git a/packages/system/src/SystemWorker.ts b/packages/system/src/system-worker.ts
similarity index 89%
rename from packages/system/src/SystemWorker.ts
rename to packages/system/src/system-worker.ts
index 9615742..eff6df7 100644
--- a/packages/system/src/SystemWorker.ts
+++ b/packages/system/src/system-worker.ts
@@ -1,11 +1,11 @@
 import { ExternalStore } from "@snort/shared";
 
 import { SystemSnapshot, SystemInterface } from ".";
-import { AuthHandler, ConnectionStateSnapshot, RelaySettings } from "./Connection";
-import { NostrEvent } from "./Nostr";
-import { NoteStore } from "./NoteCollection";
-import { Query } from "./Query";
-import { RequestBuilder } from "./RequestBuilder";
+import { AuthHandler, ConnectionStateSnapshot, RelaySettings } from "./connection";
+import { NostrEvent } from "./nostr";
+import { NoteStore } from "./note-collection";
+import { Query } from "./query";
+import { RequestBuilder } from "./request-builder";
 
 export class SystemWorker extends ExternalStore<SystemSnapshot> implements SystemInterface {
   #port: MessagePort;
diff --git a/packages/system/src/Utils.ts b/packages/system/src/utisl.ts
similarity index 92%
rename from packages/system/src/Utils.ts
rename to packages/system/src/utisl.ts
index b5ec3b0..cb8f6c0 100644
--- a/packages/system/src/Utils.ts
+++ b/packages/system/src/utisl.ts
@@ -1,7 +1,7 @@
 
 import { equalProp } from "@snort/shared";
-import { FlatReqFilter } from "./RequestExpander";
-import { NostrEvent, ReqFilter } from "./Nostr";
+import { FlatReqFilter } from "./request-expander";
+import { NostrEvent, ReqFilter } from "./nostr";
 
 export function findTag(e: NostrEvent, tag: string) {
     const maybeTag = e.tags.find(evTag => {