diff --git a/src/components/Molecules/AddressActivityDetails/AddressActivityDetails.stories.tsx b/src/components/Molecules/Address/AddressActivityDetails/AddressActivityDetails.stories.tsx
similarity index 89%
rename from src/components/Molecules/AddressActivityDetails/AddressActivityDetails.stories.tsx
rename to src/components/Molecules/Address/AddressActivityDetails/AddressActivityDetails.stories.tsx
index 398e1af5..1dd058c4 100644
--- a/src/components/Molecules/AddressActivityDetails/AddressActivityDetails.stories.tsx
+++ b/src/components/Molecules/Address/AddressActivityDetails/AddressActivityDetails.stories.tsx
@@ -4,7 +4,7 @@ import { AddressActivityDetails as AddressActivityDetailsComponent } from "./Add
 type Story = StoryObj<typeof AddressActivityDetailsComponent>;
 
 const meta: Meta<typeof AddressActivityDetailsComponent> = {
-    title: "Molecules/Address Activity Details",
+    title: "Molecules/Address/Address Activity Details",
     component: AddressActivityDetailsComponent,
 };
 
diff --git a/src/components/Molecules/AddressActivityDetails/AddressActivityDetails.tsx b/src/components/Molecules/Address/AddressActivityDetails/AddressActivityDetails.tsx
similarity index 100%
rename from src/components/Molecules/AddressActivityDetails/AddressActivityDetails.tsx
rename to src/components/Molecules/Address/AddressActivityDetails/AddressActivityDetails.tsx
diff --git a/src/components/Molecules/AddressActivityList/AddressActivityList.stories.tsx b/src/components/Molecules/Address/AddressActivityList/AddressActivityList.stories.tsx
similarity index 89%
rename from src/components/Molecules/AddressActivityList/AddressActivityList.stories.tsx
rename to src/components/Molecules/Address/AddressActivityList/AddressActivityList.stories.tsx
index 61607912..b2711e50 100644
--- a/src/components/Molecules/AddressActivityList/AddressActivityList.stories.tsx
+++ b/src/components/Molecules/Address/AddressActivityList/AddressActivityList.stories.tsx
@@ -4,7 +4,7 @@ import { AddressActivityList as AddressActivityListComponent } from "./AddressAc
 type Story = StoryObj<typeof AddressActivityListComponent>;
 
 const meta: Meta<typeof AddressActivityListComponent> = {
-    title: "Molecules/Address Activity List",
+    title: "Molecules/Address/Address Activity List",
     component: AddressActivityListComponent,
 };
 
diff --git a/src/components/Molecules/AddressActivityList/AddressActivityList.tsx b/src/components/Molecules/Address/AddressActivityList/AddressActivityList.tsx
similarity index 100%
rename from src/components/Molecules/AddressActivityList/AddressActivityList.tsx
rename to src/components/Molecules/Address/AddressActivityList/AddressActivityList.tsx
diff --git a/src/components/Molecules/AddressDetails/AddressDetails.stories.tsx b/src/components/Molecules/Address/AddressDetails/AddressDetails.stories.tsx
similarity index 90%
rename from src/components/Molecules/AddressDetails/AddressDetails.stories.tsx
rename to src/components/Molecules/Address/AddressDetails/AddressDetails.stories.tsx
index 41092918..f10a746c 100644
--- a/src/components/Molecules/AddressDetails/AddressDetails.stories.tsx
+++ b/src/components/Molecules/Address/AddressDetails/AddressDetails.stories.tsx
@@ -4,7 +4,7 @@ import { AddressDetails as AddressDetailsComponent } from "./AddressDetails";
 type Story = StoryObj<typeof AddressDetailsComponent>;
 
 const meta: Meta<typeof AddressDetailsComponent> = {
-    title: "Molecules/Address Details",
+    title: "Molecules/Address/Address Details",
     component: AddressDetailsComponent,
 };
 
diff --git a/src/components/Molecules/AddressDetails/AddressDetails.tsx b/src/components/Molecules/Address/AddressDetails/AddressDetails.tsx
similarity index 100%
rename from src/components/Molecules/AddressDetails/AddressDetails.tsx
rename to src/components/Molecules/Address/AddressDetails/AddressDetails.tsx
diff --git a/src/components/Molecules/AddressTransactions/AddressTransactions.stories.tsx b/src/components/Molecules/Address/AddressTransactions/AddressTransactions.stories.tsx
similarity index 90%
rename from src/components/Molecules/AddressTransactions/AddressTransactions.stories.tsx
rename to src/components/Molecules/Address/AddressTransactions/AddressTransactions.stories.tsx
index 80059c71..9d4e752f 100644
--- a/src/components/Molecules/AddressTransactions/AddressTransactions.stories.tsx
+++ b/src/components/Molecules/Address/AddressTransactions/AddressTransactions.stories.tsx
@@ -4,7 +4,7 @@ import { AddressTransactions as AddressTransactionsComponent } from "./AddressTr
 type Story = StoryObj<typeof AddressTransactionsComponent>;
 
 const meta: Meta<typeof AddressTransactionsComponent> = {
-    title: "Molecules/Address Transactions",
+    title: "Molecules/Address/Address Transactions",
     component: AddressTransactionsComponent,
 };
 
diff --git a/src/components/Molecules/AddressTransactions/AddressTransactions.tsx b/src/components/Molecules/Address/AddressTransactions/AddressTransactions.tsx
similarity index 100%
rename from src/components/Molecules/AddressTransactions/AddressTransactions.tsx
rename to src/components/Molecules/Address/AddressTransactions/AddressTransactions.tsx
diff --git a/src/components/Molecules/BlockDetails/BlockDetails.stories.tsx b/src/components/Molecules/Block/BlockDetails/BlockDetails.stories.tsx
similarity index 90%
rename from src/components/Molecules/BlockDetails/BlockDetails.stories.tsx
rename to src/components/Molecules/Block/BlockDetails/BlockDetails.stories.tsx
index 524cde57..08626a6a 100644
--- a/src/components/Molecules/BlockDetails/BlockDetails.stories.tsx
+++ b/src/components/Molecules/Block/BlockDetails/BlockDetails.stories.tsx
@@ -4,7 +4,7 @@ import { BlockDetails as BlockDetailsComponent } from "./BlockDetails";
 type Story = StoryObj<typeof BlockDetailsComponent>;
 
 const meta: Meta<typeof BlockDetailsComponent> = {
-    title: "Molecules/Block Details",
+    title: "Molecules/Block/Block Details",
     component: BlockDetailsComponent,
 };
 
