change component imports

55 files changed, 129 insertions, 95 deletions

diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte
index ed0bec3e..6ce7979c 100644
--- a/src/routes/(app)/+error.svelte
+++ b/src/routes/(app)/+error.svelte
@@ -1,6 +1,6 @@
 <script>
   import { back } from "$lib/utils";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { page } from "$app/stores";
 
   export let data;
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index c5a312e1..51ebd9fe 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -13,7 +13,10 @@
   import { page } from "$app/stores";
   import { browser } from "$app/environment";
   import { goto } from "$app/navigation";
-  import { LoadingSplash, Invoice, Password, Request } from "$comp";
+  import LoadingSplash from "$comp/LoadingSplash.svelte";
+  import Invoice from "$comp/Invoice.svelte";
+  import Password from "$comp/Password.svelte";
+  import Request  from "$comp/Request.svelte";
   import { warning, protectedRoutes } from "$lib/utils";
   import { t, locale } from "$lib/translations";
   import { onNavigate } from "$app/navigation";
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 6b166e2c..604f3fd0 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -2,7 +2,7 @@
   import { hexToUint8Array } from "uint8array-extras";
   import { copy, f, s, sats } from "$lib/utils";
   import { animatedRate } from "$lib/store";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { sign, send } from "$lib/nostr";
   import { bech32m } from "@scure/base";
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index b0e36090..36512d1e 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -1,6 +1,9 @@
 <script>
   import { onMount } from "svelte";
-  import { Icon, Avatar, Balance, Feed } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Avatar from "$comp/Avatar.svelte";
+  import Balance from "$comp/Balance.svelte";
+  import Feed from "$comp/Feed.svelte";
   import { t } from "$lib/translations";
   import { ease, f, sat, sats } from "$lib/utils";
   import { sign, send, encrypt, decrypt } from "$lib/nostr";
diff --git a/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte b/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
index 1347947f..74ce1067 100644
--- a/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Event } from "$comp";
+  import Event from "$comp/Event.svelte";
   export let data;
   let { event } = data;
 </script>
diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.svelte b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
index f51af86b..e087ad42 100644
--- a/src/routes/(app)/[username]/(profile)/followers/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { t } from "$lib/translations";
-  import { Avatar } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
   import { browser } from "$app/environment";
   import VirtualScroll from "svelte-virtual-scroll-list";
 
diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.svelte b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
index 4f1bf32b..e4363796 100644
--- a/src/routes/(app)/[username]/(profile)/follows/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { t } from "$lib/translations";
-  import { Avatar } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
   import { browser } from "$app/environment";
   import VirtualScroll from "svelte-virtual-scroll-list";
 
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.svelte b/src/routes/(app)/[username]/(profile)/request/+page.svelte
index 5727c3d4..a07ee914 100644
--- a/src/routes/(app)/[username]/(profile)/request/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/request/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
 
   export let data;
 
diff --git a/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
index 6ce0c9f6..ce5eb276 100644
--- a/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
 
   export let data;
   let { subject } = data;
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index 3a351e48..dd29e3aa 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { AppHeader } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
   import { onNavigate } from "$app/navigation";
   export let data;
 
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.svelte b/src/routes/(app)/[username]/card/[serial]/+page.svelte
index a2e17dfc..1d11ebee 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.svelte
+++ b/src/routes/(app)/[username]/card/[serial]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Card, Icon } from "$comp";
+  import Card from "$comp/Card.svelte";
+  import Icon from "$comp/Icon.svelte";
   export let data;
   let { serial } = data;
   let balance = 0;
diff --git a/src/routes/(app)/[username]/funds/+page.svelte b/src/routes/(app)/[username]/funds/+page.svelte
index 667176e1..25686e86 100644
--- a/src/routes/(app)/[username]/funds/+page.svelte
+++ b/src/routes/(app)/[username]/funds/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 
   export let data;
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
index 4ebb5eae..68f5741a 100644
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -2,7 +2,7 @@
   import { fail, post, wait } from "$lib/utils";
   import { onMount } from "svelte";
   import { goto, invalidate } from "$app/navigation";
