diff --git a/src/pages/email-confirm.astro b/src/pages/account/email-confirm.astro
similarity index 100%
rename from src/pages/email-confirm.astro
rename to src/pages/account/email-confirm.astro
diff --git a/src/pages/account.astro b/src/pages/account/index.astro
similarity index 95%
rename from src/pages/account.astro
rename to src/pages/account/index.astro
index a32d9c3..fe1adb2 100644
--- a/src/pages/account.astro
+++ b/src/pages/account/index.astro
@@ -18,7 +18,7 @@ if (Astro.url.href.endsWith('PasswordReset')) {var MessagePasswordReset = true}
 else {var MessagePasswordReset = false}
 
 // Supabase Data
-import { supabase } from "../library/supabase"
+import { supabase } from "@library/supabase"
 const { data: { user } } = await supabase.auth.getUser()
 const avatarUrl = user?.user_metadata.avatar_url
 const displayName = user?.user_metadata.full_name
@@ -79,9 +79,9 @@ const lastSignInDate = lastSignIn.toLocaleDateString('en-US', dateFormat)
          <p>Theme: {user_theme}</p>
          <p>Color Scheme: {user_color_scheme}</p>
             {user_beta ?
-                <form method="post" action="/api/account/beta-off"><button type="submit">Leave Beta</button></form>
+                <form method="post" action="/api/account/preferences/beta-off"><button type="submit">Leave Beta</button></form>
                 :
-                <form method="post" action="/api/account/beta-on"><button type="submit">Enter Beta</button></form>
+                <form method="post" action="/api/account/preferences/beta-on"><button type="submit">Enter Beta</button></form>
             }
          </p>
         <hr/>
diff --git a/src/pages/reset-password.astro b/src/pages/account/reset-password.astro
similarity index 100%
rename from src/pages/reset-password.astro
rename to src/pages/account/reset-password.astro
diff --git a/src/pages/api/account/beta-off.ts b/src/pages/api/account/preference/beta-off.ts
similarity index 100%
rename from src/pages/api/account/beta-off.ts
rename to src/pages/api/account/preference/beta-off.ts
diff --git a/src/pages/api/account/beta-on.ts b/src/pages/api/account/preference/beta-on.ts
similarity index 100%
rename from src/pages/api/account/beta-on.ts
rename to src/pages/api/account/preference/beta-on.ts
diff --git a/src/pages/api/account/add.astro b/src/pages/api/account/subscription/add.astro
similarity index 89%
rename from src/pages/api/account/add.astro
rename to src/pages/api/account/subscription/add.astro
index 970b38a..863378d 100644
--- a/src/pages/api/account/add.astro
+++ b/src/pages/api/account/subscription/add.astro
@@ -1,7 +1,7 @@
 ---
 import Base from "@layouts/Base.astro"
 const CreatorId = Astro.url.href.split("add?=").pop()
-import { supabase } from "../../../library/supabase"
+import { supabase } from "@library/supabase"
 const { data: { user } } = await supabase.auth.getUser()
 const { data, error } = await supabase
   .from('subs')
diff --git a/src/pages/api/account/remove.astro b/src/pages/api/account/subscription/remove.astro
similarity index 88%
rename from src/pages/api/account/remove.astro
rename to src/pages/api/account/subscription/remove.astro
index 65cd4a9..513b0c8 100644
--- a/src/pages/api/account/remove.astro
+++ b/src/pages/api/account/subscription/remove.astro
@@ -1,7 +1,7 @@
 ---
 import Base from "@layouts/Base.astro"
 const CreatorId = Astro.url.href.split("remove?=").pop()
-import { supabase } from "../../../library/supabase"
+import { supabase } from "@library/supabase"
 const { data: { user } } = await supabase.auth.getUser()
 const id = user?.id
 const { data, error } = await supabase
diff --git a/src/pages/api/auth/register.ts b/src/pages/api/auth/register.ts
index aae5360..dd1f3d9 100644
--- a/src/pages/api/auth/register.ts
+++ b/src/pages/api/auth/register.ts
@@ -33,5 +33,5 @@ export const POST: APIRoute = async ({ request, redirect }) => {
     return new Response(error.message, { status: 500 })
   }
 
-  return redirect("/email-confirm")
+  return redirect("/account/email-confirm")
 }
diff --git a/src/pages/creator/C6nSFpj9HTCZ5t-N3Rm3-HA.astro b/src/pages/creator/C6nSFpj9HTCZ5t-N3Rm3-HA.astro
index 4ab26d2..da76079 100644
--- a/src/pages/creator/C6nSFpj9HTCZ5t-N3Rm3-HA.astro
+++ b/src/pages/creator/C6nSFpj9HTCZ5t-N3Rm3-HA.astro
@@ -17,9 +17,9 @@ let { data: subs } = await supabase
     <p style="font-size: 18px; font-weight: bold;">Vsause</p>
     <div>
       {subs[0].Subscribed ? 
-        <a style="font-size: 14px;" href={"/api/account/remove?=" + 'C6nSFpj9HTCZ5t-N3Rm3-HA'}>Unsubscribe</a>
+        <a style="font-size: 14px;" href={"/api/account/subscription/remove?=" + 'C6nSFpj9HTCZ5t-N3Rm3-HA'}>Unsubscribe</a>
           :
-        <a style="font-size: 14px;" href={"/api/account/add?=" + 'C6nSFpj9HTCZ5t-N3Rm3-HA'}>Subscribe</a>
+        <a style="font-size: 14px;" href={"/api/account/subscription/add?=" + 'C6nSFpj9HTCZ5t-N3Rm3-HA'}>Subscribe</a>
       }
     </div>
   </div>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 96658e3..d0b5941 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -9,7 +9,7 @@ if (Astro.cookies.get('sb-access-token') && Astro.cookies.get('sb-refresh-token'
 }
 
 // Supabase Data
-import { supabase } from "../library/supabase"
+import { supabase } from "@library/supabase"
 const { data: { user } } = await supabase.auth.getUser()
 const avatar = user?.user_metadata.avatar_url
 const displayName = user?.user_metadata.full_name