diff --git a/src/components/Molecules/BlockDetails/BlockDetails.tsx b/src/components/Molecules/Block/BlockDetails/BlockDetails.tsx
similarity index 100%
rename from src/components/Molecules/BlockDetails/BlockDetails.tsx
rename to src/components/Molecules/Block/BlockDetails/BlockDetails.tsx
diff --git a/src/components/Molecules/BlockTransactions/BlockTransactions.stories.tsx b/src/components/Molecules/Block/BlockTransactions/BlockTransactions.stories.tsx
similarity index 90%
rename from src/components/Molecules/BlockTransactions/BlockTransactions.stories.tsx
rename to src/components/Molecules/Block/BlockTransactions/BlockTransactions.stories.tsx
index 4a6f0d56..c742dba4 100644
--- a/src/components/Molecules/BlockTransactions/BlockTransactions.stories.tsx
+++ b/src/components/Molecules/Block/BlockTransactions/BlockTransactions.stories.tsx
@@ -4,7 +4,7 @@ import { BlockTransactions as BlockTransactionsComponent } from "./BlockTransact
 type Story = StoryObj<typeof BlockTransactionsComponent>;
 
 const meta: Meta<typeof BlockTransactionsComponent> = {
-    title: "Molecules/Block Transactions",
+    title: "Molecules/Block/Block Transactions",
     component: BlockTransactionsComponent,
 };
 
diff --git a/src/components/Molecules/BlockTransactions/BlockTransactions.tsx b/src/components/Molecules/Block/BlockTransactions/BlockTransactions.tsx
similarity index 100%
rename from src/components/Molecules/BlockTransactions/BlockTransactions.tsx
rename to src/components/Molecules/Block/BlockTransactions/BlockTransactions.tsx
diff --git a/src/components/Molecules/LatestBlocks/LatestBlocks.stories.tsx b/src/components/Molecules/Block/LatestBlocks/LatestBlocks.stories.tsx
similarity index 90%
rename from src/components/Molecules/LatestBlocks/LatestBlocks.stories.tsx
rename to src/components/Molecules/Block/LatestBlocks/LatestBlocks.stories.tsx
index 284fcd5e..cf04512b 100644
--- a/src/components/Molecules/LatestBlocks/LatestBlocks.stories.tsx
+++ b/src/components/Molecules/Block/LatestBlocks/LatestBlocks.stories.tsx
@@ -4,7 +4,7 @@ import { LatestBlocks as LatestBlocksComponent } from "./LatestBlocks";
 type Story = StoryObj<typeof LatestBlocksComponent>;
 
 const meta: Meta<typeof LatestBlocksComponent> = {
-    title: "Molecules/Latest Blocks",
+    title: "Molecules/Block/Latest Blocks",
     component: LatestBlocksComponent,
 };
 
diff --git a/src/components/Molecules/LatestBlocks/LatestBlocks.tsx b/src/components/Molecules/Block/LatestBlocks/LatestBlocks.tsx
similarity index 100%
rename from src/components/Molecules/LatestBlocks/LatestBlocks.tsx
rename to src/components/Molecules/Block/LatestBlocks/LatestBlocks.tsx
diff --git a/src/components/Molecules/NFTCollectionDetails/NFTCollectionDetails.stories.tsx b/src/components/Molecules/NFT/NFTCollectionDetails/NFTCollectionDetails.stories.tsx
similarity index 91%
rename from src/components/Molecules/NFTCollectionDetails/NFTCollectionDetails.stories.tsx
rename to src/components/Molecules/NFT/NFTCollectionDetails/NFTCollectionDetails.stories.tsx
index 98c9fce7..e137de36 100644
--- a/src/components/Molecules/NFTCollectionDetails/NFTCollectionDetails.stories.tsx
+++ b/src/components/Molecules/NFT/NFTCollectionDetails/NFTCollectionDetails.stories.tsx
@@ -4,7 +4,7 @@ import { NFTCollectionDetails as NFYCollectionDetailsComponent } from "./NFTColl
 type Story = StoryObj<typeof NFYCollectionDetailsComponent>;
 
 const meta: Meta<typeof NFYCollectionDetailsComponent> = {
-    title: "Molecules/NFT Collection Details",
+    title: "Molecules/NFT/NFT Collection Details",
     component: NFYCollectionDetailsComponent,
 };
 
diff --git a/src/components/Molecules/NFTCollectionDetails/NFTCollectionDetails.tsx b/src/components/Molecules/NFT/NFTCollectionDetails/NFTCollectionDetails.tsx
similarity index 100%
rename from src/components/Molecules/NFTCollectionDetails/NFTCollectionDetails.tsx
rename to src/components/Molecules/NFT/NFTCollectionDetails/NFTCollectionDetails.tsx
diff --git a/src/components/Molecules/NFTCollectionTokensList/NFTCollectionTokensList.stories.tsx b/src/components/Molecules/NFT/NFTCollectionTokensList/NFTCollectionTokensList.stories.tsx
similarity index 90%
rename from src/components/Molecules/NFTCollectionTokensList/NFTCollectionTokensList.stories.tsx
rename to src/components/Molecules/NFT/NFTCollectionTokensList/NFTCollectionTokensList.stories.tsx
index 4bb4e6f7..9d1630f3 100644
--- a/src/components/Molecules/NFTCollectionTokensList/NFTCollectionTokensList.stories.tsx
+++ b/src/components/Molecules/NFT/NFTCollectionTokensList/NFTCollectionTokensList.stories.tsx
@@ -4,7 +4,7 @@ import { NFTCollectionTokensList as NFTCollectionTokensListComponent } from "./N
 type Story = StoryObj<typeof NFTCollectionTokensListComponent>;
 
 const meta: Meta<typeof NFTCollectionTokensListComponent> = {
-    title: "Molecules/NFT Collection Tokens List",
+    title: "Molecules/NFT/NFT Collection Tokens List",
     component: NFTCollectionTokensListComponent,
 };
 
diff --git a/src/components/Molecules/NFTCollectionTokensList/NFTCollectionTokensList.tsx b/src/components/Molecules/NFT/NFTCollectionTokensList/NFTCollectionTokensList.tsx
similarity index 100%
rename from src/components/Molecules/NFTCollectionTokensList/NFTCollectionTokensList.tsx
rename to src/components/Molecules/NFT/NFTCollectionTokensList/NFTCollectionTokensList.tsx
diff --git a/src/components/Molecules/NFTFloorPrice/NFTFloorPrice.stories.tsx b/src/components/Molecules/NFT/NFTFloorPrice/NFTFloorPrice.stories.tsx
similarity index 92%
rename from src/components/Molecules/NFTFloorPrice/NFTFloorPrice.stories.tsx
rename to src/components/Molecules/NFT/NFTFloorPrice/NFTFloorPrice.stories.tsx
index 7cfea8eb..582a45c1 100644
--- a/src/components/Molecules/NFTFloorPrice/NFTFloorPrice.stories.tsx
+++ b/src/components/Molecules/NFT/NFTFloorPrice/NFTFloorPrice.stories.tsx
@@ -5,7 +5,7 @@ import { NFT_COLLECTIONS } from "@/utils/constants/shared.constants";
 type Story = StoryObj<typeof NFTFloorPriceComponent>;
 
 const meta: Meta<typeof NFTFloorPriceComponent> = {
-    title: "Molecules/NFT Floor Price",
+    title: "Molecules/NFT/NFT Floor Price",
     component: NFTFloorPriceComponent,
 };
 