-  import { Pin } from "$comp";
+   import Pin from "$comp/Pin.svelte" 
   import { loginRedirect, pin, password, passwordPrompt } from "$lib/store";
   import { generate } from "$lib/nostr";
   import { browser } from "$app/environment";
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index b6bf70b7..b18c1a70 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -16,7 +16,10 @@
   import { tick, onMount, onDestroy } from "svelte";
   import { browser } from "$app/environment";
   import { last } from "$lib/store";
-  import { Avatar, Icon, Heart, Image } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Heart from "$comp/Heart.svelte";
+  import Image from "$comp/Image.svelte";
   import { t } from "$lib/translations";
   import { goto, invalidate } from "$app/navigation";
 
diff --git a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
index 655bc3e4..ed1ae931 100644
--- a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { browser } from "$app/environment";
   import { t } from "$lib/translations";
diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
index 87e48f01..02a896b2 100644
--- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
@@ -3,7 +3,8 @@
   import { browser } from "$app/environment";
   import { invoice as inv, request } from "$lib/store";
   import { copy, focus, f, sat, get, reverseFormat, s, sats } from "$lib/utils";
-  import { Icon, Slider } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Slider from "$comp/Slider.svelte";
   import { goto } from "$app/navigation";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
diff --git a/src/routes/(app)/[username]/invoice/sent/+page.svelte b/src/routes/(app)/[username]/invoice/sent/+page.svelte
index 8583de09..b95bc85e 100644
--- a/src/routes/(app)/[username]/invoice/sent/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/sent/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { request } from "$lib/store";
 </script>
 
diff --git a/src/routes/(app)/[username]/map/+page.svelte b/src/routes/(app)/[username]/map/+page.svelte
index a2ae657c..e69de29b 100644
--- a/src/routes/(app)/[username]/map/+page.svelte
+++ b/src/routes/(app)/[username]/map/+page.svelte
@@ -1,8 +0,0 @@
-<script>
-  import { LocationsMap } from "$comp";
-  export let data;
-
-  let { locations } = data;
-</script>
-
-<LocationsMap {locations} />
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index 16b82679..263f7294 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -5,7 +5,8 @@
   import { format } from "date-fns";
   import { scale, fade, fly } from "svelte/transition";
   import { enhance } from "$app/forms";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { back, fail, focus } from "$lib/utils";
   import { sign, send, encrypt, decrypt } from "$lib/nostr";
   import { event as e, password } from "$lib/store";
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index e61e156c..e80d7e80 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { onMount } from "svelte";
   import { format } from "date-fns";
   import { newPayment } from "$lib/store";
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index 085a6f6d..49e279b9 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -1,5 +1,7 @@
 <script>
-  import { Icon, Numpad, Toggle } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Toggle from "$comp/Toggle.svelte";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
   import { page } from "$app/stores";
diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte
index f9672c6f..ff33c02c 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/request/[id]/+page.svelte
@@ -1,7 +1,8 @@
 <script>
   import { scale } from "svelte/transition";
   import { t } from "$lib/translations";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { f, sat, sats } from "$lib/utils";
   import { request as req, requestRedirect } from "$lib/store";
   import { onMount } from "svelte";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 92772f43..b7a9ccfb 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -4,7 +4,9 @@
   import { fly } from "svelte/transition";
   import { applyAction, deserialize } from "$app/forms";
 
-  import { Icon, Spinner, Pin } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+  import Pin from "$comp/Pin.svelte";
   import { t } from "$lib/translations";
   import { fail, post, warning, success } from "$lib/utils";
   import { avatar, banner, password, pin } from "$lib/store";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index 64ab669f..20c883e3 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -1,7 +1,7 @@
 <script>
   import { tick } from "svelte";
   import { colorTheme, avatar, banner } from "$lib/store";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { page } from "$app/stores";
 
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index 94a35493..cbf31a68 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -1,5 +1,7 @@
 <script>
-  import { Icon, LocaleSelector, Toggle } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import LocaleSelector from "$comp/LocaleSelector.svelte";
+  import Toggle from "$comp/Toggle.svelte";
   import { t } from "$lib/translations";
   import { success, fail } from "$lib/utils";
   import { page } from "$app/stores";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index f8c14e7b..38bf726c 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -2,7 +2,9 @@
   import { getMnemonic, getNsec } from "$lib/nostr";
   import { tick } from "svelte";
   import { t } from "$lib/translations";
