diff --git a/src/lib/commandCenter/searchers/organizations.ts b/src/lib/commandCenter/searchers/organizations.ts
index c24f38799e..9df8003a17 100644
--- a/src/lib/commandCenter/searchers/organizations.ts
+++ b/src/lib/commandCenter/searchers/organizations.ts
@@ -1,16 +1,10 @@
+import { resolve } from '$app/paths';
 import { goto } from '$app/navigation';
-import { base } from '$app/paths';
-import { sdk } from '$lib/stores/sdk';
 import type { Searcher } from '../commands';
-import { isCloud } from '$lib/system';
-import { Platform, Query } from '@appwrite.io/console';
+import { getTeamOrOrganizationList } from '$lib/stores/organization';
 
 export const orgSearcher = (async (query: string) => {
-    const { teams } = !isCloud
-        ? await sdk.forConsole.teams.list()
-        : await sdk.forConsole.billing.listOrganization([
-              Query.equal('platform', Platform.Appwrite)
-          ]);
+    const { teams } = await getTeamOrOrganizationList();
 
     return teams
         .filter((organization) => organization.name.toLowerCase().includes(query.toLowerCase()))
@@ -18,7 +12,11 @@ export const orgSearcher = (async (query: string) => {
             return {
                 label: organization.name,
                 callback: () => {
-                    goto(`${base}/organization-${organization.$id}`);
+                    goto(
+                        resolve('/(console)/organization-[organization]', {
+                            organization: organization.$id
+                        })
+                    );
                 },
                 group: 'organizations'
             } as const;
diff --git a/src/lib/components/archiveProject.svelte b/src/lib/components/archiveProject.svelte
index 8eb3795914..8a324b395b 100644
--- a/src/lib/components/archiveProject.svelte
+++ b/src/lib/components/archiveProject.svelte
@@ -38,23 +38,21 @@
     import { isSmallViewport } from '$lib/stores/viewport';
     import { isCloud } from '$lib/system';
     import { regions as regionsStore } from '$lib/stores/organization';
-    import type { Organization } from '$lib/stores/organization';
-    import type { Plan } from '$lib/sdk/billing';
 
     // props
     interface Props {
+        currentPlan: Models.BillingPlan;
+        organization: Models.Organization;
         projectsToArchive: Models.Project[];
-        organization: Organization;
-        currentPlan: Plan;
         archivedTotalOverall: number;
         archivedOffset: number;
         limit: number;
     }
 
     let {
-        projectsToArchive,
-        organization,
         currentPlan,
+        organization,
+        projectsToArchive,
         archivedTotalOverall,
         archivedOffset,
         limit
diff --git a/src/lib/components/billing/alerts/limitReached.svelte b/src/lib/components/billing/alerts/limitReached.svelte
index 4885db75e1..12605cded4 100644
--- a/src/lib/components/billing/alerts/limitReached.svelte
+++ b/src/lib/components/billing/alerts/limitReached.svelte
@@ -5,16 +5,21 @@
     import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { HeaderAlert } from '$lib/layout';
-    import { hideBillingHeaderRoutes, readOnly, tierToPlan, upgradeURL } from '$lib/stores/billing';
+    import {
+        hideBillingHeaderRoutes,
+        readOnly,
+        billingIdToPlan,
+        upgradeURL
+    } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
 </script>
 
 {#if $organization?.$id && $organization?.billingPlan === BillingPlan.FREE && $readOnly && !hideBillingHeaderRoutes.includes(page.url.pathname)}
     <HeaderAlert
         type="error"
-        title={`${$organization.name} usage has reached the ${tierToPlan($organization.billingPlan).name} plan limit`}>
+        title={`${$organization.name} usage has reached the ${billingIdToPlan($organization.billingPlan).name} plan limit`}>
         <svelte:fragment>
-            Usage for the <b>{$organization.name}</b> organization has reached the limits of the {tierToPlan(
+            Usage for the <b>{$organization.name}</b> organization has reached the limits of the {billingIdToPlan(
                 $organization.billingPlan
             ).name}
             plan. Consider upgrading to increase your resource usage.
diff --git a/src/lib/components/billing/alerts/paymentMandate.svelte b/src/lib/components/billing/alerts/paymentMandate.svelte
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/lib/components/billing/alerts/selectProjectCloud.svelte b/src/lib/components/billing/alerts/selectProjectCloud.svelte
index 510334aa2e..a0084f97ab 100644
--- a/src/lib/components/billing/alerts/selectProjectCloud.svelte
+++ b/src/lib/components/billing/alerts/selectProjectCloud.svelte
@@ -31,10 +31,10 @@
 
     async function updateSelected() {
         try {
-            await sdk.forConsole.billing.updateSelectedProjects(
-                projects[0].teamId,
-                selectedProjects
-            );
+            await sdk.forConsole.organizations.updateProjects({
+                organizationId,
+                projects: selectedProjects
+            });
 
             showSelectProject = false;
             invalidate(Dependencies.ORGANIZATION);
diff --git a/src/lib/components/billing/couponInput.svelte b/src/lib/components/billing/couponInput.svelte
index 85e73411c0..fc33df37df 100644
--- a/src/lib/components/billing/couponInput.svelte
+++ b/src/lib/components/billing/couponInput.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-    import { Button, InputText } from '$lib/elements/forms';
-    import { formatCurrency } from '$lib/helpers/numbers';
-    import type { Coupon } from '$lib/sdk/billing';
     import { sdk } from '$lib/stores/sdk';
-    import { Layout } from '@appwrite.io/pink-svelte';
     import { createEventDispatcher } from 'svelte';
+    import { Layout } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
+    import { formatCurrency } from '$lib/helpers/numbers';
+    import { Button, InputText } from '$lib/elements/forms';
 
     const dispatch = createEventDispatcher();
 
     export let required = false;
     export let coupon: string = '';
-    export let couponData: Partial<Coupon> = {
+    export let couponData: Partial<Models.Coupon> = {
         code: null,
         status: null,
         credits: null
@@ -18,8 +18,10 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.billing.getCouponAccount(coupon);
-            couponData = response;
+            couponData = await sdk.forConsole.account.getCoupon({
+                couponId: coupon
+            });
+
             dispatch('validation', couponData);
             coupon = null;
         } catch (error) {
diff --git a/src/lib/components/billing/creditsApplied.svelte b/src/lib/components/billing/creditsApplied.svelte
index a02fa7d4ba..dc5f995a03 100644
--- a/src/lib/components/billing/creditsApplied.svelte
+++ b/src/lib/components/billing/creditsApplied.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { Button } from '$lib/elements/forms';
-    import type { Coupon } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
     import { formatCurrency } from '$lib/helpers/numbers';
     import { IconTag, IconX } from '@appwrite.io/pink-icons-svelte';
     import { Badge, Icon, Layout, Tooltip, Typography } from '@appwrite.io/pink-svelte';
 
-    export let couponData: Partial<Coupon> = {
+    export let couponData: Partial<Models.Coupon> = {
         code: null,
         status: null,
         credits: null
diff --git a/src/lib/components/billing/discountsApplied.svelte b/src/lib/components/billing/discountsApplied.svelte
index d32f67a8f0..83e05df01c 100644
--- a/src/lib/components/billing/discountsApplied.svelte
+++ b/src/lib/components/billing/discountsApplied.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import type { Coupon } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
     import { formatCurrency } from '$lib/helpers/numbers';
     import { IconTag } from '@appwrite.io/pink-icons-svelte';
     import { Badge, Icon, Layout, Typography } from '@appwrite.io/pink-svelte';
 
     export let label: string;
     export let value: number;
-    export let couponData: Partial<Coupon> = {
+    export let couponData: Partial<Models.Coupon> = {
         code: null,
         status: null,
         credits: null
diff --git a/src/lib/components/billing/emptyCardCloud.svelte b/src/lib/components/billing/emptyCardCloud.svelte
index b83676f28d..0ca7071967 100644
--- a/src/lib/components/billing/emptyCardCloud.svelte
+++ b/src/lib/components/billing/emptyCardCloud.svelte
@@ -1,21 +1,33 @@
 <script lang="ts">
-    import { Click, trackEvent } from '$lib/actions/analytics';
-    import { BillingPlan } from '$lib/constants';
+    import { Card } from '..';
+    import type { Snippet } from 'svelte';
     import { Button } from '$lib/elements/forms';
-    import { tierToPlan, upgradeURL } from '$lib/stores/billing';
+    import { BillingPlanGroup } from '@appwrite.io/console';
+    import { Click, trackEvent } from '$lib/actions/analytics';
     import { Layout, Typography } from '@appwrite.io/pink-svelte';
-    import { Card } from '..';
+    import { getBasePlanFromGroup, upgradeURL } from '$lib/stores/billing';
+
+    let {
+        service,
+        eventSource,
+        children = null
+    }: {
+        service: string;
+        eventSource: string;
+        children?: Snippet;
+    } = $props();
 
-    export let service: string;
-    export let eventSource: string;
+    const proPlanName = getBasePlanFromGroup(BillingPlanGroup.Pro).name;
 </script>
 
 <Card>
-    <slot>
+    {#if children}
+        {@render children()}
+    {:else}
         <Layout.Stack alignItems="center">
             <Typography.Text variant="m-600">Upgrade to add {service}</Typography.Text>
             <Typography.Text>
-                Upgrade to a {tierToPlan(BillingPlan.PRO).name} plan to add {service} to your organization
+                Upgrade to a {proPlanName} plan to add {service} to your organization
             </Typography.Text>
 
             <Button
@@ -31,5 +43,5 @@
                 Upgrade
             </Button>
         </Layout.Stack>
-    </slot>
+    {/if}
 </Card>
diff --git a/src/lib/components/billing/estimatedTotalBox.svelte b/src/lib/components/billing/estimatedTotalBox.svelte
index dd78788903..c859d48de4 100644
--- a/src/lib/components/billing/estimatedTotalBox.svelte
+++ b/src/lib/components/billing/estimatedTotalBox.svelte
@@ -1,24 +1,22 @@
 <script lang="ts">
     import { InputChoice, InputNumber } from '$lib/elements/forms';
     import { formatCurrency } from '$lib/helpers/numbers';
-    import type { Coupon, Estimation } from '$lib/sdk/billing';
-    import { type Tier } from '$lib/stores/billing';
     import { Card, Divider, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { CreditsApplied } from '.';
     import { sdk } from '$lib/stores/sdk';
-    import { AppwriteException } from '@appwrite.io/console';
+    import { AppwriteException, type Models } from '@appwrite.io/console';
     import DiscountsApplied from './discountsApplied.svelte';
 
-    export let billingPlan: Tier;
+    export let billingPlan: string;
     export let collaborators: string[];
-    export let couponData: Partial<Coupon>;
+    export let couponData: Partial<Models.Coupon>;
     export let billingBudget: number;
     export let fixedCoupon = false; // If true, the coupon cannot be removed
     export let isDowngrade = false;
     export let organizationId: string | undefined = undefined;
 
     let budgetEnabled = false;
-    let estimation: Estimation;
+    let estimation: Models.Estimation;
 
     async function getEstimate(
         billingPlan: string,
@@ -26,11 +24,11 @@
         couponId: string | undefined
     ) {
         try {
-            estimation = await sdk.forConsole.billing.estimationCreateOrganization(
+            estimation = await sdk.forConsole.organizations.estimationCreateOrganization({
                 billingPlan,
-                couponId === '' ? null : couponId,
-                collaborators ?? []
-            );
+                invites: collaborators ?? [],
+                couponId: couponId === '' ? null : couponId
+            });
         } catch (e) {
             if (e instanceof AppwriteException) {
                 if (
@@ -56,12 +54,12 @@
         couponId: string | undefined
     ) {
         try {
-            estimation = await sdk.forConsole.billing.estimationUpdatePlan(
+            estimation = await sdk.forConsole.organizations.estimationUpdatePlan({
                 organizationId,
-                billingPlan,
-                couponId && couponId.length > 0 ? couponId : null,
-                collaborators ?? []
-            );
+                billingPlan: billingPlan,
+                invites: collaborators ?? [],
+                couponId: couponId && couponId.length > 0 ? couponId : null
+            });
         } catch (e) {
             if (e instanceof AppwriteException) {
                 if (
diff --git a/src/lib/components/billing/paymentBoxes.svelte b/src/lib/components/billing/paymentBoxes.svelte
index 27719cba54..5883b4460a 100644
--- a/src/lib/components/billing/paymentBoxes.svelte
+++ b/src/lib/components/billing/paymentBoxes.svelte
@@ -4,11 +4,11 @@
     import { CreditCardBrandImage } from '..';
     import { initializeStripe, unmountPaymentElement } from '$lib/stores/stripe';
     import { Badge, Card, Layout } from '@appwrite.io/pink-svelte';
-    import type { PaymentMethodData } from '$lib/sdk/billing';
     import type { PaymentMethod } from '@stripe/stripe-js';
     import StatePicker from './statePicker.svelte';
+    import type { Models } from '@appwrite.io/console';
 
-    export let methods: PaymentMethodData[];
+    export let methods: Array<Models.PaymentMethod>;
     export let group: string;
     export let name: string;
     export let defaultMethod: string = null;
diff --git a/src/lib/components/billing/paymentModal.svelte b/src/lib/components/billing/paymentModal.svelte
index e881cd93ef..bdda244fd3 100644
--- a/src/lib/components/billing/paymentModal.svelte
+++ b/src/lib/components/billing/paymentModal.svelte
@@ -13,19 +13,19 @@
     import { addNotification } from '$lib/stores/notifications';
     import { page } from '$app/state';
     import { Spinner } from '@appwrite.io/pink-svelte';
-    import type { PaymentMethod } from '@stripe/stripe-js';
+    import type { PaymentMethod as StripePaymentMethod } from '@stripe/stripe-js';
     import StatePicker from './statePicker.svelte';
-    import type { PaymentMethodData } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let onCardSubmit: ((card: PaymentMethodData) => void) | null = null;
+    export let onCardSubmit: ((card: Models.PaymentMethod) => void) | null = null;
 
     let modal: FakeModal;
     let name: string;
     let state: string = '';
     let error: string = null;
     let showState: boolean = false;
-    let paymentMethod: PaymentMethod | null = null;
+    let paymentMethod: StripePaymentMethod | null = null;
 
     async function handleSubmit() {
         try {
@@ -47,15 +47,15 @@
 
             const card = await submitStripeCard(name, page?.params?.organization ?? null);
             if (card && Object.hasOwn(card, 'id')) {
-                if ((card as PaymentMethod).card?.country === 'US') {
-                    paymentMethod = card as PaymentMethod;
+                if ((card as StripePaymentMethod).card?.country === 'US') {
+                    paymentMethod = card as StripePaymentMethod;
                     showState = true;
                     return;
                 }
             }
             modal.closeModal();
             await invalidate(Dependencies.PAYMENT_METHODS);
-            onCardSubmit?.(card as PaymentMethodData);
+            onCardSubmit?.(card as Models.PaymentMethod);
             addNotification({
                 type: 'success',
                 message: 'A new payment method has been added to your account'
diff --git a/src/lib/components/billing/planComparisonBox.svelte b/src/lib/components/billing/planComparisonBox.svelte
index 4379cc6f88..80ae87f25e 100644
--- a/src/lib/components/billing/planComparisonBox.svelte
+++ b/src/lib/components/billing/planComparisonBox.svelte
@@ -1,103 +1,131 @@
 <script lang="ts">
+    import { page } from '$app/state';
     import { BillingPlan } from '$lib/constants';
     import { formatNum } from '$lib/helpers/string';
-    import { plansInfo, tierToPlan, type Tier } from '$lib/stores/billing';
+    import { BillingPlanGroup, type Models } from '@appwrite.io/console';
     import { Card, Layout, Tabs, Typography } from '@appwrite.io/pink-svelte';
+    import { getBasePlanFromGroup, planHasGroup, plansInfo } from '$lib/stores/billing';
 
-    export let downgrade = false;
+    let {
+        downgrade = false
+    }: {
+        downgrade?: boolean;
+    } = $props();
 
-    let selectedTab: Tier = BillingPlan.FREE;
+    let selectedTab: string = $state(getBasePlanFromGroup(BillingPlanGroup.Starter).$id);
 
-    $: plan = $plansInfo.get(selectedTab);
+    const currentPlan: Models.BillingPlan = $derived($plansInfo.get(selectedTab));
+    const visiblePlans: Array<Models.BillingPlan> = $derived.by(() => {
+        return page.data.plans.plans.filter(
+            (plan: Models.BillingPlan) => plan.$id !== BillingPlan.SCALE
+        );
+    });
 
-    const allTiers: Tier[] = [BillingPlan.FREE, BillingPlan.PRO, BillingPlan.SCALE];
-    $: visibleTiers = allTiers.filter((tier) => tier !== BillingPlan.SCALE);
+    const uniquePlans: Array<Models.BillingPlan> = $derived.by(() => {
+        const map = new Map(visiblePlans.map((p) => [p.group ?? p.$id, p]));
+
+        return [...map.values()];
+    });
+
+    function pluralize(count: number, singular: string, plural?: string) {
+        if (count === 1) return singular;
+        return plural ?? `${singular}s`;
+    }
 </script>
 
 <Card.Base>
     <Layout.Stack>
         <Tabs.Root stretch let:root>
-            {#each visibleTiers as tier}
+            {#each uniquePlans as plan}
                 <Tabs.Item.Button
                     {root}
-                    active={selectedTab === tier}
-                    on:click={() => (selectedTab = tier)}>
-                    {tierToPlan(tier).name}
+                    active={selectedTab === plan.$id}
+                    on:click={() => (selectedTab = plan.$id)}>
+                    {plan.name}
                 </Tabs.Item.Button>
             {/each}
         </Tabs.Root>
 
-        <Typography.Text variant="m-600">{plan.name} plan</Typography.Text>
-        {#if selectedTab === BillingPlan.FREE}
-            {#if downgrade}
-                <ul class="u-margin-block-start-8 list u-gap-4 u-small">
-                    <li class="list-item u-gap-4 u-cross-center">
-                        <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
-                        <span class="text">
-                            Limited to {plan.databases} Database, {plan.buckets} Buckets, {plan.functions}
-                            Functions per project
-                        </span>
-                    </li>
-                    <li class="list-item u-gap-4 u-cross-center">
-                        <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
-                        <span class="text"> Limited to 1 organization member </span>
-                    </li>
-                    <li class="list-item u-gap-4 u-cross-center">
-                        <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
-                        <span class="text">
-                            {plan.bandwidth}GB bandwidth
-                        </span>
-                    </li>
-                    <li class="list-item u-gap-4 u-cross-center">
-                        <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
-                        <span class="text">
-                            {plan.storage}GB storage
-                        </span>
-                    </li>
-                    <li class="list-item u-gap-4 u-cross-center">
-                        <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
-                        <span class="text">
-                            {formatNum(plan.executions)} executions
-                        </span>
-                    </li>
-                </ul>
-            {:else}
-                <ul class="un-order-list">
-                    <li>
-                        Limited to {plan.databases} Database, {plan.buckets} Buckets, {plan.functions}
-                        Functions per project
-                    </li>
-                    <li>Limited to 1 organization member</li>
-                    <li>
-                        Limited to {plan.bandwidth}GB bandwidth
-                    </li>
-                    <li>
-                        Limited to {plan.storage}GB storage
-                    </li>
-                    <li>
-                        Limited to {formatNum(plan.executions)} executions
-                    </li>
-                </ul>
-            {/if}
-        {:else if selectedTab === BillingPlan.PRO}
-            <Typography.Text>Everything in the Free plan, plus:</Typography.Text>
-            <ul class="un-order-list">
-                <li>Unlimited databases, buckets, functions</li>
-                <li>Unlimited seats</li>
-                <li>{plan.bandwidth}GB bandwidth</li>
-                <li>{plan.storage}GB storage</li>
-                <li>{formatNum(plan.executions)} executions</li>
-                <li>Email support</li>
+        <Typography.Text variant="m-600">{currentPlan.name} plan</Typography.Text>
+
+        {@render appwritePlanView()}
+    </Layout.Stack>
+</Card.Base>
+
+{#snippet appwritePlanView()}
+    {#if planHasGroup(selectedTab, BillingPlanGroup.Starter)}
+        {#if downgrade}
+            <ul class="u-margin-block-start-8 list u-gap-4 u-small">
+                <li class="list-item u-gap-4 u-cross-center">
+                    <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
+                    <span class="text">
+                        Limited to {currentPlan.databases}
+                        {pluralize(currentPlan.databases, 'Database')}, {currentPlan.buckets}
+                        {pluralize(currentPlan.buckets, 'Bucket')}, {currentPlan.functions}
+                        {pluralize(currentPlan.functions, 'Function')} per project
+                    </span>
+                </li>
+                <li class="list-item u-gap-4 u-cross-center">
+                    <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
+                    <span class="text"> Limited to 1 organization member </span>
+                </li>
+                <li class="list-item u-gap-4 u-cross-center">
+                    <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
+                    <span class="text">
+                        {currentPlan.bandwidth}GB bandwidth
+                    </span>
+                </li>
+                <li class="list-item u-gap-4 u-cross-center">
+                    <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
+                    <span class="text">
+                        {currentPlan.storage}GB storage
+                    </span>
+                </li>
+                <li class="list-item u-gap-4 u-cross-center">
+                    <span class="icon-arrow-down u-color-text-danger" aria-hidden="true"></span>
+                    <span class="text">
+                        {formatNum(currentPlan.executions)} executions
+                    </span>
+                </li>
             </ul>
-        {:else if selectedTab === BillingPlan.SCALE}
-            <Typography.Text>Everything in the Pro plan, plus:</Typography.Text>
+        {:else}
             <ul class="un-order-list">
-                <li>Unlimited seats</li>
-                <li>Organization roles</li>
-                <li>SOC-2, HIPAA compliance</li>
-                <li>SSO <span class="inline-tag">Coming soon</span></li>
-                <li>Priority support</li>
+                <li>
+                    Limited to {currentPlan.databases}
+                    {pluralize(currentPlan.databases, 'Database')}, {currentPlan.buckets}
+                    {pluralize(currentPlan.buckets, 'Bucket')}, {currentPlan.functions}
+                    {pluralize(currentPlan.functions, 'Function')} per project
+                </li>
+                <li>Limited to 1 organization member</li>
+                <li>
+                    Limited to {currentPlan.bandwidth}GB bandwidth
+                </li>
+                <li>
+                    Limited to {currentPlan.storage}GB storage
+                </li>
+                <li>
+                    Limited to {formatNum(currentPlan.executions)} executions
+                </li>
             </ul>
         {/if}
-    </Layout.Stack>
-</Card.Base>
+    {:else if planHasGroup(selectedTab, BillingPlanGroup.Pro)}
+        <Typography.Text>Everything in the Free plan, plus:</Typography.Text>
+        <ul class="un-order-list">
+            <li>Unlimited databases, buckets, functions</li>
+            <li>Unlimited seats</li>
+            <li>{currentPlan.bandwidth}GB bandwidth</li>
+            <li>{currentPlan.storage}GB storage</li>
+            <li>{formatNum(currentPlan.executions)} executions</li>
+            <li>Email support</li>
+        </ul>
+    {:else if planHasGroup(selectedTab, BillingPlanGroup.Scale)}
+        <Typography.Text>Everything in the Pro plan, plus:</Typography.Text>
+        <ul class="un-order-list">
+            <li>Unlimited seats</li>
+            <li>Organization roles</li>
+            <li>SOC-2, HIPAA compliance</li>
+            <li>SSO <span class="inline-tag">Coming soon</span></li>
+            <li>Priority support</li>
+        </ul>
+    {/if}
+{/snippet}
diff --git a/src/lib/components/billing/planExcess.svelte b/src/lib/components/billing/planExcess.svelte
deleted file mode 100644
index 7bdf28e3f8..0000000000
--- a/src/lib/components/billing/planExcess.svelte
+++ /dev/null
@@ -1,131 +0,0 @@
-<script lang="ts">
-    import {
-        calculateExcess,
-        plansInfo,
-        tierToPlan,
-        getServiceLimit,
-        type Tier
-    } from '$lib/stores/billing';
-    import { organization } from '$lib/stores/organization';
-    import { toLocaleDate } from '$lib/helpers/date';
-    import { humanFileSize } from '$lib/helpers/sizeConvertion';
-    import { abbreviateNumber } from '$lib/helpers/numbers';
-    import { formatNum } from '$lib/helpers/string';
-    import { onMount } from 'svelte';
-    import { sdk } from '$lib/stores/sdk';
-    import { BillingPlan } from '$lib/constants';
-    import { Alert, Icon, Table, Tooltip } from '@appwrite.io/pink-svelte';
-    import { IconInfo } from '@appwrite.io/pink-icons-svelte';
-    import type { AggregationTeam } from '$lib/sdk/billing';
-
-    export let tier: Tier;
-
-    const plan = $plansInfo?.get(tier);
-    let excess: {
-        bandwidth?: number;
-        storage?: number;
-        users?: number;
-        executions?: number;
-        members?: number;
-    } = null;
-    let aggregation: AggregationTeam = null;
-    let showExcess = false;
-
-    onMount(async () => {
-        aggregation = await sdk.forConsole.billing.getAggregation(
-            $organization.$id,
-            $organization.billingAggregationId
-        );
-        excess = calculateExcess(aggregation, plan);
-        showExcess = Object.values(excess).some((value) => value > 0);
-    });
-</script>
-
-{#if showExcess}
-    <Alert.Inline
-        status="error"
-        title={`  Your organization will switch to ${tierToPlan(BillingPlan.FREE).name} plan on ${toLocaleDate(
-            $organization.billingNextInvoiceDate
-        )}`}>
-        You will retain access to {tierToPlan($organization.billingPlan).name} plan features until your
-        billing period ends. After that,
-        {#if excess?.members > 0}<span class="u-bold">
-                all team members except the owner will be removed,</span>
-        {:else}
-            <span class="u-bold">your organization will be limited to Free plan resources,</span>
-        {/if} and service disruptions may occur if usage exceeds Free plan limits.
-    </Alert.Inline>
-
-    <Table.Root columns={3} let:root>
-        <svelte:fragment slot="header" let:root>
-            <Table.Header.Cell {root}>Resource</Table.Header.Cell>
-            <Table.Header.Cell {root}>Free limit</Table.Header.Cell>
-            <Table.Header.Cell {root}>
-                Excess usage <Tooltip maxWidth="fit-content"
-                    ><Icon icon={IconInfo} />
-                    <span slot="tooltip">Metrics are estimates updated every 24 hours</span>
-                </Tooltip>
-            </Table.Header.Cell>
-        </svelte:fragment>
-        {#if excess?.members}
-            <Table.Row.Base {root}>
-                <Table.Cell {root}>Organization members</Table.Cell>
-                <Table.Cell {root}>{getServiceLimit('members', tier)} members</Table.Cell>
-                <Table.Cell {root}>
-                    <p class="u-color-text-danger u-flex u-cross-center u-gap-4">
-                        <span class="icon-arrow-up"></span>
-                        {excess?.members} members
-                    </p>
-                </Table.Cell>
-            </Table.Row.Base>
-        {/if}
-        {#if excess?.storage}
-            <Table.Row.Base {root}>
-                <Table.Cell {root}>Storage</Table.Cell>
-                <Table.Cell {root}>{plan.storage} GB</Table.Cell>
-                <Table.Cell {root}>
-                    <p class="u-color-text-danger">
-                        <span class="icon-arrow-up"></span>
-                        {humanFileSize(excess?.storage).value}
-                        {humanFileSize(excess?.storage).unit}
-                    </p>
-                </Table.Cell>
-            </Table.Row.Base>
-        {/if}
-        {#if excess?.executions}
-            <Table.Row.Base {root}>
-                <Table.Cell {root}>Function executions</Table.Cell>
-                <Table.Cell {root}>
-                    {abbreviateNumber(plan.executions)} executions
-                </Table.Cell>
-                <Table.Cell {root}>
-                    <p class="u-color-text-danger">
-                        <span class="icon-arrow-up"></span>
-                        <span
-                            title={excess?.executions
-                                ? excess.executions.toString()
-                                : 'executions'}>
-                            {formatNum(excess?.executions)} executions
-                        </span>
-                    </p>
-                </Table.Cell>
-            </Table.Row.Base>
-        {/if}
-        {#if excess?.users}
-            <Table.Row.Base {root}>
-                <Table.Cell {root}>Users</Table.Cell>
-                <Table.Cell {root}>
-                    {abbreviateNumber(plan.users)} users
-                </Table.Cell>
-                <Table.Cell column="usage" {root}>
-                    <p class="u-color-text-danger">
-                        <span class="icon-arrow-up"></span>
-                        <span title={excess?.users ? excess.users.toString() : 'users'}>
-                            {formatNum(excess?.users)} users
-                        </span>
-                    </p>
-                </Table.Cell>
-            </Table.Row.Base>
-        {/if}
-    </Table.Root>
-{/if}
diff --git a/src/lib/components/billing/planSelection.svelte b/src/lib/components/billing/planSelection.svelte
index 6499a47c0b..bd1402f565 100644
--- a/src/lib/components/billing/planSelection.svelte
+++ b/src/lib/components/billing/planSelection.svelte
@@ -4,21 +4,21 @@
     import { currentPlan, organization } from '$lib/stores/organization';
     import { Badge, Layout, Tooltip, Typography } from '@appwrite.io/pink-svelte';
     import { LabelCard } from '..';
-    import type { Plan } from '$lib/sdk/billing';
     import { page } from '$app/state';
+    import type { Models } from '@appwrite.io/console';
 
-    export let billingPlan: BillingPlan;
+    export let billingPlan: string;
     export let isNewOrg = false;
     export let selfService = true;
     export let anyOrgFree = false;
 
-    $: plans = Object.values(page.data.plans.plans) as Plan[];
+    $: plans = Object.values(page.data.plans.plans) as Models.BillingPlan[];
     $: currentPlanInList = plans.some((plan) => plan.$id === $currentPlan?.$id);
 
     // experiment to remove scale plan temporarily
     $: plansWithoutScale = plans.filter((plan) => plan.$id != BillingPlan.SCALE);
 
-    function shouldShowTooltip(plan: Plan) {
+    function shouldShowTooltip(plan: Models.BillingPlan) {
         if (plan.$id !== BillingPlan.FREE) return true;
         else return !anyOrgFree;
     }
diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte
index c80aacacfe..9682b99953 100644
--- a/src/lib/components/billing/selectPaymentMethod.svelte
+++ b/src/lib/components/billing/selectPaymentMethod.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { Button, InputText } from '$lib/elements/forms';
-    import type { PaymentList, PaymentMethodData } from '$lib/sdk/billing';
     import { hasStripePublicKey, isCloud } from '$lib/system';
     import { onMount } from 'svelte';
     import PaymentModal from './paymentModal.svelte';
@@ -10,15 +9,16 @@
     import InputSelect from '$lib/elements/forms/inputSelect.svelte';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
+    import type { Models } from '@appwrite.io/console';
 
-    export let value: string;
     export let taxId = '';
-    export let methods: PaymentList;
+    export let value: string;
+    export let methods: Models.PaymentMethodList;
 
     let showTaxId = false;
     let showPaymentModal = false;
 
-    async function cardSaved(card: PaymentMethodData) {
+    async function cardSaved(card: Models.PaymentMethod) {
         value = card.$id;
 
         if (value) {
diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte
index 49ab414e93..5e264dd294 100644
--- a/src/lib/components/billing/usageRates.svelte
+++ b/src/lib/components/billing/usageRates.svelte
@@ -2,15 +2,16 @@
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDate } from '$lib/helpers/date';
-    import { type Organization } from '$lib/stores/organization';
     import { plansInfo } from '$lib/stores/billing';
     import { abbreviateNumber, formatCurrency, isWithinSafeRange } from '$lib/helpers/numbers';
     import { BillingPlan } from '$lib/constants';
     import { Table, Typography } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let org: Organization;
+    export let org: Models.Organization;
 
+    let plan: Models.BillingPlan;
     $: plan = $plansInfo?.get(org.billingPlan);
 
     $: nextDate = org?.name
diff --git a/src/lib/components/billing/validateCreditModal.svelte b/src/lib/components/billing/validateCreditModal.svelte
index 9b2f026916..6e41448354 100644
--- a/src/lib/components/billing/validateCreditModal.svelte
+++ b/src/lib/components/billing/validateCreditModal.svelte
@@ -1,26 +1,28 @@
 <script lang="ts">
     import { Modal } from '$lib/components';
     import { Button, InputText } from '$lib/elements/forms';
-    import type { Coupon } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { createEventDispatcher } from 'svelte';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
     export let isNewOrg = false;
-    export let couponData: Partial<Coupon> = {
+    export let couponData: Partial<Models.Coupon> = {
         code: null,
         status: null,
         credits: null
     };
+
     let error: string = null;
     let coupon: string = '';
     const dispatch = createEventDispatcher();
 
     async function addCoupon() {
         try {
-            // const response = await sdk.forConsole.billing.getCoupon(coupon);
-            const response = await sdk.forConsole.billing.getCouponAccount(coupon); //TODO: double check that this is the correct method
+            const response = await sdk.forConsole.account.getCoupon({
+                couponId: coupon
+            });
 
             if (response.onlyNewOrgs && !isNewOrg) {
                 show = false;
diff --git a/src/lib/components/creditCardInfo.svelte b/src/lib/components/creditCardInfo.svelte
index f750e87c32..871a9b98ea 100644
--- a/src/lib/components/creditCardInfo.svelte
+++ b/src/lib/components/creditCardInfo.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import type { PaymentMethodData } from '$lib/sdk/billing';
-    import { Badge, Layout, Link, Popover, Table } from '@appwrite.io/pink-svelte';
-    import CreditCardBrandImage from './creditCardBrandImage.svelte';
+    import type { Models } from '@appwrite.io/console';
     import type { TableRootProp } from '$lib/helpers/types';
+    import CreditCardBrandImage from './creditCardBrandImage.svelte';
+    import { Badge, Layout, Link, Popover, Table } from '@appwrite.io/pink-svelte';
 
     export let root: TableRootProp;
-    export let paymentMethod: PaymentMethodData;
     export let isBackup: boolean = false;
+    export let paymentMethod: Models.PaymentMethod;
 </script>
 
 <Table.Cell column="cc" {root}>
diff --git a/src/lib/components/emptyCardImageCloud.svelte b/src/lib/components/emptyCardImageCloud.svelte
index 0f4c234504..870edc4889 100644
--- a/src/lib/components/emptyCardImageCloud.svelte
+++ b/src/lib/components/emptyCardImageCloud.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { isSmallViewport } from '$lib/stores/viewport';
     import { organization } from '$lib/stores/organization';
-    import { getNextTier, tierToPlan } from '$lib/stores/billing';
     import { Card, Layout, Typography } from '@appwrite.io/pink-svelte';
+    import { getNextTierBillingPlan, billingIdToPlan } from '$lib/stores/billing';
 
     export let source = 'empty_state_card';
     export let responsive = false;
@@ -11,6 +11,8 @@
     let direction: 'column' | 'row' | 'row-reverse' | 'column-reverse' = 'row';
 
     $: direction = responsive ? ($isSmallViewport ? 'column' : 'row') : 'row';
+
+    $: nextTierBillingPlan = getNextTierBillingPlan($organization.billingPlan);
 </script>
 
 <Card.Base variant="secondary" padding="s" radius="s">
@@ -24,7 +26,7 @@
             <Layout.Stack gap="xxs">
                 <Typography.Text variant="m-600"><slot name="title" /></Typography.Text>
                 <Typography.Text>
-                    <slot nextTier={tierToPlan(getNextTier($organization.billingPlan)).name} />
+                    <slot nextTier={billingIdToPlan(nextTierBillingPlan)?.name} />
                 </Typography.Text>
             </Layout.Stack>
             <slot name="cta" {source} />
diff --git a/src/lib/components/organizationUsageLimits.svelte b/src/lib/components/organizationUsageLimits.svelte
index dac1cbb3d6..9705442c47 100644
--- a/src/lib/components/organizationUsageLimits.svelte
+++ b/src/lib/components/organizationUsageLimits.svelte
@@ -11,15 +11,15 @@
     import { Alert } from '@appwrite.io/pink-svelte';
     import { addNotification } from '$lib/stores/notifications';
     import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
-    import { organization, type Organization } from '$lib/stores/organization';
+    import { organization } from '$lib/stores/organization';
     import type { Models } from '@appwrite.io/console';
 
     // Props
     type Props = {
-        organization: Organization;
+        storageUsage?: number;
         projects?: Models.Project[];
         members?: Models.Membership[];
-        storageUsage?: number;
+        organization: Models.Organization;
     };
 
     const { projects = [], members = [], storageUsage = 0 }: Props = $props();
diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index d05d2639c3..50ab1f3454 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -5,13 +5,13 @@
     import { isSupportOnline, showSupportModal } from '$routes/(console)/wizard/support/store';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import { localeShortTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
-    import { plansInfo } from '$lib/stores/billing';
     import { Card } from '$lib/components/index';
     import { app } from '$lib/stores/app';
-    import { currentPlan, type Organization, organizationList } from '$lib/stores/organization';
+    import { currentPlan, organizationList } from '$lib/stores/organization';
     import { isCloud } from '$lib/system';
     import { Typography } from '@appwrite.io/pink-svelte';
     import { base } from '$app/paths';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
 
@@ -20,12 +20,12 @@
     $: hasPremiumSupport = $currentPlan?.premiumSupport ?? allOrgsHavePremiumSupport ?? false;
 
     $: allOrgsHavePremiumSupport = $organizationList.teams.every(
-        (team) => $plansInfo.get((team as Organization).billingPlan)?.premiumSupport
+        (team) => (team as Models.Organization).billingPlanDetails?.premiumSupport
     );
 
     // there can only be one free organization
     $: freeOrganization = $organizationList.teams.find(
-        (team) => !$plansInfo.get((team as Organization).billingPlan)?.premiumSupport
+        (team) => !(team as Models.Organization).billingPlanDetails?.premiumSupport
     );
 
     $: upgradeURL = `${base}/organization-${freeOrganization?.$id}/change-plan`;
diff --git a/src/lib/flags.ts b/src/lib/flags.ts
index dfbedecd9e..288091e791 100644
--- a/src/lib/flags.ts
+++ b/src/lib/flags.ts
@@ -1,6 +1,6 @@
 import { env } from '$env/dynamic/public';
 import type { Account } from './stores/user';
-import type { Organization } from './stores/organization';
+import type { Models } from '@appwrite.io/console';
 
 // Parse feature flags from env as a string array (exact match only)
 const flagsRaw = (env.PUBLIC_CONSOLE_FEATURE_FLAGS ?? '').split(',');
@@ -8,7 +8,7 @@ const flagsRaw = (env.PUBLIC_CONSOLE_FEATURE_FLAGS ?? '').split(',');
 // @ts-expect-error: unused method!
 function isFlagEnabled(name: string) {
     // loose generic to allow safe access while retaining type safety
-    return <T extends { account?: Account; organization?: Organization }>(data: T) => {
+    return <T extends { account?: Account; organization?: Models.Organization }>(data: T) => {
         const { account, organization } = data;
 
         return !!(
diff --git a/src/lib/layout/containerButton.svelte b/src/lib/layout/containerButton.svelte
index 53cfc35bf1..de3f0024cf 100644
--- a/src/lib/layout/containerButton.svelte
+++ b/src/lib/layout/containerButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
-    import { tierToPlan } from '$lib/stores/billing';
+    import { billingIdToPlan } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
     import { Tooltip } from '@appwrite.io/pink-svelte';
 
@@ -10,7 +10,7 @@
         $organization?.billingPlan === BillingPlan.FREE
             ? `Upgrade to add more ${title.toLocaleLowerCase()}`
             : `You've reached the ${title.toLocaleLowerCase()} limit for the ${
-                  tierToPlan($organization?.billingPlan)?.name
+                  billingIdToPlan($organization?.billingPlan)?.name
               } plan`;
     export let disabled: boolean;
     export let buttonText: string;
diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
index 84fe96607b..1847c23d10 100644
--- a/src/lib/layout/containerHeader.svelte
+++ b/src/lib/layout/containerHeader.svelte
@@ -11,7 +11,7 @@
         getServiceLimit,
         readOnly,
         showUsageRatesModal,
-        tierToPlan,
+        billingIdToPlan,
         upgradeURL,
         type PlanServices
     } from '$lib/stores/billing';
@@ -38,18 +38,15 @@
     let showDropdown = false;
 
     // TODO: remove the default billing limits when backend is updated with billing code
-    const { bandwidth, documents, storage, users, executions } = $organization?.billingLimits ?? {
+    const { bandwidth, storage, users, executions } = $organization?.billingLimits ?? {
         bandwidth: 1,
-        documents: 1,
         storage: 1,
         users: 1,
         executions: 1
     };
 
-    // TODO: @itznotabug - check with @abnegate, what do we do here? this is billing!
     const limitedServices = [
         { name: 'bandwidth', value: bandwidth },
-        { name: 'documents', value: documents },
         { name: 'storage', value: storage },
         { name: 'users', value: users },
         { name: 'executions', value: executions }
@@ -64,7 +61,7 @@
     };
     const dispatch = createEventDispatcher();
 
-    $: tier = tierToPlan($organization?.billingPlan)?.name;
+    $: tier = billingIdToPlan($organization?.billingPlan)?.name;
     // these can be organization level limitations as well.
     // we need to migrate this sometime later, but soon!
     $: hasProjectLimitation =
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index fcfc39086d..193aa63335 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -9,7 +9,7 @@
     import { organization, organizationList } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { user } from '$lib/stores/user';
-    import { tierToPlan } from '$lib/stores/billing';
+    import { billingIdToPlan } from '$lib/stores/billing';
     import { isCloud } from '$lib/system';
     import SideNavigation from '$lib/layout/navigation.svelte';
     import { hasOnboardingDismissed } from '$lib/helpers/onboarding';
@@ -161,7 +161,7 @@
                 name: org.name,
                 $id: org.$id,
                 showUpgrade: billingPlan === BillingPlan.FREE,
-                tierName: isCloud ? tierToPlan(billingPlan).name : null,
+                tierName: isCloud ? billingIdToPlan(billingPlan).name : null,
                 isSelected: $organization?.$id === org.$id
             };
         }),
diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte
index bccb4de76e..27b44f624e 100644
--- a/src/lib/layout/unauthenticated.svelte
+++ b/src/lib/layout/unauthenticated.svelte
@@ -5,23 +5,22 @@
     import AppwriteLogoLight from '$lib/images/appwrite-logo-light.svg';
     import LoginDark from '$lib/images/login/login-dark-mode.png';
     import LoginLight from '$lib/images/login/login-light-mode.png';
-    import type { Coupon } from '$lib/sdk/billing';
     import { app } from '$lib/stores/app';
-    import type { Campaign } from '$lib/stores/campaigns';
     import { Typography, Layout, Avatar } from '@appwrite.io/pink-svelte';
     import { getCampaignImageUrl } from '$routes/(public)/card/helpers';
     import { isSmallViewport } from '$lib/stores/viewport';
+    import type { Models } from '@appwrite.io/console';
 
     export const imgLight = LoginLight;
     export const imgDark = LoginDark;
 
-    export let campaign: Campaign = null;
-    export let coupon: Coupon = null;
+    export let campaign: Models.Campaign = null;
+    export let coupon: Models.Coupon = null;
     export let align: 'start' | 'center' | 'end' = 'start';
 
     $: variation = ((coupon?.campaign ?? campaign) ? campaign?.template : 'default') as
         | 'default'
-        | Campaign['template'];
+        | Models.Campaign['template'];
 
     let currentReviewNumber = 0;
     $: currentReview = campaign?.reviews?.[currentReviewNumber];
diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 994506e720..2c7a646d4b 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -1,330 +1,4 @@
-import type { Tier } from '$lib/stores/billing';
-import type { Campaign } from '$lib/stores/campaigns';
-import type { Client, Models } from '@appwrite.io/console';
-import type { PaymentMethod } from '@stripe/stripe-js';
-import type { Organization, OrganizationError, OrganizationList } from '../stores/organization';
-
-export type PaymentMethodData = {
-    $id: string;
-    $createdAt: string;
-    $updatedAt: string;
-    providerMethodId: string;
-    providerUserId: string;
-    userId: string;
-    expiryMonth: number;
-    expiryYear: number;
-    expired: boolean;
-    last4: string;
-    country: string;
-    brand: string;
-    clientSecret: string;
-    failed: boolean;
-    name: string;
-    mandateId?: string;
-    lastError?: string;
-};
-
-export type PaymentList = {
-    paymentMethods: PaymentMethodData[];
-    total: number;
-};
-
-export type Invoice = {
-    $id: string;
-    $createdAt: Date;
-    $updatedAt: Date;
-    permissions: string[];
-    teamId: string;
-    aggregationId: string;
-    plan: Tier;
-    amount: number;
-    tax: number;
-    taxAmount: number;
-    vat: number;
-    vatAmount: number;
-    grossAmount: number;
-    creditsUsed: number;
-    currency: string;
-    from: string;
-    to: string;
-    status: string;
-    dueAt: string;
-    clientSecret: string;
-    usage: {
-        name: string;
-        value: number /* service over the limit*/;
-        amount: number /* price of service over the limit*/;
-        rate: number;
-        desc: string;
-    }[];
-    lastError?: string;
-};
-
-export type InvoiceList = {
-    invoices: Invoice[];
-    total: number;
-};
-
-export type Estimation = {
-    amount: number;
-    grossAmount: number;
-    credits: number;
-    discount: number;
-    items: EstimationItem[];
-    discounts: EstimationItem[];
-    trialDays: number;
-    trialEndDate: string | undefined;
-    error: string | undefined;
-};
-
-export type EstimationItem = {
-    label: string;
-    value: number;
-};
-
-export type EstimationDeleteOrganization = {
-    amount: number;
-    grossAmount: number;
-    credits: number;
-    discount: number;
-    items: EstimationItem[];
-    unpaidInvoices: Invoice[];
-};
-
-export type Coupon = {
-    $id: string;
-    code: string;
-    credits: number;
-    expiration: string;
-    status: string; // 'active' | 'disabled' | 'expired'
-    validity: number;
-    campaign?: string;
-    onlyNewOrgs?: boolean;
-};
-
-export type Credit = {
-    /**
-     * Credit ID.
-     */
-    $id: string;
-    /**
-     * Credit creation time in ISO 8601 format.
-     */
-    $createdAt: string;
-    /**
-     * Credit update date in ISO 8601 format.
-     */
-    $updatedAt: string;
-    /**
-     * coupon ID
-     */
-    couponId: string;
-    /**
-     * ID of the User.
-     */
-    userId: string;
-    /**
-     * ID of the Team.
-     */
-    teamId: string;
-    /**
-     * Provided credit amount
-     */
-    total: number;
-    /**
-     * Remaining credit amount
-     */
-    credits: number;
-    /**
-     * Credit expiration time in ISO 8601 format.
-     */
-    expiration: string;
-    /**
-     * Status of the credit. Can be one of `disabled`, `active` or `expired`.
-     */
-    status: string;
-};
-
-export type CreditList = {
-    available: number;
-    credits: Credit[];
-    total: number;
-};
-
-export type AggregationTeam = {
-    $id: string;
-    /**
-     * Aggregation creation time in ISO 8601 format.
-     */
-    $createdAt: string;
-    /**
-     * Aggregation update date in ISO 8601 format.
-     */
-    $updatedAt: string;
-    /**
-     * Beginning date of the invoice.
-     */
-    from: string;
-    /**
-     * End date of the invoice.
-     */
-    to: string;
-    /**
-     * Total amount of the invoice.
-     */
-    amount: number;
-    additionalMembers: number;
-
-    /**
-     * Price for additional members
-     */
-    additionalMemberAmount: number;
-    /**
-     * Total storage usage.
-     */
-    usageStorage: number;
-    /**
-     * Total active users for the billing period.
-     */
-    usageUsers: number;
-    /**
-     * Total number of executions for the billing period.
-     */
-    usageExecutions: number;
-    /**
-     * Total bandwidth usage for the billing period.
-     */
-    usageBandwidth: number;
-    /**
-     * Total realtime usage for the billing period.
-     */
-    usageRealtime: number;
-    /**
-     * Usage logs for the billing period.
-     */
-    resources: InvoiceUsage[];
-    /**
-     * Aggregation billing plan
-     */
-    plan: string;
-    breakdown: AggregationBreakdown[];
-};
-
-export type AggregationBreakdown = {
-    $id: string;
-    name: string;
-    amount: number;
-    region: string;
-    resources: InvoiceUsage[];
-};
-
-export type InvoiceUsage = {
-    resourceId: string;
-    value: number;
-    amount: number;
-};
-
-export type AvailableCredit = {
-    available: number;
-};
-
-export type Aggregation = {
-    $id: string;
-    /**
-     * Aggregation creation time in ISO 8601 format.
-     */
-    $createdAt: string;
-    /**
-     * Aggregation update date in ISO 8601 format.
-     */
-    $updatedAt: string;
-    /**
-     * Beginning date of the invoice.
-     */
-    from: string;
-    /**
-     * End date of the invoice.
-     */
-    to: string;
-    /**
-     * Total amount of the invoice.
-     */
-    amount: number;
-    additionalMembers: number;
-
-    /**
-     * Price for additional members
-     */
-    additionalMemberAmount: number;
-    /**
-     * Total storage usage.
-     */
-    usageStorage: number;
-    /**
-     * Total active users for the billing period.
-     */
-    usageUsers: number;
-    /**
-     * Total number of executions for the billing period.
-     */
-    usageExecutions: number;
-    /**
-     * Total bandwidth usage for the billing period.
-     */
-    usageBandwidth: number;
-    /**
-     * Total realtime usage for the billing period.
-     */
-    usageRealtime: number;
-    /**
-     * Usage logs for the billing period.
-     */
-    resources: OrganizationUsage;
-    /**
-     * Aggregation billing plan
-     */
-    plan: string;
-};
-
-export type OrganizationUsage = {
-    bandwidth: Array<Models.Metric>;
-    executions: Array<Models.Metric>;
-    databasesReads: Array<Models.Metric>;
-    databasesWrites: Array<Models.Metric>;
-    imageTransformations: Array<Models.Metric>;
-    executionsTotal: number;
-    filesStorageTotal: number;
-    buildsStorageTotal: number;
-    databasesReadsTotal: number;
-    databasesWritesTotal: number;
-    imageTransformationsTotal: number;
-    deploymentsStorageTotal: number;
-    executionsMBSecondsTotal: number;
-    buildsMBSecondsTotal: number;
-    backupsStorageTotal: number;
-    storageTotal: number;
-    users: Array<Models.Metric>;
-    usersTotal: number;
-    projects: Array<{
-        projectId: string;
-        storage: number;
-        executions: number;
-        bandwidth: number;
-        databasesReads: number;
-        databasesWrites: number;
-        users: number;
-        authPhoneTotal: number;
-        authPhoneEstimate: number;
-        imageTransformations: number;
-    }>;
-    authPhoneTotal: number;
-    authPhoneEstimate: number;
-};
-
-export type AggregationList = {
-    aggregations: Aggregation[];
-    total: number;
-};
+import type { Models } from '@appwrite.io/console';
 
 export type AllowedRegions =
     | 'fra'
@@ -338,1099 +12,4 @@ export type AllowedRegions =
     | 'syd'
     | 'default'; //TODO: remove after migration
 
-export type Address = {
-    $id: string;
-    streetAddress: string;
-    addressLine2?: string;
-    country: string;
-    city: string;
-    state?: string;
-    postalCode: string;
-    userId: string;
-};
-
-export type AddressesList = {
-    billingAddresses: Address[];
-    total: number;
-};
-
-export type AdditionalResource = {
-    name: string;
-    currency: string;
-    invoiceDesc: string;
-    price: number;
-    unit: string;
-    value: number;
-    multiplier?: number;
-};
-
-export type PlanAddon = {
-    supported: boolean;
-    currency: string;
-    invoiceDesc: string;
-    price: number;
-    limit: number;
-    value: number;
-    type: string;
-    planIncluded: number;
-};
-
-export type Plan = {
-    $id: string;
-    name: string;
-    desc: string;
-    price: number;
-    order: number;
-    bandwidth: number;
-    storage: number;
-    imageTransformations: number;
-    webhooks: number;
-    users: number;
-    teams: number;
-    projects: number;
-    databases: number;
-    databasesAllowEncrypt: boolean;
-    databasesReads: number;
-    databasesWrites: number;
-    buckets: number;
-    fileSize: number;
-    functions: number;
-    executions: number;
-    GBHours: number;
-    realtime: number;
-    logs: number;
-    authPhone: number;
-    usage: {
-        bandwidth: AdditionalResource;
-        executions: AdditionalResource;
-        member: AdditionalResource;
-        realtime: AdditionalResource;
-        storage: AdditionalResource;
-        users: AdditionalResource;
-        databasesReads: AdditionalResource;
-        databasesWrites: AdditionalResource;
-        GBHours: AdditionalResource;
-        imageTransformations: AdditionalResource;
-    };
-    addons: {
-        seats: PlanAddon;
-        projects: PlanAddon;
-    };
-    trialDays: number;
-    budgetCapEnabled: boolean;
-    isAvailable: boolean;
-    selfService: boolean;
-    premiumSupport: boolean;
-    budgeting: boolean;
-    supportsMockNumbers: boolean;
-    backupsEnabled: boolean;
-    backupPolicies: number;
-    emailBranding: boolean;
-    supportsCredits: boolean;
-    supportsOrganizationRoles: boolean;
-    buildSize: number; // in MB
-    deploymentSize: number; // in MB
-    usagePerProject: boolean;
-};
-
-export type PlanList = {
-    plans: Plan[];
-    total: number;
-};
-
-export type PlansMap = Map<string, Plan>;
-
-export type Roles = {
-    scopes: string[];
-    roles: string[];
-};
-
-export class Billing {
-    client: Client;
-
-    constructor(client: Client) {
-        this.client = client;
-    }
-
-    async listOrganization(queries: string[] = []): Promise<OrganizationList> {
-        const path = `/organizations`;
-        const params = {
-            queries
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async validateOrganization(organizationId: string, invites: string[]): Promise<Organization> {
-        const path = `/organizations/${organizationId}/validate`;
-        const params = {
-            organizationId,
-            invites
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'PATCH',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async createOrganization(
-        organizationId: string,
-        name: string,
-        billingPlan: string,
-        paymentMethodId: string,
-        billingAddressId: string = undefined,
-        couponId: string = null,
-        invites: Array<string> = [],
-        budget: number = undefined,
-        taxId: string = null
-    ): Promise<Organization | OrganizationError> {
-        const path = `/organizations`;
-        const params = {
-            organizationId,
-            name,
-            billingPlan,
-            paymentMethodId,
-            billingAddressId,
-            couponId,
-            invites,
-            budget,
-            taxId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'POST',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async estimationCreateOrganization(
-        billingPlan: string,
-        couponId: string = null,
-        invites: Array<string> = []
-    ): Promise<Estimation> {
-        const path = `/organizations/estimations/create-organization`;
-        const params = {
-            billingPlan,
-            couponId,
-            invites
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async deleteOrganization(organizationId: string): Promise<Organization> {
-        const path = `/organizations/${organizationId}`;
-        const params = {
-            organizationId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'DELETE',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async estimationDeleteOrganization(
-        organizationId: string
-    ): Promise<EstimationDeleteOrganization> {
-        const path = `/organizations/${organizationId}/estimations/delete-organization`;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call('patch', uri, {
-            'content-type': 'application/json'
-        });
-    }
-
-    async getOrganizationPlan(organizationId: string): Promise<Plan> {
-        const path = `/organizations/${organizationId}/plan`;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call('get', uri, {
-            'content-type': 'application/json'
-        });
-    }
-
-    async listPlans(queries: string[] = []): Promise<PlanList> {
-        const path = `/console/plans`;
-        const uri = new URL(this.client.config.endpoint + path);
-        const params = {
-            queries
-        };
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getPlan(planId: string): Promise<Plan> {
-        const path = `/console/plans/${planId}`;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call('get', uri, {
-            'content-type': 'application/json'
-        });
-    }
-
-    async getRoles(organizationId: string): Promise<Roles> {
-        const path = `/organizations/${organizationId}/roles`;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call('get', uri, {
-            'content-type': 'application/json'
-        });
-    }
-
-    async updatePlan(
-        organizationId: string,
-        billingPlan: string,
-        paymentMethodId: string,
-        billingAddressId: string = undefined,
-        couponId: string = null,
-        invites: Array<string> = [],
-        budget: number = undefined,
-        taxId: string = null
-    ): Promise<Organization | OrganizationError> {
-        const path = `/organizations/${organizationId}/plan`;
-        const params = {
-            organizationId,
-            billingPlan,
-            paymentMethodId,
-            billingAddressId,
-            couponId,
-            invites,
-            budget,
-            taxId
-        };
-
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async estimationUpdatePlan(
-        organizationId: string,
-        billingPlan: string,
-        couponId: string = null,
-        invites: Array<string> = []
-    ): Promise<Estimation> {
-        const path = `/organizations/${organizationId}/estimations/update-plan`;
-        const params = {
-            billingPlan,
-            couponId,
-            invites
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async cancelDowngrade(organizationId: string): Promise<Organization | OrganizationError> {
-        const path = `/organizations/${organizationId}/plan/cancel`;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call('patch', uri, {
-            'content-type': 'application/json'
-        });
-    }
-
-    async updateBudget(
-        organizationId: string,
-        budget: number,
-        alerts: number[]
-    ): Promise<Organization> {
-        const path = `/organizations/${organizationId}/budget`;
-        const params = {
-            organizationId,
-            budget,
-            alerts
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async updateSelectedProjects(
-        organizationId: string,
-        projects: string[]
-    ): Promise<Organization> {
-        const path = `/organizations/${organizationId}/projects`;
-        const params = {
-            projects
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async setOrganizationPaymentMethod(
-        organizationId: string,
-        paymentMethodId: string
-    ): Promise<Organization> {
-        const path = `/organizations/${organizationId}/payment-method`;
-        const params = {
-            organizationId,
-            paymentMethodId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async setOrganizationPaymentMethodBackup(
-        organizationId: string,
-        paymentMethodId: string
-    ): Promise<Organization> {
-        const path = `/organizations/${organizationId}/payment-method/backup`;
-        const params = {
-            organizationId,
-            paymentMethodId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-    async removeOrganizationPaymentMethod(organizationId: string): Promise<Organization> {
-        const path = `/organizations/${organizationId}/payment-method`;
-        const params = {
-            organizationId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'DELETE',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-    async removeOrganizationPaymentMethodBackup(organizationId: string): Promise<Organization> {
-        const path = `/organizations/${organizationId}/payment-method/backup`;
-        const params = {
-            organizationId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'DELETE',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async listInvoices(organizationId: string, queries: string[] = []): Promise<InvoiceList> {
-        const path = `/organizations/${organizationId}/invoices`;
-        const params = {
-            organizationId,
-            queries
-        };
-
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getInvoice(organizationId: string, invoiceId: string): Promise<Invoice> {
-        const path = `/organizations/${organizationId}/invoices/${invoiceId}`;
-        const params = {
-            organizationId,
-            invoiceId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getInvoiceView(
-        organizationId: string,
-        invoiceId: string
-    ): Promise<Record<string, ArrayBuffer>> {
-        const path = `/organizations/${organizationId}/invoices/${invoiceId}/view`;
-        const params = {
-            organizationId,
-            invoiceId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/pdf'
-            },
-            params
-        );
-    }
-
-    async downloadInvoice(
-        organizationId: string,
-        invoiceId: string
-    ): Promise<Record<string, ArrayBuffer>> {
-        const path = `/organizations/${organizationId}/invoices/${invoiceId}/download`;
-        const params = {
-            organizationId,
-            invoiceId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async updateInvoiceStatus(organizationId: string, invoiceId: string): Promise<Invoice> {
-        const path = `/organizations/${organizationId}/invoices/${invoiceId}/status`;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call('PATCH', uri, {
-            'content-type': 'application/json'
-        });
-    }
-
-    async retryPayment(
-        organizationId: string,
-        invoiceId: string,
-        paymentMethodId: string
-    ): Promise<Invoice> {
-        const path = `/organizations/${organizationId}/invoices/${invoiceId}/payments`;
-        const params = {
-            organizationId,
-            invoiceId,
-            paymentMethodId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'post',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async listUsage(
-        organizationId: string,
-        startDate: string = undefined,
-        endDate: string = undefined
-    ): Promise<OrganizationUsage> {
-        const path = `/organizations/${organizationId}/usage`;
-        const params = {
-            organizationId
-        };
-
-        if (startDate !== undefined) {
-            params['startDate'] = startDate;
-        }
-        if (endDate !== undefined) {
-            params['endDate'] = endDate;
-        }
-
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async listAggregation(
-        organizationId: string,
-        queries: string[] = []
-    ): Promise<AggregationList> {
-        const path = `/organizations/${organizationId}/aggregations`;
-        const params = {
-            organizationId,
-            queries
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getAggregation(
-        organizationId: string,
-        aggregationId: string,
-        limit?: number,
-        offset?: number
-    ): Promise<AggregationTeam> {
-        const path = `/organizations/${organizationId}/aggregations/${aggregationId}`;
-        const params: {
-            organizationId: string;
-            aggregationId: string;
-            limit?: number;
-            offset?: number;
-        } = {
-            organizationId,
-            aggregationId
-        };
-        if (typeof limit === 'number') params.limit = limit;
-        if (typeof offset === 'number') params.offset = offset;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async addCredit(organizationId: string, couponId: string): Promise<Credit> {
-        const path = `/organizations/${organizationId}/credits`;
-        const params = {
-            couponId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'POST',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-    async listCredits(organizationId: string, queries = []): Promise<CreditList> {
-        const path = `/organizations/${organizationId}/credits`;
-        const params = {
-            queries
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getAvailableCredit(organizationId: string): Promise<AvailableCredit> {
-        const path = `/organizations/${organizationId}/credits/available`;
-        const params = {};
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getCredit(organizationId: string, creditId: string): Promise<Credit> {
-        const path = `/organizations/${organizationId}/credits/${creditId}`;
-        const params = {
-            creditId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getCampaign(campaignId: string): Promise<Campaign> {
-        const path = `/console/campaigns/${campaignId}`;
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call('GET', uri, {
-            'content-type': 'application/json'
-        });
-    }
-
-    async setMembership(
-        programId: string
-    ): Promise<{ $createdAt: string } | { error: { code: number; message: string } }> {
-        const path = `/console/programs/${programId}/memberships`;
-        const uri = new URL(this.client.config.endpoint + path);
-        try {
-            return await this.client.call('POST', uri, {
-                'content-type': 'application/json'
-            });
-        } catch (e) {
-            return { error: { code: e.code, message: e.message } };
-        }
-    }
-
-    async getCouponAccount(couponId: string): Promise<Coupon> {
-        const path = `/account/coupons/${couponId}`;
-        const params = {
-            couponId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getCoupon(couponId: string): Promise<Coupon> {
-        const path = `/console/coupons/${couponId}`;
-        const params = {
-            couponId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async setBillingAddress(
-        organizationId: string,
-        billingAddressId: string
-    ): Promise<Organization> {
-        const path = `/organizations/${organizationId}/billing-address`;
-        const params = {
-            organizationId,
-            billingAddressId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'PATCH',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async removeBillingAddress(organizationId: string): Promise<void> {
-        const path = `/organizations/${organizationId}/billing-address`;
-        const params = {
-            organizationId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'DELETE',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async updateTaxId(organizationId: string, taxId: string): Promise<Organization> {
-        const path = `/organizations/${organizationId}/taxId`;
-        const params = {
-            organizationId,
-            taxId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'PATCH',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getOrganizationPaymentMethod(
-        organizationId: string,
-        paymentMethodId: string
-    ): Promise<PaymentMethodData> {
-        const path = `/organizations/${organizationId}/payment-methods/${paymentMethodId}`;
-        const params = {
-            organizationId,
-            paymentMethodId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getOrganizationBillingAddress(
-        organizationId: string,
-        billingAddressId: string
-    ): Promise<Address> {
-        const path = `/organizations/${organizationId}/billing-addresses/${billingAddressId}`;
-        const params = {
-            organizationId,
-            billingAddressId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    //ACCOUNT
-
-    async listPaymentMethods(queries: [] = []): Promise<PaymentList> {
-        const path = `/account/payment-methods`;
-        const params = {
-            queries
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getPaymentMethod(paymentMethodId: string): Promise<PaymentMethodData> {
-        const path = `/account/payment-methods/${paymentMethodId}`;
-        const params = {
-            paymentMethodId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async createPaymentMethod(): Promise<PaymentMethodData> {
-        const path = `/account/payment-methods`;
-        const params = {};
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'POST',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async setPaymentMethod(
-        paymentMethodId: string,
-        providerMethodId: string | PaymentMethod,
-        name: string,
-        state: string | undefined = undefined
-    ): Promise<PaymentMethodData> {
-        const path = `/account/payment-methods/${paymentMethodId}/provider`;
-        const params = {
-            paymentMethodId,
-            providerMethodId,
-            name
-        };
-
-        if (state !== undefined) {
-            params['state'] = state;
-        }
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async updatePaymentMethod(
-        paymentMethodId: string,
-        expiryMonth: string,
-        expiryYear: string
-    ): Promise<PaymentMethodData> {
-        const path = `/account/payment-methods/${paymentMethodId}`;
-        const params = {
-            paymentMethodId,
-            expiryMonth,
-            expiryYear
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async deletePaymentMethod(paymentMethodId: string): Promise<PaymentMethodData> {
-        const path = `/account/payment-methods/${paymentMethodId}`;
-        const params = {
-            paymentMethodId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'delete',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-    async setDefaultPaymentMethod(paymentMethodId: string): Promise<PaymentMethodData> {
-        const path = `/account/payment-methods/${paymentMethodId}/default`;
-        const params = {
-            paymentMethodId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'patch',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async listAddresses(queries: string[] = []): Promise<AddressesList> {
-        const path = `/account/billing-addresses`;
-        const params = {
-            queries
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getAddress(billingAddressId: string): Promise<Address> {
-        const path = `/account/billing-addresses/${billingAddressId}`;
-        const params = {
-            billingAddressId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'get',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async createAddress(
-        country: string,
-        streetAddress: string,
-        city: string,
-        state: string,
-        postalCode: string,
-        addressLine2?: string
-    ): Promise<Address> {
-        const path = `/account/billing-addresses`;
-        const params = {
-            country,
-            streetAddress,
-            city,
-            state,
-            postalCode,
-            addressLine2
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'POST',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-    async updateAddress(
-        billingAddressId: string,
-        country: string,
-        streetAddress: string,
-        city: string,
-        state: string,
-        postalCode: string,
-        addressLine2?: string
-    ): Promise<Address> {
-        const path = `/account/billing-addresses/${billingAddressId}`;
-        const params = {
-            billingAddressId,
-            country,
-            streetAddress,
-            city,
-            state,
-            postalCode,
-            addressLine2
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'PUT',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-    async deleteAddress(billingAddressId: string): Promise<void> {
-        const path = `/account/billing-addresses/${billingAddressId}`;
-        const params = {
-            billingAddressId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'delete',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async listRegions(organizationId: string): Promise<Models.ConsoleRegionList> {
-        const path = `/console/regions`;
-        const params = {
-            organizationId
-        };
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-
-    async getPlansInfo(): Promise<PlanList> {
-        const path = `/console/plans`;
-        const params = {};
-        const uri = new URL(this.client.config.endpoint + path);
-        return await this.client.call(
-            'GET',
-            uri,
-            {
-                'content-type': 'application/json'
-            },
-            params
-        );
-    }
-}
+export type BillingPlansMap = Map<string, Models.BillingPlan>;
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index df2d291788..61608aa3c1 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -1,6 +1,6 @@
 import { browser } from '$app/environment';
 import { goto } from '$app/navigation';
-import { base } from '$app/paths';
+import { resolve } from '$app/paths';
 import { Click, trackEvent } from '$lib/actions/analytics';
 import { page } from '$app/stores';
 import LimitReached from '$lib/components/billing/alerts/limitReached.svelte';
@@ -11,28 +11,20 @@ import PaymentAuthRequired from '$lib/components/billing/alerts/paymentAuthRequi
 
 import { BillingPlan, NEW_DEV_PRO_UPGRADE_COUPON } from '$lib/constants';
 import { cachedStore } from '$lib/helpers/cache';
-import { type Size, sizeToBytes } from '$lib/helpers/sizeConvertion';
-import type {
-    AddressesList,
-    AggregationTeam,
-    Invoice,
-    InvoiceList,
-    PaymentList,
-    Plan,
-    PlansMap
-} from '$lib/sdk/billing';
+import type { BillingPlansMap } from '$lib/sdk/billing';
 import { isCloud } from '$lib/system';
 import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/(console)/store';
-import { AppwriteException, Query, Platform } from '@appwrite.io/console';
+import {
+    AppwriteException,
+    BillingPlanGroup,
+    type Models,
+    Platform,
+    Query
+} from '@appwrite.io/console';
 import { derived, get, writable } from 'svelte/store';
 import { headerAlert } from './headerAlert';
 import { addNotification, notifications } from './notifications';
-import {
-    currentPlan,
-    organization,
-    type Organization,
-    type OrganizationError
-} from './organization';
+import { currentPlan, organization } from './organization';
 import { canSeeBilling } from './roles';
 import { sdk } from './sdk';
 import { user } from './user';
@@ -41,8 +33,6 @@ import TeamReadonlyAlert from '$routes/(console)/organization-[organization]/tea
 import ProjectsLimit from '$lib/components/billing/alerts/projectsLimit.svelte';
 import EnterpriseTrial from '$routes/(console)/organization-[organization]/enterpriseTrial.svelte';
 
-export type Tier = 'tier-0' | 'tier-1' | 'tier-2' | 'auto-1' | 'cont-1' | 'ent-1';
-
 export const roles = [
     {
         label: 'Owner',
@@ -69,9 +59,15 @@ export const roles = [
 export const teamStatusReadonly = 'readonly';
 export const billingLimitOutstandingInvoice = 'outstanding_invoice';
 
-export const paymentMethods = derived(page, ($page) => $page.data.paymentMethods as PaymentList);
-export const addressList = derived(page, ($page) => $page.data.addressList as AddressesList);
-export const plansInfo = derived(page, ($page) => $page.data.plansInfo as PlansMap);
+export const paymentMethods = derived(
+    page,
+    ($page) => $page.data.paymentMethods as Models.PaymentMethodList
+);
+export const addressList = derived(
+    page,
+    ($page) => $page.data.addressList as Models.BillingAddressList
+);
+export const plansInfo = derived(page, ($page) => $page.data.plansInfo as BillingPlansMap);
 export const daysLeftInTrial = writable<number>(0);
 export const readOnly = writable<boolean>(false);
 
@@ -84,45 +80,64 @@ export function getRoleLabel(role: string) {
     return roles.find((r) => r.value === role)?.label ?? role;
 }
 
-export function tierToPlan(tier: Tier) {
-    switch (tier) {
-        case BillingPlan.FREE:
-            return tierFree;
-        case BillingPlan.PRO:
-            return tierPro;
-        case BillingPlan.SCALE:
-            return tierScale;
-        case BillingPlan.GITHUB_EDUCATION:
-            return tierGitHubEducation;
-        case BillingPlan.CUSTOM:
-            return tierCustom;
-        case BillingPlan.ENTERPRISE:
-            return tierEnterprise;
-        default:
-            return tierCustom;
+export function planHasGroup(billingPlanId: string, group: BillingPlanGroup) {
+    const plansInfoStore = get(plansInfo);
+    return plansInfoStore.get(billingPlanId)?.group === group;
+}
+
+export function getBasePlanFromGroup(billingPlanGroup: BillingPlanGroup): Models.BillingPlan {
+    const plansInfoStore = get(plansInfo);
+
+    // hot fix for now, starter doesn't have a group atm.
+    const correctBillingPlanGroup =
+        billingPlanGroup === BillingPlanGroup.Starter ? null : billingPlanGroup;
+
+    const proPlans = Array.from(plansInfoStore.values()).filter(
+        (plan) => plan.group === correctBillingPlanGroup
+    );
+
+    return proPlans.sort((a, b) => a.order - b.order)[0];
+}
+
+export function billingIdToPlan(billingId: string): Models.BillingPlan {
+    const plansInfoStore = get(plansInfo);
+    if (plansInfoStore.has(billingId)) {
+        return plansInfoStore.get(billingId);
+    } else {
+        // fallback to PRO group's 1st item.
+        // TODO: @itznotabug, @dlohani - but should we fallback to PRO?.
+        return getBasePlanFromGroup(BillingPlanGroup.Pro);
     }
 }
 
-export function getNextTier(tier: Tier) {
-    switch (tier) {
-        case BillingPlan.FREE:
-            return BillingPlan.PRO;
-        case BillingPlan.PRO:
-            return BillingPlan.SCALE;
-        default:
-            return BillingPlan.PRO;
+// TODO: @itznotabug - just return the BillingPlan object!
+export function getNextTierBillingPlan(tier: string): string {
+    const currentPlanData = billingIdToPlan(tier);
+    const currentOrder = currentPlanData.order;
+    const plans = get(plansInfo);
+
+    for (const [, plan] of plans) {
+        if (plan.order === currentOrder + 1) {
+            return plan.$id;
+        }
     }
+
+    return getBasePlanFromGroup(BillingPlanGroup.Pro).$id;
 }
 
-export function getPreviousTier(tier: Tier) {
-    switch (tier) {
-        case BillingPlan.PRO:
-            return BillingPlan.FREE;
-        case BillingPlan.SCALE:
-            return BillingPlan.PRO;
-        default:
-            return BillingPlan.FREE;
+// TODO: @itznotabug - just return the BillingPlan object!
+export function getPreviousTierBillingPlan(tier: string): string {
+    const currentPlanData = billingIdToPlan(tier);
+    const currentOrder = currentPlanData.order;
+    const plans = get(plansInfo);
+
+    for (const [, plan] of plans) {
+        if (plan.order === currentOrder - 1) {
+            return plan.$id;
+        }
     }
+
+    return getBasePlanFromGroup(BillingPlanGroup.Starter).$id;
 }
 
 export type PlanServices =
@@ -151,7 +166,11 @@ export type PlanServices =
     | 'authPhone'
     | 'imageTransformations';
 
-export function getServiceLimit(serviceId: PlanServices, tier: Tier = null, plan?: Plan): number {
+export function getServiceLimit(
+    serviceId: PlanServices,
+    tier: string = null,
+    plan?: Models.BillingPlan
+): number {
     if (!isCloud) return 0;
     if (!serviceId) return 0;
 
@@ -177,7 +196,7 @@ export function getServiceLimit(serviceId: PlanServices, tier: Tier = null, plan
 }
 
 export const failedInvoice = cachedStore<
-    Invoice,
+    Models.Invoice,
     {
         load: (orgId: string) => Promise<void>;
     }
@@ -186,9 +205,10 @@ export const failedInvoice = cachedStore<
         load: async (orgId) => {
             if (!isCloud) set(null);
             if (!get(canSeeBilling)) set(null);
-            const failedInvoices = await sdk.forConsole.billing.listInvoices(orgId, [
-                Query.equal('status', 'failed')
-            ]);
+            const failedInvoices = await sdk.forConsole.organizations.listInvoices({
+                organizationId: orgId,
+                queries: [Query.equal('status', 'failed')]
+            });
             // const failedInvoices = invoices.invoices;
             if (failedInvoices?.invoices?.length > 0) {
                 const firstFailed = failedInvoices.invoices[0];
@@ -203,48 +223,12 @@ export const failedInvoice = cachedStore<
     };
 });
 
-export const actionRequiredInvoices = writable<InvoiceList>(null);
-
-export type TierData = {
-    name: string;
-    description: string;
-};
-
-export const tierFree: TierData = {
-    name: 'Free',
-    description: 'A great fit for passion projects and small applications.'
-};
-
-export const tierGitHubEducation: TierData = {
-    name: 'GitHub Education',
-    description: 'For members of GitHub student developers program.'
-};
-
-export const tierPro: TierData = {
-    name: 'Pro',
-    description:
-        'For production applications that need powerful functionality and resources to scale.'
-};
-export const tierScale: TierData = {
-    name: 'Scale',
-    description:
-        'For teams that handle more complex and large projects and need more control and support.'
-};
-
-export const tierCustom: TierData = {
-    name: 'Custom',
-    description: 'Team on a custom contract'
-};
-
-export const tierEnterprise: TierData = {
-    name: 'Enterprise',
-    description: 'For enterprises that need more power and premium support.'
-};
+export const actionRequiredInvoices = writable<Models.InvoiceList>(null);
 
 export const showUsageRatesModal = writable<boolean>(false);
 export const useNewPricingModal = derived(currentPlan, ($plan) => $plan?.usagePerProject === true);
 
-export function checkForUsageFees(plan: Tier, id: PlanServices) {
+export function checkForUsageFees(plan: string, id: PlanServices) {
     if (plan === BillingPlan.PRO || plan === BillingPlan.SCALE) {
         switch (id) {
             case 'bandwidth':
@@ -284,7 +268,7 @@ export function checkForProjectLimitation(id: PlanServices) {
     }
 }
 
-export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: number) {
+export function isServiceLimited(serviceId: PlanServices, plan: string, total: number) {
     if (!total) return false;
     const limit = getServiceLimit(serviceId) || Infinity;
     const isLimited = limit !== 0 && limit < Infinity;
@@ -292,7 +276,7 @@ export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: num
     return isLimited && total >= limit && !hasUsageFees;
 }
 
-export function checkForEnterpriseTrial(org: Organization) {
+export function checkForEnterpriseTrial(org: Models.Organization) {
     if (!org || !org.billingNextInvoiceDate) return;
     if (calculateEnterpriseTrial(org) > 0) {
         headerAlert.add({
@@ -304,7 +288,7 @@ export function checkForEnterpriseTrial(org: Organization) {
     }
 }
 
-export function calculateEnterpriseTrial(org: Organization) {
+export function calculateEnterpriseTrial(org: Models.Organization) {
     if (!org || !org.billingNextInvoiceDate) return 0;
     const endDate = new Date(org.billingNextInvoiceDate);
     const startDate = new Date(org.billingCurrentInvoiceDate);
@@ -319,7 +303,7 @@ export function calculateEnterpriseTrial(org: Organization) {
     return 0;
 }
 
-export function calculateTrialDay(org: Organization) {
+export function calculateTrialDay(org: Models.Organization) {
     if (org?.billingPlan === BillingPlan.FREE) return false;
     const endDate = new Date(org?.billingStartDate);
     const today = new Date();
@@ -333,11 +317,13 @@ export function calculateTrialDay(org: Organization) {
     return days;
 }
 
-export async function checkForProjectsLimit(org: Organization, orgProjectCount?: number) {
+export async function checkForProjectsLimit(org: Models.Organization, orgProjectCount?: number) {
     if (!isCloud) return;
     if (!org) return;
 
-    const plan = await sdk.forConsole.billing.getOrganizationPlan(org.$id);
+    const plan = await sdk.forConsole.organizations.getPlan({
+        organizationId: org.$id
+    });
     if (!plan) return;
 
     if (plan.$id !== BillingPlan.FREE) return;
@@ -357,7 +343,7 @@ export async function checkForProjectsLimit(org: Organization, orgProjectCount?:
     }
 }
 
-export async function checkForUsageLimit(org: Organization) {
+export async function checkForUsageLimit(org: Models.Organization) {
     if (org?.status === teamStatusReadonly && org?.remarks === billingLimitOutstandingInvoice) {
         headerAlert.add({
             id: 'teamReadOnlyFailedInvoices',
@@ -390,10 +376,9 @@ export async function checkForUsageLimit(org: Organization) {
     }
 
     // TODO: @itznotabug - check with @abnegate, what do we do here? this is billing!
-    const { bandwidth, documents, executions, storage, users } = org?.billingLimits ?? {};
+    const { bandwidth, executions, storage, users } = org?.billingLimits ?? {};
     const resources = [
         { value: bandwidth, name: 'bandwidth' },
-        { value: documents, name: 'documents' },
         { value: executions, name: 'executions' },
         { value: storage, name: 'storage' },
         { value: users, name: 'users' }
@@ -418,9 +403,9 @@ export async function checkForUsageLimit(org: Organization) {
         if (now - lastNotification < 1000 * 60 * 60 * 24) return;
 
         localStorage.setItem('limitReachedNotification', now.toString());
-        let message = `<b>${org.name}</b> has reached <b>75%</b> of the ${tierToPlan(BillingPlan.FREE).name} plan's ${resources.find((r) => r.value >= 75).name} limit. Upgrade to ensure there are no service disruptions.`;
+        let message = `<b>${org.name}</b> has reached <b>75%</b> of the ${billingIdToPlan(BillingPlan.FREE).name} plan's ${resources.find((r) => r.value >= 75).name} limit. Upgrade to ensure there are no service disruptions.`;
         if (resources.filter((r) => r.value >= 75)?.length > 1) {
-            message = `Usage for <b>${org.name}</b> has reached 75% of the ${tierToPlan(BillingPlan.FREE).name} plan limit. Upgrade to ensure there are no service disruptions.`;
+            message = `Usage for <b>${org.name}</b> has reached 75% of the ${billingIdToPlan(BillingPlan.FREE).name} plan limit. Upgrade to ensure there are no service disruptions.`;
         }
         addNotification({
             type: 'warning',
@@ -431,13 +416,21 @@ export async function checkForUsageLimit(org: Organization) {
                 {
                     name: 'View usage',
                     method: () => {
-                        goto(`${base}/organization-${org.$id}/usage`);
+                        goto(
+                            resolve('/(console)/organization-[organization]/usage', {
+                                organization: org.$id
+                            })
+                        );
                     }
                 },
                 {
                     name: 'Upgrade plan',
                     method: () => {
-                        goto(`${base}/organization-${org.$id}/change-plan`);
+                        goto(
+                            resolve('/(console)/organization-[organization]/change-plan', {
+                                organization: org.$id
+                            })
+                        );
                         trackEvent(Click.OrganizationClickUpgrade, {
                             from: 'button',
                             source: 'limit_reached_notification'
@@ -451,12 +444,13 @@ export async function checkForUsageLimit(org: Organization) {
     }
 }
 
-export async function checkPaymentAuthorizationRequired(org: Organization) {
+export async function checkPaymentAuthorizationRequired(org: Models.Organization) {
     if (org.billingPlan === BillingPlan.FREE) return;
 
-    const invoices = await sdk.forConsole.billing.listInvoices(org.$id, [
-        Query.equal('status', 'requires_authentication')
-    ]);
+    const invoices = await sdk.forConsole.organizations.listInvoices({
+        organizationId: org.$id,
+        queries: [Query.equal('status', 'requires_authentication')]
+    });
 
     if (invoices?.invoices?.length > 0) {
         headerAlert.add({
@@ -471,12 +465,13 @@ export async function checkPaymentAuthorizationRequired(org: Organization) {
     actionRequiredInvoices.set(invoices);
 }
 
-export async function paymentExpired(org: Organization) {
+export async function paymentExpired(org: Models.Organization) {
     if (!org?.paymentMethodId) return;
-    const payment = await sdk.forConsole.billing.getOrganizationPaymentMethod(
-        org.$id,
-        org.paymentMethodId
-    );
+    const payment = await sdk.forConsole.organizations.getPaymentMethod({
+        organizationId: org.$id,
+        paymentMethodId: org.paymentMethodId
+    });
+
     if (!payment?.expiryYear) return;
     const sessionStorageNotification = sessionStorage.getItem('expiredPaymentNotification');
     if (sessionStorageNotification === 'true') return;
@@ -500,7 +495,7 @@ export async function paymentExpired(org: Organization) {
                 {
                     name: 'Update payment details',
                     method: () => {
-                        goto(`${base}/account/payments`);
+                        goto(resolve('/account/payments'));
                     }
                 }
             ]
@@ -514,7 +509,7 @@ export async function paymentExpired(org: Organization) {
                 {
                     name: 'Update payment details',
                     method: () => {
-                        goto(`${base}/account/payments`);
+                        goto(resolve('/account/payments'));
                     }
                 }
             ]
@@ -523,7 +518,7 @@ export async function paymentExpired(org: Organization) {
     sessionStorage.setItem('expiredPaymentNotification', 'true');
 }
 
-export function checkForMarkedForDeletion(org: Organization) {
+export function checkForMarkedForDeletion(org: Models.Organization) {
     if (org?.markedForDeletion) {
         headerAlert.add({
             id: 'markedForDeletion',
@@ -535,12 +530,15 @@ export function checkForMarkedForDeletion(org: Organization) {
 }
 
 export async function checkForMissingPaymentMethod() {
-    const orgs = await sdk.forConsole.billing.listOrganization([
-        Query.notEqual('billingPlan', BillingPlan.FREE),
-        Query.isNull('paymentMethodId'),
-        Query.isNull('backupPaymentMethodId'),
-        Query.equal('platform', Platform.Appwrite)
-    ]);
+    const orgs = await sdk.forConsole.organizations.list({
+        queries: [
+            Query.notEqual('billingPlan', getBasePlanFromGroup(BillingPlanGroup.Starter).$id),
+            Query.isNull('paymentMethodId'),
+            Query.isNull('backupPaymentMethodId'),
+            Query.equal('platform', Platform.Appwrite)
+        ]
+    });
+
     if (orgs?.total) {
         orgMissingPaymentMethod.set(orgs.teams[0]);
         headerAlert.add({
@@ -553,7 +551,7 @@ export async function checkForMissingPaymentMethod() {
 }
 
 // Display upgrade banner for new users after 1 week for 30 days
-export async function checkForNewDevUpgradePro(org: Organization) {
+export async function checkForNewDevUpgradePro(org: Models.Organization) {
     // browser or plan check.
     if (!browser || org?.billingPlan !== BillingPlan.FREE) return;
 
@@ -569,14 +567,16 @@ export async function checkForNewDevUpgradePro(org: Organization) {
     const accountCreated = new Date(account.$createdAt).getTime();
     if (now - accountCreated < 1000 * 60 * 60 * 24 * 7) return;
 
-    const organizations = await sdk.forConsole.billing.listOrganization([
-        Query.notEqual('billingPlan', BillingPlan.FREE)
-    ]);
+    const organizations = await sdk.forConsole.organizations.list({
+        queries: [Query.notEqual('billingPlan', getBasePlanFromGroup(BillingPlanGroup.Starter).$id)]
+    });
 
     if (organizations?.total) return;
 
     try {
-        await sdk.forConsole.billing.getCouponAccount(NEW_DEV_PRO_UPGRADE_COUPON);
+        await sdk.forConsole.console.getCoupon({
+            couponId: NEW_DEV_PRO_UPGRADE_COUPON
+        });
     } catch (error) {
         if (
             // already utilized if error is 409
@@ -596,32 +596,16 @@ export async function checkForNewDevUpgradePro(org: Organization) {
         importance: 1
     });
 }
-export const upgradeURL = derived(
-    page,
-    ($page) => `${base}/organization-${$page.data?.organization?.$id}/change-plan`
-);
-export const billingURL = derived(
-    page,
-    ($page) => `${base}/organization-${$page.data?.organization?.$id}/billing`
-);
-
-export const hideBillingHeaderRoutes = [base + '/create-organization', base + '/account'];
-
-export function calculateExcess(addon: AggregationTeam, plan: Plan) {
-    return {
-        bandwidth: calculateResourceSurplus(addon.usageBandwidth, plan.bandwidth),
-        storage: calculateResourceSurplus(addon.usageStorage, plan.storage, 'GB'),
-        executions: calculateResourceSurplus(addon.usageExecutions, plan.executions, 'GB'),
-        members: addon.additionalMembers
-    };
-}
+export const upgradeURL = derived(page, ($page) => {
+    return resolve('/(console)/organization-[organization]/change-plan', {
+        organization: $page.data?.organization?.$id
+    });
+});
 
-export function calculateResourceSurplus(total: number, limit: number, limitUnit: Size = null) {
-    if (total === undefined || limit === undefined) return 0;
-    const realLimit = (limitUnit ? sizeToBytes(limit, limitUnit) : limit) || Infinity;
-    return total > realLimit ? total - realLimit : 0;
-}
+export const hideBillingHeaderRoutes = [resolve('/account'), resolve('/create-organization')];
 
-export function isOrganization(org: Organization | OrganizationError): org is Organization {
-    return (org as Organization).$id !== undefined;
+export function isPaymentAuthenticationRequired(
+    org: Models.Organization | Models.PaymentAuthentication
+): org is Models.PaymentAuthentication {
+    return 'clientSecret' in org;
 }
diff --git a/src/lib/stores/bottom-alerts.ts b/src/lib/stores/bottom-alerts.ts
index 0e80a6dfa8..b0a044f1a6 100644
--- a/src/lib/stores/bottom-alerts.ts
+++ b/src/lib/stores/bottom-alerts.ts
@@ -1,7 +1,6 @@
 import { writable } from 'svelte/store';
 import type { Component } from 'svelte';
 import type { Models } from '@appwrite.io/console';
-import type { Organization } from '$lib/stores/organization';
 import type { NotificationCoolOffOptions } from '$lib/helpers/notifications';
 
 export type BottomModalAlertAction = {
@@ -10,7 +9,7 @@ export type BottomModalAlertAction = {
     background?: Record<'light' | 'dark', string> | string;
     backgroundHover?: Record<'light' | 'dark', string> | string;
     hideOnClick?: boolean;
-    link: (ctx: { organization: Organization; project: Models.Project }) => string;
+    link: (ctx: { organization: Models.Organization; project: Models.Project }) => string;
     external?: boolean;
 };
 
diff --git a/src/lib/stores/campaigns.ts b/src/lib/stores/campaigns.ts
deleted file mode 100644
index cf082fb94a..0000000000
--- a/src/lib/stores/campaigns.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { BillingPlan } from '$lib/constants';
-
-export type Campaign = {
-    $id: string;
-    template: string;
-    title: string;
-    description: string;
-    cta?: string;
-    claimed?: string;
-    unclaimed?: string;
-    reviews?: Review[];
-    image?: {
-        dark: string;
-        light: string;
-    };
-    onlyNewOrgs?: boolean;
-    footer?: boolean;
-    plan?: BillingPlan;
-};
-
-export type Review = {
-    name: string;
-    image: string;
-    description: string;
-    review: string;
-};
diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts
index b3b874cab4..8503d8f637 100644
--- a/src/lib/stores/organization.ts
+++ b/src/lib/stores/organization.ts
@@ -1,59 +1,8 @@
 import { page } from '$app/stores';
-import type { Tier } from './billing';
-import type { Plan } from '$lib/sdk/billing';
+import { sdk } from '$lib/stores/sdk';
+import { isCloud } from '$lib/system';
 import { derived, writable } from 'svelte/store';
-import { type Models, Platform } from '@appwrite.io/console';
-
-export type OrganizationError = {
-    status: number;
-    message: string;
-    teamId: string;
-    invoiceId: string;
-    clientSecret: string;
-    type: string;
-};
-
-export type Organization = Models.Team<Record<string, unknown>> & {
-    billingBudget: number;
-    billingPlan: Tier;
-    billingPlanId: Tier /* unused for now! */;
-    billingPlanDetails: Plan /* unused for now! */;
-    budgetAlerts: number[];
-    paymentMethodId: string;
-    backupPaymentMethodId: string;
-    markedForDeletion: boolean;
-    billingLimits: BillingLimits;
-    billingCurrentInvoiceDate: string;
-    billingNextInvoiceDate: string;
-    billingTrialStartDate?: string;
-    billingStartDate?: string;
-    billingTrialDays?: number;
-    billingAddressId?: string;
-    amount: number;
-    billingTaxId?: string;
-    billingPlanDowngrade?: Tier;
-    billingAggregationId: string;
-    billingInvoiceId: string;
-    status: string;
-    remarks: string;
-    projects: string[];
-    platform: Platform;
-};
-
-export type OrganizationList = {
-    teams: Organization[];
-    total: number;
-};
-
-// TODO: @itznotabug - check with @abnegate, what do we do here? this is billing!
-export type BillingLimits = {
-    bandwidth: number;
-    documents: number;
-    executions: number;
-    storage: number;
-    users: number;
-    budgetLimit: number;
-};
+import { type Models, Platform, Query } from '@appwrite.io/console';
 
 export const newOrgModal = writable<boolean>(false);
 export const newMemberModal = writable<boolean>(false);
@@ -62,7 +11,26 @@ export const organizationList = derived(
     ($page) => $page.data.organizations as Models.TeamList<Record<string, unknown>>
 );
 
-export const organization = derived(page, ($page) => $page.data?.organization as Organization);
-export const currentPlan = derived(page, ($page) => $page.data?.currentPlan as Plan);
+export const organization = derived(
+    page,
+    ($page) => $page.data?.organization as Models.Organization
+);
+export const currentPlan = derived(page, ($page) => $page.data?.currentPlan as Models.BillingPlan);
 export const members = derived(page, ($page) => $page.data.members as Models.MembershipList);
 export const regions = writable<Models.ConsoleRegionList>({ total: 0, regions: [] });
+
+export async function getTeamOrOrganizationList(
+    queries: string[] = []
+): Promise<Models.TeamList | Models.OrganizationList> {
+    let organizations: Models.TeamList | Models.OrganizationList;
+
+    if (isCloud) {
+        organizations = await sdk.forConsole.organizations.list({
+            queries: [...queries, Query.equal('platform', Platform.Appwrite)]
+        });
+    } else {
+        organizations = await sdk.forConsole.teams.list({ queries });
+    }
+
+    return organizations;
+}
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index d7e0cc7b9d..efea179593 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -26,7 +26,6 @@ import {
     Realtime,
     Organizations
 } from '@appwrite.io/console';
-import { Billing } from '../sdk/billing';
 import { Sources } from '$lib/sdk/sources';
 import {
     REGION_FRA,
@@ -91,7 +90,6 @@ function createConsoleSdk(client: Client) {
         migrations: new Migrations(client),
         console: new Console(client),
         assistant: new Assistant(client),
-        billing: new Billing(client),
         sources: new Sources(client),
         sites: new Sites(client),
         domains: new Domains(client),
diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts
index 9f4bc727bc..11797553bf 100644
--- a/src/lib/stores/stripe.ts
+++ b/src/lib/stores/stripe.ts
@@ -1,6 +1,6 @@
 import type {
     Appearance,
-    PaymentMethod,
+    PaymentMethod as StripePaymentMethod,
     Stripe,
     StripeElement,
     StripeElements
@@ -8,21 +8,21 @@ import type {
 import { sdk } from './sdk';
 import { app } from './app';
 import { get, writable } from 'svelte/store';
-import type { PaymentMethodData } from '$lib/sdk/billing';
 import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
 import { addNotification } from './notifications';
 import { organization } from './organization';
 import { base } from '$app/paths';
 import { ThemeDarkCloud, ThemeLightCloud } from '$themes';
 import Color from 'color';
+import type { Models } from '@appwrite.io/console';
 
 export const stripe = writable<Stripe>();
-let paymentMethod: PaymentMethodData;
+export const isStripeInitialized = writable(false);
+
 let clientSecret: string;
 let elements: StripeElements;
 let paymentElement: StripeElement;
-
-export const isStripeInitialized = writable(false);
+let paymentMethod: Models.PaymentMethod;
 
 export async function initializeStripe(node: HTMLElement) {
     if (!get(stripe)) return;
@@ -32,7 +32,7 @@ export async function initializeStripe(node: HTMLElement) {
 
     isStripeInitialized.set(true);
 
-    const methods = await sdk.forConsole.billing.listPaymentMethods();
+    const methods = await sdk.forConsole.account.listPaymentMethods();
 
     // Get the client secret from empty payment method if available
     clientSecret = methods.paymentMethods?.filter(
@@ -41,7 +41,7 @@ export async function initializeStripe(node: HTMLElement) {
 
     // If there is no payment method, create an empty one and get the client secret
     if (!clientSecret) {
-        paymentMethod = await sdk.forConsole.billing.createPaymentMethod();
+        paymentMethod = await sdk.forConsole.account.createPaymentMethod();
         clientSecret = paymentMethod.clientSecret;
     }
 
@@ -78,7 +78,7 @@ export async function submitStripeCard(name: string, organizationId?: string) {
     try {
         // If a payment method was created during initialization, use it, otherwise create a new one
         if (!paymentMethod) {
-            paymentMethod = await sdk.forConsole.billing.createPaymentMethod();
+            paymentMethod = await sdk.forConsole.account.createPaymentMethod();
             clientSecret = paymentMethod.clientSecret;
         }
 
@@ -116,12 +116,12 @@ export async function submitStripeCard(name: string, organizationId?: string) {
         }
 
         if (setupIntent && setupIntent.status === 'succeeded') {
-            const pm = setupIntent.payment_method as PaymentMethod | string | undefined;
+            const pm = setupIntent.payment_method as StripePaymentMethod | string | undefined;
             // If Stripe returned an expanded PaymentMethod object, check the card country.
             // If it returned a string id (common), `typeof pm === 'string'` and we skip this.
             if (typeof pm !== 'string' && pm?.card?.country === 'US') {
                 // need to get state
-                return pm as PaymentMethod;
+                return pm as StripePaymentMethod;
             }
 
             // The backend expects a provider method ID (string). Extract the id
@@ -130,7 +130,7 @@ export async function submitStripeCard(name: string, organizationId?: string) {
             if (typeof pm === 'string') {
                 providerId = pm;
             } else {
-                providerId = (pm as PaymentMethod)?.id;
+                providerId = (pm as StripePaymentMethod)?.id;
             }
 
             if (!providerId) {
@@ -139,11 +139,12 @@ export async function submitStripeCard(name: string, organizationId?: string) {
                 throw e;
             }
 
-            const method = await sdk.forConsole.billing.setPaymentMethod(
-                paymentMethod.$id,
-                providerId,
+            const method = await sdk.forConsole.account.updatePaymentMethodProvider({
+                paymentMethodId: paymentMethod.$id,
+                providerMethodId: providerId,
                 name
-            );
+            });
+
             paymentElement.destroy();
             isStripeInitialized.set(false);
             trackEvent(Submit.PaymentMethodCreate);
@@ -169,12 +170,12 @@ export async function setPaymentMethod(providerMethodId: string, name: string, s
         return;
     }
     try {
-        const method = await sdk.forConsole.billing.setPaymentMethod(
-            paymentMethod.$id,
-            providerMethodId,
+        const method = await sdk.forConsole.account.updatePaymentMethodProvider({
+            paymentMethodId: paymentMethod.$id,
+            providerMethodId: providerMethodId,
             name,
             state
-        );
+        });
         paymentElement.destroy();
         isStripeInitialized.set(false);
         trackEvent(Submit.PaymentMethodCreate);
@@ -195,7 +196,7 @@ export async function confirmPayment(
         const url =
             window.location.origin + (route ? route : `${base}/organization-${orgId}/billing`);
 
-        const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentMethodId);
+        const paymentMethod = await sdk.forConsole.account.getPaymentMethod({ paymentMethodId });
 
         const { error } = await get(stripe).confirmPayment({
             clientSecret: clientSecret,
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index ce28dd7c2f..61feb71e8c 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -6,7 +6,7 @@
 
     import { app } from '$lib/stores/app';
     import { database, checkForDatabaseBackupPolicies } from '$lib/stores/database';
-    import { newOrgModal, organization, type Organization } from '$lib/stores/organization';
+    import { newOrgModal, organization } from '$lib/stores/organization';
     import { wizard } from '$lib/stores/wizard';
     import { afterUpdate, onMount } from 'svelte';
     import { loading } from '$routes/store';
@@ -22,7 +22,6 @@
         checkForUsageLimit,
         checkPaymentAuthorizationRequired,
         paymentExpired,
-        plansInfo,
         showUsageRatesModal
     } from '$lib/stores/billing';
     import { goto } from '$app/navigation';
@@ -56,6 +55,7 @@
         IconSwitchHorizontal
     } from '@appwrite.io/pink-icons-svelte';
     import type { LayoutData } from './$types';
+    import type { Models } from '@appwrite.io/console';
 
     export let data: LayoutData;
 
@@ -291,7 +291,7 @@
     });
 
     let currentOrganizationId = null;
-    async function checkForUsageLimits(org: Organization) {
+    async function checkForUsageLimits(org: Models.Organization) {
         if (!org) return;
         if (currentOrganizationId === org.$id) return;
         if (isCloud) {
@@ -308,7 +308,7 @@
                 await paymentExpired(org);
                 await checkPaymentAuthorizationRequired(org);
 
-                if ($plansInfo.get(org.billingPlan)?.trialDays) {
+                if (org?.billingTrialDays) {
                     calculateTrialDay(org);
                 }
             }
diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts
index af48c06718..73f3acde08 100644
--- a/src/routes/(console)/+layout.ts
+++ b/src/routes/(console)/+layout.ts
@@ -1,10 +1,8 @@
-import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
 import type { LayoutLoad } from './$types';
-import type { Tier } from '$lib/stores/billing';
-import type { Plan, PlanList } from '$lib/sdk/billing';
-import { Query } from '@appwrite.io/console';
+import { Dependencies } from '$lib/constants';
+import { type Models, Platform, Query } from '@appwrite.io/console';
 
 export const load: LayoutLoad = async ({ depends, parent }) => {
     const { organizations } = await parent();
@@ -16,7 +14,11 @@ export const load: LayoutLoad = async ({ depends, parent }) => {
     const { endpoint, project } = sdk.forConsole.client.config;
     const [preferences, plansArray, versionData, consoleVariables] = await Promise.all([
         sdk.forConsole.account.getPrefs(),
-        isCloud ? sdk.forConsole.billing.getPlansInfo() : null,
+        isCloud
+            ? sdk.forConsole.console.getPlans({
+                  platform: Platform.Appwrite
+              })
+            : null,
         fetch(`${endpoint}/health/version`, {
             headers: { 'X-Appwrite-Project': project as string }
         }).then((response) => response.json() as { version?: string }),
@@ -60,14 +62,14 @@ export const load: LayoutLoad = async ({ depends, parent }) => {
     };
 };
 
-function toPlanMap(plansArray: PlanList | null): Map<Tier, Plan> {
-    const map = new Map<Tier, Plan>();
+function toPlanMap(plansArray: Models.BillingPlanList | null): Map<string, Models.BillingPlan> {
+    const map = new Map<string, Models.BillingPlan>();
     if (!plansArray?.plans.length) return map;
 
     const plans = plansArray.plans;
     for (let i = 0; i < plans.length; i++) {
         const plan = plans[i];
-        map.set(plan.$id as Tier, plan);
+        map.set(plan.$id, plan);
     }
 
     return map;
diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte
index 2d16680439..4a74a13f2a 100644
--- a/src/routes/(console)/account/organizations/+page.svelte
+++ b/src/routes/(console)/account/organizations/+page.svelte
@@ -15,8 +15,7 @@
     import { isCloud } from '$lib/system';
     import { Badge, Skeleton } from '@appwrite.io/pink-svelte';
     import type { Models } from '@appwrite.io/console';
-    import type { Organization } from '$lib/stores/organization';
-    import { daysLeftInTrial, plansInfo, tierToPlan, type Tier } from '$lib/stores/billing';
+    import { daysLeftInTrial, billingIdToPlan } from '$lib/stores/billing';
     import { toLocaleDate } from '$lib/helpers/date';
     import { BillingPlan } from '$lib/constants';
     import { goto } from '$app/navigation';
@@ -40,16 +39,18 @@
         if (!billingPlan) return 'Unknown';
 
         // For known plans, use tierToPlan
-        const tierData = tierToPlan(billingPlan as Tier);
+        const tierData = billingIdToPlan(billingPlan);
 
-        // If it's not a custom plan or we got a non-custom result, return the name
+        // If it's not a custom plan, or we got a non-custom result, return the name
         if (tierData.name !== 'Custom') {
             return tierData.name;
         }
 
         // For custom plans, fetch from API
         try {
-            const plan = await sdk.forConsole.billing.getPlan(billingPlan);
+            const plan = await sdk.forConsole.console.getPlan({
+                planId: billingPlan
+            });
             return plan.name;
         } catch (error) {
             // Fallback to 'Custom' if fetch fails
@@ -57,32 +58,34 @@
         }
     }
 
-    function isOrganizationOnTrial(organization: Organization): boolean {
+    function isOrganizationOnTrial(organization: Models.Organization): boolean {
         if (!organization?.billingTrialStartDate) return false;
         if ($daysLeftInTrial <= 0) return false;
         if (organization.billingPlan === BillingPlan.FREE) return false;
 
-        return !!$plansInfo.get(organization.billingPlan)?.trialDays;
+        return !!organization?.billingTrialDays;
     }
 
-    function isNonPayingOrganization(organization: Organization): boolean {
+    function isNonPayingOrganization(organization: Models.Organization): boolean {
         return (
             organization?.billingPlan === BillingPlan.FREE ||
             organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
         );
     }
 
-    function isPayingOrganization(team: Models.Preferences | Organization): Organization | null {
+    function isPayingOrganization(
+        team: Models.Preferences | Models.Organization
+    ): Models.Organization | null {
         const isPayingOrganization =
             isCloudOrg(team) && !isOrganizationOnTrial(team) && !isNonPayingOrganization(team);
 
-        if (isPayingOrganization) return team as Organization;
+        if (isPayingOrganization) return team as Models.Organization;
         else return null;
     }
 
     function isCloudOrg(
-        data: Partial<Models.TeamList<Models.Preferences>> | Organization
-    ): data is Organization {
+        data: Partial<Models.TeamList<Models.Preferences>> | Models.Organization
+    ): data is Models.Organization {
         return isCloud && 'billingPlan' in data;
     }
 
diff --git a/src/routes/(console)/account/organizations/+page.ts b/src/routes/(console)/account/organizations/+page.ts
index c669a9fe1f..c1141d4630 100644
--- a/src/routes/(console)/account/organizations/+page.ts
+++ b/src/routes/(console)/account/organizations/+page.ts
@@ -1,25 +1,17 @@
-import { Query, Platform } from '@appwrite.io/console';
-import { sdk } from '$lib/stores/sdk';
-import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
-import { CARD_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
-import { isCloud } from '$lib/system';
+import { CARD_LIMIT } from '$lib/constants';
+import { Query } from '@appwrite.io/console';
+import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
+import { getTeamOrOrganizationList } from '$lib/stores/organization';
 
 export const load: PageLoad = async ({ url, route }) => {
     const page = getPage(url);
     const limit = getLimit(url, route, CARD_LIMIT);
     const offset = pageToOffset(page, limit);
 
-    const queries = [
-        Query.offset(offset),
-        Query.limit(limit),
-        Query.orderDesc(''),
-        ...(isCloud ? [Query.equal('platform', Platform.Appwrite)] : [])
-    ];
+    const queries = [Query.offset(offset), Query.limit(limit), Query.orderDesc('')];
 
-    const organizations = !isCloud
-        ? await sdk.forConsole.teams.list({ queries })
-        : await sdk.forConsole.billing.listOrganization(queries);
+    const organizations = await getTeamOrOrganizationList(queries);
 
     return {
         offset,
diff --git a/src/routes/(console)/account/payments/+page.ts b/src/routes/(console)/account/payments/+page.ts
index b275a6e9b5..fb0cb2d96d 100644
--- a/src/routes/(console)/account/payments/+page.ts
+++ b/src/routes/(console)/account/payments/+page.ts
@@ -7,8 +7,8 @@ export const load: PageLoad = async ({ depends }) => {
     depends(Dependencies.ADDRESS);
 
     const [paymentMethods, addressList, countryList, locale] = await Promise.all([
-        sdk.forConsole.billing.listPaymentMethods(),
-        sdk.forConsole.billing.listAddresses(),
+        sdk.forConsole.account.listPaymentMethods(),
+        sdk.forConsole.account.listBillingAddresses(),
         sdk.forConsole.locale.listCountries(),
         sdk.forConsole.locale.get()
     ]);
diff --git a/src/routes/(console)/account/payments/addressModal.svelte b/src/routes/(console)/account/payments/addressModal.svelte
index 5b058dbfb0..57ea22c101 100644
--- a/src/routes/(console)/account/payments/addressModal.svelte
+++ b/src/routes/(console)/account/payments/addressModal.svelte
@@ -5,7 +5,6 @@
     import { Dependencies } from '$lib/constants';
     import { Button, InputSelect, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import type { Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import type { Models } from '@appwrite.io/console';
@@ -43,18 +42,22 @@
 
     async function handleSubmit() {
         try {
-            const response = await sdk.forConsole.billing.createAddress(
+            const response = await sdk.forConsole.account.createBillingAddress({
                 country,
-                address,
+                streetAddress: address,
                 city,
                 state,
-                zip ? zip : undefined,
-                address2 ? address2 : undefined
-            );
+                postalCode: zip ? zip : undefined,
+                addressLine2: address2 ? address2 : undefined
+            });
+
             trackEvent(Submit.BillingAddressCreate);
-            let org: Organization = null;
+            let org: Models.Organization = null;
             if (organization) {
-                org = await sdk.forConsole.billing.setBillingAddress(organization, response.$id);
+                org = await sdk.forConsole.organizations.setBillingAddress({
+                    organizationId: organization,
+                    billingAddressId: response.$id
+                });
                 trackEvent(Submit.OrganizationBillingAddressUpdate);
                 await invalidate(Dependencies.ORGANIZATIONS);
             }
diff --git a/src/routes/(console)/account/payments/billingAddress.svelte b/src/routes/(console)/account/payments/billingAddress.svelte
index 4e55ddb1a7..5e9b888376 100644
--- a/src/routes/(console)/account/payments/billingAddress.svelte
+++ b/src/routes/(console)/account/payments/billingAddress.svelte
@@ -6,8 +6,7 @@
     import type { Models } from '@appwrite.io/console';
     import DeleteAddress from './deleteAddressModal.svelte';
     import EditAddressModal from './editAddressModal.svelte';
-    import type { Address } from '$lib/sdk/billing';
-    import { organizationList, type Organization } from '$lib/stores/organization';
+    import { organizationList } from '$lib/stores/organization';
     import { base } from '$app/paths';
     import {
         IconDotsHorizontal,
@@ -35,11 +34,11 @@
 
     let show = false;
     let showEdit = false;
-    let selectedAddress: Address;
-    let selectedLinkedOrgs: Organization[] = [];
+    let selectedAddress: Models.BillingAddress;
+    let selectedLinkedOrgs: Array<Models.Organization> = [];
     let showDelete = false;
 
-    $: orgList = $organizationList.teams as unknown as Organization[];
+    $: orgList = $organizationList.teams as unknown as Array<Models.Organization>;
 </script>
 
 <CardGrid>
diff --git a/src/routes/(console)/account/payments/deleteAddressModal.svelte b/src/routes/(console)/account/payments/deleteAddressModal.svelte
index 059beab3cb..9f267daabb 100644
--- a/src/routes/(console)/account/payments/deleteAddressModal.svelte
+++ b/src/routes/(console)/account/payments/deleteAddressModal.svelte
@@ -4,20 +4,23 @@
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import Confirm from '$lib/components/confirm.svelte';
     import { Dependencies } from '$lib/constants';
-    import type { Address } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import type { Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { Layout, Link } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
     export let showDelete = false;
-    export let selectedAddress: Address;
-    export let linkedOrgs: Organization[] = [];
+    export let linkedOrgs: Array<Models.Organization> = [];
+    export let selectedAddress: Models.BillingAddress;
+
     let error: string = null;
 
     async function handleDelete() {
         try {
-            await sdk.forConsole.billing.deleteAddress(selectedAddress.$id);
+            await sdk.forConsole.account.deleteBillingAddress({
+                billingAddressId: selectedAddress.$id
+            });
+
             await invalidate(Dependencies.PAYMENT_METHODS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/account/payments/deletePaymentModal.svelte b/src/routes/(console)/account/payments/deletePaymentModal.svelte
index 50406a32f5..613db91617 100644
--- a/src/routes/(console)/account/payments/deletePaymentModal.svelte
+++ b/src/routes/(console)/account/payments/deletePaymentModal.svelte
@@ -5,19 +5,21 @@
     import Confirm from '$lib/components/confirm.svelte';
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
-    import type { Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { Layout, Link, Typography } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
-    export let linkedOrgs: Organization[] = [];
-    export let showDelete = false;
     export let method: string;
+    export let showDelete = false;
+    export let linkedOrgs: Array<Models.Organization> = [];
 
     let error: string;
 
     async function handleDelete() {
         try {
-            await sdk.forConsole.billing.deletePaymentMethod(method);
+            await sdk.forConsole.account.deletePaymentMethod({
+                paymentMethodId: method
+            });
             await invalidate(Dependencies.PAYMENT_METHODS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/(console)/account/payments/editAddressModal.svelte b/src/routes/(console)/account/payments/editAddressModal.svelte
index 59b709bdd5..891b65103f 100644
--- a/src/routes/(console)/account/payments/editAddressModal.svelte
+++ b/src/routes/(console)/account/payments/editAddressModal.svelte
@@ -4,16 +4,15 @@
     import { Modal } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button, InputSelect, InputText } from '$lib/elements/forms';
-    import type { Address } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let selectedAddress: Address;
     export let locale: Models.Locale;
     export let countryList: Models.CountryList;
+    export let selectedAddress: Models.BillingAddress;
 
     let error: string = null;
     let options = [
@@ -34,20 +33,22 @@
 
     async function handleSubmit() {
         try {
-            await sdk.forConsole.billing.updateAddress(
-                selectedAddress.$id,
-                selectedAddress.country,
-                selectedAddress.streetAddress,
-                selectedAddress.city,
-                selectedAddress.state,
-                selectedAddress.postalCode ? selectedAddress.postalCode : undefined,
-                selectedAddress.addressLine2 ? selectedAddress.addressLine2 : undefined
-            );
+            await sdk.forConsole.account.updateBillingAddress({
+                billingAddressId: selectedAddress.$id,
+                country: selectedAddress.country,
+                streetAddress: selectedAddress.streetAddress,
+                city: selectedAddress.city,
+                state: selectedAddress.state,
+                postalCode: selectedAddress.postalCode ? selectedAddress.postalCode : undefined,
+                addressLine2: selectedAddress.addressLine2
+                    ? selectedAddress.addressLine2
+                    : undefined
+            });
             await invalidate(Dependencies.ADDRESS);
             show = false;
             addNotification({
                 type: 'success',
-                message: `Address has been added`
+                message: 'Address has been updated'
             });
             trackEvent(Submit.BillingAddressUpdate);
         } catch (e) {
diff --git a/src/routes/(console)/account/payments/editPaymentModal.svelte b/src/routes/(console)/account/payments/editPaymentModal.svelte
index 24a8fa08f3..eb6dedcc9f 100644
--- a/src/routes/(console)/account/payments/editPaymentModal.svelte
+++ b/src/routes/(console)/account/payments/editPaymentModal.svelte
@@ -5,9 +5,9 @@
     import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
-    import type { PaymentMethodData } from '$lib/sdk/billing';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Alert } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
     let {
         show = $bindable(false),
@@ -16,7 +16,7 @@
     }: {
         show: boolean;
         isLinked?: boolean;
-        selectedPaymentMethod: PaymentMethodData;
+        selectedPaymentMethod: Models.PaymentMethod;
     } = $props();
 
     let year: number | null = $state(null);
@@ -24,6 +24,7 @@
     let error: string | null = $state(null);
 
     const currentYear = new Date().getFullYear();
+
     const months = Array.from({ length: 12 }, (_, i) => {
         const value = String(i + 1).padStart(2, '0');
         return { value, label: value };
@@ -33,11 +34,14 @@
 
     async function handleSubmit() {
         try {
-            await sdk.forConsole.billing.updatePaymentMethod(
-                selectedPaymentMethod.$id,
-                month,
-                year?.toString()
-            );
+            await sdk.forConsole.account.updatePaymentMethod({
+                paymentMethodId: selectedPaymentMethod.$id,
+                expiryMonth: parseInt(month),
+                expiryYear: year
+            });
+
+            trackEvent(Submit.PaymentMethodUpdate);
+            invalidate(Dependencies.PAYMENT_METHODS);
             show = false;
             trackEvent(Submit.PaymentMethodUpdate);
             await invalidate(Dependencies.PAYMENT_METHODS);
diff --git a/src/routes/(console)/account/payments/paymentMethods.svelte b/src/routes/(console)/account/payments/paymentMethods.svelte
index 8e53a8d3da..05f866bfb6 100644
--- a/src/routes/(console)/account/payments/paymentMethods.svelte
+++ b/src/routes/(console)/account/payments/paymentMethods.svelte
@@ -2,8 +2,7 @@
     import { CardGrid, CreditCardInfo, Empty } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { paymentMethods } from '$lib/stores/billing';
-    import type { PaymentMethodData } from '$lib/sdk/billing';
-    import { organizationList, type Organization } from '$lib/stores/organization';
+    import { organizationList } from '$lib/stores/organization';
     import { base } from '$app/paths';
     import EditPaymentModal from './editPaymentModal.svelte';
     import DeletePaymentModal from './deletePaymentModal.svelte';
@@ -26,22 +25,21 @@
         Tag,
         Typography
     } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
     export let showPayment = false;
     let showDropdown = [];
-    let selectedMethod: PaymentMethodData;
-    let selectedLinkedOrgs: Organization[] = [];
+    let selectedMethod: Models.PaymentMethod;
+    let selectedLinkedOrgs: Array<Models.Organization> = [];
     let showDelete = false;
     let showEdit = false;
     let isLinked = false;
 
-    $: orgList = $organizationList.teams as unknown as Organization[];
+    $: orgList = $organizationList.teams as unknown as Array<Models.Organization>;
 
-    $: filteredMethods = $paymentMethods?.paymentMethods.filter(
-        (method: PaymentMethodData) => !!method?.last4
-    );
+    $: filteredMethods = $paymentMethods?.paymentMethods.filter((method) => !!method?.last4);
 
-    const isMethodLinkedToOrg = (methodId: string, org: Organization) =>
+    const isMethodLinkedToOrg = (methodId: string, org: Models.Organization) =>
         methodId === org.paymentMethodId || methodId === org.backupPaymentMethodId;
 
     $: linkedMethodIds = new Set(
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index db9dbc0387..c8516076c9 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -8,19 +8,18 @@
     import { Button, Form, InputSelect, InputTags, InputText } from '$lib/elements/forms';
     import { toLocaleDate } from '$lib/helpers/date';
     import { Wizard } from '$lib/layout';
-    import type { PaymentList, Plan } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import {
-        organizationList,
-        type Organization,
-        type OrganizationError
-    } from '$lib/stores/organization';
+    import { organizationList } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { confirmPayment } from '$lib/stores/stripe.js';
-    import { ID } from '@appwrite.io/console';
+    import { BillingPlanGroup, ID, type Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { writable } from 'svelte/store';
-    import { isOrganization, plansInfo, type Tier } from '$lib/stores/billing';
+    import {
+        getBasePlanFromGroup,
+        isPaymentAuthenticationRequired,
+        plansInfo
+    } from '$lib/stores/billing';
     import { Fieldset, Icon, Layout, Tooltip } from '@appwrite.io/pink-svelte';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
     import EstimatedTotalBox from '$lib/components/billing/estimatedTotalBox.svelte';
@@ -48,7 +47,7 @@
     let formComponent: Form;
     let couponForm: Form;
     let isSubmitting = writable(false);
-    let methods: PaymentList;
+    let methods: Models.PaymentMethodList;
     let paymentMethodId: string;
     let collaborators: string[];
     let taxId: string;
@@ -68,9 +67,11 @@
     let coupon: string;
     let couponData = data?.couponData;
     let campaign = data?.campaign;
-    let billingPlan: Tier = BillingPlan.PRO;
     let tempOrgId = null;
-    let currentPlan: Plan;
+
+    let billingPlan = getBasePlanFromGroup(BillingPlanGroup.Pro).$id;
+
+    let currentPlan: Models.BillingPlan;
 
     $: onlyNewOrgs = campaign?.onlyNewOrgs || couponData?.onlyNewOrgs;
 
@@ -103,7 +104,10 @@
                 const organizationId = page.url.searchParams.get('id');
                 collaborators = page.url.searchParams.get('invites').split(',');
 
-                await sdk.forConsole.billing.validateOrganization(organizationId, collaborators);
+                await sdk.forConsole.organizations.validatePayment({
+                    organizationId,
+                    invites: collaborators
+                });
             }
         }
 
@@ -113,7 +117,7 @@
     });
 
     async function loadPaymentMethods() {
-        const methodList = await sdk.forConsole.billing.listPaymentMethods();
+        const methodList = await sdk.forConsole.account.listPaymentMethods();
         const filteredMethods = methodList.paymentMethods.filter((method) => !!method?.last4);
         methods = { paymentMethods: filteredMethods, total: filteredMethods.length };
         paymentMethodId =
@@ -126,44 +130,45 @@
         if (couponForm && !couponForm.checkValidity()) return;
         isSubmitting.set(true);
         try {
-            let org: Organization | OrganizationError;
+            let org: Models.Organization | Models.PaymentAuthentication;
             // Create new org
             if (selectedOrgId === newOrgId) {
-                org = await sdk.forConsole.billing.createOrganization(
-                    newOrgId,
+                org = await sdk.forConsole.organizations.create({
+                    organizationId: newOrgId,
                     name,
-                    billingPlan,
+                    billingPlan: billingPlan,
                     paymentMethodId,
-                    undefined,
-                    couponData.code ? couponData.code : null,
-                    collaborators,
-                    billingBudget,
-                    taxId
-                );
+                    invites: collaborators,
+                    couponId: couponData.code ? couponData.code : null,
+                    taxId,
+                    budget: billingBudget
+                });
             }
 
             // Upgrade existing org
             else if (selectedOrg?.billingPlan !== billingPlan && isUpgrade()) {
-                org = await sdk.forConsole.billing.updatePlan(
-                    selectedOrg.$id,
-                    billingPlan,
+                org = await sdk.forConsole.organizations.updatePlan({
+                    organizationId: selectedOrg.$id,
+                    billingPlan: billingPlan,
                     paymentMethodId,
-                    undefined,
-                    couponData.code ? couponData.code : null,
-                    collaborators
-                );
+                    invites: collaborators,
+                    couponId: couponData.code ? couponData.code : null
+                });
             }
             // Existing pro org, apply credits
             else {
                 org = selectedOrg;
-                await sdk.forConsole.billing.addCredit(org.$id, couponData.code);
+                await sdk.forConsole.organizations.addCredit({
+                    organizationId: org.$id,
+                    couponId: couponData.code
+                });
             }
 
-            if (!isOrganization(org) && org.status === 402) {
+            if (isPaymentAuthenticationRequired(org)) {
                 let clientSecret = org.clientSecret;
                 let params = new URLSearchParams();
                 params.append('type', 'payment_confirmed');
-                params.append('org', org.teamId);
+                params.append('org', org.organizationId);
                 for (const [key, value] of page.url.searchParams.entries()) {
                     if (key !== 'type' && key !== 'id') {
                         params.append(key, value);
@@ -176,10 +181,14 @@
                     paymentMethodId,
                     `${base}/apply-credit?${params}`
                 );
-                org = await sdk.forConsole.billing.validateOrganization(org.teamId, collaborators);
+
+                org = await sdk.forConsole.organizations.validatePayment({
+                    organizationId: org.organizationId,
+                    invites: collaborators
+                });
             }
 
-            if (isOrganization(org)) {
+            if (!isPaymentAuthenticationRequired(org)) {
                 trackEvent(Submit.CreditRedeem, {
                     coupon: couponData.code,
                     campaign: couponData?.campaign
@@ -205,8 +214,10 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.billing.getCouponAccount(coupon);
-            couponData = response;
+            couponData = await sdk.forConsole.console.getCoupon({
+                couponId: coupon
+            });
+
             coupon = null;
             addNotification({
                 type: 'success',
@@ -222,21 +233,21 @@
 
     $: selectedOrg = $organizationList?.teams?.find(
         (team) => team.$id === selectedOrgId
-    ) as Organization;
+    ) as Models.Organization;
 
-    function getBillingPlan(): Tier | undefined {
+    function getBillingPlan(): string | undefined {
         const campaignPlan =
             campaign?.plan && $plansInfo.get(campaign.plan) ? $plansInfo.get(campaign.plan) : null;
         const newPlan = $plansInfo.get(billingPlan);
 
-        // if campaign has a plan and it's higher than the selected new plan
+        // if campaign has a plan, and it's higher than the selected new plan
         if (campaignPlan?.order > newPlan?.order) {
-            return campaignPlan.$id as Tier;
+            return campaignPlan.$id;
         }
 
         // if current plan's order is higher than the selected new plan
         if (currentPlan?.order > newPlan?.order) {
-            return currentPlan.$id as Tier;
+            return currentPlan.$id;
         }
 
         return billingPlan;
@@ -250,7 +261,9 @@
 
     $: if (!isNewOrg) {
         (async () => {
-            currentPlan = await sdk.forConsole.billing.getOrganizationPlan(selectedOrgId);
+            currentPlan = await sdk.forConsole.organizations.getPlan({
+                organizationId: selectedOrgId
+            });
         })();
         loadPaymentMethods();
     }
diff --git a/src/routes/(console)/apply-credit/+page.ts b/src/routes/(console)/apply-credit/+page.ts
index 362a3adff7..998895e60c 100644
--- a/src/routes/(console)/apply-credit/+page.ts
+++ b/src/routes/(console)/apply-credit/+page.ts
@@ -1,38 +1,41 @@
-import { base } from '$app/paths';
-import type { Coupon } from '$lib/sdk/billing.js';
-import type { Campaign } from '$lib/stores/campaigns.js';
+import { resolve } from '$app/paths';
 import { sdk } from '$lib/stores/sdk.js';
 import { redirect } from '@sveltejs/kit';
+import type { Models } from '@appwrite.io/console';
 
 export const load = async ({ url }) => {
     // Has promo code
     if (url.searchParams.has('code')) {
-        let couponData: Coupon;
-        let campaign: Campaign;
+        let couponData: Models.Coupon;
+        let campaign: Models.Campaign;
         const code = url.searchParams.get('code');
         try {
-            couponData = await sdk.forConsole.billing.getCouponAccount(code);
+            couponData = await sdk.forConsole.console.getCoupon({
+                couponId: code
+            });
             if (couponData.campaign) {
-                campaign = await sdk.forConsole.billing.getCampaign(couponData.campaign);
+                campaign = await sdk.forConsole.console.getCampaign({
+                    campaignId: couponData.campaign
+                });
             }
             return { couponData, campaign };
         } catch (e) {
-            redirect(303, base);
+            redirect(303, resolve('/'));
         }
     }
     // Has campaign
     else if (url.searchParams.has('campaign')) {
         const campaignId = url.searchParams.get('campaign');
-        let campaign: Campaign;
+        let campaign: Models.Campaign;
         try {
-            campaign = await sdk.forConsole.billing.getCampaign(campaignId);
+            campaign = await sdk.forConsole.console.getCampaign({ campaignId });
             return { campaign };
         } catch (e) {
-            redirect(303, base);
+            redirect(303, resolve('/'));
         }
     }
     // No campaign or promo code
     else {
-        redirect(303, base);
+        redirect(303, resolve('/'));
     }
 };
diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
index 13d296facd..72ebd36607 100644
--- a/src/routes/(console)/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -8,13 +8,11 @@
     import { BillingPlan, Dependencies } from '$lib/constants';
     import { Button, Form, InputTags, InputText } from '$lib/elements/forms';
     import { Wizard } from '$lib/layout';
-    import type { Coupon } from '$lib/sdk/billing';
-    import { isOrganization, tierToPlan } from '$lib/stores/billing';
+    import { billingIdToPlan, isPaymentAuthenticationRequired } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import type { OrganizationError, Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { confirmPayment } from '$lib/stores/stripe';
-    import { ID } from '@appwrite.io/console';
+    import { ID, type Models } from '@appwrite.io/console';
     import { IconPlus } from '@appwrite.io/pink-icons-svelte';
     import { Divider, Fieldset, Icon, Layout, Link, Typography } from '@appwrite.io/pink-svelte';
     import { writable } from 'svelte/store';
@@ -25,9 +23,9 @@
     const { data }: PageProps = $props();
 
     let showExitModal = $state(false);
+    let selectedPlan = $state(data.plan);
     let previousPage: string = $state(resolve('/(console)'));
-    let selectedPlan: BillingPlan = $state(data.plan as BillingPlan);
-    let selectedCoupon: Partial<Coupon> | null = $state(data.coupon);
+    let selectedCoupon: Partial<Models.Coupon> | null = $state(data.coupon);
 
     let isSubmitting = $state(writable(false));
     let formComponent: Form | null = $state(null);
@@ -36,7 +34,6 @@
     let taxId: string | null = $state(null);
     let collaborators: string[] = $state([]);
     let paymentMethodId: string | null = $state(null);
-    let billingPlan: BillingPlan = $state(BillingPlan.FREE);
 
     let showCreditModal = $state(false);
     let billingBudget: number | undefined = $state(undefined);
@@ -49,7 +46,9 @@
         if (page.url.searchParams.has('coupon')) {
             const coupon = page.url.searchParams.get('coupon');
             try {
-                selectedCoupon = await sdk.forConsole.billing.getCouponAccount(coupon);
+                selectedCoupon = await sdk.forConsole.console.getCoupon({
+                    couponId: coupon
+                });
             } catch (e) {
                 selectedCoupon = {
                     code: null,
@@ -61,18 +60,21 @@
         if (page.url.searchParams.has('name')) {
             name = page.url.searchParams.get('name');
         }
+
         if (page.url.searchParams.has('plan')) {
             const plan = page.url.searchParams.get('plan');
-            if (plan && Object.values(BillingPlan).includes(plan as BillingPlan)) {
-                billingPlan = plan as BillingPlan;
+            if (plan) {
+                selectedPlan = plan;
             }
         }
+
         if (
             data?.hasFreeOrganizations ||
             (page.url.searchParams.has('type') && page.url.searchParams.get('type') === 'createPro')
         ) {
-            billingPlan = BillingPlan.PRO;
+            selectedPlan = BillingPlan.PRO;
         }
+
         if (page.url.searchParams.has('type')) {
             const type = page.url.searchParams.get('type');
             if (type === 'payment_confirmed') {
@@ -85,8 +87,12 @@
 
     async function validate(organizationId: string, invites: string[]) {
         try {
-            const org = await sdk.forConsole.billing.validateOrganization(organizationId, invites);
-            if (isOrganization(org)) {
+            const org = await sdk.forConsole.organizations.validatePayment({
+                organizationId,
+                invites
+            });
+
+            if (!isPaymentAuthenticationRequired(org)) {
                 await preloadData(`${base}/console/organization-${org.$id}`);
                 await goto(`${base}/console/organization-${org.$id}`);
                 addNotification({
@@ -105,33 +111,31 @@
 
     async function create() {
         try {
-            let org: Organization | OrganizationError;
+            let org: Models.Organization | Models.PaymentAuthentication;
 
             if (selectedPlan === BillingPlan.FREE) {
-                org = await sdk.forConsole.billing.createOrganization(
-                    ID.unique(),
-                    name,
-                    BillingPlan.FREE,
-                    null
-                );
+                org = await sdk.forConsole.organizations.create({
+                    organizationId: ID.unique(),
+                    name: name,
+                    billingPlan: BillingPlan.FREE
+                });
             } else {
-                org = await sdk.forConsole.billing.createOrganization(
-                    ID.unique(),
+                org = await sdk.forConsole.organizations.create({
+                    organizationId: ID.unique(),
                     name,
-                    selectedPlan,
+                    billingPlan: selectedPlan,
                     paymentMethodId,
-                    undefined,
-                    selectedCoupon?.code,
-                    collaborators,
-                    billingBudget,
+                    couponId: selectedCoupon?.code,
+                    invites: collaborators,
+                    budget: billingBudget,
                     taxId
-                );
+                });
 
-                if (!isOrganization(org) && org.status === 402) {
+                if (isPaymentAuthenticationRequired(org)) {
                     let clientSecret = org.clientSecret;
                     let params = new URLSearchParams();
                     params.append('type', 'payment_confirmed');
-                    params.append('id', org.teamId);
+                    params.append('id', org.organizationId);
                     for (const [key, value] of page.url.searchParams.entries()) {
                         if (key !== 'type' && key !== 'id') {
                             params.append(key, value);
@@ -144,17 +148,17 @@
                         paymentMethodId,
                         `${base}/create-organization?${params}`
                     );
-                    await validate(org.teamId, collaborators);
+                    await validate(org.organizationId, collaborators);
                 }
             }
 
             trackEvent(Submit.OrganizationCreate, {
-                plan: tierToPlan(billingPlan)?.name,
+                plan: billingIdToPlan(selectedPlan)?.name,
                 budget_cap_enabled: billingBudget !== null,
                 members_invited: collaborators?.length
             });
 
-            if (isOrganization(org)) {
+            if (!isPaymentAuthenticationRequired(org)) {
                 await invalidate(Dependencies.ACCOUNT);
                 await preloadData(`${base}/organization-${org.$id}`);
                 await goto(`${base}/organization-${org.$id}`);
diff --git a/src/routes/(console)/create-organization/+page.ts b/src/routes/(console)/create-organization/+page.ts
index 57d6280fe4..4ba42ce304 100644
--- a/src/routes/(console)/create-organization/+page.ts
+++ b/src/routes/(console)/create-organization/+page.ts
@@ -1,20 +1,21 @@
-import { BillingPlan, Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
 import type { PageLoad } from './$types';
-import type { Coupon } from '$lib/sdk/billing';
-import type { Organization } from '$lib/stores/organization';
+import { type Models, Platform } from '@appwrite.io/console';
+import { BillingPlan, Dependencies } from '$lib/constants';
 
 export const load: PageLoad = async ({ url, parent, depends }) => {
     const { organizations } = await parent();
     depends(Dependencies.ORGANIZATIONS);
     const [coupon, paymentMethods, plans] = await Promise.all([
         getCoupon(url),
-        sdk.forConsole.billing.listPaymentMethods(),
-        sdk.forConsole.billing.listPlans()
+        sdk.forConsole.account.listPaymentMethods(),
+        sdk.forConsole.console.getPlans({
+            platform: Platform.Appwrite
+        })
     ]);
     let plan = getPlanFromUrl(url);
     const hasFreeOrganizations = organizations.teams?.some(
-        (org) => (org as Organization)?.billingPlan === BillingPlan.FREE
+        (org) => (org as Models.Organization)?.billingPlan === BillingPlan.FREE
     );
 
     if (plan === BillingPlan.FREE && hasFreeOrganizations) {
@@ -31,21 +32,23 @@ export const load: PageLoad = async ({ url, parent, depends }) => {
     };
 };
 
-function getPlanFromUrl(url: URL): BillingPlan | null {
+function getPlanFromUrl(url: URL): string | null {
     if (url.searchParams.has('plan')) {
         const plan = url.searchParams.get('plan');
-        if (plan && plan in BillingPlan) {
-            return plan as BillingPlan;
+        if (plan) {
+            return plan;
         }
     }
     return BillingPlan.FREE;
 }
 
-async function getCoupon(url: URL): Promise<Coupon | null> {
+async function getCoupon(url: URL): Promise<Models.Coupon | null> {
     if (url.searchParams.has('code')) {
         const coupon = url.searchParams.get('code');
         try {
-            return sdk.forConsole.billing.getCouponAccount(coupon);
+            return sdk.forConsole.account.getCoupon({
+                couponId: coupon
+            });
         } catch (e) {
             return null;
         }
diff --git a/src/routes/(console)/onboarding/create-organization/+page.svelte b/src/routes/(console)/onboarding/create-organization/+page.svelte
index 6ed323c7a2..39da2ce70b 100644
--- a/src/routes/(console)/onboarding/create-organization/+page.svelte
+++ b/src/routes/(console)/onboarding/create-organization/+page.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
     import { isCloud } from '$lib/system';
     import { sdk } from '$lib/stores/sdk';
-    import { ID } from '@appwrite.io/console';
-    import { BillingPlan, Dependencies } from '$lib/constants';
-    import { tierToPlan } from '$lib/stores/billing';
+    import { BillingPlanGroup, ID } from '@appwrite.io/console';
+    import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
     import { loadAvailableRegions } from '$routes/(console)/regions';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
@@ -11,6 +10,7 @@
     import { Form } from '$lib/elements/forms/index.js';
     import { goto, invalidate } from '$app/navigation';
     import { base } from '$app/paths';
+    import { getBasePlanFromGroup } from '$lib/stores/billing';
 
     let isLoading = false;
     let organizationName = 'Personal Projects';
@@ -21,15 +21,14 @@
 
         try {
             if (isCloud) {
-                organization = await sdk.forConsole.billing.createOrganization(
-                    ID.unique(),
-                    organizationName,
-                    BillingPlan.FREE,
-                    null
-                );
+                organization = await sdk.forConsole.organizations.create({
+                    organizationId: ID.unique(),
+                    name: organizationName,
+                    billingPlan: getBasePlanFromGroup(BillingPlanGroup.Starter).$id
+                });
 
                 trackEvent(Submit.OrganizationCreate, {
-                    plan: tierToPlan(BillingPlan.FREE)?.name,
+                    plan: getBasePlanFromGroup(BillingPlanGroup.Starter)?.name,
                     budget_cap_enabled: false,
                     members_invited: 0
                 });
diff --git a/src/routes/(console)/onboarding/create-project/+page.ts b/src/routes/(console)/onboarding/create-project/+page.ts
index b387753551..94ee3e32f0 100644
--- a/src/routes/(console)/onboarding/create-project/+page.ts
+++ b/src/routes/(console)/onboarding/create-project/+page.ts
@@ -2,9 +2,8 @@ import type { PageLoad } from './$types';
 import { isCloud } from '$lib/system';
 import { sdk } from '$lib/stores/sdk';
 import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-import { isOrganization, tierToPlan } from '$lib/stores/billing';
-import { ID, Query, type Models } from '@appwrite.io/console';
-import { BillingPlan } from '$lib/constants';
+import { getBasePlanFromGroup, isPaymentAuthenticationRequired } from '$lib/stores/billing';
+import { BillingPlanGroup, ID, type Models, Query } from '@appwrite.io/console';
 import { redirect } from '@sveltejs/kit';
 import { base } from '$app/paths';
 
@@ -25,19 +24,19 @@ export const load: PageLoad = async ({ parent }) => {
     if (!organizations?.total) {
         try {
             if (isCloud) {
-                const org = await sdk.forConsole.billing.createOrganization(
-                    ID.unique(),
-                    'Personal projects',
-                    BillingPlan.FREE,
-                    null
-                );
+                const org = await sdk.forConsole.organizations.create({
+                    organizationId: ID.unique(),
+                    name: 'Personal projects',
+                    billingPlan: getBasePlanFromGroup(BillingPlanGroup.Starter).$id
+                });
+
                 trackEvent(Submit.OrganizationCreate, {
-                    plan: tierToPlan(BillingPlan.FREE)?.name,
+                    plan: getBasePlanFromGroup(BillingPlanGroup.Starter)?.name,
                     budget_cap_enabled: false,
                     members_invited: 0
                 });
 
-                if (isOrganization(org)) {
+                if (!isPaymentAuthenticationRequired(org)) {
                     return {
                         accountPrefs,
                         organization: org
diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts
index aa1b03b8d7..63f15ce7ed 100644
--- a/src/routes/(console)/organization-[organization]/+layout.ts
+++ b/src/routes/(console)/organization-[organization]/+layout.ts
@@ -11,10 +11,8 @@ import ProjectsAtRisk from '$lib/components/billing/alerts/projectsAtRisk.svelte
 import { get } from 'svelte/store';
 import { preferences } from '$lib/stores/preferences';
 import { defaultRoles, defaultScopes } from '$lib/constants';
-import type { Plan } from '$lib/sdk/billing';
 import { loadAvailableRegions } from '$routes/(console)/regions';
-import type { Organization } from '$lib/stores/organization';
-import { Platform } from '@appwrite.io/console';
+import { type Models, Platform } from '@appwrite.io/console';
 import { resolve } from '$app/paths';
 
 export const load: LayoutLoad = async ({ params, depends, parent }) => {
@@ -28,13 +26,18 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
 
     let roles = isCloud ? [] : defaultRoles;
     let scopes = isCloud ? [] : defaultScopes;
-    let currentPlan: Plan = null;
+    let currentPlan: Models.BillingPlan | null = null;
 
     try {
         if (isCloud) {
             [{ roles, scopes }, currentPlan] = await Promise.all([
-                sdk.forConsole.billing.getRoles(params.organization),
-                sdk.forConsole.billing.getOrganizationPlan(params.organization)
+                sdk.forConsole.organizations.getScopes({
+                    organizationId: params.organization
+                }),
+
+                sdk.forConsole.organizations.getPlan({
+                    organizationId: params.organization
+                })
             ]);
 
             if (scopes.includes('billing.read')) {
@@ -47,7 +50,9 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
         }
 
         const [org, members, countryList, locale] = await Promise.all([
-            sdk.forConsole.teams.get({ teamId: params.organization }) as Promise<Organization>,
+            sdk.forConsole.teams.get({
+                teamId: params.organization
+            }) as Promise<Models.Organization>,
             sdk.forConsole.teams.listMemberships({ teamId: params.organization }),
             sdk.forConsole.locale.listCountries(),
             sdk.forConsole.locale.get(),
@@ -94,7 +99,7 @@ async function checkPlatformAndRedirect(
 ) {
     // check if preloaded
     let requestedOrg = organizations.teams.find((team) => team.$id === params.organization) as
-        | Organization
+        | Models.Organization
         | undefined;
 
     // not found, load!
@@ -102,7 +107,7 @@ async function checkPlatformAndRedirect(
         try {
             requestedOrg = (await sdk.forConsole.teams.get({
                 teamId: params.organization
-            })) as Organization;
+            })) as Models.Organization;
         } catch (e) {
             return null;
         }
@@ -133,7 +138,7 @@ async function checkPlatformAndRedirect(
                 // check if exists and is valid
                 const orgFromPrefs = (await sdk.forConsole.teams.get({
                     teamId: orgIdInPrefs
-                })) as Organization;
+                })) as Models.Organization;
 
                 // exists and is valid, redirect
                 redirect(
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte
index 51d7fe3539..fdb29040c7 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte
@@ -8,7 +8,12 @@
     import AvailableCredit from './availableCredit.svelte';
     import PaymentHistory from './paymentHistory.svelte';
     import TaxId from './taxId.svelte';
-    import { failedInvoice, tierToPlan, upgradeURL, useNewPricingModal } from '$lib/stores/billing';
+    import {
+        failedInvoice,
+        billingIdToPlan,
+        upgradeURL,
+        useNewPricingModal
+    } from '$lib/stores/billing';
     import { onMount } from 'svelte';
     import { page } from '$app/state';
     import { confirmPayment } from '$lib/stores/stripe';
@@ -41,10 +46,10 @@
                 page.url.searchParams.get('type') === 'confirmation'
             ) {
                 const invoiceId = page.url.searchParams.get('invoice');
-                const invoice = await sdk.forConsole.billing.getInvoice(
-                    page.params.organization,
+                const invoice = await sdk.forConsole.organizations.getInvoice({
+                    organizationId: page.params.organization,
                     invoiceId
-                );
+                });
 
                 await confirmPayment(
                     organization.$id,
@@ -59,7 +64,10 @@
                 page.url.searchParams.get('type') === 'validate-invoice'
             ) {
                 const invoiceId = page.url.searchParams.get('invoice');
-                await sdk.forConsole.billing.updateInvoiceStatus(organization.$id, invoiceId);
+                await sdk.forConsole.organizations.validateInvoice({
+                    organizationId: organization.$id,
+                    invoiceId
+                });
                 invalidate(Dependencies.INVOICES);
                 invalidate(Dependencies.ORGANIZATION);
             }
@@ -69,10 +77,10 @@
                 page.url.searchParams.get('type') === 'retry'
             ) {
                 const invoiceId = page.url.searchParams.get('invoice');
-                const invoice = await sdk.forConsole.billing.getInvoice(
-                    page.params.organization,
+                const invoice = await sdk.forConsole.organizations.getInvoice({
+                    organizationId: page.params.organization,
                     invoiceId
-                );
+                });
                 selectedInvoice.set(invoice);
                 showRetryModal.set(true);
             }
@@ -117,9 +125,12 @@
     {/if}
     {#if organization?.billingPlanDowngrade}
         <Alert.Inline status="info">
-            Your organization has changed to {tierToPlan(organization?.billingPlanDowngrade).name} plan.
-            You will continue to have access to {tierToPlan(organization?.billingPlan).name} plan features
-            until your billing period ends on {toLocaleDate(organization.billingNextInvoiceDate)}.
+            Your organization has changed to {billingIdToPlan(organization?.billingPlanDowngrade)
+                .name} plan. You will continue to have access to {billingIdToPlan(
+                organization?.billingPlan
+            ).name} plan features until your billing period ends on {toLocaleDate(
+                organization.billingNextInvoiceDate
+            )}.
         </Alert.Inline>
     {/if}
     {#if $useNewPricingModal}
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts
index 2f2a4418cf..beabe19eab 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.ts
+++ b/src/routes/(console)/organization-[organization]/billing/+page.ts
@@ -1,20 +1,23 @@
-import { BillingPlan, DEFAULT_BILLING_PROJECTS_LIMIT, Dependencies } from '$lib/constants';
-import type { Address, PaymentList } from '$lib/sdk/billing';
-import { type Organization } from '$lib/stores/organization';
+import { resolve } from '$app/paths';
+import { isCloud } from '$lib/system';
 import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
-import { isCloud } from '$lib/system';
-import { base } from '$app/paths';
-import { type PaymentMethodData } from '$lib/sdk/billing';
+import { BillingPlan, DEFAULT_BILLING_PROJECTS_LIMIT, Dependencies } from '$lib/constants';
 
+import type { Models } from '@appwrite.io/console';
 import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 
 export const load: PageLoad = async ({ parent, depends, url, route }) => {
     const { organization, scopes, currentPlan, countryList, locale } = await parent();
 
     if (!scopes.includes('billing.read')) {
-        return redirect(301, `${base}/organization-${organization.$id}`);
+        return redirect(
+            301,
+            resolve('/(console)/organization-[organization]', {
+                organization: organization.$id
+            })
+        );
     }
 
     depends(Dependencies.PAYMENT_METHODS);
@@ -25,10 +28,13 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
     // aggregation reloads on page param changes
     depends(Dependencies.BILLING_AGGREGATION);
 
-    const billingAddressId = (organization as Organization)?.billingAddressId;
-    const billingAddressPromise: Promise<Address> = billingAddressId
-        ? sdk.forConsole.billing
-              .getOrganizationBillingAddress(organization.$id, billingAddressId)
+    const billingAddressId = (organization as Models.Organization)?.billingAddressId;
+    const billingAddressPromise: Promise<Models.BillingAddress> = billingAddressId
+        ? sdk.forConsole.organizations
+              .getBillingAddress({
+                  organizationId: organization.$id,
+                  billingAddressId
+              })
               .catch(() => null)
         : null;
 
@@ -37,27 +43,27 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
      * initially created, these might return 404
      * - can be removed later once that is fixed in back-end
      */
-    let billingAggregation = null;
+    let billingAggregation: Models.AggregationTeam | null = null;
     try {
         const currentPage = getPage(url) || 1;
         const limit = getLimit(url, route, DEFAULT_BILLING_PROJECTS_LIMIT);
         const offset = pageToOffset(currentPage, limit);
-        billingAggregation = await sdk.forConsole.billing.getAggregation(
-            organization.$id,
-            (organization as Organization)?.billingAggregationId,
+        billingAggregation = await sdk.forConsole.organizations.getAggregation({
+            organizationId: organization.$id,
+            aggregationId: (organization as Models.Organization)?.billingAggregationId,
             limit,
             offset
-        );
+        });
     } catch (e) {
         // ignore error
     }
 
     let billingInvoice = null;
     try {
-        billingInvoice = await sdk.forConsole.billing.getInvoice(
-            organization.$id,
-            (organization as Organization)?.billingInvoiceId
-        );
+        billingInvoice = await sdk.forConsole.organizations.getInvoice({
+            organizationId: organization.$id,
+            invoiceId: (organization as Models.Organization)?.billingInvoiceId
+        });
     } catch (e) {
         // ignore error
     }
@@ -70,14 +76,18 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
 
     const [paymentMethods, addressList, billingAddress, availableCredit, billingPlanDowngrade] =
         await Promise.all([
-            sdk.forConsole.billing.listPaymentMethods(),
-            sdk.forConsole.billing.listAddresses(),
+            sdk.forConsole.account.listPaymentMethods(),
+            sdk.forConsole.account.listBillingAddresses(),
             billingAddressPromise,
             areCreditsSupported
-                ? sdk.forConsole.billing.getAvailableCredit(organization.$id)
+                ? sdk.forConsole.organizations.getAvailableCredits({
+                      organizationId: organization.$id
+                  })
                 : null,
             organization.billingPlanDowngrade
-                ? sdk.forConsole.billing.getPlan(organization.billingPlanDowngrade)
+                ? sdk.forConsole.console.getPlan({
+                      planId: organization.billingPlanDowngrade
+                  })
                 : null
         ]);
 
@@ -108,14 +118,14 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
 };
 
 function getOrganizationPaymentMethods(
-    organization: Organization,
-    paymentMethods: PaymentList
+    organization: Models.Organization,
+    paymentMethods: Models.PaymentMethodList
 ): {
-    backup: PaymentMethodData | null;
-    primary: PaymentMethodData | null;
+    backup: Models.PaymentMethod | null;
+    primary: Models.PaymentMethod | null;
 } {
-    let backup: PaymentMethodData | null = null;
-    let primary: PaymentMethodData | null = null;
+    let backup: Models.PaymentMethod | null = null;
+    let primary: Models.PaymentMethod | null = null;
 
     for (const paymentMethod of paymentMethods.paymentMethods) {
         if (paymentMethod.$id === organization.paymentMethodId) {
diff --git a/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte b/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
index 263e9a737a..be8a77303f 100644
--- a/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
@@ -16,7 +16,10 @@
 
     async function redeem() {
         try {
-            await sdk.forConsole.billing.addCredit($organization.$id, coupon);
+            await sdk.forConsole.organizations.addCredit({
+                organizationId: $organization.$id,
+                couponId: coupon
+            });
             show = false;
             await invalidate(Dependencies.CREDIT);
             await invalidate(Dependencies.ORGANIZATION);
diff --git a/src/routes/(console)/organization-[organization]/billing/addCreditWizard.svelte b/src/routes/(console)/organization-[organization]/billing/addCreditWizard.svelte
index 3ae09404f6..cff0627255 100644
--- a/src/routes/(console)/organization-[organization]/billing/addCreditWizard.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/addCreditWizard.svelte
@@ -18,12 +18,15 @@
 
     async function create() {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethod(
-                $organization.$id,
-                $addCreditWizardStore.paymentMethodId
-            );
+            await sdk.forConsole.organizations.setDefaultPaymentMethod({
+                organizationId: $organization.$id,
+                paymentMethodId: $addCreditWizardStore.paymentMethodId
+            });
 
-            await sdk.forConsole.billing.addCredit($organization.$id, $addCreditWizardStore.coupon);
+            await sdk.forConsole.organizations.addCredit({
+                organizationId: $organization.$id,
+                couponId: $addCreditWizardStore.coupon
+            });
             addNotification({
                 type: 'success',
                 message: `Credit has been added to ${$organization.name}`
diff --git a/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
index 52bc768599..a655313277 100644
--- a/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
     import { CardGrid, Empty, PaginationInline } from '$lib/components';
     import { toLocaleDate } from '$lib/helpers/date';
-    import type { CreditList } from '$lib/sdk/billing';
     import { organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { wizard } from '$lib/stores/wizard';
-    import { Query } from '@appwrite.io/console';
+    import { type Models, Query } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { Button } from '$lib/elements/forms';
     import AddCreditModal from './addCreditModal.svelte';
@@ -20,14 +19,16 @@
     export let areCreditsSupported: boolean;
 
     let offset = 0;
-    let creditList: CreditList = {
-        available: 0,
-        credits: [],
-        total: 0
-    };
     let show = false;
     let reloadOnWizardClose = false;
 
+    /* default credits until loaded */
+    let creditList: Models.CreditList = {
+        total: 0,
+        credits: [],
+        available: 0
+    };
+
     onMount(request);
 
     const limit = 5;
@@ -44,10 +45,10 @@
          * Technically, we could reuse that for offsets < 25 (i.e., the first 5 pages with limit = 5)
          * to avoid an extra request. But for now, we always fetch fresh data.
          */
-        creditList = await sdk.forConsole.billing.listCredits($organization.$id, [
-            Query.limit(limit),
-            Query.offset(offset)
-        ]);
+        creditList = await sdk.forConsole.organizations.listCredits({
+            organizationId: $organization.$id,
+            queries: [Query.limit(limit), Query.offset(offset)]
+        });
 
         creditList = {
             ...creditList,
diff --git a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
index 238d0de7fe..ebecd52319 100644
--- a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
@@ -4,10 +4,8 @@
     import { CardGrid } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
-    import type { Address } from '$lib/sdk/billing';
     import { addressList } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import { type Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import RemoveAddress from './removeAddress.svelte';
     import { user } from '$lib/stores/user';
@@ -24,10 +22,10 @@
     } from '@appwrite.io/pink-icons-svelte';
     import type { Models } from '@appwrite.io/console';
 
-    export let organization: Organization;
     export let locale: Models.Locale;
     export let countryList: Models.CountryList;
-    export let billingAddress: Address;
+    export let organization: Models.Organization;
+    export let billingAddress: Models.BillingAddress;
 
     let showCreate = false;
     let showEdit = false;
@@ -36,7 +34,10 @@
 
     async function addAddress(addressId: string) {
         try {
-            await sdk.forConsole.billing.setBillingAddress(organization.$id, addressId);
+            await sdk.forConsole.organizations.setBillingAddress({
+                organizationId: organization.$id,
+                billingAddressId: addressId
+            });
 
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index 5743273b94..42dd040096 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -3,20 +3,19 @@
     import { Click, Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { CardGrid } from '$lib/components';
     import { BillingPlan, Dependencies } from '$lib/constants';
-    import { tierToPlan, upgradeURL } from '$lib/stores/billing';
+    import { billingIdToPlan, upgradeURL } from '$lib/stores/billing';
     import { Button, Form } from '$lib/elements/forms';
     import { symmetricDifference } from '$lib/helpers/array';
     import { addNotification } from '$lib/stores/notifications';
-    import { type Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { Alert, Icon, Table } from '@appwrite.io/pink-svelte';
     import { IconTrash } from '@appwrite.io/pink-icons-svelte';
     import InputSelect from '$lib/elements/forms/inputSelect.svelte';
-    import type { Plan } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
 
-    export let organization: Organization;
-    export let currentPlan: Plan;
     export let alertsEnabled = false;
+    export let currentPlan: Models.BillingPlan;
+    export let organization: Models.Organization;
 
     let search: string;
     let selectedAlert: number;
@@ -47,19 +46,20 @@
 
     async function updateBudget() {
         try {
-            await sdk.forConsole.billing.updateBudget(
-                organization.$id,
-                organization.billingBudget,
+            await sdk.forConsole.organizations.updateBudget({
+                organizationId: organization.$id,
+                budget: organization.billingBudget,
                 alerts
-            );
+            });
 
-            invalidate(Dependencies.ORGANIZATION);
+            await invalidate(Dependencies.ORGANIZATION);
 
             addNotification({
                 type: 'success',
                 isHtml: true,
                 message: `<span> ${alerts.length === 0 ? 'Budget alerts removed from' : alerts.length > 1 ? `Budget alerts added to` : 'A budget alert has been added to'} <b>${organization.name}</b> </span>`
             });
+
             trackEvent(Submit.BudgetAlertsUpdate, {
                 alerts
             });
@@ -80,7 +80,7 @@
     <svelte:fragment slot="title">Billing alerts</svelte:fragment>
     {#if !currentPlan.budgeting}
         Get notified by email when your organization meets a percentage of your budget cap. <b
-            >{tierToPlan(organization.billingPlan).name} organizations will receive one notification
+            >{billingIdToPlan(organization.billingPlan).name} organizations will receive one notification
             at 75% resource usage.</b>
     {:else}
         Get notified by email when your organization meets or exceeds a percentage of your specified
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index bd08a88ca7..8a829e6a56 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -6,24 +6,24 @@
     import { Button, Form, InputNumber, InputSwitch } from '$lib/elements/forms';
     import { showUsageRatesModal, upgradeURL } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
-    import { type Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { Alert, Link } from '@appwrite.io/pink-svelte';
     import BudgetAlert from './budgetAlert.svelte';
-    import type { Plan } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
+
+    export let currentPlan: Models.BillingPlan;
+    export let organization: Models.Organization;
 
-    export let currentPlan: Plan;
-    export let organization: Organization;
-    let capActive = organization?.billingBudget !== null;
     let budget = organization.billingBudget;
+    let capActive = organization?.billingBudget !== null;
 
     async function updateBudget() {
         try {
-            await sdk.forConsole.billing.updateBudget(
-                organization.$id,
+            await sdk.forConsole.organizations.updateBudget({
+                organizationId: organization.$id,
                 budget,
-                organization.budgetAlerts
-            );
+                alerts: organization.budgetAlerts
+            });
             await invalidate(Dependencies.ORGANIZATION);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/organization-[organization]/billing/cancelDowngradeModal.svelte b/src/routes/(console)/organization-[organization]/billing/cancelDowngradeModal.svelte
index ac649dd837..84b9854341 100644
--- a/src/routes/(console)/organization-[organization]/billing/cancelDowngradeModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/cancelDowngradeModal.svelte
@@ -6,7 +6,7 @@
     import { organization } from '$lib/stores/organization';
     import { Dependencies } from '$lib/constants';
     import { invalidate } from '$app/navigation';
-    import { tierToPlan } from '$lib/stores/billing';
+    import { billingIdToPlan } from '$lib/stores/billing';
     import { toLocaleDate } from '$lib/helpers/date';
 
     export let showCancel = false;
@@ -15,7 +15,10 @@
 
     async function cancelDowngrade() {
         try {
-            await sdk.forConsole.billing.cancelDowngrade($organization.$id);
+            await sdk.forConsole.organizations.cancelDowngrade({
+                organizationId: $organization.$id
+            });
+
             await invalidate(Dependencies.ORGANIZATION);
             showCancel = false;
             addNotification({
@@ -36,7 +39,7 @@
     size="s">
     <p>
         Your organization is set to change to <strong>
-            {tierToPlan($organization?.billingPlanDowngrade).name}</strong>
+            {billingIdToPlan($organization?.billingPlanDowngrade).name}</strong>
         plan on <strong> {toLocaleDate($organization.billingNextInvoiceDate)}</strong>. Are you sure
         you want to cancel this change and keep your current plan?
     </p>
diff --git a/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte b/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
index 1de90ac4a8..58164982ec 100644
--- a/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
@@ -19,7 +19,9 @@
         if ($organization?.billingPlan !== BillingPlan.FREE && !hasOtherMethod) return;
 
         try {
-            await sdk.forConsole.billing.removeOrganizationPaymentMethod($organization.$id);
+            await sdk.forConsole.organizations.deleteDefaultPaymentMethod({
+                organizationId: $organization.$id
+            });
             addNotification({
                 type: 'success',
                 message: `The payment method has been removed from ${$organization.name}`
@@ -34,12 +36,15 @@
             showDelete = false;
         }
     }
+
     async function removeBackupMethod() {
         if ($organization?.billingPlan !== BillingPlan.FREE && !hasOtherMethod) return;
         showDelete = false;
 
         try {
-            await sdk.forConsole.billing.removeOrganizationPaymentMethodBackup($organization.$id);
+            await sdk.forConsole.organizations.deleteBackupPaymentMethod({
+                organizationId: $organization.$id
+            });
             addNotification({
                 type: 'success',
                 message: `The payment method has been removed from ${$organization.name}`
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
index 552288765e..e9bf2ebb08 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
@@ -5,9 +5,8 @@
     import { Button } from '$lib/elements/forms';
     import DualTimeView from '$lib/components/dualTimeView.svelte';
     import { formatCurrency } from '$lib/helpers/numbers';
-    import type { Invoice, InvoiceList } from '$lib/sdk/billing';
     import { getApiEndpoint, sdk } from '$lib/stores/sdk';
-    import { Query } from '@appwrite.io/console';
+    import { type Models, Query } from '@appwrite.io/console';
     import { trackEvent } from '$lib/actions/analytics';
     import { selectedInvoice, showRetryModal } from './store';
     import {
@@ -32,7 +31,7 @@
     let limit = $state(5);
     let offset = $state(0);
     let isLoadingInvoices = $state(false);
-    let invoiceList: InvoiceList = $state({
+    let invoiceList: Models.InvoiceList = $state({
         invoices: [],
         total: 0
     });
@@ -52,20 +51,23 @@
 
     async function request(patchQuery: boolean = false) {
         isLoadingInvoices = true;
-        invoiceList = await sdk.forConsole.billing.listInvoices(page.params.organization, [
-            Query.orderDesc('$createdAt'),
+        invoiceList = await sdk.forConsole.organizations.listInvoices({
+            organizationId: page.params.organization,
+            queries: [
+                Query.orderDesc('$createdAt'),
 
-            // first page extra must have an extra limit!
-            Query.limit(patchQuery ? limit + 1 : limit),
+                // first page extra must have an extra limit!
+                Query.limit(patchQuery ? limit + 1 : limit),
 
-            // so an invoice isn't repeated on 2nd page!
-            Query.offset(patchQuery ? offset : offset + 1)
-        ]);
+                // so an invoice isn't repeated on 2nd page!
+                Query.offset(patchQuery ? offset : offset + 1)
+            ]
+        });
 
         isLoadingInvoices = false;
     }
 
-    function retryPayment(invoice: Invoice) {
+    function retryPayment(invoice: Models.Invoice) {
         $selectedInvoice = invoice;
         $showRetryModal = true;
     }
diff --git a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
index 445c65d107..fb1eba319b 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -5,10 +5,8 @@
     import { CardGrid, CreditCardBrandImage, CreditCardInfo } from '$lib/components';
     import { BillingPlan, Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
-    import { type Organization } from '$lib/stores/organization';
     import { Button } from '$lib/elements/forms';
     import { hasStripePublicKey, isCloud } from '$lib/system';
-    import type { PaymentList, PaymentMethodData } from '$lib/sdk/billing';
     import DeleteOrgPayment from './deleteOrgPayment.svelte';
     import ReplaceCard from './replaceCard.svelte';
     import EditPaymentModal from '$routes/(console)/account/payments/editPaymentModal.svelte';
@@ -33,25 +31,25 @@
         IconSwitchHorizontal,
         IconTrash
     } from '@appwrite.io/pink-icons-svelte';
+    import type { Models } from '@appwrite.io/console';
 
-    export let methods: PaymentList;
-    export let organization: Organization;
+    export let organization: Models.Organization;
+    export let methods: Models.PaymentMethodList;
+    export let backupMethod: Models.PaymentMethod;
+    export let primaryMethod: Models.PaymentMethod;
 
-    export let backupMethod: PaymentMethodData;
-    export let primaryMethod: PaymentMethodData;
-
-    let showPayment = false;
     let showEdit = false;
     let showDelete = false;
+    let showPayment = false;
     let showReplace = false;
     let isSelectedBackup = false;
 
     async function addPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethod(
-                organization.$id,
+            await sdk.forConsole.organizations.setDefaultPaymentMethod({
+                organizationId: organization.$id,
                 paymentMethodId
-            );
+            });
             addNotification({
                 type: 'success',
                 message: `A new payment method has been added to ${organization.name}`
@@ -69,10 +67,10 @@
 
     async function addBackupPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethodBackup(
-                organization.$id,
+            await sdk.forConsole.organizations.setBackupPaymentMethod({
+                organizationId: organization.$id,
                 paymentMethodId
-            );
+            });
             addNotification({
                 type: 'success',
                 message: `A new payment method has been added to ${organization.name}`
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index fb3df8a608..12ddeded31 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -5,7 +5,6 @@
     import { toLocaleDate } from '$lib/helpers/date';
     import { upgradeURL } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
-    import type { AggregationTeam, InvoiceUsage, Plan } from '$lib/sdk/billing';
     import { formatCurrency } from '$lib/helpers/numbers';
     import { BillingPlan, DEFAULT_BILLING_PROJECTS_LIMIT } from '$lib/constants';
     import { Click, trackEvent } from '$lib/actions/analytics';
@@ -25,6 +24,7 @@
     import { IconTag } from '@appwrite.io/pink-icons-svelte';
     import { page } from '$app/state';
     import type { RowFactoryOptions } from '$routes/(console)/organization-[organization]/billing/store';
+    import type { Models } from '@appwrite.io/console';
 
     let {
         currentPlan,
@@ -34,10 +34,10 @@
         limit = undefined,
         offset = undefined
     }: {
-        currentPlan: Plan;
-        nextPlan?: Plan | null;
+        currentPlan: Models.BillingPlan;
+        nextPlan?: Models.BillingPlan | null;
         availableCredit?: number | undefined;
-        currentAggregation?: AggregationTeam | undefined;
+        currentAggregation?: Models.AggregationTeam | undefined;
         limit?: number | undefined;
         offset?: number | undefined;
     } = $props();
@@ -146,8 +146,8 @@
         ];
     }
 
-    function getResource(resources: InvoiceUsage[] | undefined, resourceId: string) {
-        return resources?.find((r) => r.resourceId === resourceId);
+    function getResource(resources: Array<Models.UsageResources> | undefined, resourceId: string) {
+        return resources?.find((resource) => resource.resourceId === resourceId);
     }
 
     function createRow({
@@ -221,7 +221,7 @@
     function createResourceRow(
         id: string,
         label: string,
-        resource: InvoiceUsage | undefined,
+        resource: Models.UsageResources | undefined,
         planLimit: number | null | undefined,
         formatValue = formatNum
     ) {
@@ -229,8 +229,8 @@
     }
 
     function getBillingData(
-        currentPlan: Plan,
-        currentAggregation: AggregationTeam | undefined,
+        currentPlan: Models.BillingPlan,
+        currentAggregation: Models.AggregationTeam | undefined,
         isSmallViewport: boolean
     ) {
         // base plan row
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummaryOld.svelte b/src/routes/(console)/organization-[organization]/billing/planSummaryOld.svelte
index 083aff4445..638f72b523 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummaryOld.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummaryOld.svelte
@@ -3,9 +3,8 @@
     import { CardGrid } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDate } from '$lib/helpers/date';
-    import { plansInfo, upgradeURL } from '$lib/stores/billing';
+    import { upgradeURL } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
-    import type { Aggregation, Invoice, Plan } from '$lib/sdk/billing';
     import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers';
     import { BillingPlan } from '$lib/constants';
     import { Click, trackEvent } from '$lib/actions/analytics';
@@ -20,18 +19,20 @@
     } from '@appwrite.io/pink-svelte';
     import { IconInfo, IconTag } from '@appwrite.io/pink-icons-svelte';
     import CancelDowngradeModel from './cancelDowngradeModal.svelte';
+    import type { Models } from '@appwrite.io/console';
 
-    export let currentPlan: Plan;
-    export let currentInvoice: Invoice | undefined = undefined;
+    export let currentPlan: Models.BillingPlan;
     export let availableCredit: number | undefined = undefined;
-    export let currentAggregation: Aggregation | undefined = undefined;
+    export let currentInvoice: Models.Invoice | undefined = undefined;
+    export let currentAggregation: Models.AggregationTeam | undefined = undefined;
 
     let showCancel: boolean = false;
 
     const today = new Date();
     const isTrial =
         new Date($organization?.billingStartDate).getTime() - today.getTime() > 0 &&
-        $plansInfo.get($organization.billingPlan)?.trialDays;
+        $organization?.billingTrialDays; /* number of trial days. */
+
     const extraUsage = currentInvoice ? currentInvoice.amount - currentPlan?.price : 0;
 </script>
 
diff --git a/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte b/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte
index 0a913b851b..52359ad2c1 100644
--- a/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte
@@ -14,7 +14,10 @@
 
     async function removeAddress() {
         try {
-            await sdk.forConsole.billing.removeBillingAddress($organization.$id);
+            await sdk.forConsole.organizations.deleteBillingAddress({
+                organizationId: $organization.$id
+            });
+
             addNotification({
                 type: 'success',
                 message: `The billing address has been removed from ${$organization.name}`
diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 5ef49d0261..56798f55b3 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -6,7 +6,6 @@
     import { organization } from '$lib/stores/organization';
     import { Dependencies } from '$lib/constants';
     import { onMount } from 'svelte';
-    import type { AddressesList } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { base } from '$app/paths';
@@ -16,8 +15,9 @@
     export let show = false;
     export let locale: Models.Locale;
     export let countryList: Models.CountryList;
+
     let loading = true;
-    let addresses: AddressesList;
+    let addresses: Models.BillingAddressList;
     let selectedAddress: string;
     let error: string;
     let country: string;
@@ -35,7 +35,7 @@
 
     onMount(async () => {
         loading = true;
-        addresses = await sdk.forConsole.billing.listAddresses();
+        addresses = await sdk.forConsole.account.listBillingAddresses();
 
         const firstNonCurrentAddress = addresses?.billingAddresses?.find(
             (address) => address.$id !== $organization?.billingAddressId
@@ -63,15 +63,19 @@
             if (selectedAddress === $organization.billingAddressId) {
                 show = false;
             } else if (selectedAddress === '$new') {
-                const address = await sdk.forConsole.billing.createAddress(
+                const address = await sdk.forConsole.account.createBillingAddress({
                     country,
                     streetAddress,
                     city,
                     state,
-                    postalCode ? postalCode : undefined,
-                    addressLine2 ? postalCode : undefined
-                );
-                await sdk.forConsole.billing.setBillingAddress($organization.$id, address.$id);
+                    postalCode: postalCode ? postalCode : undefined,
+                    addressLine2: addressLine2 ? addressLine2 : undefined
+                });
+
+                await sdk.forConsole.organizations.setBillingAddress({
+                    organizationId: $organization.$id,
+                    billingAddressId: address.$id
+                });
 
                 invalidate(Dependencies.ORGANIZATION);
                 invalidate(Dependencies.ADDRESS);
@@ -86,7 +90,10 @@
                     message: `Your billing address has been updated`
                 });
             } else {
-                await sdk.forConsole.billing.setBillingAddress($organization.$id, selectedAddress);
+                await sdk.forConsole.organizations.setBillingAddress({
+                    organizationId: $organization.$id,
+                    billingAddressId: selectedAddress
+                });
 
                 invalidate(Dependencies.ORGANIZATION);
                 invalidate(Dependencies.ADDRESS);
diff --git a/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte b/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte
index 920f7b4741..847ebd016c 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte
@@ -3,15 +3,14 @@
     import { FakeModal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { sdk } from '$lib/stores/sdk';
-    import type { Organization } from '$lib/stores/organization';
     import { Dependencies } from '$lib/constants';
     import { setPaymentMethod, submitStripeCard } from '$lib/stores/stripe';
     import { onMount } from 'svelte';
-    import type { PaymentList, PaymentMethodData } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { PaymentBoxes } from '$lib/components/billing';
-    import type { PaymentMethod } from '@stripe/stripe-js';
+    import type { PaymentMethod as StripePaymentMethod } from '@stripe/stripe-js';
+    import type { Models } from '@appwrite.io/console';
 
     let {
         show = $bindable(false),
@@ -21,15 +20,15 @@
     }: {
         show?: boolean;
         isBackup?: boolean;
-        methods: PaymentList;
-        organization: Organization;
+        methods: Models.PaymentMethodList;
+        organization: Models.Organization;
     } = $props();
 
     let name: string | null = $state(null);
     let error: string | null = $state(null);
     let showState: boolean = $state(false);
     let countryState: string | null = $state(null);
-    let paymentMethod: PaymentMethod | null = $state(null);
+    let paymentMethod: StripePaymentMethod | null = $state(null);
     let selectedPaymentMethodId: string | null = $state(null);
 
     const filteredMethods = $derived(methods?.paymentMethods.filter((method) => !!method?.last4));
@@ -60,19 +59,19 @@
                 if (showState && !countryState) {
                     throw Error('Please select a state');
                 }
-                let method: PaymentMethodData;
+                let method: Models.PaymentMethod;
                 if (showState) {
                     method = await setPaymentMethod(paymentMethod.id, name, countryState);
                 } else {
                     const card = await submitStripeCard(name, organization.$id);
                     if (card && Object.hasOwn(card, 'id')) {
-                        if ((card as PaymentMethod).card?.country === 'US') {
-                            paymentMethod = card as PaymentMethod;
+                        if ((card as StripePaymentMethod).card?.country === 'US') {
+                            paymentMethod = card as StripePaymentMethod;
                             showState = true;
                             return;
                         }
                     } else if (card && Object.hasOwn(card, '$id')) {
-                        method = card as PaymentMethodData;
+                        method = card as Models.PaymentMethod;
                     }
                 }
                 selectedPaymentMethodId = method.$id;
@@ -97,10 +96,10 @@
 
     async function addPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethod(
-                organization.$id,
+            await sdk.forConsole.organizations.setDefaultPaymentMethod({
+                organizationId: organization.$id,
                 paymentMethodId
-            );
+            });
         } catch (err) {
             error = err.message;
         }
@@ -108,10 +107,10 @@
 
     async function addBackupPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethodBackup(
-                organization.$id,
+            await sdk.forConsole.organizations.setBackupPaymentMethod({
+                organizationId: organization.$id,
                 paymentMethodId
-            );
+            });
         } catch (err) {
             error = err.message;
         }
diff --git a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
index 65e217d2c6..13cbf9fd0f 100644
--- a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
@@ -3,7 +3,6 @@
     import { FakeModal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { Dependencies } from '$lib/constants';
-    import type { Invoice, PaymentMethodData } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { page } from '$app/state';
@@ -21,18 +20,21 @@
     import { getApiEndpoint, sdk } from '$lib/stores/sdk';
     import { formatCurrency } from '$lib/helpers/numbers';
     import { base } from '$app/paths';
-    import type { PaymentMethod } from '@stripe/stripe-js';
+    import type { PaymentMethod as StripePaymentMethod } from '@stripe/stripe-js';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let invoice: Invoice;
+    export let invoice: Models.Invoice;
+
+    let name: string;
+    let state: string = '';
     let error: string = null;
+    let setAsDefault = false;
     let isButtonDisabled = false;
-    let name: string;
     let paymentMethodId: string;
-    let setAsDefault = false;
     let showState: boolean = false;
-    let state: string = '';
-    let paymentMethod: PaymentMethod | null = null;
+    let paymentMethod: StripePaymentMethod | null = null;
+
     const endpoint = getApiEndpoint();
 
     onMount(async () => {
@@ -60,15 +62,15 @@
                     if (showState && !state) {
                         throw Error('Please select a state');
                     }
-                    let method: PaymentMethodData;
+                    let method: Models.PaymentMethod;
                     if (showState) {
                         method = await setPaymentMethod(paymentMethod.id, name, state);
                     } else {
                         const card = await submitStripeCard(name, $organization.$id);
                         // When Stripe returns an expanded PaymentMethod for US cards, we need state.
-                        if (Object.hasOwn(card, 'id') && (card as PaymentMethod)?.card) {
-                            if ((card as PaymentMethod).card?.country === 'US') {
-                                paymentMethod = card as PaymentMethod;
+                        if (Object.hasOwn(card, 'id') && (card as StripePaymentMethod)?.card) {
+                            if ((card as StripePaymentMethod).card?.country === 'US') {
+                                paymentMethod = card as StripePaymentMethod;
                                 showState = true;
                                 return;
                             }
@@ -76,10 +78,14 @@
 
                         // Otherwise, we expect an Appwrite PaymentMethodData with `$id`.
                         if (Object.hasOwn(card, '$id')) {
-                            method = card as PaymentMethodData;
+                            method = card as Models.PaymentMethod;
                         }
                     }
-                    const card = await sdk.forConsole.billing.getPaymentMethod(method.$id);
+
+                    const card = await sdk.forConsole.account.getPaymentMethod({
+                        paymentMethodId: method.$id
+                    });
+
                     if (card?.last4) {
                         paymentMethodId = card.$id;
                     } else {
@@ -87,20 +93,27 @@
                             'The payment method you selected is not valid. Please select a different one.'
                         );
                     }
-                    invalidate(Dependencies.PAYMENT_METHODS);
+
+                    await invalidate(Dependencies.PAYMENT_METHODS);
                 } catch (e) {
                     paymentMethodId = $organization.paymentMethodId;
                     error = e.message;
                 }
             }
+
             if (setAsDefault) {
-                await sdk.forConsole.billing.setDefaultPaymentMethod(paymentMethodId);
+                await sdk.forConsole.organizations.setDefaultPaymentMethod({
+                    organizationId: $organization.$id,
+                    paymentMethodId
+                });
             }
-            const { clientSecret, status } = await sdk.forConsole.billing.retryPayment(
-                $organization.$id,
-                invoice.$id,
-                paymentMethodId
-            );
+
+            const { clientSecret, status } =
+                await sdk.forConsole.organizations.createInvoicePayment({
+                    organizationId: $organization.$id,
+                    invoiceId: invoice.$id,
+                    paymentMethodId
+                });
 
             if (status !== 'succeeded' && status !== 'cancelled') {
                 // probably still pending, confirm via stripe!
@@ -111,7 +124,10 @@
                     `${base}/organization-${$organization.$id}/billing?type=validate-invoice&invoice=${invoice.$id}`
                 );
 
-                await sdk.forConsole.billing.updateInvoiceStatus($organization.$id, invoice.$id);
+                await sdk.forConsole.organizations.validateInvoice({
+                    organizationId: $organization.$id,
+                    invoiceId: invoice.$id
+                });
             }
 
             invalidate(Dependencies.ORGANIZATION);
diff --git a/src/routes/(console)/organization-[organization]/billing/store.ts b/src/routes/(console)/organization-[organization]/billing/store.ts
index a8f05930a9..e11b695153 100644
--- a/src/routes/(console)/organization-[organization]/billing/store.ts
+++ b/src/routes/(console)/organization-[organization]/billing/store.ts
@@ -1,11 +1,11 @@
 import { page } from '$app/stores';
 import { derived, writable } from 'svelte/store';
+import type { Models } from '@appwrite.io/console';
 import type { WizardStepsType } from '$lib/layout/wizardWithSteps.svelte';
-import type { AggregationList, Invoice, InvoiceUsage } from '$lib/sdk/billing';
 
 export const aggregationList = derived(
     page,
-    ($page) => $page.data.aggregationList as AggregationList
+    ($page) => $page.data.aggregationList as Models.AggregationTeamList
 );
 
 export const addCreditWizardSteps = writable<WizardStepsType>(new Map());
@@ -14,33 +14,33 @@ export const addCreditWizardStore = writable<{ coupon: string; paymentMethodId:
     paymentMethodId: null
 });
 
-export const selectedInvoice = writable<Invoice>(null);
+export const selectedInvoice = writable<Models.Invoice>(null);
 export const showRetryModal = writable(false);
 
 export type RowFactoryOptions = {
     id: string;
     label: string;
-    resource?: InvoiceUsage;
+    resource?: Models.UsageResources;
     planLimit?: number | null;
     includeProgress?: boolean;
     formatValue?: (value: number | null | undefined) => string;
     usageFormatter?: (options: {
         value: number;
         planLimit?: number | null;
-        resource?: InvoiceUsage;
+        resource?: Models.UsageResources;
         formatValue: (value: number | null | undefined) => string;
         hasLimit: boolean;
     }) => string;
-    priceFormatter?: (options: { amount: number; resource?: InvoiceUsage }) => string;
+    priceFormatter?: (options: { amount: number; resource?: Models.UsageResources }) => string;
     progressFactory?: (options: {
         value: number;
         planLimit?: number | null;
-        resource?: InvoiceUsage;
+        resource?: Models.UsageResources;
         hasLimit: boolean;
     }) => Array<{ size: number; color: string; tooltip?: { title: string; label: string } }>;
     maxFactory?: (options: {
         planLimit?: number | null;
         hasLimit: boolean;
-        resource?: InvoiceUsage;
+        resource?: Models.UsageResources;
     }) => number | null;
 };
diff --git a/src/routes/(console)/organization-[organization]/billing/taxId.svelte b/src/routes/(console)/organization-[organization]/billing/taxId.svelte
index bbdb664796..bef6cc8444 100644
--- a/src/routes/(console)/organization-[organization]/billing/taxId.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/taxId.svelte
@@ -17,7 +17,10 @@
 
     async function updateTaxId() {
         try {
-            await sdk.forConsole.billing.updateTaxId($organization.$id, taxId);
+            await sdk.forConsole.organizations.setBillingTaxId({
+                organizationId: $organization.$id,
+                taxId
+            });
             await invalidate(Dependencies.ORGANIZATION);
             addNotification({
                 type: 'success',
diff --git a/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte b/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
index d8933fa6b4..99ece582a8 100644
--- a/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
@@ -1,24 +1,26 @@
 <script lang="ts">
     import { CouponInput } from '$lib/components/billing';
     import { WizardStep } from '$lib/layout';
-    import type { Coupon } from '$lib/sdk/billing';
     import { sdk } from '$lib/stores/sdk';
     import { wizard } from '$lib/stores/wizard';
     import { onMount } from 'svelte';
     import { addCreditWizardStore } from '../store';
+    import type { Models } from '@appwrite.io/console';
 
-    let coupon: string;
-    export let couponData: Partial<Coupon> = {
+    export let couponData: Partial<Models.Coupon> = {
         code: null,
         status: null,
         credits: null
     };
 
+    let coupon: string;
+
     async function validateCoupon() {
         if (couponData?.status === 'active') return;
         try {
-            const response = await sdk.forConsole.billing.getCouponAccount(coupon);
-            couponData = response;
+            couponData = await sdk.forConsole.account.getCoupon({
+                couponId: coupon
+            });
             $addCreditWizardStore.coupon = coupon;
             coupon = null;
         } catch (error) {
diff --git a/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte b/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
index fd27def7e0..b81384e00a 100644
--- a/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { WizardStep } from '$lib/layout';
     import { onMount } from 'svelte';
-    import type { PaymentList, PaymentMethodData } from '$lib/sdk/billing';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { isStripeInitialized, setPaymentMethod, submitStripeCard } from '$lib/stores/stripe';
@@ -9,16 +8,17 @@
     import { PaymentBoxes } from '$lib/components/billing';
     import { addCreditWizardStore } from '../store';
     import { organization } from '$lib/stores/organization';
-    import type { PaymentMethod } from '@stripe/stripe-js';
+    import type { Models } from '@appwrite.io/console';
+    import type { PaymentMethod as StripePaymentMethod } from '@stripe/stripe-js';
 
-    let methods: PaymentList;
     let name: string;
-    let showState: boolean = false;
     let state: string = '';
-    let paymentMethod: PaymentMethod | null = null;
+    let showState: boolean = false;
+    let methods: Models.PaymentMethodList;
+    let paymentMethod: StripePaymentMethod | null = null;
 
     onMount(async () => {
-        methods = await sdk.forConsole.billing.listPaymentMethods();
+        methods = await sdk.forConsole.account.listPaymentMethods();
         $addCreditWizardStore.paymentMethodId =
             methods.paymentMethods.find((method) => !!method?.last4)?.$id ?? null;
     });
@@ -28,19 +28,19 @@
             if (showState && !state) {
                 throw Error('Please select a state');
             }
-            let method: PaymentMethodData;
+            let method: Models.PaymentMethod;
             if (showState) {
                 method = await setPaymentMethod(paymentMethod.id, name, state);
             } else {
                 const card = await submitStripeCard(name, $organization.$id);
                 if (card && Object.hasOwn(card, 'id')) {
-                    if ((card as PaymentMethod).card?.country === 'US') {
-                        paymentMethod = card as PaymentMethod;
+                    if ((card as StripePaymentMethod).card?.country === 'US') {
+                        paymentMethod = card as StripePaymentMethod;
                         showState = true;
                         return;
                     }
                 } else if (card && Object.hasOwn(card, '$id')) {
-                    method = card as PaymentMethodData;
+                    method = card as Models.PaymentMethod;
                 }
             }
             $addCreditWizardStore.paymentMethodId = method.$id;
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index d0228e2cc8..bf61a0b414 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { afterNavigate, goto, invalidate } from '$app/navigation';
-    import { base } from '$app/paths';
+    import { base, resolve } from '$app/paths';
     import { page } from '$app/state';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { PlanComparisonBox, PlanSelection, SelectPaymentMethod } from '$lib/components/billing';
@@ -9,8 +9,11 @@
     import { Button, Form, InputSelect, InputTags, InputTextarea } from '$lib/elements/forms';
     import { formatCurrency } from '$lib/helpers/numbers.js';
     import { Wizard } from '$lib/layout';
-    import { type Coupon, type PaymentMethodData } from '$lib/sdk/billing';
-    import { isOrganization, plansInfo, tierToPlan } from '$lib/stores/billing';
+    import {
+        plansInfo,
+        billingIdToPlan,
+        isPaymentAuthenticationRequired
+    } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { currentPlan, organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
@@ -33,16 +36,15 @@
     import EstimatedTotalBox from '$lib/components/billing/estimatedTotalBox.svelte';
     import OrganizationUsageLimits from '$lib/components/organizationUsageLimits.svelte';
     import { Query } from '@appwrite.io/console';
-    import type { OrganizationUsage } from '$lib/sdk/billing';
     import type { Models } from '@appwrite.io/console';
     import { toLocaleDate } from '$lib/helpers/date';
 
     export let data;
 
-    let selectedCoupon: Partial<Coupon> = null;
+    let selectedCoupon: Partial<Models.Coupon> = null;
 
-    let selectedPlan: BillingPlan = data.plan as BillingPlan;
-    let previousPage: string = base;
+    let selectedPlan = data.plan;
+    let previousPage: string = resolve('/');
     let showExitModal = false;
     let formComponent: Form;
     let usageLimitsComponent:
@@ -60,14 +62,15 @@
     let showCreditModal = false;
     let feedbackDowngradeReason: string;
     let feedbackMessage: string;
-    let orgUsage: OrganizationUsage;
+    let orgUsage: Models.UsageOrganization;
     let allProjects: { projects: Models.Project[] } | undefined;
 
     $: paymentMethods = null;
 
     $: paymentMethodId =
         data.organization.paymentMethodId ??
-        paymentMethods?.paymentMethods?.find((method: PaymentMethodData) => !!method?.last4)?.$id;
+        paymentMethods?.paymentMethods?.find((method: Models.PaymentMethod) => !!method?.last4)
+            ?.$id;
 
     afterNavigate(({ from }) => {
         previousPage = from?.url?.pathname || previousPage;
@@ -79,15 +82,17 @@
         const couponCode = params.get('code');
         if (couponCode) {
             try {
-                selectedCoupon = await sdk.forConsole.billing.getCouponAccount(couponCode);
+                selectedCoupon = await sdk.forConsole.account.getCoupon({
+                    couponId: couponCode
+                });
             } catch {
                 selectedCoupon = { code: null, status: null, credits: null };
             }
         }
 
         const plan = params.get('plan');
-        if (plan && plan in BillingPlan) {
-            selectedPlan = plan as BillingPlan;
+        if (plan) {
+            selectedPlan = plan;
         }
 
         if (params.get('type') === 'payment_confirmed') {
@@ -100,7 +105,9 @@
             $currentPlan?.$id === BillingPlan.SCALE ? BillingPlan.SCALE : BillingPlan.PRO;
 
         try {
-            orgUsage = await sdk.forConsole.billing.listUsage(data.organization.$id);
+            orgUsage = await sdk.forConsole.organizations.getUsage({
+                organizationId: data.organization.$id
+            });
         } catch {
             orgUsage = undefined;
         }
@@ -119,7 +126,7 @@
     });
 
     async function loadPaymentMethods() {
-        paymentMethods = await sdk.forConsole.billing.listPaymentMethods();
+        paymentMethods = await sdk.forConsole.account.listPaymentMethods();
         return paymentMethods;
     }
 
@@ -156,11 +163,11 @@
     async function downgrade() {
         try {
             // 1) update the plan first
-            await sdk.forConsole.billing.updatePlan(
-                data.organization.$id,
-                selectedPlan,
+            await sdk.forConsole.organizations.updatePlan({
+                organizationId: data.organization.$id,
+                billingPlan: selectedPlan,
                 paymentMethodId
-            );
+            });
 
             // 2) If the target plan has a project limit, apply selected projects now
             const targetProjectsLimit = $plansInfo?.get(selectedPlan)?.projects ?? 0;
@@ -168,10 +175,10 @@
                 const selected = usageLimitsComponent.getSelectedProjects();
                 if (selected?.length) {
                     try {
-                        await sdk.forConsole.billing.updateSelectedProjects(
-                            data.organization.$id,
-                            selected
-                        );
+                        await sdk.forConsole.organizations.updateProjects({
+                            organizationId: data.organization.$id,
+                            projects: selected
+                        });
                     } catch (projectError) {
                         console.warn('Project selection failed after plan update:', projectError);
                     }
@@ -188,7 +195,7 @@
             });
 
             trackEvent(Submit.OrganizationDowngrade, {
-                plan: tierToPlan(selectedPlan)?.name
+                plan: billingIdToPlan(selectedPlan)?.name
             });
         } catch (e) {
             addNotification({
@@ -201,8 +208,12 @@
 
     async function validate(organizationId: string, invites: string[]) {
         try {
-            let org = await sdk.forConsole.billing.validateOrganization(organizationId, invites);
-            if (isOrganization(org)) {
+            let org = await sdk.forConsole.organizations.validatePayment({
+                organizationId,
+                invites
+            });
+
+            if (!isPaymentAuthenticationRequired(org)) {
                 await invalidate(Dependencies.ACCOUNT);
                 await invalidate(Dependencies.ORGANIZATION);
 
@@ -213,7 +224,7 @@
                 });
 
                 trackEvent(Submit.OrganizationUpgrade, {
-                    plan: tierToPlan(selectedPlan)?.name
+                    plan: billingIdToPlan(selectedPlan)?.name
                 });
             }
         } catch (e) {
@@ -235,18 +246,17 @@
                         !data?.members?.memberships?.find((m) => m.userEmail === collaborator)
                 );
             }
-            const org = await sdk.forConsole.billing.updatePlan(
-                data.organization.$id,
-                selectedPlan,
+            const org = await sdk.forConsole.organizations.updatePlan({
+                organizationId: data.organization.$id,
+                billingPlan: selectedPlan,
                 paymentMethodId,
-                undefined,
-                selectedCoupon?.code,
-                newCollaborators,
-                billingBudget,
-                taxId ? taxId : null
-            );
-
-            if (!isOrganization(org) && org.status == 402) {
+                couponId: selectedCoupon?.code,
+                invites: newCollaborators,
+                budget: billingBudget,
+                taxId: taxId ? taxId : null
+            });
+
+            if (isPaymentAuthenticationRequired(org)) {
                 let clientSecret = org.clientSecret;
                 let params = new URLSearchParams();
                 for (const [key, value] of page.url.searchParams.entries()) {
@@ -255,7 +265,7 @@
                     }
                 }
                 params.append('type', 'payment_confirmed');
-                params.append('id', org.teamId);
+                params.append('id', org.organizationId);
                 params.append('invites', collaborators.join(','));
                 params.append('plan', selectedPlan);
                 await confirmPayment(
@@ -264,10 +274,10 @@
                     paymentMethodId,
                     base + '/change-plan?' + params.toString()
                 );
-                await validate(org.teamId, collaborators);
+                await validate(org.organizationId, collaborators);
             }
 
-            if (isOrganization(org)) {
+            if (!isPaymentAuthenticationRequired(org)) {
                 /**
                  * Reload on upgrade (e.g. Free → Paid)
                  */
@@ -283,7 +293,7 @@
                 });
 
                 trackEvent(Submit.OrganizationUpgrade, {
-                    plan: tierToPlan(selectedPlan)?.name
+                    plan: billingIdToPlan(selectedPlan)?.name
                 });
             }
         } catch (e) {
@@ -367,11 +377,12 @@
                         {:else if selectedPlan === BillingPlan.FREE}
                             <Alert.Inline
                                 status="error"
-                                title={`Your organization will switch to ${tierToPlan(selectedPlan).name} plan on ${toLocaleDate(
+                                title={`Your organization will switch to ${billingIdToPlan(selectedPlan).name} plan on ${toLocaleDate(
                                     $organization.billingNextInvoiceDate
                                 )}`}>
-                                You will retain access to {tierToPlan($organization.billingPlan)
-                                    .name} plan features until your billing period ends. After that,
+                                You will retain access to {billingIdToPlan(
+                                    $organization.billingPlan
+                                ).name} plan features until your billing period ends. After that,
                                 <span class="u-bold"
                                     >all team members except the owner will be removed,</span>
                                 and service disruptions may occur if usage exceeds Free plan limits.
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.ts b/src/routes/(console)/organization-[organization]/change-plan/+page.ts
index c6a137f96a..ea4f1b5a37 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.ts
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.ts
@@ -1,31 +1,45 @@
 import type { PageLoad } from './$types';
-import type { Organization } from '$lib/stores/organization';
-import { BillingPlan, Dependencies } from '$lib/constants';
+import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
+import { BillingPlanGroup, type Models, Platform } from '@appwrite.io/console';
+import { getBasePlanFromGroup } from '$lib/stores/billing';
 
 export const load: PageLoad = async ({ depends, parent }) => {
     const { members, currentPlan, organizations } = await parent();
+
     depends(Dependencies.UPGRADE_PLAN);
 
-    let plans;
+    let plans: Models.BillingPlanList;
+
     try {
-        plans = await sdk.forConsole.billing.listPlans();
+        plans = await sdk.forConsole.console.getPlans({
+            platform: Platform.Appwrite
+        });
     } catch (error) {
         console.error('Failed to load billing plans:', error);
-        plans = { plans: {} };
+        plans = {
+            total: 0,
+            plans: []
+        };
     }
 
-    let plan: BillingPlan;
+    let plan: string;
+
+    const pro = getBasePlanFromGroup(BillingPlanGroup.Pro);
+    const scale = getBasePlanFromGroup(BillingPlanGroup.Scale);
 
-    if (currentPlan?.$id === BillingPlan.SCALE) {
-        plan = BillingPlan.SCALE;
+    // TODO: why not just use the current id as is?
+    if (currentPlan?.$id === scale.$id) {
+        plan = scale.$id /* temp */;
     } else {
-        plan = BillingPlan.PRO;
+        plan = pro.$id /* temp */;
     }
 
     const selfService = currentPlan?.selfService ?? true;
     const hasFreeOrgs = organizations.teams?.some(
-        (org) => (org as Organization)?.billingPlan === BillingPlan.FREE
+        (org) =>
+            (org as Models.Organization)?.billingPlan ===
+            getBasePlanFromGroup(BillingPlanGroup.Starter).$id
     );
 
     return {
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.svelte
index fc70514a72..fb630bac94 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
     import { Container } from '$lib/layout';
-    import ChangeOrganization from './changeOrganization.svelte';
     import DeleteDomain from './deleteDomain.svelte';
-    import type { OrganizationList } from '$lib/stores/organization';
+    import ChangeOrganization from './changeOrganization.svelte';
 
-    export let data;
-    // cloud only, so OrganizationList is returned!
-    let organizations: OrganizationList = data.organizations as OrganizationList;
+    import type { PageProps } from './$types';
+
+    let { data }: PageProps = $props();
 </script>
 
 <Container>
-    <ChangeOrganization domain={data.domain} {organizations} />
+    <ChangeOrganization domain={data.domain} organizations={data.organizations} />
+
     <DeleteDomain domain={data.domain} />
 </Container>
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts
index fda7fb6a2a..2ed1fc7d71 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts
@@ -1,18 +1,26 @@
-import { Dependencies } from '$lib/constants';
-import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
-import { Query, Platform } from '@appwrite.io/console';
+import { redirect } from '@sveltejs/kit';
+import { resolve } from '$app/paths';
+import { Dependencies } from '$lib/constants';
+import type { Models } from '@appwrite.io/console';
+import { getTeamOrOrganizationList } from '$lib/stores/organization';
 
-export const load = async ({ parent, depends }) => {
-    depends(Dependencies.DOMAINS);
+export const load = async ({ params, parent, depends }) => {
+    if (!isCloud) {
+        redirect(
+            303,
+            resolve('/(console)/organization-[organization]', {
+                organization: params.organization
+            })
+        );
+    }
 
-    const organizations = !isCloud
-        ? await sdk.forConsole.teams.list()
-        : await sdk.forConsole.billing.listOrganization([
-              Query.equal('platform', Platform.Appwrite)
-          ]);
+    depends(Dependencies.DOMAINS);
 
     const { domain } = await parent();
+
+    const organizations = (await getTeamOrOrganizationList()) as Models.OrganizationList;
+
     return {
         domain,
         organizations
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte
index 542ea62ad1..0ecaa38cb8 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/changeOrganization.svelte
@@ -6,12 +6,12 @@
     import { Dependencies } from '$lib/constants';
     import { Button, InputSelect } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import type { OrganizationList } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@appwrite.io/console';
 
     export let domain: Models.Domain;
-    export let organizations: OrganizationList;
+    export let organizations: Models.OrganizationList;
+
     let selectedOrg: string = null;
 
     async function moveDomain() {
diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
index 191131ae49..ba61eccca1 100644
--- a/src/routes/(console)/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -11,16 +11,10 @@
     import {
         daysLeftInTrial,
         getServiceLimit,
-        plansInfo,
         readOnly,
-        tierToPlan
+        billingIdToPlan
     } from '$lib/stores/billing';
-    import {
-        members,
-        newMemberModal,
-        newOrgModal,
-        type Organization
-    } from '$lib/stores/organization';
+    import { members, newMemberModal, newOrgModal } from '$lib/stores/organization';
     import {
         canSeeBilling,
         canSeeProjects,
@@ -31,6 +25,7 @@
     import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
     import { IconGithub, IconPlus, IconPlusSm } from '@appwrite.io/pink-icons-svelte';
     import { Badge, Icon, Layout, Tooltip, Typography } from '@appwrite.io/pink-svelte';
+    import type { Models } from '@appwrite.io/console';
 
     let areMembersLimited: boolean = $state(false);
 
@@ -42,7 +37,7 @@
             (($readOnly && !GRACE_PERIOD_OVERRIDE) || (isLimited && $members?.total >= limit));
     });
 
-    const organization = $derived(page.data.organization as Organization);
+    const organization = $derived(page.data.organization as Models.Organization);
     const path = $derived(`${base}/organization-${organization.$id}`);
 
     const tabs = $derived(
@@ -110,7 +105,7 @@
                 {:else if isCloud && organization?.billingPlan === BillingPlan.FREE}
                     <Badge variant="secondary" content="Free"></Badge>
                 {/if}
-                {#if isCloud && organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.FREE && $plansInfo.get(organization.billingPlan)?.trialDays}
+                {#if isCloud && organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.FREE && organization?.billingTrialDays}
                     <Tooltip>
                         <Badge variant="secondary" content="Trial" />
                         <svelte:fragment slot="tooltip">
@@ -153,7 +148,7 @@
                                 {organization?.billingPlan === BillingPlan.FREE
                                     ? 'Upgrade to add more members'
                                     : `You've reached the members limit for the ${
-                                          tierToPlan(organization?.billingPlan)?.name
+                                          billingIdToPlan(organization?.billingPlan)?.name
                                       } plan`}
                             </div>
                         </Tooltip>
diff --git a/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/download/+page.ts b/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/download/+page.ts
index de6e172699..3a0e31cbd3 100644
--- a/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/download/+page.ts
+++ b/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/download/+page.ts
@@ -4,7 +4,10 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
     // verify invoice exists
-    const invoice = await sdk.forConsole.billing.getInvoice(params.organization, params.invoiceId);
+    const invoice = await sdk.forConsole.organizations.getInvoice({
+        organizationId: params.organization,
+        invoiceId: params.invoiceId
+    });
     const endpoint = getApiEndpoint();
 
     return redirect(
diff --git a/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/view/+page.ts b/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/view/+page.ts
index bfd0e5b082..3a4576785e 100644
--- a/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/view/+page.ts
+++ b/src/routes/(console)/organization-[organization]/invoices/[invoiceId]/view/+page.ts
@@ -4,7 +4,11 @@ import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params }) => {
     // verify invoice exists
-    const invoice = await sdk.forConsole.billing.getInvoice(params.organization, params.invoiceId);
+    const invoice = await sdk.forConsole.organizations.getInvoice({
+        organizationId: params.organization,
+        invoiceId: params.invoiceId
+    });
+
     const endpoint = getApiEndpoint();
 
     return redirect(
diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte
index 05c3500802..c9ad661504 100644
--- a/src/routes/(console)/organization-[organization]/members/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/members/+page.svelte
@@ -35,7 +35,7 @@
         Tooltip
     } from '@appwrite.io/pink-svelte';
     import { BillingPlan } from '$lib/constants';
-    import { tierToPlan } from '$lib/stores/billing';
+    import { billingIdToPlan } from '$lib/stores/billing';
 
     export let data;
 
@@ -92,7 +92,7 @@
                 {$organization?.billingPlan === BillingPlan.FREE
                     ? 'Upgrade to add more members'
                     : `You've reached the members limit for the ${
-                          tierToPlan($organization?.billingPlan)?.name
+                          billingIdToPlan($organization?.billingPlan)?.name
                       } plan`}
             </div>
         </Tooltip>
diff --git a/src/routes/(console)/organization-[organization]/settings/+page.ts b/src/routes/(console)/organization-[organization]/settings/+page.ts
index 42c229dd9d..1f377bfe33 100644
--- a/src/routes/(console)/organization-[organization]/settings/+page.ts
+++ b/src/routes/(console)/organization-[organization]/settings/+page.ts
@@ -12,7 +12,11 @@ export const load: PageLoad = async ({ depends, params, parent }) => {
         sdk.forConsole.projects.list({
             queries: [Query.equal('teamId', params.organization), Query.select(['$id', 'name'])]
         }),
-        isCloud ? sdk.forConsole.billing.listInvoices(params.organization) : undefined
+        isCloud
+            ? sdk.forConsole.organizations.listInvoices({
+                  organizationId: params.organization
+              })
+            : undefined
     ]);
 
     return {
diff --git a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationEstimation.svelte b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationEstimation.svelte
index e521985a52..14ae7d8bcb 100644
--- a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationEstimation.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationEstimation.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
     import { Alert } from '@appwrite.io/pink-svelte';
-    import type { EstimationDeleteOrganization } from '$lib/sdk/billing';
     import InvoicesTable from './invoicesTable.svelte';
-    export let estimation: EstimationDeleteOrganization;
+    import type { Models } from '@appwrite.io/console';
+
+    export let estimation: Models.EstimationDeleteOrganization;
 </script>
 
 {#if estimation}
diff --git a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
index 135d9b68c4..51a1d483aa 100644
--- a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
@@ -12,23 +12,25 @@
     import { toLocaleDate } from '$lib/helpers/date';
     import { isCloud } from '$lib/system';
     import { formatCurrency } from '$lib/helpers/numbers';
-    import { tierToPlan } from '$lib/stores/billing';
+    import { billingIdToPlan } from '$lib/stores/billing';
     import { Table, Tabs, Alert } from '@appwrite.io/pink-svelte';
     import DeleteOrganizationEstimation from './deleteOrganizationEstimation.svelte';
-    import type { EstimationDeleteOrganization, InvoiceList } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
 
     export let showDelete = false;
-    export let invoices: InvoiceList;
+    export let invoices: Models.InvoiceList;
 
     let error: string = null;
     let selectedTab = 'projects';
     let organizationName: string = null;
-    let estimation: EstimationDeleteOrganization;
+    let estimation: Models.EstimationDeleteOrganization;
 
     async function deleteOrg() {
         try {
             if (isCloud) {
-                await sdk.forConsole.billing.deleteOrganization($organization.$id);
+                await sdk.forConsole.organizations.delete({
+                    organizationId: $organization.$id
+                });
             } else {
                 await sdk.forConsole.teams.delete({
                     teamId: $organization.$id
@@ -82,9 +84,9 @@
         if (isCloud) {
             try {
                 error = '';
-                estimation = await sdk.forConsole.billing.estimationDeleteOrganization(
-                    $organization.$id
-                );
+                estimation = await sdk.forConsole.organizations.estimationDeleteOrganization({
+                    organizationId: $organization.$id
+                });
             } catch (e) {
                 error = e.message;
             }
@@ -97,7 +99,7 @@
         <Alert.Inline
             status="warning"
             title={`You have a pending ${formatCurrency(upcomingInvoice.grossAmount)} invoice for your
-        ${tierToPlan(upcomingInvoice.plan).name} plan`}>
+        ${billingIdToPlan(upcomingInvoice.plan).name} plan`}>
             By proceeding, your invoice will be processed within the hour. Upon successful payment,
             your organization will be deleted.
         </Alert.Inline>
@@ -112,7 +114,8 @@
             <b>This action is irreversible</b>.
         {/if}
     </p>
-    {#if estimation && (estimation.unpaidInvoices.length > 0 || estimation.grossAmount > 0)}
+    <!-- has estimation, has unpaid invoices, any of the invoices' gross amount is > 0   -->
+    {#if estimation && (estimation.unpaidInvoices.length > 0 || estimation.unpaidInvoices.some((invoice) => invoice.grossAmount > 0))}
         <DeleteOrganizationEstimation {estimation} />
     {:else}
         {#if $projects.total > 0}
diff --git a/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte b/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte
index 84b7ca6093..514e8a575a 100644
--- a/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/invoicesTable.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import type { Invoice } from '$lib/sdk/billing';
     import { getApiEndpoint } from '$lib/stores/sdk';
     import { selectedInvoice, showRetryModal } from '../billing/store';
     import { toLocaleDate } from '$lib/helpers/date';
@@ -14,13 +13,14 @@
         IconRefresh
     } from '@appwrite.io/pink-icons-svelte';
     import { page } from '$app/state';
+    import type { Models } from '@appwrite.io/console';
 
-    const endpoint = getApiEndpoint();
-
-    export let invoices: Invoice[];
     export let showActions = true;
+    export let invoices: Array<Models.Invoice>;
+
+    const endpoint = getApiEndpoint();
 
-    function retryPayment(invoice: Invoice) {
+    function retryPayment(invoice: Models.Invoice) {
         $selectedInvoice = invoice;
         $showRetryModal = true;
     }
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index a9422df60b..64e4a342a5 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -7,7 +7,6 @@
     import {
         getServiceLimit,
         showUsageRatesModal,
-        type Tier,
         upgradeURL,
         useNewPricingModal
     } from '$lib/stores/billing';
@@ -15,7 +14,6 @@
     import ProjectBreakdown from './ProjectBreakdown.svelte';
     import { formatNum } from '$lib/helpers/string';
     import { accumulateFromEndingTotal, total } from '$lib/layout/usage.svelte';
-    import type { OrganizationUsage } from '$lib/sdk/billing';
     import { BillingPlan } from '$lib/constants';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import TotalMembers from './totalMembers.svelte';
@@ -28,12 +26,12 @@
     export let data;
 
     const tier = data?.plan
-        ? (data.plan.$id as Tier)
+        ? data.plan.$id
         : (data?.currentInvoice?.plan ?? $organization?.billingPlan);
 
     const plan = data?.plan ?? undefined;
 
-    $: projects = (data.organizationUsage as OrganizationUsage).projects;
+    $: projects = data.organizationUsage.projects;
 
     let usageProjects: Record<string, UsageProjectInfo> = {};
 
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
index 05fd3ff846..769b3c52ee 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -1,11 +1,10 @@
 import { sdk } from '$lib/stores/sdk';
 import type { PageLoad } from './$types';
-import type { UsageProjectInfo } from '../../store';
 import { type Models, Query } from '@appwrite.io/console';
-import type { Invoice, OrganizationUsage } from '$lib/sdk/billing';
+import type { UsageProjectInfo } from '../../store';
 
 export const load: PageLoad = async ({ params, parent }) => {
-    const { invoice } = params;
+    const { invoice: invoiceId } = params;
     const { organization: org, currentPlan: plan } = await parent();
 
     /**
@@ -41,16 +40,24 @@ export const load: PageLoad = async ({ params, parent }) => {
 
     let startDate: string = org.billingCurrentInvoiceDate;
     let endDate: string = org.billingNextInvoiceDate;
-    let currentInvoice: Invoice = undefined;
+    let currentInvoice: Models.Invoice = undefined;
 
-    if (invoice) {
-        currentInvoice = await sdk.forConsole.billing.getInvoice(org.$id, invoice);
+    if (invoiceId) {
+        currentInvoice = await sdk.forConsole.organizations.getInvoice({
+            organizationId: org.$id,
+            invoiceId
+        });
         startDate = currentInvoice.from;
         endDate = currentInvoice.to;
     }
 
     const [usage, organizationMembers] = await Promise.all([
-        sdk.forConsole.billing.listUsage(org.$id, startDate, endDate),
+        sdk.forConsole.organizations.getUsage({
+            organizationId: org.$id,
+            startDate,
+            endDate
+        }),
+
         // this section is cloud only,
         // so it is fine to use this check and fetch memberships conditionally!
         !plan?.addons?.seats?.supported
@@ -68,7 +75,7 @@ export const load: PageLoad = async ({ params, parent }) => {
 };
 
 // all this to get the project's name and region!
-function getUsageProjects(usage: OrganizationUsage) {
+function getUsageProjects(usage: Models.UsageOrganization) {
     return (async () => {
         const limit = 100;
         const requests: Array<Promise<Models.ProjectList>> = [];
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index 98a0282821..8044227685 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
     import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
-    import type { OrganizationUsage } from '$lib/sdk/billing';
     import { canSeeProjects } from '$lib/stores/roles';
     import { onMount } from 'svelte';
     import { Accordion, Table } from '@appwrite.io/pink-svelte';
-    import { base } from '$app/paths';
     import type { UsageProjectInfo } from '../../store';
+    import type { Models } from '@appwrite.io/console';
+    import { resolve } from '$app/paths';
 
     type Metric =
         | 'users'
@@ -22,9 +22,9 @@
 
     type DatabaseOperationMetric = Extract<Metric, 'databasesReads' | 'databasesWrites'>;
 
-    export let projects: OrganizationUsage['projects'];
     export let metric: Metric | undefined = undefined;
     export let estimate: Estimate | undefined = undefined;
+    export let projects: Models.UsageOrganization['projects'];
     export let usageProjects: Record<string, UsageProjectInfo> = {};
     export let databaseOperationMetric: DatabaseOperationMetric[] | undefined = undefined;
 
@@ -39,7 +39,10 @@
 
     function getProjectUsageLink(projectId: string): string {
         const region = usageProjects[projectId]?.region ?? 'default';
-        return `${base}/project-${region}-${projectId}/settings/usage`;
+        return resolve('/(console)/project-[region]-[project]/settings/usage', {
+            region,
+            project: projectId
+        });
     }
 
     function groupByProject(
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
index 15176735fd..90219042af 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
@@ -4,7 +4,7 @@
     import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { formatCurrency } from '$lib/helpers/numbers';
-    import { plansInfo, tierToPlan } from '$lib/stores/billing';
+    import { plansInfo, billingIdToPlan } from '$lib/stores/billing';
     import { newMemberModal, organization } from '$lib/stores/organization';
     import type { Models } from '@appwrite.io/console';
     import { IconInfo, IconPlus } from '@appwrite.io/pink-icons-svelte';
@@ -37,7 +37,7 @@
                             <Tooltip maxWidth="200px">
                                 <Icon icon={IconInfo} size="s" />
                                 <svelte:fragment slot="tooltip">
-                                    You can add unlimited organization members on the {tierToPlan(
+                                    You can add unlimited organization members on the {billingIdToPlan(
                                         $organization.billingPlan
                                     ).name} plan {$organization.billingPlan === BillingPlan.PRO
                                         ? `for ${formatCurrency(plan.addons.seats.price)} each per billing period.`
@@ -53,6 +53,7 @@
                 </Layout.Stack>
             </div>
             <Paginator items={members?.memberships} hideFooter={members?.total <= 5}>
+                <!-- TODO: @itznotabug, some odd type issue here -->
                 {#snippet children(paginatedItems: typeof members.memberships)}
                     <Table.Root columns={2} let:root>
                         <svelte:fragment slot="header" let:root>
diff --git a/src/routes/(console)/project-[region]-[project]/+layout.ts b/src/routes/(console)/project-[region]-[project]/+layout.ts
index e45017ad88..4db871851f 100644
--- a/src/routes/(console)/project-[region]-[project]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/+layout.ts
@@ -8,8 +8,7 @@ import { get } from 'svelte/store';
 import { headerAlert } from '$lib/stores/headerAlert';
 import PaymentFailed from '$lib/components/billing/alerts/paymentFailed.svelte';
 import { loadAvailableRegions } from '$routes/(console)/regions';
-import type { Organization, OrganizationList } from '$lib/stores/organization';
-import { Platform } from '@appwrite.io/console';
+import { type Models, Platform } from '@appwrite.io/console';
 import { redirect } from '@sveltejs/kit';
 import { resolve } from '$app/paths';
 
@@ -21,7 +20,7 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
     project.region ??= 'default';
 
     // fast path without a network call!
-    let organization = (organizations as OrganizationList)?.teams?.find(
+    let organization = (organizations as Models.OrganizationList)?.teams?.find(
         (org) => org.$id === project.teamId
     );
 
@@ -30,10 +29,15 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
 
     const [org, regionalConsoleVariables, rolesResult] = await Promise.all([
         !organization
-            ? (sdk.forConsole.teams.get({ teamId: project.teamId }) as Promise<Organization>)
+            ? // TODO: @itznotabug - teams.get with Models.Organization?
+              (sdk.forConsole.teams.get({ teamId: project.teamId }) as Promise<Models.Organization>)
             : organization,
         sdk.forConsoleIn(project.region).console.variables(),
-        isCloud ? sdk.forConsole.billing.getRoles(project.teamId) : null,
+        isCloud
+            ? sdk.forConsole.organizations.getScopes({
+                  organizationId: project.teamId
+              })
+            : null,
 
         loadAvailableRegions(project.teamId)
     ]);
@@ -56,7 +60,9 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
     const organizationPlan = includedInBasePlans
         ? plansInfo.get(organization?.billingPlan)
         : isCloud
-          ? await sdk.forConsole.billing.getOrganizationPlan(organization?.$id)
+          ? await sdk.forConsole.organizations.getPlan({
+                organizationId: organization?.$id
+            })
           : null;
 
     const roles = rolesResult?.roles ?? defaultRoles;
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
index cec0eda648..d540b921aa 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts
@@ -6,7 +6,6 @@ import { timeFromNow } from '$lib/helpers/date';
 import type { PageLoad, RouteParams } from './$types';
 import { isSelfHosted } from '$lib/system';
 import { isCloud } from '$lib/system';
-import type { Plan } from '$lib/sdk/billing';
 
 export const load: PageLoad = async ({ url, route, depends, params, parent }) => {
     depends(Dependencies.DATABASES);
@@ -45,7 +44,7 @@ async function fetchDatabasesAndBackups(
     offset: number,
     params: RouteParams,
     search?: string | undefined,
-    currentPlan?: Plan
+    currentPlan?: Models.BillingPlan
 ) {
     const backupsEnabled = currentPlan?.backupsEnabled ?? true;
 
diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
index 76d4d5e1e2..ef04a0dc32 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Container } from '$lib/layout';
     import { CardGrid, Card, ProgressBarBig } from '$lib/components';
-    import { showUsageRatesModal, tierToPlan, upgradeURL } from '$lib/stores/billing';
+    import { showUsageRatesModal, billingIdToPlan, upgradeURL } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
     import { Button } from '$lib/elements/forms';
     import { bytesToSize, humanFileSize, mbSecondsToGBHours } from '$lib/helpers/sizeConvertion';
@@ -45,7 +45,7 @@
     ];
 
     const tier = data?.currentInvoice?.plan ?? $organization?.billingPlan;
-    const plan = tierToPlan(tier).name;
+    const plan = billingIdToPlan(tier).name;
 </script>
 
 <Container>
diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
index e5e1ee5a6c..0efb7c6020 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.ts
@@ -1,53 +1,59 @@
-import type { AggregationTeam, Invoice, InvoiceUsage } from '$lib/sdk/billing';
-import { accumulateUsage } from '$lib/sdk/usage';
 import { sdk } from '$lib/stores/sdk';
-import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
+import { accumulateUsage } from '$lib/sdk/usage';
+import { type Models, Query } from '@appwrite.io/console';
 
 export const load: PageLoad = async ({ params, parent }) => {
-    const { invoice, project, region } = params;
+    const { invoice: invoiceId, project, region } = params;
     const { organization } = await parent();
 
     let startDate: string = organization.billingCurrentInvoiceDate;
     let endDate: string = organization.billingNextInvoiceDate;
-    let currentInvoice: Invoice = undefined;
-    let currentAggregation: AggregationTeam = undefined;
+    let currentInvoice: Models.Invoice = undefined;
+    let currentAggregation: Models.AggregationTeam = undefined;
 
-    if (invoice) {
-        currentInvoice = await sdk.forConsole.billing.getInvoice(organization.$id, invoice);
-        currentAggregation = await sdk.forConsole.billing.getAggregation(
-            organization.$id,
-            currentInvoice.aggregationId
-        );
+    if (invoiceId) {
+        currentInvoice = await sdk.forConsole.organizations.getInvoice({
+            organizationId: organization.$id,
+            invoiceId
+        });
+        currentAggregation = await sdk.forConsole.organizations.getAggregation({
+            organizationId: organization.$id,
+            aggregationId: currentInvoice.aggregationId
+        });
 
         startDate = currentInvoice.from;
         endDate = currentInvoice.to;
     } else {
         try {
-            currentAggregation = await sdk.forConsole.billing.getAggregation(
-                organization.$id,
-                organization.billingAggregationId
-            );
+            currentAggregation = await sdk.forConsole.organizations.getAggregation({
+                organizationId: organization.$id,
+                aggregationId: organization.billingAggregationId
+            });
         } catch (e) {
             // ignore error if no aggregation found
         }
     }
 
     const [invoices, usage] = await Promise.all([
-        sdk.forConsole.billing.listInvoices(organization.$id, [Query.orderDesc('from')]),
+        sdk.forConsole.organizations.listInvoices({
+            organizationId: organization.$id,
+            queries: [Query.orderDesc('from')]
+        }),
         sdk.forProject(region, project).project.getUsage({ startDate, endDate })
     ]);
 
     if (currentAggregation) {
-        let projectSpecificData = null;
+        let projectSpecificData: Models.AggregationBreakdown | null = null;
         if (currentAggregation.breakdown) {
             projectSpecificData = currentAggregation.breakdown.find((p) => p.$id === project);
         }
 
         if (projectSpecificData) {
             const executionsResource = projectSpecificData.resources?.find?.(
-                (r: InvoiceUsage) => r.resourceId === 'executions'
+                (resource) => resource.resourceId === 'executions'
             );
+
             if (executionsResource) {
                 usage.executionsTotal = executionsResource.value || usage.executionsTotal;
             }
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
index f0b24c0605..d0d4a0b0d6 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
@@ -10,11 +10,10 @@
     import { organization } from '$lib/stores/organization';
     import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
     import { updateBucket } from './+page.svelte';
-    import type { Plan } from '$lib/sdk/billing';
     import type { Models } from '@appwrite.io/console';
 
     export let bucket: Models.Bucket;
-    export let currentPlan: Plan | null;
+    export let currentPlan: Models.BillingPlan | null;
 
     const service = currentPlan ? currentPlan['fileSize'] : null;
     const { value, unit, baseValue, units } = createByteUnitPair(bucket.maximumFileSize, 1000);
diff --git a/src/routes/(console)/regions.ts b/src/routes/(console)/regions.ts
index 32dbd0308e..404ee92096 100644
--- a/src/routes/(console)/regions.ts
+++ b/src/routes/(console)/regions.ts
@@ -21,10 +21,11 @@ export async function loadAvailableRegions(orgId: string, force: boolean = false
             return;
         }
 
-        // TODO: @itznotabug, @torstendittmann we need a better way for this!
-        const availableRegions = await sdk.forConsole.billing.listRegions(orgId);
-        regions.set(availableRegions);
+        const availableRegions = await sdk.forConsole.console.getRegions({
+            organizationId: orgId
+        });
 
+        regions.set(availableRegions);
         lastLoadedOrganization = orgId;
     } catch (error) {
         console.error(`Failed to load regions for teamId: ${orgId}`, error);
diff --git a/src/routes/(console)/store.ts b/src/routes/(console)/store.ts
index 359a71b30f..a21c994510 100644
--- a/src/routes/(console)/store.ts
+++ b/src/routes/(console)/store.ts
@@ -1,6 +1,5 @@
 import { page } from '$app/stores';
 import type { HeaderAlert } from '$lib/stores/headerAlert';
-import type { Organization } from '$lib/stores/organization';
 import type { Models } from '@appwrite.io/console';
 import { derived, writable } from 'svelte/store';
 
@@ -16,4 +15,4 @@ export const protocol = derived(consoleVariables, ($vars) =>
 );
 
 export const activeHeaderAlert = writable<HeaderAlert>(null);
-export const orgMissingPaymentMethod = writable<Organization>(null);
+export const orgMissingPaymentMethod = writable<Models.Organization>(null);
diff --git a/src/routes/(public)/(guest)/login/+page.ts b/src/routes/(public)/(guest)/login/+page.ts
index 33d808b7e5..5aac9163a0 100644
--- a/src/routes/(public)/(guest)/login/+page.ts
+++ b/src/routes/(public)/(guest)/login/+page.ts
@@ -1,34 +1,40 @@
-import { base } from '$app/paths';
-import type { Campaign } from '$lib/stores/campaigns';
+import { resolve } from '$app/paths';
 import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
+import type { Models } from '@appwrite.io/console';
 
 export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
-        let campaign: Campaign;
+        let campaign: Models.Campaign;
         try {
-            const couponData = await sdk.forConsole.billing.getCoupon(code);
+            const couponData = await sdk.forConsole.console.getCoupon({
+                couponId: code
+            });
+
             if (couponData.campaign) {
-                campaign = await sdk.forConsole.billing.getCampaign(couponData.campaign);
+                campaign = await sdk.forConsole.console.getCampaign({
+                    campaignId: couponData.campaign
+                });
                 return {
                     couponData,
                     campaign
                 };
-            } else redirect(303, `${base}/login`);
+            } else redirect(303, resolve('/login'));
         } catch (e) {
-            redirect(303, `${base}/login`);
+            redirect(303, resolve('/login'));
         }
     }
+
     if (url.searchParams.has('campaign')) {
         const campaignId = url.searchParams.get('campaign');
-        let campaign: Campaign;
+        let campaign: Models.Campaign;
         try {
-            campaign = await sdk.forConsole.billing.getCampaign(campaignId);
+            campaign = await sdk.forConsole.console.getCampaign({ campaignId });
             return { campaign };
         } catch (e) {
-            redirect(303, `${base}/login`);
+            redirect(303, resolve('/login'));
         }
     }
     return;
diff --git a/src/routes/(public)/(guest)/register/+page.ts b/src/routes/(public)/(guest)/register/+page.ts
index 1fa2e79de8..6f3dfe81ef 100644
--- a/src/routes/(public)/(guest)/register/+page.ts
+++ b/src/routes/(public)/(guest)/register/+page.ts
@@ -1,34 +1,40 @@
-import { base } from '$app/paths';
-import type { Campaign } from '$lib/stores/campaigns.js';
+import { resolve } from '$app/paths';
 import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
+import type { Models } from '@appwrite.io/console';
 
 export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
-        let campaign: Campaign;
+        let campaign: Models.Campaign;
         try {
-            const couponData = await sdk.forConsole.billing.getCoupon(code);
+            const couponData = await sdk.forConsole.console.getCoupon({
+                couponId: code
+            });
+
             if (couponData.campaign) {
-                campaign = await sdk.forConsole.billing.getCampaign(couponData.campaign);
+                campaign = await sdk.forConsole.console.getCampaign({
+                    campaignId: couponData.campaign
+                });
                 return {
                     couponData,
                     campaign
                 };
-            } else redirect(303, `${base}/register`);
+            } else redirect(303, resolve('/register'));
         } catch (e) {
-            redirect(303, `${base}/register`);
+            redirect(303, resolve('/register'));
         }
     }
+
     if (url.searchParams.has('campaign')) {
         const campaignId = url.searchParams.get('campaign');
-        let campaign: Campaign;
+        let campaign: Models.Campaign;
         try {
-            campaign = await sdk.forConsole.billing.getCampaign(campaignId);
+            campaign = await sdk.forConsole.console.getCampaign({ campaignId });
             return { campaign };
         } catch (e) {
-            redirect(303, `${base}/register`);
+            redirect(303, resolve('/register'));
         }
     }
     return;
diff --git a/src/routes/(public)/functions/deploy/+page.svelte b/src/routes/(public)/functions/deploy/+page.svelte
index 0399cf3a3e..53ba37ece0 100644
--- a/src/routes/(public)/functions/deploy/+page.svelte
+++ b/src/routes/(public)/functions/deploy/+page.svelte
@@ -5,7 +5,6 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import CustomId from '$lib/components/customId.svelte';
     import { Button, Form, InputSelect } from '$lib/elements/forms';
-    import type { AllowedRegions } from '$lib/sdk/billing.js';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { isCloud } from '$lib/system';
@@ -24,6 +23,7 @@
     import { filterRegions } from '$lib/helpers/regions';
     import { loadAvailableRegions } from '$routes/(console)/regions';
     import { regions as regionsStore } from '$lib/stores/organization';
+    import type { AllowedRegions } from '$lib/sdk/billing';
 
     let { data } = $props();
 
diff --git a/src/routes/(public)/functions/deploy/+page.ts b/src/routes/(public)/functions/deploy/+page.ts
index d91d084ff8..929de33ec1 100644
--- a/src/routes/(public)/functions/deploy/+page.ts
+++ b/src/routes/(public)/functions/deploy/+page.ts
@@ -2,12 +2,12 @@ import { sdk } from '$lib/stores/sdk.js';
 import { redirect } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import { isCloud } from '$lib/system';
-import { BillingPlan } from '$lib/constants';
-import { ID, type Models, Query, Platform } from '@appwrite.io/console';
-import type { OrganizationList } from '$lib/stores/organization';
+import { BillingPlanGroup, ID } from '@appwrite.io/console';
+import { getTeamOrOrganizationList } from '$lib/stores/organization';
 import { redirectTo } from '$routes/store';
 import type { PageLoad } from './$types';
 import { getRepositoryInfo } from '$lib/helpers/github';
+import { getBasePlanFromGroup } from '$lib/stores/billing';
 
 export const load: PageLoad = async ({ parent, url }) => {
     const { account } = await parent();
@@ -64,24 +64,16 @@ export const load: PageLoad = async ({ parent, url }) => {
     deploymentData.repository.owner = info.owner;
 
     // Get organizations
-    let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
-    if (isCloud) {
-        organizations = await sdk.forConsole.billing.listOrganization([
-            Query.equal('platform', Platform.Appwrite)
-        ]);
-    } else {
-        organizations = await sdk.forConsole.teams.list();
-    }
+    let organizations = await getTeamOrOrganizationList();
 
     if (!organizations?.total) {
         try {
             if (isCloud) {
-                await sdk.forConsole.billing.createOrganization(
-                    ID.unique(),
-                    'Personal Projects',
-                    BillingPlan.FREE,
-                    null
-                );
+                await sdk.forConsole.organizations.create({
+                    organizationId: ID.unique(),
+                    name: 'Personal Projects',
+                    billingPlan: getBasePlanFromGroup(BillingPlanGroup.Starter).$id
+                });
             } else {
                 await sdk.forConsole.teams.create({
                     teamId: ID.unique(),
@@ -89,13 +81,7 @@ export const load: PageLoad = async ({ parent, url }) => {
                 });
             }
 
-            if (isCloud) {
-                organizations = await sdk.forConsole.billing.listOrganization([
-                    Query.equal('platform', Platform.Appwrite)
-                ]);
-            } else {
-                organizations = await sdk.forConsole.teams.list();
-            }
+            organizations = await getTeamOrOrganizationList();
         } catch (e) {
             console.error('Failed to create default organization:', e);
         }
diff --git a/src/routes/(public)/sites/deploy/+page.svelte b/src/routes/(public)/sites/deploy/+page.svelte
index 0d258793ac..c3d928dba8 100644
--- a/src/routes/(public)/sites/deploy/+page.svelte
+++ b/src/routes/(public)/sites/deploy/+page.svelte
@@ -6,7 +6,6 @@
     import CustomId from '$lib/components/customId.svelte';
     import { SvgIcon } from '$lib/components/index.js';
     import { Button, Form, InputSelect } from '$lib/elements/forms';
-    import type { AllowedRegions } from '$lib/sdk/billing.js';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { getFrameworkIcon } from '$lib/stores/sites.js';
@@ -28,6 +27,7 @@
     import { filterRegions } from '$lib/helpers/regions';
     import { loadAvailableRegions } from '$routes/(console)/regions';
     import { regions as regionsStore } from '$lib/stores/organization';
+    import type { AllowedRegions } from '$lib/sdk/billing';
 
     let { data } = $props();
 
diff --git a/src/routes/(public)/sites/deploy/+page.ts b/src/routes/(public)/sites/deploy/+page.ts
index ca57d36e34..1dc13b44fa 100644
--- a/src/routes/(public)/sites/deploy/+page.ts
+++ b/src/routes/(public)/sites/deploy/+page.ts
@@ -2,12 +2,12 @@ import { sdk } from '$lib/stores/sdk.js';
 import { redirect, error } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import { isCloud } from '$lib/system';
-import { BillingPlan } from '$lib/constants';
-import { ID, type Models, Query, Platform } from '@appwrite.io/console';
-import type { OrganizationList } from '$lib/stores/organization';
+import { BillingPlanGroup, ID, type Models } from '@appwrite.io/console';
+import { getTeamOrOrganizationList } from '$lib/stores/organization';
 import { redirectTo } from '$routes/store';
 import type { PageLoad } from './$types';
 import { getRepositoryInfo } from '$lib/helpers/github';
+import { getBasePlanFromGroup } from '$lib/stores/billing';
 
 export const load: PageLoad = async ({ parent, url }) => {
     const { account } = await parent();
@@ -80,25 +80,16 @@ export const load: PageLoad = async ({ parent, url }) => {
         };
     }
 
-    let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
-
-    if (isCloud) {
-        organizations = await sdk.forConsole.billing.listOrganization([
-            Query.equal('platform', Platform.Appwrite)
-        ]);
-    } else {
-        organizations = await sdk.forConsole.teams.list();
-    }
+    let organizations = await getTeamOrOrganizationList();
 
     if (!organizations?.total) {
         try {
             if (isCloud) {
-                await sdk.forConsole.billing.createOrganization(
-                    ID.unique(),
-                    'Personal Projects',
-                    BillingPlan.FREE,
-                    null
-                );
+                await sdk.forConsole.organizations.create({
+                    organizationId: ID.unique(),
+                    name: 'Personal Projects',
+                    billingPlan: getBasePlanFromGroup(BillingPlanGroup.Starter).$id
+                });
             } else {
                 await sdk.forConsole.teams.create({
                     teamId: ID.unique(),
@@ -107,13 +98,7 @@ export const load: PageLoad = async ({ parent, url }) => {
             }
 
             // Refetch organizations after creation
-            if (isCloud) {
-                organizations = await sdk.forConsole.billing.listOrganization([
-                    Query.equal('platform', Platform.Appwrite)
-                ]);
-            } else {
-                organizations = await sdk.forConsole.teams.list();
-            }
+            organizations = await getTeamOrOrganizationList();
         } catch (e) {
             console.error('Failed to create default organization:', e);
         }
diff --git a/src/routes/(public)/template-[template]/+page.svelte b/src/routes/(public)/template-[template]/+page.svelte
index 600914e154..6ef3da9c7e 100644
--- a/src/routes/(public)/template-[template]/+page.svelte
+++ b/src/routes/(public)/template-[template]/+page.svelte
@@ -4,7 +4,6 @@
     import CustomId from '$lib/components/customId.svelte';
     import { SvgIcon } from '$lib/components/index.js';
     import { Button, Form, InputSelect } from '$lib/elements/forms';
-    import type { AllowedRegions } from '$lib/sdk/billing.js';
     import { app } from '$lib/stores/app';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
@@ -23,6 +22,7 @@
         Typography
     } from '@appwrite.io/pink-svelte';
     import { filterRegions } from '$lib/helpers/regions';
+    import type { AllowedRegions } from '$lib/sdk/billing';
 
     let { data } = $props();
 
diff --git a/src/routes/(public)/template-[template]/+page.ts b/src/routes/(public)/template-[template]/+page.ts
index e2dac3adfa..f9516d960e 100644
--- a/src/routes/(public)/template-[template]/+page.ts
+++ b/src/routes/(public)/template-[template]/+page.ts
@@ -1,11 +1,11 @@
-import { BillingPlan } from '$lib/constants.js';
+import { base } from '$app/paths';
 import { sdk } from '$lib/stores/sdk.js';
-import { ID, type Models, Query, Platform } from '@appwrite.io/console';
 import { isCloud } from '$lib/system.js';
-import { error, redirect } from '@sveltejs/kit';
-import type { OrganizationList } from '$lib/stores/organization.js';
 import { redirectTo } from '$routes/store.js';
-import { base } from '$app/paths';
+import { error, redirect } from '@sveltejs/kit';
+import { getBasePlanFromGroup } from '$lib/stores/billing';
+import { getTeamOrOrganizationList } from '$lib/stores/organization.js';
+import { BillingPlanGroup, ID, type Models } from '@appwrite.io/console';
 
 export const load = async ({ parent, url, params }) => {
     const { account } = await parent();
@@ -37,24 +37,14 @@ export const load = async ({ parent, url, params }) => {
             error(404, 'Type is not valid');
     }
 
-    let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
-    if (isCloud) {
-        organizations = account?.$id
-            ? await sdk.forConsole.billing.listOrganization([
-                  Query.equal('platform', Platform.Appwrite)
-              ])
-            : undefined;
-    } else {
-        organizations = account?.$id ? await sdk.forConsole.teams.list() : undefined;
-    }
+    const organizations = account?.$id ? await getTeamOrOrganizationList() : undefined;
 
     if (!organizations?.total && account?.$id) {
-        await sdk.forConsole.billing.createOrganization(
-            ID.unique(),
-            'Personal project',
-            BillingPlan.FREE,
-            null
-        );
+        await sdk.forConsole.organizations.create({
+            organizationId: ID.unique(),
+            name: 'Personal project',
+            billingPlan: getBasePlanFromGroup(BillingPlanGroup.Starter).$id
+        });
     }
 
     return {
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 571542d06f..ce32145cf5 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -68,11 +68,16 @@
 
         if (page.url.searchParams.has('code')) {
             const code = page.url.searchParams.get('code');
-            const coupon = await sdk.forConsole.billing.getCoupon(code).catch<null>(() => null);
+            const coupon = await sdk.forConsole.console
+                .getCoupon({
+                    couponId: code
+                })
+                .catch<null>(() => null);
             if (coupon?.campaign) {
-                const campaign = await sdk.forConsole.billing
-                    .getCampaign(coupon.campaign)
+                const campaign = await sdk.forConsole.console
+                    .getCampaign({ campaignId: coupon.campaign })
                     .catch<null>(() => null);
+
                 if (campaign && $user) {
                     goto(`${base}/apply-credit?${page.url.searchParams}`);
                     loading.set(false);
@@ -83,9 +88,10 @@
 
         if ($user && page.url.searchParams.has('campaign')) {
             const campaignId = page.url.searchParams.get('campaign');
-            const campaign = await sdk.forConsole.billing
-                .getCampaign(campaignId)
+            const campaign = await sdk.forConsole.console
+                .getCampaign({ campaignId })
                 .catch<null>(() => null);
+
             if (campaign) {
                 goto(`${base}/apply-credit?${page.url.searchParams}`);
 
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index bcd3e307ff..a80e909b98 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -8,9 +8,10 @@ import type { LayoutLoad } from './$types';
 import { redirectTo } from './store';
 import { base, resolve } from '$app/paths';
 import type { Account } from '$lib/stores/user';
-import { type AppwriteException, Query, Platform } from '@appwrite.io/console';
+import { type AppwriteException } from '@appwrite.io/console';
 import { isCloud, VARS } from '$lib/system';
 import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
+import { getTeamOrOrganizationList } from '$lib/stores/organization';
 
 export const ssr = false;
 
@@ -40,11 +41,7 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
 
         return {
             account: account,
-            organizations: !isCloud
-                ? await sdk.forConsole.teams.list()
-                : await sdk.forConsole.billing.listOrganization([
-                      Query.equal('platform', Platform.Appwrite)
-                  ])
+            organizations: await getTeamOrOrganizationList()
         };
     }
 
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
index ea9e97cb82..e9600a4267 100644
--- a/src/routes/+page.ts
+++ b/src/routes/+page.ts
@@ -1,23 +1,24 @@
 import { redirect } from '@sveltejs/kit';
-import { base } from '$app/paths';
+import { base, resolve } from '$app/paths';
 import type { PageLoad } from './$types';
 import { sdk } from '$lib/stores/sdk';
 import { VARS } from '$lib/system';
 
 const handleGithubEducationMembership = async (name: string, email: string) => {
-    const result = await sdk.forConsole.billing.setMembership('github-student-developer');
-    if (result && 'error' in result) {
-        if (result.error.code === 409) {
-            redirect(303, `${base}/account/organizations`);
+    try {
+        await sdk.forConsole.console.createProgramMembership({
+            programId: 'github-student-developer'
+        });
+
+        await setToGhStudentMailingList(name, email);
+    } catch (error) {
+        if (error.code === 409) {
+            redirect(303, resolve('/(console)/account/organizations'));
         } else {
             await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
-            redirect(
-                303,
-                `${base}/education/error?message=${result.error.message}&code=${result.error.code}`
-            );
+            const errorUrl = resolve('/(public)/(guest)/education/error');
+            redirect(303, `${errorUrl}?message=${error.message}&code=${error.code}`);
         }
-    } else if (result && '$createdAt' in result) {
-        setToGhStudentMailingList(name, email);
     }
 };
 
@@ -35,7 +36,7 @@ export const load: PageLoad = async ({ parent, url }) => {
 
     if (userVisitedEducationPage()) {
         await handleGithubEducationMembership(account.name, account.email);
-        redirect(303, base);
+        redirect(303, resolve('/'));
     } else if (organizations.total && !isApplyingCredit) {
         const teamId = account.prefs.organization ?? organizations.teams[0].$id;
         if (!teamId) {