diff --git a/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx b/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx
index 0620354..67eea06 100644
--- a/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx
+++ b/src/codec-components/LookupTypeEdit/LookupTypeEdit.tsx
@@ -1,6 +1,9 @@
-import { runtimeCtx$ } from "@/chain.state"
+import { runtimeCtx$ } from "@/state/chains/chain.state"
 import { byteArraysAreEqual } from "@/utils/byteArray"
-import { CodecComponentType, CodecComponentValue } from "@polkadot-api/react-builder"
+import {
+  CodecComponentType,
+  CodecComponentValue,
+} from "@polkadot-api/react-builder"
 import { state, useStateObservable } from "@react-rxjs/core"
 import { Codec } from "polkadot-api"
 import { ComponentProps, FC, useEffect, useRef, useState } from "react"
diff --git a/src/main.tsx b/src/main.tsx
index 2a7b6cb..062d99d 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -4,7 +4,7 @@ import { createRoot } from "react-dom/client"
 import { BrowserRouter } from "react-router-dom"
 import { merge } from "rxjs"
 import App from "./App.tsx"
-import { dynamicBuilder$ } from "./chain.state.ts"
+import { dynamicBuilder$ } from "@/state/chains/chain.state"
 import { TooltipProvider } from "./components/Tooltip.tsx"
 import "./index.css"
 import { explorer$ } from "./pages/Explorer"
diff --git a/src/pages/Constants.tsx b/src/pages/Constants.tsx
index 54d981d..8da9d46 100644
--- a/src/pages/Constants.tsx
+++ b/src/pages/Constants.tsx
@@ -1,4 +1,4 @@
-import { lookup$, runtimeCtx$ } from "@/chain.state"
+import { lookup$, runtimeCtx$ } from "@/state/chains/chain.state"
 import { ViewCodec } from "@/codec-components/ViewCodec"
 import { ButtonGroup } from "@/components/ButtonGroup"
 import { DocsRenderer } from "@/components/DocsRenderer"
diff --git a/src/pages/Explorer/BlockPopover.tsx b/src/pages/Explorer/BlockPopover.tsx
index f65494b..56311b1 100644
--- a/src/pages/Explorer/BlockPopover.tsx
+++ b/src/pages/Explorer/BlockPopover.tsx
@@ -1,4 +1,4 @@
-import { runtimeCtx$ } from "@/chain.state"
+import { runtimeCtx$ } from "@/state/chains/chain.state"
 import { CircularProgress } from "@/components/CircularProgress"
 import { groupBy } from "@/lib/groupBy"
 import { state, useStateObservable } from "@react-rxjs/core"
diff --git a/src/pages/Explorer/BlockTable.tsx b/src/pages/Explorer/BlockTable.tsx
index df74432..789fd07 100644
--- a/src/pages/Explorer/BlockTable.tsx
+++ b/src/pages/Explorer/BlockTable.tsx
@@ -1,4 +1,4 @@
-import { chainHead$ } from "@/chain.state"
+import { chainHead$ } from "@/state/chains/chain.state"
 import { CopyText } from "@/components/Copy"
 import { Popover } from "@/components/Popover"
 import { state, useStateObservable } from "@react-rxjs/core"