-  import { Pin, Icon, Qr } from "$comp";
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Qr from "$comp/Qr.svelte";
   import { copy, post, success, fail } from "$lib/utils";
   import { pin as current } from "$lib/store";
   import { invalidate } from "$app/navigation";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
index 3e2a8dae..0266fa9c 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
@@ -1,6 +1,6 @@
 <script>
   import { t } from "$lib/translations";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { page } from "$app/stores";
 
   export let user;
diff --git a/src/routes/(app)/admin/+layout.svelte b/src/routes/(app)/admin/+layout.svelte
index 33b64b6a..f85a3b08 100644
--- a/src/routes/(app)/admin/+layout.svelte
+++ b/src/routes/(app)/admin/+layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { LandingHeader } from "$comp";
+   import LandingHeader from "$comp/LandingHeader.svelte" 
   export let data;
   let { user } = data;
 </script>
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 2f999555..903eb7f4 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -1,6 +1,10 @@
 <script>
   import { enhance } from "$app/forms";
-  import { Icon, Lock, Card, Calendar, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Lock from "$comp/Lock.svelte";
+  import Card from "$comp/Card.svelte";
+  import Calendar from "$comp/Calendar.svelte";
+  import Spinner  from "$comp/Spinner.svelte";
   import { animatedRate } from "$lib/store";
   import { f } from "$lib/utils";
 
diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte
index 117a4b42..b81e2917 100644
--- a/src/routes/(app)/fund/[id]/+page.svelte
+++ b/src/routes/(app)/fund/[id]/+page.svelte
@@ -2,7 +2,8 @@
   import { format } from "date-fns";
   import { enhance } from "$app/forms";
   import { page } from "$app/stores";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { t } from "$lib/translations";
   import { types, copy, f, s, sat, sats } from "$lib/utils";
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
index bbd7013f..4a48edf8 100644
--- a/src/routes/(app)/fund/[id]/sweep/+page.svelte
+++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { scale } from "svelte/transition";
   import { fiat, f, s } from "$lib/utils";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 
   export let data;
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
index 6b2010b7..7af07e38 100644
--- a/src/routes/(app)/fund/[id]/withdraw/+page.svelte
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
@@ -1,7 +1,9 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon, Numpad, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { back } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/launch/+page.svelte b/src/routes/(app)/launch/+page.svelte
index 028274fa..b7c472c1 100644
--- a/src/routes/(app)/launch/+page.svelte
+++ b/src/routes/(app)/launch/+page.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { LandingHeader } from "$comp";
+   import LandingHeader from "$comp/LandingHeader.svelte" 
   import { loginRedirect } from "$lib/store";
   import { beforeNavigate } from "$app/navigation";
   import { info } from "$lib/utils";
-  import { Icon } from "$comp";
+   import Icon from "$comp/Icon.svelte" 
   import { t } from "$lib/translations";
   import { goto } from "$app/navigation";
   import { scroll } from "$lib/utils";
diff --git a/src/routes/(app)/launch/purchase/card/+page.svelte b/src/routes/(app)/launch/purchase/card/+page.svelte
index 037a65b2..6d33c87f 100644
--- a/src/routes/(app)/launch/purchase/card/+page.svelte
+++ b/src/routes/(app)/launch/purchase/card/+page.svelte
@@ -1,6 +1,9 @@
 <script>
   import { enhance } from "$app/forms";
-  import { Lock, Card, Calendar, Spinner } from "$comp";
+  import Lock from "$comp/Lock.svelte";
+  import Card from "$comp/Card.svelte";
+  import Calendar from "$comp/Calendar.svelte";
+  import Spinner from "$comp/Spinner.svelte";
 
   export let data;
 
diff --git a/src/routes/(app)/ln/[lnurl]/+page.svelte b/src/routes/(app)/ln/[lnurl]/+page.svelte
index 9b733f89..26616a29 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.svelte
+++ b/src/routes/(app)/ln/[lnurl]/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Lnurlp, Lnurlw } from "$comp";
+   import Lnurlp from "$comp/Lnurlp.svelte"; import Lnurlw from "$comp/Lnurlw.svelte" 
   export let data;
   let { tag } = data;
 </script>