diff --git a/src/components/Molecules/NFTFloorPrice/NFTFloorPrice.tsx b/src/components/Molecules/NFT/NFTFloorPrice/NFTFloorPrice.tsx
similarity index 100%
rename from src/components/Molecules/NFTFloorPrice/NFTFloorPrice.tsx
rename to src/components/Molecules/NFT/NFTFloorPrice/NFTFloorPrice.tsx
diff --git a/src/components/Molecules/NFTSalesCount/NFTSalesCount.stories.tsx b/src/components/Molecules/NFT/NFTSalesCount/NFTSalesCount.stories.tsx
similarity index 92%
rename from src/components/Molecules/NFTSalesCount/NFTSalesCount.stories.tsx
rename to src/components/Molecules/NFT/NFTSalesCount/NFTSalesCount.stories.tsx
index 9cca4663..5ff04403 100644
--- a/src/components/Molecules/NFTSalesCount/NFTSalesCount.stories.tsx
+++ b/src/components/Molecules/NFT/NFTSalesCount/NFTSalesCount.stories.tsx
@@ -5,7 +5,7 @@ import { NFT_COLLECTIONS } from "@/utils/constants/shared.constants";
 type Story = StoryObj<typeof NFTSalesCountComponent>;
 
 const meta: Meta<typeof NFTSalesCountComponent> = {
-    title: "Molecules/NFT Sales Count",
+    title: "Molecules/NFT/NFT Sales Count",
     component: NFTSalesCountComponent,
 };
 
diff --git a/src/components/Molecules/NFTSalesCount/NFTSalesCount.tsx b/src/components/Molecules/NFT/NFTSalesCount/NFTSalesCount.tsx
similarity index 100%
rename from src/components/Molecules/NFTSalesCount/NFTSalesCount.tsx
rename to src/components/Molecules/NFT/NFTSalesCount/NFTSalesCount.tsx
diff --git a/src/components/Molecules/NFTVolume/NFTVolume.stories.tsx b/src/components/Molecules/NFT/NFTVolume/NFTVolume.stories.tsx
similarity index 92%
rename from src/components/Molecules/NFTVolume/NFTVolume.stories.tsx
rename to src/components/Molecules/NFT/NFTVolume/NFTVolume.stories.tsx
index da6d85e9..2544cd3a 100644
--- a/src/components/Molecules/NFTVolume/NFTVolume.stories.tsx
+++ b/src/components/Molecules/NFT/NFTVolume/NFTVolume.stories.tsx
@@ -5,7 +5,7 @@ import { NFT_COLLECTIONS } from "@/utils/constants/shared.constants";
 type Story = StoryObj<typeof NFTVolumeComponent>;
 
 const meta: Meta<typeof NFTVolumeComponent> = {
-    title: "Molecules/NFT Volume",
+    title: "Molecules/NFT/NFT Volume",
     component: NFTVolumeComponent,
 };
 
diff --git a/src/components/Molecules/NFTVolume/NFTVolume.tsx b/src/components/Molecules/NFT/NFTVolume/NFTVolume.tsx
similarity index 100%
rename from src/components/Molecules/NFTVolume/NFTVolume.tsx
rename to src/components/Molecules/NFT/NFTVolume/NFTVolume.tsx
diff --git a/src/components/Molecules/NFTWalletCollectionDetails/NFTWalletCollectionDetails.stories.tsx b/src/components/Molecules/NFT/NFTWalletCollectionDetails/NFTWalletCollectionDetails.stories.tsx
similarity index 90%
rename from src/components/Molecules/NFTWalletCollectionDetails/NFTWalletCollectionDetails.stories.tsx
rename to src/components/Molecules/NFT/NFTWalletCollectionDetails/NFTWalletCollectionDetails.stories.tsx
index e6cdae5e..51497aac 100644
--- a/src/components/Molecules/NFTWalletCollectionDetails/NFTWalletCollectionDetails.stories.tsx
+++ b/src/components/Molecules/NFT/NFTWalletCollectionDetails/NFTWalletCollectionDetails.stories.tsx
@@ -4,7 +4,7 @@ import { NFTWalletCollectionDetails as NFTWalletCollectionDetailsComponent } fro
 type Story = StoryObj<typeof NFTWalletCollectionDetailsComponent>;
 
 const meta: Meta<typeof NFTWalletCollectionDetailsComponent> = {
-    title: "Molecules/NFT Wallet Collection Details",
+    title: "Molecules/NFT/NFT Wallet Collection Details",
     component: NFTWalletCollectionDetailsComponent,
 };
 
diff --git a/src/components/Molecules/NFTWalletCollectionDetails/NFTWalletCollectionDetails.tsx b/src/components/Molecules/NFT/NFTWalletCollectionDetails/NFTWalletCollectionDetails.tsx
similarity index 100%
rename from src/components/Molecules/NFTWalletCollectionDetails/NFTWalletCollectionDetails.tsx
rename to src/components/Molecules/NFT/NFTWalletCollectionDetails/NFTWalletCollectionDetails.tsx
diff --git a/src/components/Molecules/NFTWalletCollectionList/NFTWalletCollectionList.stories.tsx b/src/components/Molecules/NFT/NFTWalletCollectionList/NFTWalletCollectionList.stories.tsx
similarity index 90%
rename from src/components/Molecules/NFTWalletCollectionList/NFTWalletCollectionList.stories.tsx
rename to src/components/Molecules/NFT/NFTWalletCollectionList/NFTWalletCollectionList.stories.tsx
index 046054bd..5ff019f6 100644
--- a/src/components/Molecules/NFTWalletCollectionList/NFTWalletCollectionList.stories.tsx
+++ b/src/components/Molecules/NFT/NFTWalletCollectionList/NFTWalletCollectionList.stories.tsx
@@ -4,7 +4,7 @@ import { NFTWalletCollectionList as NFTWalletCollectionListComponent } from "./N
 type Story = StoryObj<typeof NFTWalletCollectionListComponent>;
 
 const meta: Meta<typeof NFTWalletCollectionListComponent> = {
-    title: "Molecules/NFT Wallet Collection List",
+    title: "Molecules/NFT/NFT Wallet Collection List",
     component: NFTWalletCollectionListComponent,
 };
 