diff --git a/src/pages/Explorer/BlockTime.tsx b/src/pages/Explorer/BlockTime.tsx
index 39f77b1..fbdce05 100644
--- a/src/pages/Explorer/BlockTime.tsx
+++ b/src/pages/Explorer/BlockTime.tsx
@@ -1,4 +1,4 @@
-import { chainHead$ } from "@/chain.state"
+import { chainHead$ } from "@/state/chains/chain.state"
 import { CircularProgress } from "@/components/CircularProgress"
 import { state, useStateObservable } from "@react-rxjs/core"
 import {
diff --git a/src/pages/Explorer/Detail/BlockDetail.tsx b/src/pages/Explorer/Detail/BlockDetail.tsx
index ad54c56..2d408c9 100644
--- a/src/pages/Explorer/Detail/BlockDetail.tsx
+++ b/src/pages/Explorer/Detail/BlockDetail.tsx
@@ -1,4 +1,4 @@
-import { runtimeCtx$ } from "@/chain.state"
+import { runtimeCtx$ } from "@/state/chains/chain.state"
 import { CopyBinary } from "@/codec-components/ViewCodec/CopyBinary"
 import { AccountIdDisplay } from "@/components/AccountIdDisplay"
 import { ExpandBtn } from "@/components/Expand"
diff --git a/src/pages/Explorer/EpochTime.tsx b/src/pages/Explorer/EpochTime.tsx
index 9bb10a9..f7fe0b6 100644
--- a/src/pages/Explorer/EpochTime.tsx
+++ b/src/pages/Explorer/EpochTime.tsx
@@ -11,7 +11,11 @@ import {
   withLatestFrom,
 } from "rxjs"
 import { targetBlockTime$ } from "./blockTime.state"
-import { chainClient$, chainHead$, runtimeCtx$ } from "@/chain.state"
+import {
+  chainClient$,
+  chainHead$,
+  runtimeCtx$,
+} from "@/state/chains/chain.state"
 import { groupBy } from "@/lib/groupBy"
 
 const bestBlock$ = chainHead$.pipeState(
diff --git a/src/pages/Explorer/Summary.tsx b/src/pages/Explorer/Summary.tsx
index a379b80..f629ed2 100644
--- a/src/pages/Explorer/Summary.tsx
+++ b/src/pages/Explorer/Summary.tsx
@@ -1,4 +1,4 @@
-import { chainHead$, runtimeCtx$ } from "@/chain.state"
+import { chainHead$, runtimeCtx$ } from "@/state/chains/chain.state"
 import { FC, PropsWithChildren } from "react"
 import { map, switchMap } from "rxjs"
 import { twMerge } from "tailwind-merge"
diff --git a/src/pages/Explorer/block.state.ts b/src/pages/Explorer/block.state.ts
index 1f56454..bda56d2 100644
--- a/src/pages/Explorer/block.state.ts
+++ b/src/pages/Explorer/block.state.ts
@@ -1,4 +1,4 @@
-import { chainClient$, chainHead$ } from "@/chain.state"
+import { chainClient$, chainHead$ } from "@/state/chains/chain.state"
 import {
   ChainHead$,
   PinnedBlocks,
diff --git a/src/pages/Explorer/blockTime.state.ts b/src/pages/Explorer/blockTime.state.ts
index 8272f9f..81c491d 100644
--- a/src/pages/Explorer/blockTime.state.ts
+++ b/src/pages/Explorer/blockTime.state.ts
@@ -1,4 +1,4 @@
-import { chainClient$, runtimeCtx$ } from "@/chain.state"
+import { chainClient$, runtimeCtx$ } from "@/state/chains/chain.state"
 import { groupBy } from "@/lib/groupBy"
 import { state } from "@react-rxjs/core"
 import { map, of, switchMap, withLatestFrom } from "rxjs"
diff --git a/src/pages/Extrinsics/Extrinsics.tsx b/src/pages/Extrinsics/Extrinsics.tsx
index 005bb7c..cedb257 100644
--- a/src/pages/Extrinsics/Extrinsics.tsx
+++ b/src/pages/Extrinsics/Extrinsics.tsx
@@ -1,9 +1,12 @@
-import { runtimeCtx$ } from "@/chain.state"
+import { runtimeCtx$ } from "@/state/chains/chain.state"
 import { BinaryDisplay } from "@/codec-components/LookupTypeEdit"
 import { ButtonGroup } from "@/components/ButtonGroup"
 import { LoadingMetadata } from "@/components/Loading"
 import { withSubscribe } from "@/components/withSuspense"
-import { CodecComponentType, CodecComponentValue } from "@polkadot-api/react-builder"
+import {
+  CodecComponentType,
+  CodecComponentValue,
+} from "@polkadot-api/react-builder"
 import { Binary } from "@polkadot-api/substrate-bindings"
 import { state, useStateObservable } from "@react-rxjs/core"
 import { useState } from "react"
diff --git a/src/pages/Extrinsics/SubmitTx/SelectAccountFromExtension.tsx b/src/pages/Extrinsics/SubmitTx/SelectAccountFromExtension.tsx
index ffa88a8..c9283a3 100644
--- a/src/pages/Extrinsics/SubmitTx/SelectAccountFromExtension.tsx
+++ b/src/pages/Extrinsics/SubmitTx/SelectAccountFromExtension.tsx
@@ -1,4 +1,4 @@
-import { unsafeApi$ } from "@/chain.state"
+import { unsafeApi$ } from "@/state/chains/chain.state"
 import { ActionButton } from "@/components/ActionButton"
 import { onNexTx } from "@/pages/Transactions"
 import { useStateObservable } from "@react-rxjs/core"
diff --git a/src/pages/Metadata/Editor.tsx b/src/pages/Metadata/Editor.tsx
index f0d97ec..9b59089 100644
--- a/src/pages/Metadata/Editor.tsx
+++ b/src/pages/Metadata/Editor.tsx
@@ -1,4 +1,4 @@
-import { lookup$ } from "@/chain.state"
+import { lookup$ } from "@/state/chains/chain.state"
 import { LookupTypeEdit } from "@/codec-components/LookupTypeEdit"
 import { getTypeComplexity } from "@/utils/shape"
 import { state, useStateObservable } from "@react-rxjs/core"
diff --git a/src/pages/Metadata/Metadata.tsx b/src/pages/Metadata/Metadata.tsx
index 1a54521..caee1a0 100644
--- a/src/pages/Metadata/Metadata.tsx
+++ b/src/pages/Metadata/Metadata.tsx
@@ -1,4 +1,4 @@
-import { lookup$, metadata$ } from "@/chain.state"
+import { lookup$, metadata$ } from "@/state/chains/chain.state"
 import { LookupTypeEdit } from "@/codec-components/LookupTypeEdit"
 import { ButtonGroup } from "@/components/ButtonGroup"
 import { JsonDisplay } from "@/components/JsonDisplay"
diff --git a/src/pages/Network/Network.tsx b/src/pages/Network/Network.tsx
index a2cceb2..ce25148 100644
--- a/src/pages/Network/Network.tsx
+++ b/src/pages/Network/Network.tsx
@@ -7,7 +7,7 @@ import {
   onChangeChain,
   SelectedChain,
   selectedChain$,
-} from "@/chain.state"
+} from "@/state/chains/chain.state"
 import {
   Accordion,
   AccordionContent,
diff --git a/src/pages/RuntimeCalls/RuntimeCallQuery.tsx b/src/pages/RuntimeCalls/RuntimeCallQuery.tsx
index d80b604..d7c5179 100644
--- a/src/pages/RuntimeCalls/RuntimeCallQuery.tsx
+++ b/src/pages/RuntimeCalls/RuntimeCallQuery.tsx
@@ -1,4 +1,8 @@
-import { dynamicBuilder$, lookup$, unsafeApi$ } from "@/chain.state"
+import {
+  dynamicBuilder$,
+  lookup$,
+  unsafeApi$,
+} from "@/state/chains/chain.state"
 import {
   InlineLookupTypeEdit,
   LookupTypeEdit,
diff --git a/src/pages/RuntimeCalls/RuntimeCalls.tsx b/src/pages/RuntimeCalls/RuntimeCalls.tsx
index 9c3f2f4..9fd0e95 100644
--- a/src/pages/RuntimeCalls/RuntimeCalls.tsx
+++ b/src/pages/RuntimeCalls/RuntimeCalls.tsx
@@ -1,4 +1,4 @@
-import { lookup$ } from "@/chain.state"
+import { lookup$ } from "@/state/chains/chain.state"
 import { DocsRenderer } from "@/components/DocsRenderer"
 import { LoadingMetadata } from "@/components/Loading"
 import { SearchableSelect } from "@/components/Select"
diff --git a/src/pages/Storage/Storage.tsx b/src/pages/Storage/Storage.tsx
index 4eeee37..7621f22 100644
--- a/src/pages/Storage/Storage.tsx
+++ b/src/pages/Storage/Storage.tsx
@@ -1,4 +1,4 @@
-import { lookup$ } from "@/chain.state"
+import { lookup$ } from "@/state/chains/chain.state"
 import { ButtonGroup } from "@/components/ButtonGroup"
 import { SearchableSelect } from "@/components/Select"
 import { withSubscribe } from "@/components/withSuspense"
diff --git a/src/pages/Storage/StorageDecode.tsx b/src/pages/Storage/StorageDecode.tsx
index c6900e2..6875f61 100644
--- a/src/pages/Storage/StorageDecode.tsx
+++ b/src/pages/Storage/StorageDecode.tsx
@@ -1,4 +1,4 @@
-import { dynamicBuilder$ } from "@/chain.state"
+import { dynamicBuilder$ } from "@/state/chains/chain.state"
 import { ActionButton } from "@/components/ActionButton"
 import { NOTIN } from "@polkadot-api/react-builder"
 import { state, useStateObservable } from "@react-rxjs/core"
diff --git a/src/pages/Storage/StorageQuery.tsx b/src/pages/Storage/StorageQuery.tsx
index a8fda08..e9594c1 100644
--- a/src/pages/Storage/StorageQuery.tsx
+++ b/src/pages/Storage/StorageQuery.tsx
@@ -1,4 +1,8 @@
-import { dynamicBuilder$, runtimeCtx$, unsafeApi$ } from "@/chain.state"
+import {
+  dynamicBuilder$,
+  runtimeCtx$,
+  unsafeApi$,
+} from "@/state/chains/chain.state"
 import { EditCodec } from "@/codec-components/EditCodec"
 import { ActionButton } from "@/components/ActionButton"
 import { BinaryEditButton } from "@/components/BinaryEditButton"
diff --git a/src/pages/Storage/StorageSubscriptions.tsx b/src/pages/Storage/StorageSubscriptions.tsx
index 3def7c8..aeb7aae 100644
--- a/src/pages/Storage/StorageSubscriptions.tsx
+++ b/src/pages/Storage/StorageSubscriptions.tsx
@@ -1,4 +1,4 @@
-import { dynamicBuilder$, metadata$ } from "@/chain.state"
+import { dynamicBuilder$, metadata$ } from "@/state/chains/chain.state"
 import { ViewCodec } from "@/codec-components/ViewCodec"
 import { CopyBinary } from "@/codec-components/ViewCodec/CopyBinary"
 import { ButtonGroup } from "@/components/ButtonGroup"
diff --git a/src/pages/Transactions/transactions.state.ts b/src/pages/Transactions/transactions.state.ts
index 1fa2820..d3fbdf8 100644
--- a/src/pages/Transactions/transactions.state.ts
+++ b/src/pages/Transactions/transactions.state.ts
@@ -1,4 +1,4 @@
-import { chainClient$ } from "@/chain.state"
+import { chainClient$ } from "@/state/chains/chain.state"
 import { state } from "@react-rxjs/core"
 import { combineKeys, createSignal, partitionByKey } from "@react-rxjs/utils"
 import { HexString, InvalidTxError, TxBroadcastEvent } from "polkadot-api"
diff --git a/src/chain.state.ts b/src/state/chains/chain.state.ts
similarity index 100%
rename from src/chain.state.ts
rename to src/state/chains/chain.state.ts
diff --git a/src/chainspecs/acala.ts b/src/state/chains/chainspecs/acala.ts
similarity index 100%
rename from src/chainspecs/acala.ts
rename to src/state/chains/chainspecs/acala.ts
diff --git a/src/chainspecs/ajuna.ts b/src/state/chains/chainspecs/ajuna.ts
similarity index 100%
rename from src/chainspecs/ajuna.ts
rename to src/state/chains/chainspecs/ajuna.ts
diff --git a/src/chainspecs/astar.ts b/src/state/chains/chainspecs/astar.ts
similarity index 100%
rename from src/chainspecs/astar.ts
rename to src/state/chains/chainspecs/astar.ts
diff --git a/src/chainspecs/hydradx.ts b/src/state/chains/chainspecs/hydradx.ts
similarity index 100%
rename from src/chainspecs/hydradx.ts
rename to src/state/chains/chainspecs/hydradx.ts
diff --git a/src/chainspecs/invarch.ts b/src/state/chains/chainspecs/invarch.ts
similarity index 100%
rename from src/chainspecs/invarch.ts
rename to src/state/chains/chainspecs/invarch.ts
diff --git a/src/chainspecs/kusama.ts b/src/state/chains/chainspecs/kusama.ts
similarity index 100%
rename from src/chainspecs/kusama.ts
rename to src/state/chains/chainspecs/kusama.ts
diff --git a/src/chainspecs/kusama_asset_hub.ts b/src/state/chains/chainspecs/kusama_asset_hub.ts
similarity index 100%
rename from src/chainspecs/kusama_asset_hub.ts
rename to src/state/chains/chainspecs/kusama_asset_hub.ts
diff --git a/src/chainspecs/kusama_encointer.ts b/src/state/chains/chainspecs/kusama_encointer.ts
similarity index 100%
rename from src/chainspecs/kusama_encointer.ts
rename to src/state/chains/chainspecs/kusama_encointer.ts
diff --git a/src/chainspecs/kusama_people.ts b/src/state/chains/chainspecs/kusama_people.ts
similarity index 100%
rename from src/chainspecs/kusama_people.ts
rename to src/state/chains/chainspecs/kusama_people.ts
diff --git a/src/chainspecs/paseo.ts b/src/state/chains/chainspecs/paseo.ts
similarity index 100%
rename from src/chainspecs/paseo.ts
rename to src/state/chains/chainspecs/paseo.ts
diff --git a/src/chainspecs/paseo_asset_hub.ts b/src/state/chains/chainspecs/paseo_asset_hub.ts
similarity index 100%
rename from src/chainspecs/paseo_asset_hub.ts
rename to src/state/chains/chainspecs/paseo_asset_hub.ts
diff --git a/src/chainspecs/polkadot.ts b/src/state/chains/chainspecs/polkadot.ts
similarity index 100%
rename from src/chainspecs/polkadot.ts
rename to src/state/chains/chainspecs/polkadot.ts
diff --git a/src/chainspecs/polkadot_asset_hub.ts b/src/state/chains/chainspecs/polkadot_asset_hub.ts
similarity index 100%
rename from src/chainspecs/polkadot_asset_hub.ts
rename to src/state/chains/chainspecs/polkadot_asset_hub.ts
diff --git a/src/chainspecs/polkadot_bridge_hub.ts b/src/state/chains/chainspecs/polkadot_bridge_hub.ts
similarity index 100%
rename from src/chainspecs/polkadot_bridge_hub.ts
rename to src/state/chains/chainspecs/polkadot_bridge_hub.ts
diff --git a/src/chainspecs/polkadot_collectives.ts b/src/state/chains/chainspecs/polkadot_collectives.ts
similarity index 100%
rename from src/chainspecs/polkadot_collectives.ts
rename to src/state/chains/chainspecs/polkadot_collectives.ts
diff --git a/src/chainspecs/polkadot_people.ts b/src/state/chains/chainspecs/polkadot_people.ts
similarity index 100%
rename from src/chainspecs/polkadot_people.ts
rename to src/state/chains/chainspecs/polkadot_people.ts
diff --git a/src/chainspecs/westend.ts b/src/state/chains/chainspecs/westend.ts
similarity index 100%
rename from src/chainspecs/westend.ts
rename to src/state/chains/chainspecs/westend.ts
diff --git a/src/chainspecs/westend_asset_hub.ts b/src/state/chains/chainspecs/westend_asset_hub.ts
similarity index 100%
rename from src/chainspecs/westend_asset_hub.ts
rename to src/state/chains/chainspecs/westend_asset_hub.ts
diff --git a/src/chainspecs/westend_collectives.ts b/src/state/chains/chainspecs/westend_collectives.ts
similarity index 100%
rename from src/chainspecs/westend_collectives.ts
rename to src/state/chains/chainspecs/westend_collectives.ts
diff --git a/src/chainspecs/westend_people.ts b/src/state/chains/chainspecs/westend_people.ts
similarity index 100%
rename from src/chainspecs/westend_people.ts
rename to src/state/chains/chainspecs/westend_people.ts
diff --git a/src/networks/kusama.json b/src/state/chains/networks/kusama.json
similarity index 100%
rename from src/networks/kusama.json
rename to src/state/chains/networks/kusama.json
diff --git a/src/networks/paseo.json b/src/state/chains/networks/paseo.json
similarity index 100%
rename from src/networks/paseo.json
rename to src/state/chains/networks/paseo.json
diff --git a/src/networks/polkadot.json b/src/state/chains/networks/polkadot.json
similarity index 100%
rename from src/networks/polkadot.json
rename to src/state/chains/networks/polkadot.json
diff --git a/src/networks/westend.json b/src/state/chains/networks/westend.json
similarity index 100%
rename from src/networks/westend.json
rename to src/state/chains/networks/westend.json
diff --git a/src/extension-accounts.state.ts b/src/state/extension-accounts.state.ts
similarity index 100%
rename from src/extension-accounts.state.ts
rename to src/state/extension-accounts.state.ts
diff --git a/src/identity.state.ts b/src/state/identity.state.ts
similarity index 91%
rename from src/identity.state.ts
rename to src/state/identity.state.ts
index 9c62038..337c33a 100644
--- a/src/identity.state.ts
+++ b/src/state/identity.state.ts
@@ -5,10 +5,10 @@ import {
 } from "@polkadot-api/descriptors"
 import { state } from "@react-rxjs/core"
 import { Binary, createClient, SS58String } from "polkadot-api"
-import { chainSpec } from "./chainspecs/polkadot_people"
+import { chainSpec } from "./chains/chainspecs/polkadot_people"
 import { catchError, map, of, tap } from "rxjs"
-import { getProvider } from "./chain.state"
-import { localStorageSubject } from "./utils/localStorageSubject"
+import { getProvider } from "./chains/chain.state"
+import { localStorageSubject } from "@/utils/localStorageSubject"
 
 export interface Identity {
   displayName: string
diff --git a/src/walletconnect.state.ts b/src/state/walletconnect.state.ts
similarity index 100%
rename from src/walletconnect.state.ts
rename to src/state/walletconnect.state.ts