diff --git a/src/routes/(app)/ln/withdrawal/sent/+page.svelte b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
index c527c017..c1a2bdb2 100644
--- a/src/routes/(app)/ln/withdrawal/sent/+page.svelte
+++ b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { t } from "$lib/translations";
 
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index 6190ae0d..08161cee 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { RegisterOrLogin } from "$comp";
+  import RegisterOrLogin from "$comp/RegisterOrLogin.svelte";
   import { onMount } from "svelte";
   import { animatedRate, pin } from "$lib/store";
 
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 7e3c6792..e2f96372 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -11,7 +11,7 @@
     success,
     types,
   } from "$lib/utils";
-  import { Avatar, Icon } from "$comp";
+   import Avatar from "$comp/Avatar.svelte", import Icon from "$comp/Icon.svelte" 
   import { format } from "date-fns";
   import { PUBLIC_EXPLORER as expl } from "$env/static/public";
 
diff --git a/src/routes/(app)/payment/[id]/plain/+page.svelte b/src/routes/(app)/payment/[id]/plain/+page.svelte
index 27e8d0ed..c63a9d7f 100644
--- a/src/routes/(app)/payment/[id]/plain/+page.svelte
+++ b/src/routes/(app)/payment/[id]/plain/+page.svelte
@@ -14,7 +14,8 @@
     success,
     types,
   } from "$lib/utils";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { format } from "date-fns";
   import { PUBLIC_EXPLORER as expl } from "$env/static/public";
 
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte
index d943b0b5..2678d91a 100644
--- a/src/routes/(app)/qr/[text]/+page.svelte
+++ b/src/routes/(app)/qr/[text]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Icon, Qr } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Qr from "$comp/Qr.svelte";
   import { back } from "$lib/utils";
   export let data;
   let { src, text } = data;
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 8310aed1..9cd13ebe 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -6,7 +6,11 @@
   import { tick } from "svelte";
   import { fly } from "svelte/transition";
   import { enhance } from "$app/forms";
-  import { Pin, Icon, Spinner } from "$comp";
+
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner  from "$comp/Spinner.svelte";
+
   import { focus, fail } from "$lib/utils";
   import { avatar, password, loginRedirect } from "$lib/store";
   import { t } from "$lib/translations";
diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte
index 033eb28b..6f22121e 100644
--- a/src/routes/(app)/scan/+page.svelte
+++ b/src/routes/(app)/scan/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Icon } from "$comp";
+   import Icon from "$comp/Icon.svelte" 
   import QrScanner from "qr-scanner";
   import { onMount, onDestroy } from "svelte";
   import { back } from "$lib/utils";
diff --git a/src/routes/(app)/send/+layout.svelte b/src/routes/(app)/send/+layout.svelte
index 1a587edf..55b01f3a 100644
--- a/src/routes/(app)/send/+layout.svelte
+++ b/src/routes/(app)/send/+layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "$app/navigation";
-  import { Pin } from "$comp";
+   import Pin from "$comp/Pin.svelte" 
   import { pin } from "$lib/store";
 
   export let data;
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 67d4afaa..8548964c 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -5,7 +5,10 @@
   import { tick } from "svelte";
   import { browser } from "$app/environment";
   import { t } from "$lib/translations";
-  import { AppHeader, Avatar, Icon, Spinner } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { back, fail } from "$lib/utils";
 
   export let data;
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index da11a22c..133eab91 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -2,7 +2,11 @@
   import { tick } from "svelte";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Toggle, Slider, Icon, Numpad, Spinner } from "$comp";
+  import Toggle from "$comp/Toggle.svelte";
+  import Slider from "$comp/Slider.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { fiat as toFiat, f, back, s, sat } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
index 886e93d2..b6a4aa0c 100644
--- a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
@@ -1,7 +1,9 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon, Numpad, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { back } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index d29f1c96..79367534 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -4,7 +4,10 @@
   import { goto, invalidateAll } from "$app/navigation";
   import { pin } from "$lib/store";
   import { enhance } from "$app/forms";
-  import { Avatar, Icon, Numpad, Spinner } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { post, back, f, fiat as toFiat, s, sats } from "$lib/utils";
   export let data;
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index 185597c7..ce9649fa 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -1,7 +1,9 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon, Numpad, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { back, s } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index cb458323..1ad2c458 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -3,7 +3,11 @@
   import { goto } from "$app/navigation";
   import { pin } from "$lib/store";
   import { enhance } from "$app/forms";
