diff --git a/components.json b/components.json
index 7cf8a7d..3af9a2c 100644
--- a/components.json
+++ b/components.json
@@ -11,6 +11,6 @@
   },
   "aliases": {
     "components": "@/components",
-    "utils": "@/lib/utils"
+    "utils": "@/components/lib/utils"
   }
 }
diff --git a/src/components/UTXOCard.tsx b/src/components/UTXOCard.tsx
index 47670e5..d669f81 100644
--- a/src/components/UTXOCard.tsx
+++ b/src/components/UTXOCard.tsx
@@ -5,7 +5,7 @@ import {
   CardHeader,
   CardTitle
 } from "@/components/ui/smaller-card"
-import nf from "@/lib/numberFormatter"
+import nf from "@/components/lib/numberFormatter"
 interface UTXOCardProps {
   amount: number
   value: number
diff --git a/src/lib/numberFormatter.ts b/src/components/lib/numberFormatter.ts
similarity index 100%
rename from src/lib/numberFormatter.ts
rename to src/components/lib/numberFormatter.ts
diff --git a/src/lib/utils.ts b/src/components/lib/utils.ts
similarity index 100%
rename from src/lib/utils.ts
rename to src/components/lib/utils.ts
diff --git a/src/components/ui/accordion.tsx b/src/components/ui/accordion.tsx
index e6a723d..8a6a999 100644
--- a/src/components/ui/accordion.tsx
+++ b/src/components/ui/accordion.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as AccordionPrimitive from "@radix-ui/react-accordion"
 import { ChevronDown } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Accordion = AccordionPrimitive.Root
 
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 466c7ab..ad89966 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import { Slot } from "@radix-ui/react-slot"
 import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const buttonVariants = cva(
   "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-bold ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx
index afa13ec..223c2db 100644
--- a/src/components/ui/card.tsx
+++ b/src/components/ui/card.tsx
@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Card = React.forwardRef<
   HTMLDivElement,
diff --git a/src/components/ui/carousel.tsx b/src/components/ui/carousel.tsx
index 9aa5346..886248e 100644
--- a/src/components/ui/carousel.tsx
+++ b/src/components/ui/carousel.tsx
@@ -6,7 +6,7 @@ import useEmblaCarousel, {
 } from "embla-carousel-react"
 import { ArrowLeft, ArrowRight } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 import { Button } from "@/components/ui/button"
 
 type CarouselProps = {
diff --git a/src/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsx
index ddbdd01..0187a2a 100644
--- a/src/components/ui/checkbox.tsx
+++ b/src/components/ui/checkbox.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
 import { Check } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Checkbox = React.forwardRef<
   React.ElementRef<typeof CheckboxPrimitive.Root>,
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index 3ff23e6..157bab6 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as DialogPrimitive from "@radix-ui/react-dialog"
 import { X } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Dialog = DialogPrimitive.Root
 
diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx
index 2f2c57a..ef6e99d 100644
--- a/src/components/ui/dropdown-menu.tsx
+++ b/src/components/ui/dropdown-menu.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
 import { Check, ChevronRight, Circle } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const DropdownMenu = DropdownMenuPrimitive.Root
 
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index 677d05f..946595e 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 export interface InputProps
   extends React.InputHTMLAttributes<HTMLInputElement> {}
diff --git a/src/components/ui/label.tsx b/src/components/ui/label.tsx
index 683faa7..f8fa04b 100644
--- a/src/components/ui/label.tsx
+++ b/src/components/ui/label.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as LabelPrimitive from "@radix-ui/react-label"
 import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const labelVariants = cva(
   "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx
index cf253cf..4aa251d 100644
--- a/src/components/ui/scroll-area.tsx
+++ b/src/components/ui/scroll-area.tsx
@@ -1,7 +1,7 @@
 import * as React from "react"
 import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const ScrollArea = React.forwardRef<
   React.ElementRef<typeof ScrollAreaPrimitive.Root>,
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index 4587282..3ee6a6c 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as SelectPrimitive from "@radix-ui/react-select"
 import { Check, ChevronDown, ChevronUp } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Select = SelectPrimitive.Root
 
diff --git a/src/components/ui/separator.tsx b/src/components/ui/separator.tsx
index 6d7f122..1777173 100644
--- a/src/components/ui/separator.tsx
+++ b/src/components/ui/separator.tsx
@@ -1,7 +1,7 @@
 import * as React from "react"
 import * as SeparatorPrimitive from "@radix-ui/react-separator"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Separator = React.forwardRef<
   React.ElementRef<typeof SeparatorPrimitive.Root>,
diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsx
index fd549ea..73b6160 100644
--- a/src/components/ui/sheet.tsx
+++ b/src/components/ui/sheet.tsx
@@ -3,7 +3,7 @@ import * as SheetPrimitive from "@radix-ui/react-dialog"
 import { cva, type VariantProps } from "class-variance-authority"
 import { X } from "lucide-react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Sheet = SheetPrimitive.Root
 
diff --git a/src/components/ui/smaller-card.tsx b/src/components/ui/smaller-card.tsx
index 7f29395..93fc30b 100644
--- a/src/components/ui/smaller-card.tsx
+++ b/src/components/ui/smaller-card.tsx
@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const Card = React.forwardRef<
   HTMLDivElement,
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
index 9f9a6dc..a15e805 100644
--- a/src/components/ui/textarea.tsx
+++ b/src/components/ui/textarea.tsx
@@ -1,6 +1,6 @@
 import * as React from "react"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 export interface TextareaProps
   extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
diff --git a/src/components/ui/toggle-group.tsx b/src/components/ui/toggle-group.tsx
index 8f9c3f2..1b10801 100644
--- a/src/components/ui/toggle-group.tsx
+++ b/src/components/ui/toggle-group.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"
 import { VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 import { toggleVariants } from "@/components/ui/toggle"
 
 const ToggleGroupContext = React.createContext<
diff --git a/src/components/ui/toggle.tsx b/src/components/ui/toggle.tsx
index 4f7bae8..4eafb5c 100644
--- a/src/components/ui/toggle.tsx
+++ b/src/components/ui/toggle.tsx
@@ -2,7 +2,7 @@ import * as React from "react"
 import * as TogglePrimitive from "@radix-ui/react-toggle"
 import { cva, type VariantProps } from "class-variance-authority"
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/components/lib/utils"
 
 const toggleVariants = cva(
   "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground",
diff --git a/src/pages/Wallet.tsx b/src/pages/Wallet.tsx
index c2c8a1a..00dc242 100644
--- a/src/pages/Wallet.tsx
+++ b/src/pages/Wallet.tsx
@@ -2,7 +2,7 @@ import { Button } from "@/components/ui/button"
 import { Download } from "lucide-react"
 import Heading from "@/components/Heading"
 import { ThemeToggler } from "@/components/ThemeToggler"
-import nf from "@/lib/numberFormatter"
+import nf from "@/components/lib/numberFormatter"
 import UTXOCard from "@/components/UTXOCard"
 import SendDrawer from "@/pages/Wallet/Send"
 import SettingsSheet from "@/pages/Wallet/Settings"