diff --git a/src/components/Molecules/NFTWalletCollectionList/NFTWalletCollectionList.tsx b/src/components/Molecules/NFT/NFTWalletCollectionList/NFTWalletCollectionList.tsx
similarity index 100%
rename from src/components/Molecules/NFTWalletCollectionList/NFTWalletCollectionList.tsx
rename to src/components/Molecules/NFT/NFTWalletCollectionList/NFTWalletCollectionList.tsx
diff --git a/src/components/Molecules/TokenBalancesList/TokenBalancesList.stories.tsx b/src/components/Molecules/Token/TokenBalancesList/TokenBalancesList.stories.tsx
similarity index 92%
rename from src/components/Molecules/TokenBalancesList/TokenBalancesList.stories.tsx
rename to src/components/Molecules/Token/TokenBalancesList/TokenBalancesList.stories.tsx
index 38819a5e..dd0dec8f 100644
--- a/src/components/Molecules/TokenBalancesList/TokenBalancesList.stories.tsx
+++ b/src/components/Molecules/Token/TokenBalancesList/TokenBalancesList.stories.tsx
@@ -4,7 +4,7 @@ import { TokenBalancesList as TokenBalancesListComponent } from "./TokenBalances
 type Story = StoryObj<typeof TokenBalancesListComponent>;
 
 const meta: Meta<typeof TokenBalancesListComponent> = {
-    title: "Molecules/Token Balances List",
+    title: "Molecules/Token/Token Balances List",
     component: TokenBalancesListComponent,
 };
 
diff --git a/src/components/Molecules/TokenBalancesList/TokenBalancesList.tsx b/src/components/Molecules/Token/TokenBalancesList/TokenBalancesList.tsx
similarity index 100%
rename from src/components/Molecules/TokenBalancesList/TokenBalancesList.tsx
rename to src/components/Molecules/Token/TokenBalancesList/TokenBalancesList.tsx
diff --git a/src/components/Molecules/TokenTransfersList/TokenTransfersList.stories.tsx b/src/components/Molecules/Token/TokenTransfersList/TokenTransfersList.stories.tsx
similarity index 91%
rename from src/components/Molecules/TokenTransfersList/TokenTransfersList.stories.tsx
rename to src/components/Molecules/Token/TokenTransfersList/TokenTransfersList.stories.tsx
index d4f9a1e6..e282c758 100644
--- a/src/components/Molecules/TokenTransfersList/TokenTransfersList.stories.tsx
+++ b/src/components/Molecules/Token/TokenTransfersList/TokenTransfersList.stories.tsx
@@ -4,7 +4,7 @@ import { TokenTransfersList as TokenTransfersListComponent } from "./TokenTransf
 type Story = StoryObj<typeof TokenTransfersListComponent>;
 
 const meta: Meta<typeof TokenTransfersListComponent> = {
-    title: "Molecules/Token Transfers List",
+    title: "Molecules/Token/Token Transfers List",
     component: TokenTransfersListComponent,
 };
 