-  import { AppHeader, Avatar, Icon, Numpad, Spinner } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { f, post, s, sat, sats } from "$lib/utils";
 
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index 400e8904..e2d297de 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { fiat, f, s, sat, sats } from "$lib/utils";
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { t } from "$lib/translations";
 
diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte
index b31b4389..8d8bee1a 100644
--- a/src/routes/(app)/support/+page.svelte
+++ b/src/routes/(app)/support/+page.svelte
@@ -2,7 +2,8 @@
   import { onDestroy } from "svelte";
   import { fail, success, post } from "$lib/utils";
   import { scale } from "svelte/transition";
-  import { AppHeader, Icon } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 
   export let data;
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte
index 29089dff..13073d5a 100644
--- a/src/routes/(static)/+layout.svelte
+++ b/src/routes/(static)/+layout.svelte
@@ -1,6 +1,8 @@
 <script>
   import { SvelteToast } from "@zerodevx/svelte-toast";
-  import { Footer, LandingHeader } from "$comp";
+  import Footer from "$comp/Footer.svelte";
+  import LandingHeader from "$comp/LandingHeader.svelte";
+
   export let data;
   $: ({ user } = data);
 </script>
diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte
index 6e08c2e8..bf7ecb20 100644
--- a/src/routes/(static)/docs/+page.svelte
+++ b/src/routes/(static)/docs/+page.svelte
@@ -1,6 +1,9 @@
 <script>
   import { copyNoNewlines as copy } from "$lib/utils";
-  import { Code, Icon } from "$comp";
+
+  import Code from "$comp/Code.svelte";
+  import Icon from "$comp/Icon.svelte";
+
   import { PUBLIC_COINOS_URL } from "$env/static/public";
   export let data;
   let { user, token } = data;
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index a90eb4ae..6eeb3a2e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,14 +1,11 @@
 <script>
-  import {
-    LandingHeader,
-    LandingHero,
-    LandingInfoCard,
-    HowItWorksCard,
-    FaqCard,
-    Image,
-    About,
-    Footer,
-  } from "$comp";
+  import LandingHeader from "$comp/LandingHeader.svelte";
+  import LandingHero from "$comp/LandingHero.svelte";
+  import LandingInfoCard from "$comp/LandingInfoCard.svelte";
+  import HowItWorksCard from "$comp/HowItWorksCard.svelte";
+  import FaqCard from "$comp/FaqCard.svelte";
+  import Image from "$comp/Image.svelte";
+  import Footer from "$comp/Footer.svelte";
 
   import { t } from "$lib/translations";
   import { onDestroy, onMount, tick } from "svelte";
@@ -35,12 +32,15 @@
   let observer;
   let isIntersecting = false;
 
+  let About;
   onMount(async () => {
-    observer = new IntersectionObserver((entries) => {
+    observer = new IntersectionObserver(async (entries) => {
+      About = (await import("$comp/About.svelte")).default;
       isIntersecting = isIntersecting || entries[0].isIntersecting;
     });
 
     loaded = true;
+
     await tick();
     observer.observe(document.getElementById("faq"));
   });
@@ -48,12 +48,8 @@
   onDestroy(() => (loaded = false));
 </script>
 
-<svelte:head>
-  <script src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js"></script>
-</svelte:head>
-
 {#if loaded}
-  <LandingHeader {howItWorks} {faq} {about} {user} />
+
 
   <main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
     <LandingHero />
diff --git a/src/routes/map/+page.svelte b/src/routes/map/+page.svelte
index 8c5fc3f8..e69de29b 100644
--- a/src/routes/map/+page.svelte
+++ b/src/routes/map/+page.svelte
@@ -1,18 +0,0 @@
-<script>
-  import { Icon, LocationsMap } from "$comp";
-  export let data;
-
-  let { locations } = data;
-</script>
-
-<div class="pt-4">
-  <div class="w-[243px] mx-auto mb-4">
-    <a href="/">
-      <Icon icon="logo" />
-    </a>
-  </div>
-
-  <div class="flex justify-center items-center">
-    <LocationsMap {locations} />
-  </div>
-</div>