diff --git a/js/feedEngine/watchHistoryFeed.js b/js/feedEngine/watchHistoryFeed.js
index b93d19c1..cd0d4428 100644
--- a/js/feedEngine/watchHistoryFeed.js
+++ b/js/feedEngine/watchHistoryFeed.js
@@ -1,6 +1,6 @@
 // js/feedEngine/watchHistoryFeed.js
 
-import { pointerKey, normalizePointerInput } from "../nostr.js";
+import { pointerKey, normalizePointerInput } from "../nostr/watchHistory.js";
 import watchHistoryService from "../watchHistoryService.js";
 import nostrService from "../services/nostrService.js";
 import { createWatchHistoryMetadataResolver } from "../watchHistoryMetadata.js";
diff --git a/js/historyView.js b/js/historyView.js
index c72a5d73..8828bd67 100644
--- a/js/historyView.js
+++ b/js/historyView.js
@@ -1,12 +1,8 @@
 // js/historyView.js
 
 import watchHistoryService from "./watchHistoryService.js";
-import {
-  pointerKey,
-  normalizePointerInput,
-  nostrClient,
-  updateWatchHistoryList
-} from "./nostr.js";
+import { nostrClient, updateWatchHistoryList } from "./nostr.js";
+import { pointerKey, normalizePointerInput } from "./nostr/watchHistory.js";
 import {
   WATCH_HISTORY_BATCH_RESOLVE,
   WATCH_HISTORY_BATCH_PAGE_SIZE
diff --git a/js/ui/watchHistoryController.js b/js/ui/watchHistoryController.js
index 610d8a2a..4f2d9dc9 100644
--- a/js/ui/watchHistoryController.js
+++ b/js/ui/watchHistoryController.js
@@ -2,7 +2,7 @@ import { isDevMode } from "../config.js";
 import {
   normalizePointerInput,
   pointerKey as derivePointerKey,
-} from "../nostr.js";
+} from "../nostr/watchHistory.js";
 import { normalizeDesignSystemContext } from "../designSystem.js";
 import { devLogger } from "../utils/logger.js";
 
diff --git a/js/watchHistoryService.js b/js/watchHistoryService.js
index facbb247..57eb7b86 100644
--- a/js/watchHistoryService.js
+++ b/js/watchHistoryService.js
@@ -1,12 +1,11 @@
 // js/watchHistoryService.js
 
+import { nostrClient, requestDefaultExtensionPermissions } from "./nostr.js";
 import {
-  nostrClient,
   normalizePointerInput,
   pointerKey,
   normalizeActorKey,
-  requestDefaultExtensionPermissions,
-} from "./nostr.js";
+} from "./nostr/watchHistory.js";
 import {
   WATCH_HISTORY_CACHE_TTL_MS,
   WATCH_HISTORY_MAX_ITEMS,
diff --git a/tests/watch-history.test.mjs b/tests/watch-history.test.mjs
index 6ef282d7..c559c1ee 100644
--- a/tests/watch-history.test.mjs
+++ b/tests/watch-history.test.mjs
@@ -17,11 +17,10 @@ const {
   getWatchHistoryV2Enabled,
   setWatchHistoryV2Enabled,
 } = await import("../js/constants.js");
-const {
-  nostrClient,
-  chunkWatchHistoryPayloadItems,
-  normalizeActorKey,
-} = await import("../js/nostr.js");
+const { nostrClient } = await import("../js/nostr.js");
+const { chunkWatchHistoryPayloadItems, normalizeActorKey } = await import(
+  "../js/nostr/watchHistory.js"
+);
 const { watchHistoryService } = await import("../js/watchHistoryService.js");
 const { buildHistoryCard } = await import("../js/historyView.js");
 const { getApplication, setApplication } = await import(