diff --git a/src/channel/_default.page.tsx b/src/app/channel/_default.page.tsx
similarity index 100%
rename from src/channel/_default.page.tsx
rename to src/app/channel/_default.page.tsx
diff --git a/src/channel/layout.tsx b/src/app/channel/layout.tsx
similarity index 100%
rename from src/channel/layout.tsx
rename to src/app/channel/layout.tsx
diff --git a/src/channel/pages/index.page.tsx b/src/app/channel/pages/index.page.tsx
similarity index 100%
rename from src/channel/pages/index.page.tsx
rename to src/app/channel/pages/index.page.tsx
diff --git a/src/chat/_default.page.tsx b/src/app/chat/_default.page.tsx
similarity index 100%
rename from src/chat/_default.page.tsx
rename to src/app/chat/_default.page.tsx
diff --git a/src/chat/layout.tsx b/src/app/chat/layout.tsx
similarity index 100%
rename from src/chat/layout.tsx
rename to src/app/chat/layout.tsx
diff --git a/src/chat/pages/index.page.tsx b/src/app/chat/pages/index.page.tsx
similarity index 100%
rename from src/chat/pages/index.page.tsx
rename to src/app/chat/pages/index.page.tsx
diff --git a/src/splashscreen/_default.page.route.tsx b/src/app/index/_default.page.route.tsx
similarity index 100%
rename from src/splashscreen/_default.page.route.tsx
rename to src/app/index/_default.page.route.tsx
diff --git a/src/splashscreen/pages/index.page.tsx b/src/app/index/pages/index.page.tsx
similarity index 97%
rename from src/splashscreen/pages/index.page.tsx
rename to src/app/index/pages/index.page.tsx
index 8284f769..4ad95b5f 100644
--- a/src/splashscreen/pages/index.page.tsx
+++ b/src/app/index/pages/index.page.tsx
@@ -125,7 +125,7 @@ export function Page() {
         () => {
           updateLastLogin(dateToUnix(now.current));
           timeout = setTimeout(() => {
-            navigate('/newsfeed/following', { overwriteLastHistoryEntry: true });
+            navigate('/app/newsfeed/following', { overwriteLastHistoryEntry: true });
           }, 5000);
         }
       );
@@ -136,7 +136,7 @@ export function Page() {
         if (res) {
           fetchInitalData(res, res.follows);
         } else {
-          navigate('/onboarding', { overwriteLastHistoryEntry: true });
+          navigate('/auth', { overwriteLastHistoryEntry: true });
         }
       })
       .catch(console.error);