diff --git a/src/components/Molecules/TokenTransfersList/TokenTransfersList.tsx b/src/components/Molecules/Token/TokenTransfersList/TokenTransfersList.tsx
similarity index 99%
rename from src/components/Molecules/TokenTransfersList/TokenTransfersList.tsx
rename to src/components/Molecules/Token/TokenTransfersList/TokenTransfersList.tsx
index 07831859..494a4e8c 100644
--- a/src/components/Molecules/TokenTransfersList/TokenTransfersList.tsx
+++ b/src/components/Molecules/Token/TokenTransfersList/TokenTransfersList.tsx
@@ -12,7 +12,7 @@ import {
 import { Fragment, useCallback, useEffect, useState } from "react";
 import { type ColumnDef } from "@tanstack/react-table";
 import { TableCell, TableRow } from "@/components/ui/table";
-import { Address, AddressAvatar } from "../../Atoms";
+import { Address, AddressAvatar } from "@/components/Atoms";
 import {
     timestampParser,
     truncate,
diff --git a/src/components/Molecules/LatestTransactions/LatestTransactions.stories.tsx b/src/components/Molecules/Transaction/LatestTransactions/LatestTransactions.stories.tsx
similarity index 88%
rename from src/components/Molecules/LatestTransactions/LatestTransactions.stories.tsx
rename to src/components/Molecules/Transaction/LatestTransactions/LatestTransactions.stories.tsx
index 6983eac6..be423f86 100644
--- a/src/components/Molecules/LatestTransactions/LatestTransactions.stories.tsx
+++ b/src/components/Molecules/Transaction/LatestTransactions/LatestTransactions.stories.tsx
@@ -4,7 +4,7 @@ import { LatestTransactions as LatestTransactionsComponent } from "./LatestTrans
 type Story = StoryObj<typeof LatestTransactionsComponent>;
 
 const meta: Meta<typeof LatestTransactionsComponent> = {
-    title: "Molecules/Latest Transactions",
+    title: "Molecules/Transaction/Latest Transactions",
     component: LatestTransactionsComponent,
 };
 
diff --git a/src/components/Molecules/LatestTransactions/LatestTransactions.tsx b/src/components/Molecules/Transaction/LatestTransactions/LatestTransactions.tsx
similarity index 100%
rename from src/components/Molecules/LatestTransactions/LatestTransactions.tsx
rename to src/components/Molecules/Transaction/LatestTransactions/LatestTransactions.tsx
diff --git a/src/components/Molecules/TransactionDetails/TransactionDetails.stories.tsx b/src/components/Molecules/Transaction/TransactionDetails/TransactionDetails.stories.tsx
similarity index 90%
rename from src/components/Molecules/TransactionDetails/TransactionDetails.stories.tsx
rename to src/components/Molecules/Transaction/TransactionDetails/TransactionDetails.stories.tsx
index 8b6bd8c6..076ac192 100644
--- a/src/components/Molecules/TransactionDetails/TransactionDetails.stories.tsx
+++ b/src/components/Molecules/Transaction/TransactionDetails/TransactionDetails.stories.tsx
@@ -4,7 +4,7 @@ import { TransactionDetails as TransactionDetailsComponent } from "./Transaction
 type Story = StoryObj<typeof TransactionDetailsComponent>;
 
 const meta: Meta<typeof TransactionDetailsComponent> = {
-    title: "Molecules/Transaction Details",
+    title: "Molecules/Transaction/Transaction Details",
     component: TransactionDetailsComponent,
 };
 
diff --git a/src/components/Molecules/TransactionDetails/TransactionDetails.tsx b/src/components/Molecules/Transaction/TransactionDetails/TransactionDetails.tsx
similarity index 100%
rename from src/components/Molecules/TransactionDetails/TransactionDetails.tsx
rename to src/components/Molecules/Transaction/TransactionDetails/TransactionDetails.tsx
diff --git a/src/components/Molecules/TransactionReceipt/TransactionReceipt.stories.tsx b/src/components/Molecules/Transaction/TransactionReceipt/TransactionReceipt.stories.tsx
similarity index 90%
rename from src/components/Molecules/TransactionReceipt/TransactionReceipt.stories.tsx
rename to src/components/Molecules/Transaction/TransactionReceipt/TransactionReceipt.stories.tsx
index e9934dd2..0b31a7f4 100644
--- a/src/components/Molecules/TransactionReceipt/TransactionReceipt.stories.tsx
+++ b/src/components/Molecules/Transaction/TransactionReceipt/TransactionReceipt.stories.tsx
@@ -4,7 +4,7 @@ import { TransactionReceipt as TransactionReceiptComponent } from "./Transaction
 type Story = StoryObj<typeof TransactionReceiptComponent>;
 
 const meta: Meta<typeof TransactionReceiptComponent> = {
-    title: "Molecules/Transaction Receipt",
+    title: "Molecules/Transaction/Transaction Receipt",
     component: TransactionReceiptComponent,
 };
 
diff --git a/src/components/Molecules/TransactionReceipt/TransactionReceipt.tsx b/src/components/Molecules/Transaction/TransactionReceipt/TransactionReceipt.tsx
similarity index 100%
rename from src/components/Molecules/TransactionReceipt/TransactionReceipt.tsx
rename to src/components/Molecules/Transaction/TransactionReceipt/TransactionReceipt.tsx
diff --git a/src/components/Molecules/XYKPoolDetails/XYKPoolDetails.stories.tsx b/src/components/Molecules/XYK/Pool/XYKPoolDetails/XYKPoolDetails.stories.tsx
similarity index 91%
rename from src/components/Molecules/XYKPoolDetails/XYKPoolDetails.stories.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolDetails/XYKPoolDetails.stories.tsx
index e202959f..35c850d1 100644
--- a/src/components/Molecules/XYKPoolDetails/XYKPoolDetails.stories.tsx
+++ b/src/components/Molecules/XYK/Pool/XYKPoolDetails/XYKPoolDetails.stories.tsx
@@ -4,7 +4,7 @@ import { XYKPoolDetails as XYKPoolDetailsComponent } from "./XYKPoolDetails";
 type Story = StoryObj<typeof XYKPoolDetailsComponent>;
 
 const meta: Meta<typeof XYKPoolDetailsComponent> = {
-    title: "Molecules/XYK Pool Details",
+    title: "Molecules/XYK/Pool/XYK Pool Details",
     component: XYKPoolDetailsComponent,
 };
 
diff --git a/src/components/Molecules/XYKPoolDetails/XYKPoolDetails.tsx b/src/components/Molecules/XYK/Pool/XYKPoolDetails/XYKPoolDetails.tsx
similarity index 100%
rename from src/components/Molecules/XYKPoolDetails/XYKPoolDetails.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolDetails/XYKPoolDetails.tsx
diff --git a/src/components/Molecules/XYKPoolList/XYKPoolList.stories.tsx b/src/components/Molecules/XYK/Pool/XYKPoolList/XYKPoolList.stories.tsx
similarity index 89%
rename from src/components/Molecules/XYKPoolList/XYKPoolList.stories.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolList/XYKPoolList.stories.tsx
index 09f568c9..c7fd1d81 100644
--- a/src/components/Molecules/XYKPoolList/XYKPoolList.stories.tsx
+++ b/src/components/Molecules/XYK/Pool/XYKPoolList/XYKPoolList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKPoolList as XYKPoolListComponent } from "./XYKPoolList";
 type Story = StoryObj<typeof XYKPoolListComponent>;
 
 const meta: Meta<typeof XYKPoolListComponent> = {
-    title: "Molecules/XYK Pool List",
+    title: "Molecules/XYK/Pool/XYK Pool List",
     component: XYKPoolListComponent,
 };
 
diff --git a/src/components/Molecules/XYKPoolList/XYKPoolList.tsx b/src/components/Molecules/XYK/Pool/XYKPoolList/XYKPoolList.tsx
similarity index 100%
rename from src/components/Molecules/XYKPoolList/XYKPoolList.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolList/XYKPoolList.tsx
diff --git a/src/components/Molecules/XYKPoolTimeseries/XYKPoolTimeseries.stories.tsx b/src/components/Molecules/XYK/Pool/XYKPoolTimeseries/XYKPoolTimeseries.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKPoolTimeseries/XYKPoolTimeseries.stories.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolTimeseries/XYKPoolTimeseries.stories.tsx
index 950012ef..f434d4b6 100644
--- a/src/components/Molecules/XYKPoolTimeseries/XYKPoolTimeseries.stories.tsx
+++ b/src/components/Molecules/XYK/Pool/XYKPoolTimeseries/XYKPoolTimeseries.stories.tsx
@@ -4,7 +4,7 @@ import { XYKPoolTimeseries as XYKPoolTimeseriesComponent } from "./XYKPoolTimese
 type Story = StoryObj<typeof XYKPoolTimeseriesComponent>;
 
 const meta: Meta<typeof XYKPoolTimeseriesComponent> = {
-    title: "Molecules/XYK Pool Timeseries",
+    title: "Molecules/XYK/Pool/XYK Pool Timeseries",
     component: XYKPoolTimeseriesComponent,
 };
 
diff --git a/src/components/Molecules/XYKPoolTimeseries/XYKPoolTimeseries.tsx b/src/components/Molecules/XYK/Pool/XYKPoolTimeseries/XYKPoolTimeseries.tsx
similarity index 100%
rename from src/components/Molecules/XYKPoolTimeseries/XYKPoolTimeseries.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolTimeseries/XYKPoolTimeseries.tsx
diff --git a/src/components/Molecules/XYKPoolTransactionsList/XYKPoolTransactionsList.stories.tsx b/src/components/Molecules/XYK/Pool/XYKPoolTransactionsList/XYKPoolTransactionsList.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKPoolTransactionsList/XYKPoolTransactionsList.stories.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolTransactionsList/XYKPoolTransactionsList.stories.tsx
index bb916dc1..43c5dd3c 100644
--- a/src/components/Molecules/XYKPoolTransactionsList/XYKPoolTransactionsList.stories.tsx
+++ b/src/components/Molecules/XYK/Pool/XYKPoolTransactionsList/XYKPoolTransactionsList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKPoolTransactionsList as XYKPoolTransactionsListComponent } from "./X
 type Story = StoryObj<typeof XYKPoolTransactionsListComponent>;
 
 const meta: Meta<typeof XYKPoolTransactionsListComponent> = {
-    title: "Molecules/XYK Pool Transactions List",
+    title: "Molecules/XYK/Pool/XYK Pool Transactions List",
     component: XYKPoolTransactionsListComponent,
 };
 
