diff --git a/src/components/LoginNIP07Button.svelte b/src/components/LoginNIP07Button.svelte
index a2467ca..199fd5a 100644
--- a/src/components/LoginNIP07Button.svelte
+++ b/src/components/LoginNIP07Button.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { processMempool } from "$lib/consensus/producer";
+  import { processMempool } from "$lib/consensus/consensus_event_producer";
   import { login } from "$lib/helpers/login";
   import { currentUser } from "$lib/stores/current-user";
-  import ndk from "$lib/stores/ndk";
+  import ndk from "$lib/stores/ndk_events";
   import { NDKNip07Signer } from "@nostr-dev-kit/ndk";
   import { Button } from "carbon-components-svelte";
   import { User } from "carbon-pictograms-svelte";
diff --git a/src/components/Profile.svelte b/src/components/Profile.svelte
index c790b60..cb878d5 100644
--- a/src/components/Profile.svelte
+++ b/src/components/Profile.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import ndk from "$lib/stores/ndk";
+  import ndk from "$lib/stores/ndk_events";
   import {
     AspectRatio,
     Column,
diff --git a/src/components/modals/AddIdentity.svelte b/src/components/modals/AddIdentity.svelte
index 05ed781..20a3522 100644
--- a/src/components/modals/AddIdentity.svelte
+++ b/src/components/modals/AddIdentity.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { BitcoinHeightTag, BitcoinTipHeight } from "$lib/helpers/bitcoin";
+  import { BitcoinHeightTag } from "$lib/helpers/bitcoin";
   import { unixTimeNow } from "$lib/helpers/mundane";
   import {
     hexPubkeyValidator,
@@ -9,8 +9,8 @@
     simulate
   } from "$lib/settings";
   import { currentUser } from "$lib/stores/current-user";
-  import ndk, { ndk_profiles } from "$lib/stores/ndk";
-  import { FUCKYOUVITE, consensusTipState } from "$lib/stores/state";
+  import ndk, { ndk_profiles } from "$lib/stores/ndk_events";
+  import { FUCKYOUVITE, consensusTipState } from "$lib/consensus/state";
   import { NDKEvent } from "@nostr-dev-kit/ndk";
   import {
     Button,
diff --git a/src/components/modals/AddProblem.svelte b/src/components/modals/AddProblem.svelte
index 5dd4bd3..59fd45f 100644
--- a/src/components/modals/AddProblem.svelte
+++ b/src/components/modals/AddProblem.svelte
@@ -8,8 +8,8 @@
       simulate
     } from "$lib/settings";
     import { currentUser } from "$lib/stores/current-user";
-    import ndk from "$lib/stores/ndk";
-    import { FUCKYOUVITE } from "$lib/stores/state";
+    import ndk from "$lib/stores/ndk_events";
+    import { FUCKYOUVITE } from "$lib/consensus/state";
     import { NDKEvent } from "@nostr-dev-kit/ndk";
     import {
       Button,
diff --git a/src/components/modals/CreateRocket.svelte b/src/components/modals/CreateRocket.svelte
index 386c6fa..7eba497 100644
--- a/src/components/modals/CreateRocket.svelte
+++ b/src/components/modals/CreateRocket.svelte
@@ -3,7 +3,7 @@
   import { unixTimeNow } from "$lib/helpers/mundane";
   import { rocketNameValidator, rootTag, simulate } from "$lib/settings";
   import { currentUser } from "$lib/stores/current-user";
-  import ndk from "$lib/stores/ndk";
+  import ndk from "$lib/stores/ndk_events";
   import { NDKEvent } from "@nostr-dev-kit/ndk";
   import {
     Button,
diff --git a/src/components/objects/Problem.svelte b/src/components/objects/Problem.svelte
index d9c6079..6c36be8 100644
--- a/src/components/objects/Problem.svelte
+++ b/src/components/objects/Problem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { consensusTipState } from "$lib/stores/state";
+  import { consensusTipState } from "$lib/consensus/state";
   import type { Problem } from "$lib/types";
   import { AccordionItem, InlineLoading } from "carbon-components-svelte";
   import AddProblem from "../modals/AddProblem.svelte";
diff --git a/src/components/views/Identity.svelte b/src/components/views/Identity.svelte
index 344ecbe..8a83fa9 100644
--- a/src/components/views/Identity.svelte
+++ b/src/components/views/Identity.svelte
@@ -1,7 +1,7 @@
 <script>
   import {
     nostrocketParticipantProfiles,
-  } from "$lib/stores/state";
+  } from "$lib/consensus/state";
   import {
     AspectRatio,
     Button,
diff --git a/src/lib/consensus/producer.ts b/src/lib/consensus/consensus_event_producer.ts
similarity index 96%
rename from src/lib/consensus/producer.ts
rename to src/lib/consensus/consensus_event_producer.ts
index 5b829b5..087bf0d 100644
--- a/src/lib/consensus/producer.ts
+++ b/src/lib/consensus/consensus_event_producer.ts
@@ -1,10 +1,10 @@
-import { weHaveTheLead } from "$lib/consensus/current-votepower";
+import { weHaveTheLead } from "$lib/consensus/votepower";
 import { BitcoinTipHeight } from "$lib/helpers/bitcoin";
 import { unixTimeNow } from "$lib/helpers/mundane";
 import { validate } from "$lib/protocol_validators/rockets";
 import { MAX_STATECHANGE_EVENT_AGE, rootEventID, rootTag, simulate } from "$lib/settings";
-import ndk from "$lib/stores/ndk";
-import { consensusTipState, eventsInState, labelledTag, mempool } from "$lib/stores/state";
+import ndk from "$lib/stores/ndk_events";
+import { consensusTipState, eventsInState, labelledTag, mempool } from "$lib/consensus/state";
 import { NDKEvent } from "@nostr-dev-kit/ndk";
 import { Mutex } from "async-mutex";
 import {
diff --git a/src/lib/consensus/current-state.ts b/src/lib/consensus/current-state.ts
deleted file mode 100644
index 5f6c4d2..0000000
--- a/src/lib/consensus/current-state.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This is the current state of Nostrocket as produced by following the consensus algorithm
-Events in mempool are NOT handled here except if they are referred to by a consensus event.
-
-See nostrocket/NIPS/Consensus.md for an overview of how consensus works.
-*/
-import { allNostrocketEventKinds } from "$lib/kinds";
-import { allNostrocketEvents } from "$lib/stores/state";
-import type { Nostrocket } from "$lib/types";
-import State from "$lib/types";
-import type { NDKEvent } from "@nostr-dev-kit/ndk";
-import { Mutex } from "async-mutex";
-import { derived, get, writable } from "svelte/store";
-
-let r: Nostrocket = new State("{}");
-
-//this is the latest nostrocket state, built from consensus events signed by participants with votepower
-export const consensusTipState = writable(r);
-let changeStateMutex = new Mutex();
-
-consensusTipState.subscribe((x) => {
-  console.log(x);
-});
-
-//todo move things from state.ts to here
diff --git a/src/lib/stores/state.ts b/src/lib/consensus/state.ts
similarity index 95%
rename from src/lib/stores/state.ts
rename to src/lib/consensus/state.ts
index 9c6094c..32fe8a3 100644
--- a/src/lib/stores/state.ts
+++ b/src/lib/consensus/state.ts
@@ -1,6 +1,6 @@
 //todo deprecate this file and use /consensus instead
 //todo deprecate precomputed state
-import createEventpool from "$lib/consensus/mempool";
+import createEventpool from "$lib/stores/mempool";
 import { validate } from "$lib/protocol_validators/rockets";
 import type { NDKEvent, NDKFilter, NDKUser } from "@nostr-dev-kit/ndk";
 import { Mutex } from "async-mutex";
@@ -12,15 +12,15 @@ import {
 } from "svelte/store";
 import { allNostrocketEventKinds } from "../kinds";
 import {
-  changeStateMutex,
   ignitionPubkey,
   nostrocketIgnitionEvent,
   rootEventID,
 } from "../settings";
 import { Nostrocket, Problem, type Account } from "../types";
-import ndk, { ndk_profiles } from "./ndk";
-import { fetchEventsAndUpsertStore, problemEvents } from "./problems";
-import { profiles } from "./profiles";
+import ndk, { ndk_profiles } from "../stores/ndk_events";
+import { fetchEventsAndUpsertStore, problemEvents } from "../stores/problems";
+import { profiles } from "../stores/profiles";
+import { changeStateMutex } from "../stores/mutex";
 
 export function FUCKYOUVITE(): NDKUser { //todo, vite issue fixed, update everywhere that uses this
   return $ndk.getUser({});
@@ -205,8 +205,7 @@ validConsensusEvents.subscribe((x) => {
     let request = labelledTag(x[0], "request", "e");
     if (request) {
       let requestEvent = mempool.fetch(request);
-      //todo add mutex
-      changeStateMutex.acquire().then(()=>{
+      changeStateMutex(request).then(release=>{
         let current = get(consensusTipState);
         if (!requestEvent) {
           console.log("event: ", request, " for consensus event ", x[0].id, " is not in mempool")
@@ -226,8 +225,7 @@ validConsensusEvents.subscribe((x) => {
             }
           }
         }
-        
-        changeStateMutex.release()
+        release()
       })
     }
   }
@@ -243,11 +241,11 @@ async function watchMempool() {
   let last = 0
   watchMempoolMutex.acquire().then(()=>{
     mempool.subscribe(()=>{
-      changeStateMutex.acquire().then(()=>{
+      changeStateMutex("state:244").then((release)=>{
         let current = get(consensusTipState);
         let newstate = processMempool(current)
         consensusTipState.set(newstate);
-        changeStateMutex.release()
+        release()
       })
     })
   })
diff --git a/src/lib/consensus/current-votepower.ts b/src/lib/consensus/votepower.ts
similarity index 100%
rename from src/lib/consensus/current-votepower.ts
rename to src/lib/consensus/votepower.ts
diff --git a/src/lib/kinds.ts b/src/lib/kinds.ts
index 0d2d669..7606c22 100644
--- a/src/lib/kinds.ts
+++ b/src/lib/kinds.ts
@@ -8,6 +8,17 @@ export const kindsThatNeedConsensus = Object.keys(consensusKinds).map((k) =>
   parseInt(k)
 );
 
+const problemKindRecord: Record<number, string> = {
+  15171971: "Problem ANCHOR",
+  15171972: "Problem COMMIT",
+  15171973: "Problem TEXT",
+  31971: "Problem HEAD",
+};
+
+export const problemKinds = Object.keys(problemKindRecord).map((k) =>
+  parseInt(k)
+);
+
 const kinds: Record<number, string> = {
   10311: "Precomputed State",
   15171031: "Rocket Ignition",
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index c96e2d9..b9116ca 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -1,4 +1,3 @@
-import { Mutex } from "async-mutex";
 
 export const MAX_STATECHANGE_EVENT_AGE = 86_400; //seconds
 
@@ -35,4 +34,13 @@ export const rocketNameValidator = /^\w{5,20}$/;
 
 export const hexPubkeyValidator = /^\w{64}$/;
 
-export const changeStateMutex = new Mutex()
\ No newline at end of file
+export const profileRelays = [
+  "wss://nostr.688.org",
+  "wss://relay.damus.io",
+  "wss://nos.lol",
+];
+
+export const defaultRelays = [
+  "wss://nostr.688.org",
+  // 'ws://localhost:8080',
+];
\ No newline at end of file
diff --git a/src/lib/consensus/mempool.ts b/src/lib/stores/mempool.ts
similarity index 80%
rename from src/lib/consensus/mempool.ts
rename to src/lib/stores/mempool.ts
index f4e1f3d..cd0810d 100644
--- a/src/lib/consensus/mempool.ts
+++ b/src/lib/stores/mempool.ts
@@ -1,6 +1,7 @@
-import { allNostrocketEventKinds, kindsThatNeedConsensus } from "$lib/kinds";
+import { allNostrocketEventKinds, kindsThatNeedConsensus, problemKinds } from "$lib/kinds";
 import { rootEventID } from "$lib/settings";
-import { labelledTag } from "$lib/stores/state";
+import { problemEvents } from "$lib/stores/problems";
+import { labelledTag } from "$lib/consensus/state";
 import type { NDKEvent } from "@nostr-dev-kit/ndk";
 import { get, writable } from "svelte/store";
 
@@ -10,6 +11,14 @@ export default function createEventpool(notstrict:boolean|undefined) {
   return {
     subscribe,
     push: (e: NDKEvent): void => {
+      if (problemKinds.includes(e.kind)) {
+        problemEvents.update(pe=>{
+          if (!pe.get(e.id)) {
+            pe.set(e.id, e)
+          }
+          return pe
+        })
+      }
       if (!notstrict) {
         if (labelledTag(e, "root", "e") == rootEventID && allNostrocketEventKinds.includes(e.kind? e.kind : 0)) {
           update((m) => {
diff --git a/src/lib/stores/mutex.ts b/src/lib/stores/mutex.ts
new file mode 100644
index 0000000..322c21c
--- /dev/null
+++ b/src/lib/stores/mutex.ts
@@ -0,0 +1,22 @@
+import { Mutex } from "async-mutex"
+import { writable } from "svelte/store"
+
+const CHANGE_STATE_MUTEX = new Mutex()
+export const MutexObserver = writable(false)
+
+export async function changeStateMutex(id:string|undefined) {
+  let p = new Promise<()=>void>((resolve)=>{
+    CHANGE_STATE_MUTEX.acquire().then(()=>{
+      MutexObserver.set(true)
+      resolve(()=>{
+        CHANGE_STATE_MUTEX.release()
+        MutexObserver.set(false)
+      })
+    })
+  })
+  return p
+}
+
+MutexObserver.subscribe(state=>{
+    console.log("Mutext is locked? ", state)
+})
\ No newline at end of file
diff --git a/src/lib/stores/ndk.ts b/src/lib/stores/ndk_events.ts
similarity index 51%
rename from src/lib/stores/ndk.ts
rename to src/lib/stores/ndk_events.ts
index 98da160..e0fed04 100644
--- a/src/lib/stores/ndk.ts
+++ b/src/lib/stores/ndk_events.ts
@@ -1,5 +1,5 @@
 import { browser } from "$app/environment";
-import NDK from "@nostr-dev-kit/ndk";
+import { defaultRelays, profileRelays } from "$lib/settings";
 import type { NDKCacheAdapter } from "@nostr-dev-kit/ndk";
 import NDKDexieCacheAdapter from "@nostr-dev-kit/ndk-cache-dexie";
 import NDKSvelte from "@nostr-dev-kit/ndk-svelte";
@@ -13,39 +13,8 @@ if (browser) {
   });
 }
 
-// // get relays from localstorage
-// let relays;
-
-// try {
-//   // relays = localStorage.getItem('relays');
-// } catch (e) {
-//   /* empty */
-// }
-
-// let relayList: string[] = [];
-
-// if (relays) {
-//   relayList = JSON.parse(relays);
-// }
-
-export const defaultRelays = [
-  "wss://nostr.688.org",
-  // 'ws://localhost:8080',
-];
-
-export const profileRelays = [
-  "wss://nostr.688.org",
-  "wss://relay.damus.io",
-  "wss://nos.lol",
-];
-
-// if (!relayList || !Array.isArray(relayList) || relayList.length === 0) {
-//   relayList = defaultRelays;
-// }
-
-let relayList = defaultRelays;
 const _ndk: NDKSvelte = new NDKSvelte({
-  explicitRelayUrls: relayList,
+  explicitRelayUrls: defaultRelays,
 });
 
 const ndk = writable(_ndk);
diff --git a/src/lib/stores/problems.ts b/src/lib/stores/problems.ts
index d25580e..da911a1 100644
--- a/src/lib/stores/problems.ts
+++ b/src/lib/stores/problems.ts
@@ -1,10 +1,11 @@
 import type { NDKEvent, NDKFilter } from "@nostr-dev-kit/ndk";
 import { get, writable, type Writable } from "svelte/store";
-import ndk from "./ndk";
-import { consensusTipState, labelledTag } from "./state";
-import { changeStateMutex } from "$lib/settings";
+import ndk from "./ndk_events";
+import { consensusTipState, labelledTag } from "../consensus/state";
+import { changeStateMutex } from "./mutex";
 
 export const problemEvents = writable<Map<string, NDKEvent>>(new Map());
+
 export function getProblemEvent(id:string):NDKEvent|undefined {
     let e = get(problemEvents).get(id)
     if (e) {return e} else if (!requested.get(id)) {
@@ -51,112 +52,8 @@ export async function fetchEventsAndUpsertStore(filter:NDKFilter, store:Writable
       })
 }
 
-// export function GetCommitEventID(e:NDKEvent | undefined):string {
-//     let val = ""
-//     if (e) {
-//         console.log(44)
-//         e.getMatchingTags("e").forEach((t)=>{
-//             if (t[t.length-1] == "commit") {
-//                 if (t[1].length == 64) {
-//                     val = t[1]
-//                 }
-//             }
-//         })
-//     }
-//     return val
-// }
-
-export function GetTextEventID(e:NDKEvent | undefined):string {
-    let val = ""
-    if (e) {
-        e.getMatchingTags("e").forEach((t)=>{
-            if (t[t.length-1] == "text") {
-                if (t[1].length == 64) {
-                    val = t[1]
-                    fetchProblemEvents(val)
-                }
-            }
-        })
-    }
-    return val
-}
-
-var titles = new Map()
-
-export function GetTitleFromTextEvent(e:NDKEvent | undefined):string {
-    let val = ""
-    let gotTitle = false
-    let title = titles.get(e?.id)
-    if (title) {
-        if (title.length > 0) {
-            titles.set(e?.id, title)
-            val = title
-            gotTitle = true
-        }
-    }
-    if (e && !gotTitle) {
-        e.getMatchingTags("t").forEach((t)=>{
-            if (t[t.length-1] == "title") {
-                if (t[1].length > 0) {
-                    val = t[1]
-                }
-            }
-        })
-    }
-    return val
-}
-
-var summaries = new Map();
-export function GetSummaryFromTextEvent(e:NDKEvent | undefined):string {
-    let val = ""
-    let gotTitle = false
-    let t = summaries.get(e?.id)
-    if (t) {
-        if (t.length > 0) {
-            summaries.set(e?.id, t)
-            val = t
-            gotTitle = true
-        }
-    }
-    if (e && !gotTitle) {
-        e.getMatchingTags("t").forEach((t)=>{
-            if (t[t.length-1] == "summary") {
-                if (t[1].length > 0) {
-                    val = t[1]
-                }
-            }
-        })
-    }
-    return val
-}
-
-var fulltext = new Map();
-export function GetFulltextFromTextEvent(e:NDKEvent | undefined):string {
-    let val = ""
-    let gotTitle = false
-    let t = fulltext.get(e?.id)
-    if (t) {
-        if (t.length > 0) {
-            fulltext.set(e?.id, t)
-            val = t
-            gotTitle = true
-        }
-    }
-    if (e && !gotTitle) {
-        e.getMatchingTags("t").forEach((t)=>{
-            if (t[t.length-1] == "full") {
-                if (t[1].length > 0) {
-                    val = t[1]
-                }
-            }
-        })
-    }
-    return val
-}
-
-
 problemEvents.subscribe(()=>{
-    changeStateMutex.acquire().then(()=>{
+    changeStateMutex().then((release)=>{
       consensusTipState.update(state=>{
         state.Problems.forEach(problem=>{
           //get the commit event and popuate status etc
@@ -205,6 +102,6 @@ problemEvents.subscribe(()=>{
         })
         return state
       })
-      changeStateMutex.release()
+      release()
     })
 })
\ No newline at end of file
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 22f7f29..217b3de 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,19 +1,18 @@
 <script>
-  import "carbon-components-svelte/css/g100.css";
+  import ndk, { ndk_profiles } from "$lib/stores/ndk_events";
   import {
+    Column,
     Content,
     Grid,
     Row,
-    Column,
-    breakpointObserver,
     Tile,
-    ModalFooter,
+    breakpointObserver
   } from "carbon-components-svelte";
+  import "carbon-components-svelte/css/g100.css";
   import { onMount } from "svelte";
   import Header from "./Header.svelte";
   import "./styles.css";
-  import ndk, { ndk_profiles } from "$lib/stores/ndk";
-  import { BitcoinTipHeight } from "$lib/helpers/bitcoin";
+  import { MutexObserver, changeStateMutex } from "$lib/stores/mutex";
   onMount(async () => {
     try {
       $ndk.connect().then(() => {
@@ -51,7 +50,7 @@
       >
         <Tile style="width:100%;">
           Visit <a href="https://nostrocket.org">nostrocket.org</a> to learn more
-          about Nostrocket
+          about Nostrocket. StateChangeMutex is {$MutexObserver?"Locked":"Unlocked"}
         </Tile>
       </div>
     </Row>
diff --git a/src/routes/Header.svelte b/src/routes/Header.svelte
index fe53afd..9d03ce4 100644
--- a/src/routes/Header.svelte
+++ b/src/routes/Header.svelte
@@ -1,8 +1,7 @@
 <script>
-    import {weHaveTheLead} from "$lib/consensus/current-votepower";
+    import {weHaveTheLead} from "$lib/consensus/votepower";
     import {BitcoinTipHeight} from "$lib/helpers/bitcoin";
     import {currentUser} from "$lib/stores/current-user";
-    import {defaultRelays, profileRelays} from "$lib/stores/ndk";
     import {
         breakpointObserver,
         Header,
@@ -25,6 +24,7 @@
     import SettingsAdjust from "carbon-icons-svelte/lib/SettingsAdjust.svelte";
     import LoginNip07Button from "../components/LoginNIP07Button.svelte";
     import menu from "$lib/menu";
+  import { defaultRelays, profileRelays } from "$lib/settings";
 
     const size = breakpointObserver();
     const larger = size.largerThan("md");
diff --git a/src/routes/eventviewer/[id]/+page.svelte b/src/routes/eventviewer/[id]/+page.svelte
index 3b8b5f7..1bf798c 100644
--- a/src/routes/eventviewer/[id]/+page.svelte
+++ b/src/routes/eventviewer/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { page } from "$app/stores";
-  import ndk from "$lib/stores/ndk";
-  import { eventsInState, mempool } from "$lib/stores/state";
+  import ndk from "$lib/stores/ndk_events";
+  import { eventsInState, mempool } from "$lib/consensus/state";
   import { NDKEvent } from "@nostr-dev-kit/ndk";
   import { CodeSnippet, InlineLoading, Row, Tile } from "carbon-components-svelte";
 
diff --git a/src/routes/mempool/+page.svelte b/src/routes/mempool/+page.svelte
index 109b115..c27536b 100644
--- a/src/routes/mempool/+page.svelte
+++ b/src/routes/mempool/+page.svelte
@@ -9,7 +9,7 @@
     mempool,
 
     mempoolEvents
-  } from "$lib/stores/state";
+  } from "$lib/consensus/state";
   import {
     Column,
     InlineNotification,
diff --git a/src/routes/problems/+page.svelte b/src/routes/problems/+page.svelte
index b3d5b11..2c023db 100644
--- a/src/routes/problems/+page.svelte
+++ b/src/routes/problems/+page.svelte
@@ -1,9 +1,9 @@
 <script>
-    import { fetchProblemEvents, problemEvents } from "$lib/stores/problems";
-    import { Problems, Rockets } from "$lib/stores/state";
-    import { Accordion, Row, Tile } from "carbon-components-svelte";
+    import { fetchProblemEvents } from "$lib/stores/problems";
+    import { Problems } from "$lib/consensus/state";
+    import { Accordion } from "carbon-components-svelte";
     import AddProblem from "../../components/modals/AddProblem.svelte";
-  import Problem from "../../components/objects/Problem.svelte";
+    import Problem from "../../components/objects/Problem.svelte";
    
     
     fetchProblemEvents(undefined)
diff --git a/src/routes/rockets/+page.svelte b/src/routes/rockets/+page.svelte
index e5ed161..b95b8f7 100644
--- a/src/routes/rockets/+page.svelte
+++ b/src/routes/rockets/+page.svelte
@@ -1,12 +1,9 @@
 <script>
-  import ndk from "$lib/stores/ndk";
-  import { Avatar } from "@nostr-dev-kit/ndk-svelte-components";
-  import { Rocket } from "carbon-pictograms-svelte";
-  import { page } from "$app/stores";
   import { base } from "$app/paths";
-  import { AspectRatio, Column, Row, Tile } from "carbon-components-svelte";
+  import { consensusTipState } from "$lib/consensus/state";
+  import { Column, Row, Tile } from "carbon-components-svelte";
+  import { Rocket } from "carbon-pictograms-svelte";
   import CreateRocket from "../../components/modals/CreateRocket.svelte";
-  import { consensusTipState } from "$lib/stores/state";
 </script>
 
 <Row>
diff --git a/src/routes/rockets/[id]/+page.svelte b/src/routes/rockets/[id]/+page.svelte
index 668863c..879cce8 100644
--- a/src/routes/rockets/[id]/+page.svelte
+++ b/src/routes/rockets/[id]/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { page } from "$app/stores";
-  import { consensusTipState } from "$lib/stores/state";
+  import { consensusTipState } from "$lib/consensus/state";
   import {
     AspectRatio,
     CodeSnippet,