diff --git a/src/newsfeed/_default.page.tsx b/src/app/newsfeed/_default.page.tsx
similarity index 100%
rename from src/newsfeed/_default.page.tsx
rename to src/app/newsfeed/_default.page.tsx
diff --git a/src/newsfeed/layout.tsx b/src/app/newsfeed/layout.tsx
similarity index 100%
rename from src/newsfeed/layout.tsx
rename to src/app/newsfeed/layout.tsx
diff --git a/src/newsfeed/pages/circle/index.page.tsx b/src/app/newsfeed/pages/circle/index.page.tsx
similarity index 100%
rename from src/newsfeed/pages/circle/index.page.tsx
rename to src/app/newsfeed/pages/circle/index.page.tsx
diff --git a/src/newsfeed/pages/following/index.page.tsx b/src/app/newsfeed/pages/following/index.page.tsx
similarity index 100%
rename from src/newsfeed/pages/following/index.page.tsx
rename to src/app/newsfeed/pages/following/index.page.tsx
diff --git a/src/onboarding/_default.page.tsx b/src/auth/_default.page.tsx
similarity index 100%
rename from src/onboarding/_default.page.tsx
rename to src/auth/_default.page.tsx
diff --git a/src/onboarding/components/user.tsx b/src/auth/components/user.tsx
similarity index 100%
rename from src/onboarding/components/user.tsx
rename to src/auth/components/user.tsx
diff --git a/src/onboarding/layout.tsx b/src/auth/layout.tsx
similarity index 100%
rename from src/onboarding/layout.tsx
rename to src/auth/layout.tsx
diff --git a/src/onboarding/pages/create/index.page.tsx b/src/auth/pages/create/index.page.tsx
similarity index 98%
rename from src/onboarding/pages/create/index.page.tsx
rename to src/auth/pages/create/index.page.tsx
index c15c7bd4..ebf97f16 100644
--- a/src/onboarding/pages/create/index.page.tsx
+++ b/src/auth/pages/create/index.page.tsx
@@ -26,7 +26,7 @@ export function Page() {
 
   const submit = () => {
     setOnboarding((prev) => ({ ...prev, pubkey: pubkey, privkey: privkey }));
-    navigate('/onboarding/create/step-2');
+    navigate('/auth/create/step-2');
   };
 
   return (
diff --git a/src/onboarding/pages/create/step-2/index.page.tsx b/src/auth/pages/create/step-2/index.page.tsx
similarity index 99%
rename from src/onboarding/pages/create/step-2/index.page.tsx
rename to src/auth/pages/create/step-2/index.page.tsx
index becd24d0..86f158e1 100644
--- a/src/onboarding/pages/create/step-2/index.page.tsx
+++ b/src/auth/pages/create/step-2/index.page.tsx
@@ -30,7 +30,7 @@ export function Page() {
   const onSubmit = (data: any) => {
     setLoading(true);
     setOnboarding((prev) => ({ ...prev, metadata: data }));
-    navigate('/onboarding/create/step-3');
+    navigate('/auth/create/step-3');
   };
 
   useEffect(() => {
diff --git a/src/onboarding/pages/create/step-3/index.page.tsx b/src/auth/pages/create/step-3/index.page.tsx
similarity index 99%
rename from src/onboarding/pages/create/step-3/index.page.tsx
rename to src/auth/pages/create/step-3/index.page.tsx
index e04aea02..26cbf664 100644
--- a/src/onboarding/pages/create/step-3/index.page.tsx
+++ b/src/auth/pages/create/step-3/index.page.tsx
@@ -1,4 +1,4 @@
-import User from '@lume/onboarding/components/user';
+import User from '@lume/auth/components/user';
 import { WRITEONLY_RELAYS } from '@lume/stores/constants';
 import { onboardingAtom } from '@lume/stores/onboarding';
 import { createAccount, createPleb } from '@lume/utils/storage';
diff --git a/src/onboarding/pages/import/index.page.tsx b/src/auth/pages/import/index.page.tsx
similarity index 99%
rename from src/onboarding/pages/import/index.page.tsx
rename to src/auth/pages/import/index.page.tsx
index 3f8ddc39..4847827b 100644
--- a/src/onboarding/pages/import/index.page.tsx
+++ b/src/auth/pages/import/index.page.tsx
@@ -43,7 +43,7 @@ export function Page() {
 
       if (typeof getPublicKey(privkey) === 'string') {
         setOnboardingPrivkey((prev) => ({ ...prev, privkey: privkey }));
-        navigate(`/onboarding/import/step-2`);
+        navigate(`/auth/import/step-2`);
       }
     } catch (error) {
       setError('key', {
diff --git a/src/onboarding/pages/import/step-2/index.page.tsx b/src/auth/pages/import/step-2/index.page.tsx
similarity index 97%
rename from src/onboarding/pages/import/step-2/index.page.tsx
rename to src/auth/pages/import/step-2/index.page.tsx
index f48e6d6a..9d02e5c4 100644
--- a/src/onboarding/pages/import/step-2/index.page.tsx
+++ b/src/auth/pages/import/step-2/index.page.tsx
@@ -2,7 +2,6 @@ import { DEFAULT_AVATAR, READONLY_RELAYS } from '@lume/stores/constants';
 import { onboardingAtom } from '@lume/stores/onboarding';
 import { shortenKey } from '@lume/utils/shortenKey';
 import { createAccount, createPleb } from '@lume/utils/storage';
-import { nip02ToArray } from '@lume/utils/transform';
 
 import { useAtom } from 'jotai';
 import { RelayPool } from 'nostr-relaypool';
@@ -37,7 +36,7 @@ export function Page() {
             setOnboarding((prev) => ({ ...prev, metadata: event.content }));
             break;
           case 3:
-            setOnboarding((prev) => ({ ...prev, follows: nip02ToArray(event.tags) }));
+            setOnboarding((prev) => ({ ...prev, follows: event.tags }));
             break;
           default:
             break;
diff --git a/src/onboarding/pages/index/index.page.tsx b/src/auth/pages/index/index.page.tsx
similarity index 98%
rename from src/onboarding/pages/index/index.page.tsx
rename to src/auth/pages/index/index.page.tsx
index a04c455c..90da6f36 100644
--- a/src/onboarding/pages/index/index.page.tsx
+++ b/src/auth/pages/index/index.page.tsx
@@ -95,14 +95,14 @@ export function Page() {
         </h1>
         <div className="mt-4 flex flex-col items-center gap-1.5">
           <a
-            href="/onboarding/create"
+            href="/auth/create"
             className="relative inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full bg-zinc-900 px-6 text-lg font-medium ring-1 ring-zinc-800 hover:bg-zinc-800"
           >
             Create new key
             <ArrowRight width={20} height={20} />
           </a>
           <a
-            href="/onboarding/import"
+            href="/auth/import"
             className="inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full px-6 text-base font-medium text-zinc-300 hover:bg-zinc-800"
           >
             Login with private key