diff --git a/src/components/Molecules/XYKPoolTransactionsList/XYKPoolTransactionsList.tsx b/src/components/Molecules/XYK/Pool/XYKPoolTransactionsList/XYKPoolTransactionsList.tsx
similarity index 100%
rename from src/components/Molecules/XYKPoolTransactionsList/XYKPoolTransactionsList.tsx
rename to src/components/Molecules/XYK/Pool/XYKPoolTransactionsList/XYKPoolTransactionsList.tsx
diff --git a/src/components/Molecules/XYKTokenDetails/XYKTokenDetails.stories.tsx b/src/components/Molecules/XYK/Token/XYKTokenDetails/XYKTokenDetails.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKTokenDetails/XYKTokenDetails.stories.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenDetails/XYKTokenDetails.stories.tsx
index 5c9c26b7..427d1265 100644
--- a/src/components/Molecules/XYKTokenDetails/XYKTokenDetails.stories.tsx
+++ b/src/components/Molecules/XYK/Token/XYKTokenDetails/XYKTokenDetails.stories.tsx
@@ -4,7 +4,7 @@ import { XYKTokenDetails as XYKTokenDetailsComponent } from "./XYKTokenDetails";
 type Story = StoryObj<typeof XYKTokenDetailsComponent>;
 
 const meta: Meta<typeof XYKTokenDetailsComponent> = {
-    title: "Molecules/XYK Token Details",
+    title: "Molecules/XYK/Token/XYK Token Details",
     component: XYKTokenDetailsComponent,
 };
 
diff --git a/src/components/Molecules/XYKTokenDetails/XYKTokenDetails.tsx b/src/components/Molecules/XYK/Token/XYKTokenDetails/XYKTokenDetails.tsx
similarity index 100%
rename from src/components/Molecules/XYKTokenDetails/XYKTokenDetails.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenDetails/XYKTokenDetails.tsx
diff --git a/src/components/Molecules/XYKTokenList/XYKTokenList.stories.tsx b/src/components/Molecules/XYK/Token/XYKTokenList/XYKTokenList.stories.tsx
similarity index 89%
rename from src/components/Molecules/XYKTokenList/XYKTokenList.stories.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenList/XYKTokenList.stories.tsx
index bb53e74f..84883b01 100644
--- a/src/components/Molecules/XYKTokenList/XYKTokenList.stories.tsx
+++ b/src/components/Molecules/XYK/Token/XYKTokenList/XYKTokenList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKTokenList as XYKTokenListComponent } from "./XYKTokenList";
 type Story = StoryObj<typeof XYKTokenListComponent>;
 
 const meta: Meta<typeof XYKTokenListComponent> = {
-    title: "Molecules/XYK Token List",
+    title: "Molecules/XYK/Token/XYK Token List",
     component: XYKTokenListComponent,
 };
 
diff --git a/src/components/Molecules/XYKTokenList/XYKTokenList.tsx b/src/components/Molecules/XYK/Token/XYKTokenList/XYKTokenList.tsx
similarity index 100%
rename from src/components/Molecules/XYKTokenList/XYKTokenList.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenList/XYKTokenList.tsx
diff --git a/src/components/Molecules/XYKTokenPoolList/XYKTokenPoolList.stories.tsx b/src/components/Molecules/XYK/Token/XYKTokenPoolList/XYKTokenPoolList.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKTokenPoolList/XYKTokenPoolList.stories.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenPoolList/XYKTokenPoolList.stories.tsx
index 04df8ac1..573fdae7 100644
--- a/src/components/Molecules/XYKTokenPoolList/XYKTokenPoolList.stories.tsx
+++ b/src/components/Molecules/XYK/Token/XYKTokenPoolList/XYKTokenPoolList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKTokenPoolList as XYKTokenPoolListComponent } from "./XYKTokenPoolLis
 type Story = StoryObj<typeof XYKTokenPoolListComponent>;
 
 const meta: Meta<typeof XYKTokenPoolListComponent> = {
-    title: "Molecules/XYK Token Pool List",
+    title: "Molecules/XYK/Token/XYK Token Pool List",
     component: XYKTokenPoolListComponent,
 };
 
diff --git a/src/components/Molecules/XYKTokenPoolList/XYKTokenPoolList.tsx b/src/components/Molecules/XYK/Token/XYKTokenPoolList/XYKTokenPoolList.tsx
similarity index 100%
rename from src/components/Molecules/XYKTokenPoolList/XYKTokenPoolList.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenPoolList/XYKTokenPoolList.tsx
diff --git a/src/components/Molecules/XYKTokenTimeseries/XYKTokenTimeseries.stories.tsx b/src/components/Molecules/XYK/Token/XYKTokenTimeseries/XYKTokenTimeseries.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKTokenTimeseries/XYKTokenTimeseries.stories.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenTimeseries/XYKTokenTimeseries.stories.tsx
index 310fdf5e..d13d934d 100644
--- a/src/components/Molecules/XYKTokenTimeseries/XYKTokenTimeseries.stories.tsx
+++ b/src/components/Molecules/XYK/Token/XYKTokenTimeseries/XYKTokenTimeseries.stories.tsx
@@ -4,7 +4,7 @@ import { XYKTokenTimeseries as XYKTokenTimeseriesComponent } from "./XYKTokenTim
 type Story = StoryObj<typeof XYKTokenTimeseriesComponent>;
 
 const meta: Meta<typeof XYKTokenTimeseriesComponent> = {
-    title: "Molecules/XYK Token Timeseries",
+    title: "Molecules/XYK/Token/XYK Token Timeseries",
     component: XYKTokenTimeseriesComponent,
 };
 
diff --git a/src/components/Molecules/XYKTokenTimeseries/XYKTokenTimeseries.tsx b/src/components/Molecules/XYK/Token/XYKTokenTimeseries/XYKTokenTimeseries.tsx
similarity index 100%
rename from src/components/Molecules/XYKTokenTimeseries/XYKTokenTimeseries.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenTimeseries/XYKTokenTimeseries.tsx
diff --git a/src/components/Molecules/XYKTokenTransactionsList/XYKTokenTransactionsList.stories.tsx b/src/components/Molecules/XYK/Token/XYKTokenTransactionsList/XYKTokenTransactionsList.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKTokenTransactionsList/XYKTokenTransactionsList.stories.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenTransactionsList/XYKTokenTransactionsList.stories.tsx
index 38cd034c..ca17867f 100644
--- a/src/components/Molecules/XYKTokenTransactionsList/XYKTokenTransactionsList.stories.tsx
+++ b/src/components/Molecules/XYK/Token/XYKTokenTransactionsList/XYKTokenTransactionsList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKTokenTransactionsList as XYKTokenTransactionsListComponent } from ".
 type Story = StoryObj<typeof XYKTokenTransactionsListComponent>;
 
 const meta: Meta<typeof XYKTokenTransactionsListComponent> = {
-    title: "Molecules/XYK Token Transactions List",
+    title: "Molecules/XYK/Token/XYK Token Transactions List",
     component: XYKTokenTransactionsListComponent,
 };
 
