diff --git a/src/components/Molecules/AccountCard/AccountCard.tsx b/src/components/Molecules/AccountCard/AccountCard.tsx
index b99c87b2..21cca9bf 100644
--- a/src/components/Molecules/AccountCard/AccountCard.tsx
+++ b/src/components/Molecules/AccountCard/AccountCard.tsx
@@ -8,7 +8,7 @@ import {
 import QRCode from "react-qr-code";
 import { useState } from "react";
 import { useToast } from "../../../utils/hooks";
-import { AddressAvatar } from "../../Atoms/AddressAvatar/AddressAvatar";
+import { AddressAvatar } from "../../Atoms";
 import { IconWrapper } from "../../Shared";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 import { type AccountCardProps } from "@/utils/types/molecules.types";
diff --git a/src/components/Molecules/BlockDetails/BlockDetails.tsx b/src/components/Molecules/BlockDetails/BlockDetails.tsx
index 2e62ed6b..1df9291f 100644
--- a/src/components/Molecules/BlockDetails/BlockDetails.tsx
+++ b/src/components/Molecules/BlockDetails/BlockDetails.tsx
@@ -1,4 +1,4 @@
-import { Address } from "@/components/Atoms/Address/Address";
+import { Address } from "@/components/Atoms";
 import { Card, CardDescription, CardTitle } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
diff --git a/src/components/Molecules/CollectionCard/CollectionCard.tsx b/src/components/Molecules/CollectionCard/CollectionCard.tsx
index a6418fe6..91e0d672 100644
--- a/src/components/Molecules/CollectionCard/CollectionCard.tsx
+++ b/src/components/Molecules/CollectionCard/CollectionCard.tsx
@@ -8,7 +8,7 @@ import {
 import QRCode from "react-qr-code";
 import { useEffect, useState } from "react";
 import { useToast } from "../../../utils/hooks";
-import { AddressAvatar } from "../../Atoms/AddressAvatar/AddressAvatar";
+import { AddressAvatar } from "../../Atoms";
 import { IconWrapper } from "../../Shared";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 import { type CollectionCardProps } from "@/utils/types/molecules.types";
diff --git a/src/components/Molecules/DecodedTransaction/DecodedTransaction.tsx b/src/components/Molecules/DecodedTransaction/DecodedTransaction.tsx
index bcaaeb6b..8cfcef35 100644
--- a/src/components/Molecules/DecodedTransaction/DecodedTransaction.tsx
+++ b/src/components/Molecules/DecodedTransaction/DecodedTransaction.tsx
@@ -5,13 +5,12 @@ import {
     type DecodedTransactionProps,
 } from "@/utils/types/molecules.types";
 import { type Option, None, Some } from "@/utils/option";
-import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
+import { Address, TokenAvatar } from "@/components/Atoms";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 import { useGoldRush } from "@/utils/store";
 import { calculatePrettyBalance, type ChainItem } from "@covalenthq/client-sdk";
 import { Card, CardContent } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
-import { Address } from "@/components/Atoms/Address/Address";
 
 export const DecodedTransaction: React.FC<DecodedTransactionProps> = ({
     chain_name,
diff --git a/src/components/Molecules/SearchBar/SearchBar.tsx b/src/components/Molecules/SearchBar/SearchBar.tsx
index 756bb03c..c3881600 100644
--- a/src/components/Molecules/SearchBar/SearchBar.tsx
+++ b/src/components/Molecules/SearchBar/SearchBar.tsx
@@ -1,13 +1,15 @@
 import { useCallback, useState } from "react";
 import { Input } from "@/components/ui/input";
 import { useDebounce } from "@/utils/hooks/use-debounce";
-import { AddressActivityListView } from "@/components/Organisms/AddressActivityListView/AddressActivityListView";
+import {
+    AddressActivityListView,
+    AddressDetailsView,
+    TransactionReceiptView,
+} from "@/components/Organisms";
 import { ChainSelector } from "../ChainSelector/ChainSelector";
 import { useGoldRush } from "@/utils/store";
 import { BlockDetails } from "../BlockDetails/BlockDetails";
 import { type Chain } from "@covalenthq/client-sdk";
-import { TransactionReceiptView } from "@/components/Organisms/TransactionReceiptView/TransactionReceiptView";
-import { AddressDetailsView } from "@/components/Organisms/AddressDetailsView/AddressDetailsView";
 import { type SEARCH_RESULTS_TYPE } from "@/utils/constants/shared.constants";
 import { Button } from "@/components/ui/button";
 
diff --git a/src/components/Organisms/AddressActivityListView/AddressActivityListView.tsx b/src/components/Organisms/AddressActivityListView/AddressActivityListView.tsx
index 7e46e70f..9e9b0519 100644
--- a/src/components/Organisms/AddressActivityListView/AddressActivityListView.tsx
+++ b/src/components/Organisms/AddressActivityListView/AddressActivityListView.tsx
@@ -18,10 +18,10 @@ import {
     TableRow,
 } from "@/components/ui/table";
 import { Checkbox } from "@/components/ui/checkbox";
-import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
+import { AccountCard } from "@/components/Molecules";
 import { Skeleton } from "@/components/ui/skeleton";
 import { timestampParser } from "@/utils/functions";
-import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "@/components/Atoms";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { IconWrapper } from "@/components/Shared";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
diff --git a/src/components/Organisms/AddressDetailsView/AddressDetailsView.tsx b/src/components/Organisms/AddressDetailsView/AddressDetailsView.tsx
index 25868d31..0a674406 100644
--- a/src/components/Organisms/AddressDetailsView/AddressDetailsView.tsx
+++ b/src/components/Organisms/AddressDetailsView/AddressDetailsView.tsx
@@ -1,4 +1,4 @@
-import { Address } from "@/components/Atoms/Address/Address";
+import { Address, TokenAvatar } from "@/components/Atoms";
 import { Card, CardContent, CardDescription } from "@/components/ui/card";
 import { Skeleton } from "@/components/ui/skeleton";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
@@ -14,8 +14,7 @@ import {
     prettifyCurrency,
 } from "@covalenthq/client-sdk";
 import { useEffect, useState } from "react";
-import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
-import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
+import { AccountCard, ChainSelector } from "@/components/Molecules";
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -25,7 +24,6 @@ import {
 } from "@radix-ui/react-dropdown-menu";
 import { CaretDownIcon } from "@radix-ui/react-icons";
 import { Button } from "@/components/ui/button";
-import { ChainSelector } from "@/components/Molecules/ChainSelector/ChainSelector";
 
 export const AddressDetailsView: React.FC<AddressDetailsProps> = ({
     address,
diff --git a/src/components/Organisms/NFTs/NFTDetailView/NFTDetailView.tsx b/src/components/Organisms/NFTs/NFTDetailView/NFTDetailView.tsx
index 810001f3..80e3e85e 100644
--- a/src/components/Organisms/NFTs/NFTDetailView/NFTDetailView.tsx
+++ b/src/components/Organisms/NFTs/NFTDetailView/NFTDetailView.tsx
@@ -1,7 +1,6 @@
 import { TypographyH1, TypographyH4 } from "@/components/ui/typography";
 import { useGoldRush } from "@/utils/store";
-import { NFTSalesCount } from "@/components/Molecules/NFTs/NFTSalesCount/NFTSalesCount";
-import { NFTFloorPrice } from "@/components/Molecules/NFTs/NFTFloorPrice/NFTFloorPrice";
+import { NFTFloorPrice, NFTSalesCount } from "@/components/Molecules";
 import { type Option, Some, None } from "@/utils/option";
 import { type NFTDetailViewProps } from "@/utils/types/organisms.types";
 import { type NftTokenContract } from "@covalenthq/client-sdk";
diff --git a/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx b/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx
index 79479fd3..6c7ba73b 100644
--- a/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx
+++ b/src/components/Organisms/NFTs/NFTWalletCollectionView/NFTWalletCollectionView.tsx
@@ -13,7 +13,7 @@ import {
 } from "@/components/ui/card";
 import { TypographyH3 } from "@/components/ui/typography";
 import { Badge } from "@/components/ui/badge";
-import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
+import { AccountCard } from "@/components/Molecules";
 import { type NFTWalletCollectionViewProps } from "@/utils/types/organisms.types";
 import { Skeleton } from "@/components/ui/skeleton";
 import { sum } from "lodash";
diff --git a/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx b/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx
index a56cfa48..a0a3fca7 100644
--- a/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx
+++ b/src/components/Organisms/NFTs/NFTWalletTokenListView/NFTWalletTokenListView.tsx
@@ -16,11 +16,11 @@ import {
     CardTitle,
 } from "@/components/ui/card";
 import sum from "lodash/sum";
-import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
+import { AccountCard } from "@/components/Molecules";
 import { Skeleton } from "@/components/ui/skeleton";
 import { useGoldRush } from "@/utils/store";
 import { type NFTWalletTokenListViewProps } from "@/utils/types/organisms.types";
-import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "@/components/Atoms";
 
 export const NFTWalletTokenListView: React.FC<NFTWalletTokenListViewProps> = ({
     chain_names,
diff --git a/src/components/Organisms/TokenBalancesListView/TokenBalancesListView.tsx b/src/components/Organisms/TokenBalancesListView/TokenBalancesListView.tsx
index e21dbe13..4c98b665 100644
--- a/src/components/Organisms/TokenBalancesListView/TokenBalancesListView.tsx
+++ b/src/components/Organisms/TokenBalancesListView/TokenBalancesListView.tsx
@@ -31,10 +31,10 @@ import {
     TableRow,
 } from "@/components/ui/table";
 import { Skeleton } from "@/components/ui/skeleton";
-import { TokenAvatar } from "../../Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "../../Atoms";
 import { Button } from "@/components/ui/button";
 import { timestampParser } from "@/utils/functions";
-import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
+import { AccountCard } from "@/components/Molecules";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { sum } from "lodash";
 import { BalancePriceDelta, IconWrapper } from "@/components/Shared";
diff --git a/src/components/Organisms/TokenTransfersListView/TokenTransfersListView.tsx b/src/components/Organisms/TokenTransfersListView/TokenTransfersListView.tsx
index 96b11bdc..52469beb 100644
--- a/src/components/Organisms/TokenTransfersListView/TokenTransfersListView.tsx
+++ b/src/components/Organisms/TokenTransfersListView/TokenTransfersListView.tsx
@@ -25,14 +25,14 @@ import {
     TableRow,
 } from "@/components/ui/table";
 import { Skeleton } from "@/components/ui/skeleton";
-import { TokenAvatar } from "../../Atoms/TokenAvatar/TokenAvatar";
+import { AddressAvatar, TokenAvatar } from "../../Atoms";
 import {
     timestampParser,
     truncate,
     calculateTimeSeriesGroup,
 } from "@/utils/functions";
 import { Badge } from "@/components/ui/badge";
-import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
+import { AccountCard } from "@/components/Molecules";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { Button } from "@/components/ui/button";
 import {
@@ -43,7 +43,6 @@ import {
     DropdownMenuSeparator,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { AddressAvatar } from "@/components/Atoms/AddressAvatar/AddressAvatar";
 import { IconWrapper } from "@/components/Shared";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 import {
diff --git a/src/components/Organisms/TransactionReceiptView/TransactionReceiptView.tsx b/src/components/Organisms/TransactionReceiptView/TransactionReceiptView.tsx
index 85025ef1..f2f3f97a 100644
--- a/src/components/Organisms/TransactionReceiptView/TransactionReceiptView.tsx
+++ b/src/components/Organisms/TransactionReceiptView/TransactionReceiptView.tsx
@@ -1,7 +1,7 @@
 import { type TransactionReceiptViewProps } from "@/utils/types/organisms.types";
 import { TypographyH4 } from "@/components/ui/typography";
-import { Address } from "@/components/Atoms/Address/Address";
-import { DecodedTransaction } from "@/components/Molecules/DecodedTransaction/DecodedTransaction";
+import { Address } from "@/components/Atoms";
+import { AccountCard, DecodedTransaction } from "@/components/Molecules";
 import { useMemo, useState } from "react";
 import { type Option, None } from "@/utils/option";
 import { type DecodedTransactionMetadata } from "@/utils/types/molecules.types";
@@ -10,7 +10,6 @@ import { CardDescription } from "@/components/ui/card";
 import { calculatePrettyBalance, type ChainItem } from "@covalenthq/client-sdk";
 import { useGoldRush } from "@/utils/store";
 import { ClockIcon } from "@radix-ui/react-icons";
-import { AccountCard } from "@/components/Molecules/AccountCard/AccountCard";
 import { Skeleton } from "@/components/ui/skeleton";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
 
diff --git a/src/components/Organisms/TransactionsList/TransactionsList.tsx b/src/components/Organisms/TransactionsList/TransactionsList.tsx
index 21a95669..1968aaf1 100644
--- a/src/components/Organisms/TransactionsList/TransactionsList.tsx
+++ b/src/components/Organisms/TransactionsList/TransactionsList.tsx
@@ -26,7 +26,7 @@ import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { useGoldRush } from "@/utils/store";
 import { SkeletonTable } from "@/components/ui/skeletonTable";
 import { type TransactionListProps } from "@/utils/types/molecules.types";
-import { Address } from "@/components/Atoms/Address/Address";
+import { Address } from "@/components/Atoms";
 import {
     DropdownMenu,
     DropdownMenuTrigger,
diff --git a/src/components/Organisms/XYK/XYKPoolDetailView/XYKPoolDetailView.tsx b/src/components/Organisms/XYK/XYKPoolDetailView/XYKPoolDetailView.tsx
index 22e544ff..a8db4b74 100644
--- a/src/components/Organisms/XYK/XYKPoolDetailView/XYKPoolDetailView.tsx
+++ b/src/components/Organisms/XYK/XYKPoolDetailView/XYKPoolDetailView.tsx
@@ -5,10 +5,9 @@ import { type XYKPoolDetailViewProps } from "@/utils/types/organisms.types";
 import { useEffect, useState } from "react";
 import { Skeleton } from "@/components/ui/skeleton";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
-import { XYKPoolTimeSeries } from "@/components/Molecules/XYK/XYKPoolTimeSeries/XYKPoolTimeSeries";
-import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
+import { XYKPoolInformation, XYKPoolTimeSeries } from "@/components/Molecules";
+import { TokenAvatar } from "@/components/Atoms";
 import { prettyToken } from "@/utils/functions/pretty-token";
-import { XYKPoolInformation } from "@/components/Molecules/XYK/XYKPoolInformation/XYKPoolInformation";
 import { type PoolWithTimeseries } from "@covalenthq/client-sdk";
 
 export const XYKPoolDetailView: React.FC<XYKPoolDetailViewProps> = ({
diff --git a/src/components/Organisms/XYK/XYKPoolListView/XYKPoolListView.tsx b/src/components/Organisms/XYK/XYKPoolListView/XYKPoolListView.tsx
index 46854111..7727612f 100644
--- a/src/components/Organisms/XYK/XYKPoolListView/XYKPoolListView.tsx
+++ b/src/components/Organisms/XYK/XYKPoolListView/XYKPoolListView.tsx
@@ -24,7 +24,7 @@ import {
     TableHeader,
     TableRow,
 } from "@/components/ui/table";
-import { TokenAvatar } from "../../../Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "../../../Atoms";
 import { Button } from "@/components/ui/button";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { IconWrapper } from "@/components/Shared";
diff --git a/src/components/Organisms/XYK/XYKTokenDetailView/XYKTokenDetailView.tsx b/src/components/Organisms/XYK/XYKTokenDetailView/XYKTokenDetailView.tsx
index bf61e45e..d6f97ada 100644
--- a/src/components/Organisms/XYK/XYKTokenDetailView/XYKTokenDetailView.tsx
+++ b/src/components/Organisms/XYK/XYKTokenDetailView/XYKTokenDetailView.tsx
@@ -5,9 +5,11 @@ import { type XYKTokenDetailViewProps } from "@/utils/types/organisms.types";
 import { useEffect, useState } from "react";
 import { Skeleton } from "@/components/ui/skeleton";
 import { GRK_SIZES } from "@/utils/constants/shared.constants";
-import { TokenAvatar } from "@/components/Atoms/TokenAvatar/TokenAvatar";
-import { XYKTokenInformation } from "@/components/Molecules/XYK/XYKTokenInformation/XYKTokenInformation";
-import { XYKTokenTimeSeries } from "@/components/Molecules/XYK/XYKTokenTimeSeries/XYKTokenTimeSeries";
+import { TokenAvatar } from "@/components/Atoms";
+import {
+    XYKTokenInformation,
+    XYKTokenTimeSeries,
+} from "@/components/Molecules";
 import { type TokenV2VolumeWithChartData } from "@covalenthq/client-sdk";
 
 export const XYKTokenDetailView: React.FC<XYKTokenDetailViewProps> = ({
diff --git a/src/components/Organisms/XYK/XYKTokenListView/XYKTokenListView.tsx b/src/components/Organisms/XYK/XYKTokenListView/XYKTokenListView.tsx
index 2e76c2ec..f5719d94 100644
--- a/src/components/Organisms/XYK/XYKTokenListView/XYKTokenListView.tsx
+++ b/src/components/Organisms/XYK/XYKTokenListView/XYKTokenListView.tsx
@@ -24,7 +24,7 @@ import {
     TableHeader,
     TableRow,
 } from "@/components/ui/table";
-import { TokenAvatar } from "../../../Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "../../../Atoms";
 import { Button } from "@/components/ui/button";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { BalancePriceDelta, IconWrapper } from "@/components/Shared";
diff --git a/src/components/Organisms/XYK/XYKTokenPoolListView/XYKTokenPoolListView.tsx b/src/components/Organisms/XYK/XYKTokenPoolListView/XYKTokenPoolListView.tsx
index 4a107af5..7e347438 100644
--- a/src/components/Organisms/XYK/XYKTokenPoolListView/XYKTokenPoolListView.tsx
+++ b/src/components/Organisms/XYK/XYKTokenPoolListView/XYKTokenPoolListView.tsx
@@ -27,7 +27,7 @@ import {
     TableHeader,
     TableRow,
 } from "@/components/ui/table";
-import { TokenAvatar } from "../../../Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "../../../Atoms";
 import { Button } from "@/components/ui/button";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { IconWrapper } from "@/components/Shared";
diff --git a/src/components/Organisms/XYK/XYKWalletPoolListView/XYKWalletPoolListView.tsx b/src/components/Organisms/XYK/XYKWalletPoolListView/XYKWalletPoolListView.tsx
index ece125cc..d13bd0a4 100644
--- a/src/components/Organisms/XYK/XYKWalletPoolListView/XYKWalletPoolListView.tsx
+++ b/src/components/Organisms/XYK/XYKWalletPoolListView/XYKWalletPoolListView.tsx
@@ -27,7 +27,7 @@ import {
     TableHeader,
     TableRow,
 } from "@/components/ui/table";
-import { TokenAvatar } from "../../../Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "../../../Atoms";
 import { Button } from "@/components/ui/button";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { IconWrapper } from "@/components/Shared";
diff --git a/src/components/Organisms/XYK/XYKWalletPositionsListView/XYKWalletPositionsListView.tsx b/src/components/Organisms/XYK/XYKWalletPositionsListView/XYKWalletPositionsListView.tsx
index 87dc5b0a..09c5d0df 100644
--- a/src/components/Organisms/XYK/XYKWalletPositionsListView/XYKWalletPositionsListView.tsx
+++ b/src/components/Organisms/XYK/XYKWalletPositionsListView/XYKWalletPositionsListView.tsx
@@ -28,7 +28,7 @@ import {
     TableHeader,
     TableRow,
 } from "@/components/ui/table";
-import { TokenAvatar } from "../../../Atoms/TokenAvatar/TokenAvatar";
+import { TokenAvatar } from "../../../Atoms";
 import { Button } from "@/components/ui/button";
 import { TableHeaderSorting } from "@/components/ui/tableHeaderSorting";
 import { IconWrapper } from "@/components/Shared";
diff --git a/vite.config.ts b/vite.config.ts
index d4775de9..1b49b702 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -6,6 +6,11 @@ import tsConfigPaths from "vite-tsconfig-paths";
 // import * as packageJson from "./package.json";
 
 export default defineConfig(() => ({
+    resolve: {
+        alias: {
+            "@": resolve(__dirname, "./src"),
+        },
+    },
     plugins: [react(), tsConfigPaths(), dts()],
     build: {
         lib: {