diff --git a/src/components/Molecules/XYKTokenTransactionsList/XYKTokenTransactionsList.tsx b/src/components/Molecules/XYK/Token/XYKTokenTransactionsList/XYKTokenTransactionsList.tsx
similarity index 100%
rename from src/components/Molecules/XYKTokenTransactionsList/XYKTokenTransactionsList.tsx
rename to src/components/Molecules/XYK/Token/XYKTokenTransactionsList/XYKTokenTransactionsList.tsx
diff --git a/src/components/Molecules/XYKWalletDetails/XYKWalletDetails.stories.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletDetails/XYKWalletDetails.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKWalletDetails/XYKWalletDetails.stories.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletDetails/XYKWalletDetails.stories.tsx
index 2bd5818a..0160477c 100644
--- a/src/components/Molecules/XYKWalletDetails/XYKWalletDetails.stories.tsx
+++ b/src/components/Molecules/XYK/Wallet/XYKWalletDetails/XYKWalletDetails.stories.tsx
@@ -4,7 +4,7 @@ import { XYKWalletDetails as XYKWalletDetailsComponent } from "./XYKWalletDetail
 type Story = StoryObj<typeof XYKWalletDetailsComponent>;
 
 const meta: Meta<typeof XYKWalletDetailsComponent> = {
-    title: "Molecules/XYK Wallet Details",
+    title: "Molecules/XYK/Wallet/XYK Wallet Details",
     component: XYKWalletDetailsComponent,
 };
 
diff --git a/src/components/Molecules/XYKWalletDetails/XYKWalletDetails.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletDetails/XYKWalletDetails.tsx
similarity index 100%
rename from src/components/Molecules/XYKWalletDetails/XYKWalletDetails.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletDetails/XYKWalletDetails.tsx
diff --git a/src/components/Molecules/XYKWalletPoolList/XYKWalletPoolList.stories.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletPoolList/XYKWalletPoolList.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKWalletPoolList/XYKWalletPoolList.stories.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletPoolList/XYKWalletPoolList.stories.tsx
index 666c8e5a..9fabf786 100644
--- a/src/components/Molecules/XYKWalletPoolList/XYKWalletPoolList.stories.tsx
+++ b/src/components/Molecules/XYK/Wallet/XYKWalletPoolList/XYKWalletPoolList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKWalletPoolList as XYKWalletPoolListComponent } from "./XYKWalletPool
 type Story = StoryObj<typeof XYKWalletPoolListComponent>;
 
 const meta: Meta<typeof XYKWalletPoolListComponent> = {
-    title: "Molecules/XYK Wallet Pool List",
+    title: "Molecules/XYK/Wallet/XYK Wallet Pool List",
     component: XYKWalletPoolListComponent,
 };
 
diff --git a/src/components/Molecules/XYKWalletPoolList/XYKWalletPoolList.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletPoolList/XYKWalletPoolList.tsx
similarity index 100%
rename from src/components/Molecules/XYKWalletPoolList/XYKWalletPoolList.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletPoolList/XYKWalletPoolList.tsx
diff --git a/src/components/Molecules/XYKWalletPositionsList/XYKWalletPositionsList.stories.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletPositionsList/XYKWalletPositionsList.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKWalletPositionsList/XYKWalletPositionsList.stories.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletPositionsList/XYKWalletPositionsList.stories.tsx
index 6e993e14..52b06be5 100644
--- a/src/components/Molecules/XYKWalletPositionsList/XYKWalletPositionsList.stories.tsx
+++ b/src/components/Molecules/XYK/Wallet/XYKWalletPositionsList/XYKWalletPositionsList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKWalletPositionsList as XYKWalletPositionsListComponent } from "./XYK
 type Story = StoryObj<typeof XYKWalletPositionsListComponent>;
 
 const meta: Meta<typeof XYKWalletPositionsListComponent> = {
-    title: "Molecules/XYK Wallet Positions List",
+    title: "Molecules/XYK/Wallet/XYK Wallet Positions List",
     component: XYKWalletPositionsListComponent,
 };
 
diff --git a/src/components/Molecules/XYKWalletPositionsList/XYKWalletPositionsList.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletPositionsList/XYKWalletPositionsList.tsx
similarity index 100%
rename from src/components/Molecules/XYKWalletPositionsList/XYKWalletPositionsList.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletPositionsList/XYKWalletPositionsList.tsx
diff --git a/src/components/Molecules/XYKWalletTransactionsList/XYKWalletTransactionsList.stories.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletTransactionsList/XYKWalletTransactionsList.stories.tsx
similarity index 90%
rename from src/components/Molecules/XYKWalletTransactionsList/XYKWalletTransactionsList.stories.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletTransactionsList/XYKWalletTransactionsList.stories.tsx
index afd8ae1d..fcf3f4dc 100644
--- a/src/components/Molecules/XYKWalletTransactionsList/XYKWalletTransactionsList.stories.tsx
+++ b/src/components/Molecules/XYK/Wallet/XYKWalletTransactionsList/XYKWalletTransactionsList.stories.tsx
@@ -4,7 +4,7 @@ import { XYKWalletTransactionsList as XYKWalletTransactionsListComponent } from
 type Story = StoryObj<typeof XYKWalletTransactionsListComponent>;
 
 const meta: Meta<typeof XYKWalletTransactionsListComponent> = {
-    title: "Molecules/XYK Wallet Transactions List",
+    title: "Molecules/XYK/Wallet/XYK Wallet Transactions List",
     component: XYKWalletTransactionsListComponent,
 };
 
diff --git a/src/components/Molecules/XYKWalletTransactionsList/XYKWalletTransactionsList.tsx b/src/components/Molecules/XYK/Wallet/XYKWalletTransactionsList/XYKWalletTransactionsList.tsx
similarity index 100%
rename from src/components/Molecules/XYKWalletTransactionsList/XYKWalletTransactionsList.tsx
rename to src/components/Molecules/XYK/Wallet/XYKWalletTransactionsList/XYKWalletTransactionsList.tsx
diff --git a/src/components/Molecules/index.ts b/src/components/Molecules/index.ts
index 304e16ce..65788d95 100644
--- a/src/components/Molecules/index.ts
+++ b/src/components/Molecules/index.ts
@@ -1,37 +1,37 @@
-export { AddressActivityDetails } from "./AddressActivityDetails/AddressActivityDetails";
-export { AddressActivityList } from "./AddressActivityList/AddressActivityList";
-export { AddressDetails } from "./AddressDetails/AddressDetails";
-export { AddressTransactions } from "./AddressTransactions/AddressTransactions";
-export { BlockDetails } from "./BlockDetails/BlockDetails";
-export { BlockTransactions } from "./BlockTransactions/BlockTransactions";
+export { AddressActivityDetails } from "./Address/AddressActivityDetails/AddressActivityDetails";
+export { AddressActivityList } from "./Address/AddressActivityList/AddressActivityList";
+export { AddressDetails } from "./Address/AddressDetails/AddressDetails";
+export { AddressTransactions } from "./Address/AddressTransactions/AddressTransactions";
+export { BlockDetails } from "./Block/BlockDetails/BlockDetails";
+export { BlockTransactions } from "./Block/BlockTransactions/BlockTransactions";
+export { LatestBlocks } from "./Block/LatestBlocks/LatestBlocks";
 export { ChainSelector } from "./ChainSelector/ChainSelector";
 export { GasCard } from "./GasCard/GasCard";
-export { LatestBlocks } from "./LatestBlocks/LatestBlocks";
 export { LatestPrice } from "./LatestPrice/LatestPrice";
-export { LatestTransactions } from "./LatestTransactions/LatestTransactions";
-export { NFTCollectionDetails } from "./NFTCollectionDetails/NFTCollectionDetails";
-export { NFTCollectionTokensList } from "./NFTCollectionTokensList/NFTCollectionTokensList";
-export { NFTFloorPrice } from "./NFTFloorPrice/NFTFloorPrice";
-export { NFTSalesCount } from "./NFTSalesCount/NFTSalesCount";
-export { NFTVolume } from "./NFTVolume/NFTVolume";
-export { NFTWalletCollectionDetails } from "./NFTWalletCollectionDetails/NFTWalletCollectionDetails";
-export { NFTWalletCollectionList } from "./NFTWalletCollectionList/NFTWalletCollectionList";
-export { TokenBalancesList } from "./TokenBalancesList/TokenBalancesList";
-export { TokenTransfersList } from "./TokenTransfersList/TokenTransfersList";
-export { TransactionDetails } from "./TransactionDetails/TransactionDetails";
-export { TransactionReceipt } from "./TransactionReceipt/TransactionReceipt";
-export { XYKPoolDetails } from "./XYKPoolDetails/XYKPoolDetails";
-export { XYKPoolList } from "./XYKPoolList/XYKPoolList";
-export { XYKPoolTimeseries } from "./XYKPoolTimeseries/XYKPoolTimeseries";
-export { XYKPoolTransactionsList } from "./XYKPoolTransactionsList/XYKPoolTransactionsList";
+export { NFTCollectionDetails } from "./NFT/NFTCollectionDetails/NFTCollectionDetails";
+export { NFTCollectionTokensList } from "./NFT/NFTCollectionTokensList/NFTCollectionTokensList";
+export { NFTFloorPrice } from "./NFT/NFTFloorPrice/NFTFloorPrice";
+export { NFTSalesCount } from "./NFT/NFTSalesCount/NFTSalesCount";
+export { NFTVolume } from "./NFT/NFTVolume/NFTVolume";
+export { NFTWalletCollectionDetails } from "./NFT/NFTWalletCollectionDetails/NFTWalletCollectionDetails";
+export { NFTWalletCollectionList } from "./NFT/NFTWalletCollectionList/NFTWalletCollectionList";
+export { TokenBalancesList } from "./Token/TokenBalancesList/TokenBalancesList";
+export { TokenTransfersList } from "./Token/TokenTransfersList/TokenTransfersList";
+export { LatestTransactions } from "./Transaction/LatestTransactions/LatestTransactions";
+export { TransactionDetails } from "./Transaction/TransactionDetails/TransactionDetails";
+export { TransactionReceipt } from "./Transaction/TransactionReceipt/TransactionReceipt";
+export { XYKPoolDetails } from "./XYK/Pool/XYKPoolDetails/XYKPoolDetails";
+export { XYKPoolList } from "./XYK/Pool/XYKPoolList/XYKPoolList";
+export { XYKPoolTimeseries } from "./XYK/Pool/XYKPoolTimeseries/XYKPoolTimeseries";
+export { XYKPoolTransactionsList } from "./XYK/Pool/XYKPoolTransactionsList/XYKPoolTransactionsList";
+export { XYKTokenDetails } from "./XYK/Token/XYKTokenDetails/XYKTokenDetails";
+export { XYKTokenList } from "./XYK/Token/XYKTokenList/XYKTokenList";
+export { XYKTokenPoolList } from "./XYK/Token/XYKTokenPoolList/XYKTokenPoolList";
+export { XYKTokenTimeseries } from "./XYK/Token/XYKTokenTimeseries/XYKTokenTimeseries";
+export { XYKTokenTransactionsList } from "./XYK/Token/XYKTokenTransactionsList/XYKTokenTransactionsList";
+export { XYKWalletDetails } from "./XYK/Wallet/XYKWalletDetails/XYKWalletDetails";
+export { XYKWalletPoolList } from "./XYK/Wallet/XYKWalletPoolList/XYKWalletPoolList";
+export { XYKWalletPositionsList } from "./XYK/Wallet/XYKWalletPositionsList/XYKWalletPositionsList";
+export { XYKWalletTransactionsList } from "./XYK/Wallet/XYKWalletTransactionsList/XYKWalletTransactionsList";
 export { XYKTimeseries } from "./XYKTimeseries/XYKTimeseries";
-export { XYKTokenDetails } from "./XYKTokenDetails/XYKTokenDetails";
-export { XYKTokenList } from "./XYKTokenList/XYKTokenList";
-export { XYKTokenPoolList } from "./XYKTokenPoolList/XYKTokenPoolList";
-export { XYKTokenTimeseries } from "./XYKTokenTimeseries/XYKTokenTimeseries";
-export { XYKTokenTransactionsList } from "./XYKTokenTransactionsList/XYKTokenTransactionsList";
 export { XYKTransactionsList } from "./XYKTransactionsList/XYKTransactionsList";
-export { XYKWalletDetails } from "./XYKWalletDetails/XYKWalletDetails";
-export { XYKWalletPoolList } from "./XYKWalletPoolList/XYKWalletPoolList";
-export { XYKWalletPositionsList } from "./XYKWalletPositionsList/XYKWalletPositionsList";
-export { XYKWalletTransactionsList } from "./XYKWalletTransactionsList/XYKWalletTransactionsList";
diff --git a/src/components/Organisms/NFTWalletCollectionView/NFTWalletCollectionView.stories.tsx b/src/components/Organisms/NFTWalletCollectionView/NFTWalletCollectionView.stories.tsx
index b0eb7252..cb28622d 100644
--- a/src/components/Organisms/NFTWalletCollectionView/NFTWalletCollectionView.stories.tsx
+++ b/src/components/Organisms/NFTWalletCollectionView/NFTWalletCollectionView.stories.tsx
@@ -4,7 +4,7 @@ import { NFTWalletCollectionView as NFTWalletCollectionViewComponent } from "./N
 type Story = StoryObj<typeof NFTWalletCollectionViewComponent>;
 
 const meta: Meta<typeof NFTWalletCollectionViewComponent> = {
-    title: "Organisms",
+    title: "Organisms/NFT Wallet Collection View",
     component: NFTWalletCollectionViewComponent,
 };