From 7c5eae2806ef1d6f9d872c7c256b327bacb23517 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Thu, 10 Oct 2024 14:53:54 +0200
Subject: [PATCH 1/2] feat: use console sdk with cloud services

---
 .gitignore                                    |   1 +
 src/lib/components/backupDatabaseAlert.svelte |   4 +-
 src/lib/components/backupRestoreBox.svelte    |   6 +-
 .../billing/alerts/limitReached.svelte        |   4 +-
 .../alerts/missingPaymentMethod.svelte        |   4 +-
 .../billing/alerts/newDevUpgradePro.svelte    |   4 +-
 .../billing/alerts/paymentMandate.svelte      |   3 +-
 src/lib/components/billing/couponInput.svelte |   6 +-
 .../components/billing/emptyCardCloud.svelte  |   4 +-
 .../billing/estimatedTotalBox.svelte          |   6 +-
 .../billing/planComparisonBox.svelte          |  18 +--
 src/lib/components/billing/planExcess.svelte  |   9 +-
 .../components/billing/planSelection.svelte   |  22 ++--
 .../billing/selectPaymentMethod.svelte        |   7 +-
 src/lib/components/billing/usageRates.svelte  |  10 +-
 .../billing/validateCreditModal.svelte        |   2 +-
 src/lib/components/bottomModalAlert.svelte    |   6 +-
 src/lib/components/creditCardInfo.svelte      |   4 +-
 src/lib/components/support.svelte             |   8 +-
 src/lib/constants.ts                          |   7 --
 src/lib/layout/activity.svelte                |   4 +-
 src/lib/layout/containerButton.svelte         |   4 +-
 src/lib/layout/containerHeader.svelte         |  10 +-
 src/lib/layout/header.svelte                  |   5 +-
 src/lib/layout/logs.svelte                    |   4 +-
 src/lib/layout/navigation.svelte              |   4 +-
 src/lib/sdk/billing.ts                        |   4 +-
 src/lib/stores/billing.ts                     | 105 +++++++++---------
 src/lib/stores/campaigns.ts                   |   4 +-
 src/lib/stores/organization.ts                |  26 ++---
 src/lib/stores/sdk.ts                         |   8 +-
 src/lib/stores/stripe.ts                      |  16 +--
 src/routes/(console)/+layout.svelte           |   7 +-
 src/routes/(console)/+layout.ts               |   8 +-
 .../account/organizations/+page.svelte        |   6 +-
 .../(console)/account/payments/+page.ts       |   4 +-
 .../account/payments/addressModal.svelte      |   7 +-
 .../payments/deleteAddressModal.svelte        |   2 +-
 .../payments/deletePaymentModal.svelte        |   2 +-
 .../account/payments/editAddressModal.svelte  |   2 +-
 .../account/payments/editPaymentModal.svelte  |  36 +++---
 .../account/payments/paymentMethods.svelte    |   6 +-
 .../(console)/apply-credit/+page.svelte       |  35 +++---
 src/routes/(console)/apply-credit/+page.ts    |   2 +-
 .../create-organization/+page.svelte          |  45 ++++----
 src/routes/(console)/onboarding/+page.svelte  |  20 ++--
 .../organization-[organization]/+layout.ts    |   2 +-
 .../organization-[organization]/+page.svelte  |   5 +-
 .../billing/+page.svelte                      |  13 +--
 .../billing/+page.ts                          |  10 +-
 .../billing/addCreditModal.svelte             |   2 +-
 .../billing/addCreditWizard.svelte            |   7 +-
 .../billing/availableCredit.svelte            |  10 +-
 .../billing/billingAddress.svelte             |   2 +-
 .../billing/budgetAlert.svelte                |   2 +-
 .../billing/budgetCap.svelte                  |   9 +-
 .../billing/deleteOrgPayment.svelte           |  11 +-
 .../billing/paymentHistory.svelte             |   9 +-
 .../billing/paymentMethods.svelte             |  22 ++--
 .../billing/planSummary.svelte                |  21 ++--
 .../billing/removeAddress.svelte              |   2 +-
 .../billing/replaceAddress.svelte             |  18 ++-
 .../billing/replaceCard.svelte                |  10 +-
 .../billing/retryPaymentModal.svelte          |  13 ++-
 .../billing/store.ts                          |   5 +-
 .../billing/taxId.svelte                      |   2 +-
 .../billing/wizard/addCredit.svelte           |   2 +-
 .../billing/wizard/paymentDetails.svelte      |   6 +-
 .../change-plan/+page.svelte                  |  52 ++++-----
 .../createMember.svelte                       |   5 +-
 .../organization-[organization]/header.svelte |   8 +-
 .../settings/+page.ts                         |   2 +-
 .../settings/deleteOrganizationModal.svelte   |   2 +-
 .../usage/[[invoice]]/+page.svelte            |  10 +-
 .../usage/[[invoice]]/+page.ts                |  11 +-
 .../usage/[[invoice]]/totalMembers.svelte     |   4 +-
 .../wizard/step1.svelte                       |   2 +-
 .../(console)/project-[project]/+layout.ts    |   2 +-
 .../auth/security/updateMockNumbers.svelte    |   4 +-
 .../auth/templates/+page.svelte               |   4 +-
 .../project-[project]/databases/create.svelte |   4 +-
 .../database-[database]/backups/+page.svelte  |   9 +-
 .../backups/containerHeader.svelte            |   4 +-
 .../backups/createPolicy.svelte               |   8 +-
 .../executions/+page.svelte                   |   5 +-
 .../settings/deleteProject.svelte             |   6 +-
 .../settings/smtp/+page.svelte                |   7 +-
 .../settings/usage/[[invoice]]/+page.svelte   |   2 +-
 .../settings/usage/[[invoice]]/+page.ts       |  13 +--
 .../storage/bucket-[bucket]/+page.svelte      |   3 +-
 .../storage/bucket-[bucket]/+page.ts          |   4 +-
 .../bucket-[bucket]/create-file/step1.svelte  |   6 +-
 .../settings/updateMaxFileSize.svelte         |   6 +-
 .../project-[project]/updateVariables.svelte  |   6 +-
 src/routes/(public)/(guest)/login/+page.ts    |   2 +-
 src/routes/(public)/(guest)/register/+page.ts |   2 +-
 src/routes/+layout.svelte                     |   2 +-
 97 files changed, 444 insertions(+), 445 deletions(-)

diff --git a/.gitignore b/.gitignore
index 031f4a1f91..2f74d4c156 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 .envrc
 .vscode
+.zed
 node_modules
 /build
 /.svelte-kit
diff --git a/src/lib/components/backupDatabaseAlert.svelte b/src/lib/components/backupDatabaseAlert.svelte
index dd1b30559a..4aec42b1a6 100644
--- a/src/lib/components/backupDatabaseAlert.svelte
+++ b/src/lib/components/backupDatabaseAlert.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { page } from '$app/stores';
-    import { BillingPlan } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { organization } from '$lib/stores/organization';
     import { HeaderAlert } from '$lib/layout';
@@ -8,6 +7,7 @@
     import { upgradeURL } from '$lib/stores/billing';
     import { hideNotification } from '$lib/helpers/notifications';
     import { backupsBannerId, showPolicyAlert } from '$lib/stores/database';
+    import { BillingPlan } from '@appwrite.io/console';
 
     function handleClose() {
         showPolicyAlert.set(false);
@@ -16,7 +16,7 @@
 </script>
 
 {#if $showPolicyAlert && isCloud && $organization?.$id && $page.url.pathname.match(/\/databases\/database-[^/]+$/)}
-    {@const isFreePlan = $organization?.billingPlan === BillingPlan.FREE}
+    {@const isFreePlan = $organization?.billingPlan === BillingPlan.Tier0}
 
     {@const subtitle = isFreePlan
         ? 'Upgrade your plan to ensure your data stays safe and backed up'
diff --git a/src/lib/components/backupRestoreBox.svelte b/src/lib/components/backupRestoreBox.svelte
index 842c15e19e..2882f5f854 100644
--- a/src/lib/components/backupRestoreBox.svelte
+++ b/src/lib/components/backupRestoreBox.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
     import { sdk } from '$lib/stores/sdk';
-    import { type Payload, Query } from '@appwrite.io/console';
+    import { BillingPlan, type Payload, Query } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { isCloud, isSelfHosted } from '$lib/system';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import type { BackupArchive, BackupRestoration } from '$lib/sdk/backups';
     import { goto, invalidate } from '$app/navigation';
     import { page } from '$app/stores';
@@ -153,7 +153,7 @@
 
     onMount(() => {
         // fast path: don't subscribe if org is on a free plan or is self-hosted.
-        if (isSelfHosted || (isCloud && $organization.billingPlan === BillingPlan.FREE)) return;
+        if (isSelfHosted || (isCloud && $organization.billingPlan === BillingPlan.Tier0)) return;
 
         sdk.forConsole.client.subscribe('console', (response) => {
             // nice!
diff --git a/src/lib/components/billing/alerts/limitReached.svelte b/src/lib/components/billing/alerts/limitReached.svelte
index f3b5cc4b91..df483fc927 100644
--- a/src/lib/components/billing/alerts/limitReached.svelte
+++ b/src/lib/components/billing/alerts/limitReached.svelte
@@ -2,14 +2,14 @@
     import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { trackEvent } from '$lib/actions/analytics';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import { HeaderAlert } from '$lib/layout';
     import { hideBillingHeaderRoutes, readOnly, tierToPlan, 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)}
+{#if $organization?.$id && $organization?.billingPlan === BillingPlan.Tier0 && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)}
     <HeaderAlert
         type="error"
         title={`${$organization.name} usage has reached the ${tierToPlan($organization.billingPlan).name} plan limit`}>
diff --git a/src/lib/components/billing/alerts/missingPaymentMethod.svelte b/src/lib/components/billing/alerts/missingPaymentMethod.svelte
index 1dbfda5659..e279a3f472 100644
--- a/src/lib/components/billing/alerts/missingPaymentMethod.svelte
+++ b/src/lib/components/billing/alerts/missingPaymentMethod.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import { HeaderAlert } from '$lib/layout';
     import { hideBillingHeaderRoutes } from '$lib/stores/billing';
     import { orgMissingPaymentMethod } from '$routes/(console)/store';
 </script>
 
-{#if ($orgMissingPaymentMethod.billingPlan === BillingPlan.PRO || $orgMissingPaymentMethod.billingPlan === BillingPlan.SCALE) && !$orgMissingPaymentMethod.paymentMethodId && !$orgMissingPaymentMethod.backupPaymentMethodId && !hideBillingHeaderRoutes.includes($page.url.pathname)}
+{#if ($orgMissingPaymentMethod.billingPlan === BillingPlan.Tier1 || $orgMissingPaymentMethod.billingPlan === BillingPlan.Tier2) && !$orgMissingPaymentMethod.paymentMethodId && !$orgMissingPaymentMethod.backupPaymentMethodId && !hideBillingHeaderRoutes.includes($page.url.pathname)}
     <HeaderAlert
         type="error"
         title={`Payment method required for ${$orgMissingPaymentMethod.name}`}>
diff --git a/src/lib/components/billing/alerts/newDevUpgradePro.svelte b/src/lib/components/billing/alerts/newDevUpgradePro.svelte
index c58ad72683..ef835b2ec6 100644
--- a/src/lib/components/billing/alerts/newDevUpgradePro.svelte
+++ b/src/lib/components/billing/alerts/newDevUpgradePro.svelte
@@ -2,7 +2,7 @@
     import { base } from '$app/paths';
     import { page } from '$app/stores';
     import { trackEvent } from '$lib/actions/analytics';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import { organization } from '$lib/stores/organization';
     import { activeHeaderAlert } from '$routes/(console)/store';
@@ -21,7 +21,7 @@
     }
 </script>
 
-{#if show && $organization?.$id && $organization?.billingPlan === BillingPlan.FREE && !$page.url.pathname.includes('/console/account')}
+{#if show && $organization?.$id && $organization?.billingPlan === BillingPlan.Tier0 && !$page.url.pathname.includes('/console/account')}
     <GradientBanner on:close={handleClose}>
         <div class="u-flex u-gap-24 u-main-center u-cross-center u-flex-vertical-mobile">
             <span class="body-text-1">Get $50 Cloud credits for Appwrite Pro.</span>
diff --git a/src/lib/components/billing/alerts/paymentMandate.svelte b/src/lib/components/billing/alerts/paymentMandate.svelte
index fa7f75a858..8a7e06b16e 100644
--- a/src/lib/components/billing/alerts/paymentMandate.svelte
+++ b/src/lib/components/billing/alerts/paymentMandate.svelte
@@ -8,8 +8,7 @@
     import { confirmSetup } from '$lib/stores/stripe';
 
     async function verifyPaymentMethod() {
-        const method = await sdk.forConsole.billing.setupPaymentMandate(
-            $organization.$id,
+        const method = await sdk.forConsole.account.updatePaymentMethodMandateOptions(
             $paymentMissingMandate.$id
         );
         await confirmSetup(method.clientSecret, method.$id);
diff --git a/src/lib/components/billing/couponInput.svelte b/src/lib/components/billing/couponInput.svelte
index 369619afed..0f610046b7 100644
--- a/src/lib/components/billing/couponInput.svelte
+++ b/src/lib/components/billing/couponInput.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
     import { Button, FormList, 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 type { Models } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
 
     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
@@ -17,7 +17,7 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.billing.getCoupon(coupon);
+            const response = await sdk.forConsole.console.getCopon(coupon);
             couponData = response;
             dispatch('validation', couponData);
             coupon = null;
diff --git a/src/lib/components/billing/emptyCardCloud.svelte b/src/lib/components/billing/emptyCardCloud.svelte
index 7b7638ce67..86eb8ea3e6 100644
--- a/src/lib/components/billing/emptyCardCloud.svelte
+++ b/src/lib/components/billing/emptyCardCloud.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { trackEvent } from '$lib/actions/analytics';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import { tierToPlan, upgradeURL } from '$lib/stores/billing';
     import { Card } from '..';
@@ -14,7 +14,7 @@
         <div class="u-flex u-flex-vertical u-main-center u-cross-center u-gap-8">
             <h6 class="body-text-1 u-bold u-trim-1">Upgrade to add {service}</h6>
             <p class="text u-text-center">
-                Upgrade to a {tierToPlan(BillingPlan.PRO).name} plan to add {service} to your organization
+                Upgrade to a {tierToPlan(BillingPlan.Tier1).name} plan to add {service} to your organization
             </p>
 
             <Button
diff --git a/src/lib/components/billing/estimatedTotalBox.svelte b/src/lib/components/billing/estimatedTotalBox.svelte
index 4945598e1d..87a4cbd798 100644
--- a/src/lib/components/billing/estimatedTotalBox.svelte
+++ b/src/lib/components/billing/estimatedTotalBox.svelte
@@ -27,9 +27,7 @@
                 ? grossCost - couponData.credits
                 : 0
             : grossCost;
-    $: trialEndDate = new Date(
-        billingPayDate.getTime() + currentPlan.trialDays * 24 * 60 * 60 * 1000
-    );
+    $: trialEndDate = new Date(billingPayDate.getTime() + currentPlan.trial * 24 * 60 * 60 * 1000);
 </script>
 
 <section
@@ -59,7 +57,7 @@
     </span>
 
     <p class="text u-margin-block-start-16">
-        Your payment method will be charged this amount plus usage fees every 30 days {!currentPlan.trialDays
+        Your payment method will be charged this amount plus usage fees every 30 days {!currentPlan.trial
             ? `starting ${toLocaleDate(billingPayDate.toString())}`
             : ` after your trial period ends on ${toLocaleDate(trialEndDate.toString())}`}.
     </p>
diff --git a/src/lib/components/billing/planComparisonBox.svelte b/src/lib/components/billing/planComparisonBox.svelte
index c48dabfc38..1ab5d8fad2 100644
--- a/src/lib/components/billing/planComparisonBox.svelte
+++ b/src/lib/components/billing/planComparisonBox.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { formatNum } from '$lib/helpers/string';
     import { plansInfo, tierFree, tierPro, type Tier } from '$lib/stores/billing';
     import { Card, SecondaryTabs, SecondaryTabsItem } from '..';
 
-    let selectedTab: Tier = BillingPlan.FREE;
+    let selectedTab: Tier = BillingPlan.Tier0;
     export let downgrade = false;
 
     $: plan = $plansInfo.get(selectedTab);
@@ -14,13 +14,13 @@
     <div class="comparison-box">
         <SecondaryTabs stretch>
             <SecondaryTabsItem
-                disabled={selectedTab === BillingPlan.FREE}
-                on:click={() => (selectedTab = BillingPlan.FREE)}>
+                disabled={selectedTab === BillingPlan.Tier0}
+                on:click={() => (selectedTab = BillingPlan.Tier0)}>
                 {tierFree.name}
             </SecondaryTabsItem>
             <SecondaryTabsItem
-                disabled={selectedTab === BillingPlan.PRO}
-                on:click={() => (selectedTab = BillingPlan.PRO)}>
+                disabled={selectedTab === BillingPlan.Tier1}
+                on:click={() => (selectedTab = BillingPlan.Tier1)}>
                 {tierPro.name}
             </SecondaryTabsItem>
             <!-- <SecondaryTabsItem
@@ -32,7 +32,7 @@
     </div>
 
     <div class="u-margin-block-start-24">
-        {#if selectedTab === BillingPlan.FREE}
+        {#if selectedTab === BillingPlan.Tier0}
             <h3 class="u-bold body-text-1">{plan.name} plan</h3>
             {#if downgrade}
                 <ul class="u-margin-block-start-8 list u-gap-4 u-small">
@@ -94,7 +94,7 @@
                     </li>
                 </ul>
             {/if}
-        {:else if selectedTab === BillingPlan.PRO}
+        {:else if selectedTab === BillingPlan.Tier1}
             <h3 class="u-bold body-text-1">{plan.name} plan</h3>
             <p class="u-margin-block-start-8">Everything in the Free plan, plus:</p>
             <ul class="un-order-list u-margin-inline-start-4">
@@ -104,7 +104,7 @@
                 <li>{formatNum(plan.executions)} executions</li>
                 <li>Email support</li>
             </ul>
-        {:else if selectedTab === BillingPlan.SCALE}
+        {:else if selectedTab === BillingPlan.Tier2}
             <h3 class="u-bold body-text-1">{plan.name} plan</h3>
             <p class="u-margin-block-start-8">Everything in the Pro plan, plus:</p>
             <ul class="un-order-list u-margin-inline-start-4">
diff --git a/src/lib/components/billing/planExcess.svelte b/src/lib/components/billing/planExcess.svelte
index 352f0b29b7..ae62c60656 100644
--- a/src/lib/components/billing/planExcess.svelte
+++ b/src/lib/components/billing/planExcess.svelte
@@ -17,9 +17,8 @@
     import { abbreviateNumber } from '$lib/helpers/numbers';
     import { formatNum } from '$lib/helpers/string';
     import { onMount } from 'svelte';
-    import type { OrganizationUsage } from '$lib/sdk/billing';
     import { sdk } from '$lib/stores/sdk';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan, type Models } from '@appwrite.io/console';
     import { tooltip } from '$lib/actions/tooltip';
 
     export let tier: Tier;
@@ -33,11 +32,11 @@
         executions?: number;
         members?: number;
     } = null;
-    let usage: OrganizationUsage = null;
+    let usage: Models.UsageOrganization = null;
     let showExcess = false;
 
     onMount(async () => {
-        usage = await sdk.forConsole.billing.listUsage(
+        usage = await sdk.forConsole.organizations.getUsage(
             $organization.$id,
             $organization.billingCurrentInvoiceDate,
             new Date().toISOString()
@@ -55,7 +54,7 @@
             )}
         </svelte:fragment>
         Following payment of your final invoice, your organization will switch to the {tierToPlan(
-            BillingPlan.FREE
+            BillingPlan.Tier0
         ).name} plan. {#if excess?.members > 0}All team members except the owner will be removed on
             that date.{/if} Service disruptions may occur unless resource usage is reduced.
         <!-- Any executions, bandwidth, or messaging usage will be reset at that time. -->
diff --git a/src/lib/components/billing/planSelection.svelte b/src/lib/components/billing/planSelection.svelte
index 0d484a9b40..b5a5c88d31 100644
--- a/src/lib/components/billing/planSelection.svelte
+++ b/src/lib/components/billing/planSelection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { formatCurrency } from '$lib/helpers/numbers';
     import { plansInfo, tierFree, tierPro, tierScale, type Tier } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
@@ -12,9 +12,9 @@
     let classes: string = '';
     export { classes as class };
 
-    $: freePlan = $plansInfo.get(BillingPlan.FREE);
-    $: proPlan = $plansInfo.get(BillingPlan.PRO);
-    $: scalePlan = $plansInfo.get(BillingPlan.SCALE);
+    $: freePlan = $plansInfo.get(BillingPlan.Tier0);
+    $: proPlan = $plansInfo.get(BillingPlan.Tier1);
+    $: scalePlan = $plansInfo.get(BillingPlan.Tier2);
 </script>
 
 {#if billingPlan}
@@ -24,7 +24,7 @@
                 name="plan"
                 bind:group={billingPlan}
                 disabled={anyOrgFree || !selfService}
-                value={BillingPlan.FREE}
+                value={BillingPlan.Tier0}
                 tooltipShow={anyOrgFree}
                 tooltipText="You are limited to 1 Free organization per account."
                 padding={1.5}>
@@ -34,7 +34,7 @@
                         class:u-opacity-50={disabled}>
                         <h4 class="body-text-2 u-bold">
                             {tierFree.name}
-                            {#if $organization?.billingPlan === BillingPlan.FREE && !isNewOrg}
+                            {#if $organization?.billingPlan === BillingPlan.Tier0 && !isNewOrg}
                                 <span class="inline-tag">Current plan</span>
                             {/if}
                         </h4>
@@ -54,7 +54,7 @@
                 name="plan"
                 disabled={!selfService}
                 bind:group={billingPlan}
-                value={BillingPlan.PRO}
+                value={BillingPlan.Tier1}
                 padding={1.5}>
                 <svelte:fragment slot="custom" let:disabled>
                     <div
@@ -62,7 +62,7 @@
                         class:u-opacity-50={disabled}>
                         <h4 class="body-text-2 u-bold">
                             {tierPro.name}
-                            {#if $organization?.billingPlan === BillingPlan.PRO && !isNewOrg}
+                            {#if $organization?.billingPlan === BillingPlan.Tier1 && !isNewOrg}
                                 <span class="inline-tag">Current plan</span>
                             {/if}
                         </h4>
@@ -76,18 +76,18 @@
                 </svelte:fragment>
             </LabelCard>
         </li>
-        {#if $organization?.billingPlan === BillingPlan.SCALE}
+        {#if $organization?.billingPlan === BillingPlan.Tier2}
             <li>
                 <LabelCard
                     name="plan"
                     bind:group={billingPlan}
-                    value={BillingPlan.SCALE}
+                    value={BillingPlan.Tier2}
                     padding={1.5}>
                     <svelte:fragment slot="custom">
                         <div class="u-flex u-flex-vertical u-gap-4 u-width-full-line">
                             <h4 class="body-text-2 u-bold">
                                 {tierScale.name}
-                                {#if $organization?.billingPlan === BillingPlan.SCALE && !isNewOrg}
+                                {#if $organization?.billingPlan === BillingPlan.Tier2 && !isNewOrg}
                                     <span class="inline-tag">Current plan</span>
                                 {/if}
                             </h4>
diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte
index 937d6bc67c..1f57582caf 100644
--- a/src/lib/components/billing/selectPaymentMethod.svelte
+++ b/src/lib/components/billing/selectPaymentMethod.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
     import { Button, Helper, InputChoice, InputSelectSearch, InputText } from '$lib/elements/forms';
-    import type { PaymentList, PaymentMethodData } from '$lib/sdk/billing';
+    import type { PaymentMethodData } from '$lib/sdk/billing';
     import { sdk } from '$lib/stores/sdk';
     import { hasStripePublicKey, isCloud } from '$lib/system';
     import { onMount } from 'svelte';
     import { Alert, Card, CreditCardBrandImage } from '..';
     import PaymentModal from './paymentModal.svelte';
     import { capitalize } from '$lib/helpers/string';
+    import type { Models } from '@appwrite.io/console';
 
-    export let methods: PaymentList;
+    export let methods: Models.PaymentMethodList;
     export let value: string;
     export let taxId = '';
 
@@ -29,7 +30,7 @@
 
     async function cardSaved(event: CustomEvent<PaymentMethodData>) {
         value = event.detail.$id;
-        methods = await sdk.forConsole.billing.listPaymentMethods();
+        methods = await sdk.forConsole.account.listPaymentMethods();
     }
 
     onMount(() => {
diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte
index c2d5c73ae0..4265c3f6c6 100644
--- a/src/lib/components/billing/usageRates.svelte
+++ b/src/lib/components/billing/usageRates.svelte
@@ -13,7 +13,7 @@
     import { organization, type Organization } from '$lib/stores/organization';
     import { plansInfo } from '$lib/stores/billing';
     import { abbreviateNumber, formatCurrency } from '$lib/helpers/numbers';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
 
     export let show = false;
     export let org: Organization;
@@ -49,19 +49,19 @@
         }
     ];
 
-    $: isFree = org.billingPlan === BillingPlan.FREE;
+    $: isFree = org.billingPlan === BillingPlan.Tier0;
 </script>
 
 <Modal bind:show size="big" headerDivider={false} title="Usage rates">
     {#if isFree}
-        Usage on the {$plansInfo?.get(BillingPlan.FREE).name} plan is limited for the following resources.
+        Usage on the {$plansInfo?.get(BillingPlan.Tier0).name} plan is limited for the following resources.
         Next billing period: {toLocaleDate(nextDate)}.
-    {:else if org.billingPlan === BillingPlan.PRO}
+    {:else if org.billingPlan === BillingPlan.Tier1}
         <p>
             Usage on the Pro plan will be charged at the end of each billing period at the following
             rates. Next billing period: {toLocaleDate(nextDate)}.
         </p>
-    {:else if org.billingPlan === BillingPlan.SCALE}
+    {:else if org.billingPlan === BillingPlan.Tier2}
         <p>
             Usage on the Scale plan will be charged at the end of each billing period at the
             following rates. Next billing period: {toLocaleDate(nextDate)}.
diff --git a/src/lib/components/billing/validateCreditModal.svelte b/src/lib/components/billing/validateCreditModal.svelte
index 961e041442..f444e247ec 100644
--- a/src/lib/components/billing/validateCreditModal.svelte
+++ b/src/lib/components/billing/validateCreditModal.svelte
@@ -18,7 +18,7 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.billing.getCoupon(coupon);
+            const response = await sdk.forConsole.console.getCopon(coupon);
             couponData = response;
             dispatch('validation', couponData);
             coupon = null;
diff --git a/src/lib/components/bottomModalAlert.svelte b/src/lib/components/bottomModalAlert.svelte
index 03ace8873f..f4392cb9a6 100644
--- a/src/lib/components/bottomModalAlert.svelte
+++ b/src/lib/components/bottomModalAlert.svelte
@@ -10,7 +10,7 @@
     } from '$lib/stores/bottom-alerts';
     import { onMount } from 'svelte';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { upgradeURL } from '$lib/stores/billing';
     import { addBottomModalAlerts } from '$routes/(console)/bottomAlerts';
     import { project } from '$routes/(console)/project-[project]/store';
@@ -74,10 +74,10 @@
             case 'free':
                 return false;
             case 'pro':
-                return organizationPlan === BillingPlan.FREE;
+                return organizationPlan === BillingPlan.Tier0;
             case 'scale':
                 return (
-                    organizationPlan === BillingPlan.FREE || organizationPlan === BillingPlan.PRO
+                    organizationPlan === BillingPlan.Tier0 || organizationPlan === BillingPlan.Tier1
                 );
         }
     }
diff --git a/src/lib/components/creditCardInfo.svelte b/src/lib/components/creditCardInfo.svelte
index f187431340..27301a97e9 100644
--- a/src/lib/components/creditCardInfo.svelte
+++ b/src/lib/components/creditCardInfo.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-    import type { PaymentMethodData } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
     import { Alert } from '.';
     import CreditCardBrandImage from './creditCardBrandImage.svelte';
 
     export let isBox = false;
-    export let paymentMethod: PaymentMethodData;
+    export let paymentMethod: Models.PaymentMethod;
 </script>
 
 <div class:box={isBox}>
diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 66d922d410..7e2ec964e9 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -6,7 +6,7 @@
     import { showSupportModal } from '$routes/(console)/wizard/support/store';
     import { isCloud } from '$lib/system';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { trackEvent } from '$lib/actions/analytics';
     import { localeTimezoneName, utcHourToLocaleHour } from '$lib/helpers/date';
     import { upgradeURL } from '$lib/stores/billing';
@@ -14,8 +14,8 @@
     export let show = false;
 
     $: isPaid =
-        $organization?.billingPlan === BillingPlan.PRO ||
-        $organization?.billingPlan === BillingPlan.SCALE;
+        $organization?.billingPlan === BillingPlan.Tier1 ||
+        $organization?.billingPlan === BillingPlan.Tier2;
 
     $: supportTimings = `${utcHourToLocaleHour('16:00')} - ${utcHourToLocaleHour('00:00')} ${localeTimezoneName()}`;
 </script>
@@ -30,7 +30,7 @@
                 </p>
             {/if}
         </div>
-        {#if $organization?.billingPlan === BillingPlan.FREE}
+        {#if $organization?.billingPlan === BillingPlan.Tier0}
             <Button
                 fullWidth
                 href={$upgradeURL}
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index ffa1bda990..7b64795ad0 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -465,13 +465,6 @@ export const eventServices: Array<EventService> = [
     }
 ];
 
-export enum BillingPlan {
-    FREE = 'tier-0',
-    PRO = 'tier-1',
-    SCALE = 'tier-2',
-    CUSTOM = 'cont-1'
-}
-
 export const feedbackDowngradeOptions = [
     {
         value: 'availableFeatures',
diff --git a/src/lib/layout/activity.svelte b/src/lib/layout/activity.svelte
index e1d691863f..f702a30345 100644
--- a/src/lib/layout/activity.svelte
+++ b/src/lib/layout/activity.svelte
@@ -22,7 +22,7 @@
     import { isCloud } from '$lib/system';
     import { organization } from '$lib/stores/organization';
     import { Button } from '$lib/elements/forms';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
 
     export let logs: Models.LogList;
     export let offset = 0;
@@ -52,7 +52,7 @@
                         Logs are retained in rolling {hoursToDays(limit)} intervals with the
                         {tierToPlan($organization.billingPlan).name}
                         plan.
-                        {#if $organization?.billingPlan === BillingPlan.FREE}
+                        {#if $organization?.billingPlan === BillingPlan.Tier0}
                             <Button link on:click={upgradeMethod}>Upgrade</Button> to increase your log
                             retention for a longer period.
                         {/if}
diff --git a/src/lib/layout/containerButton.svelte b/src/lib/layout/containerButton.svelte
index e0b0512d35..f1fc32b7bd 100644
--- a/src/lib/layout/containerButton.svelte
+++ b/src/lib/layout/containerButton.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { tooltip } from '$lib/actions/tooltip';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import { tierToPlan } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
 
     export let title: string;
     export let tooltipContent =
-        $organization?.billingPlan === BillingPlan.FREE
+        $organization?.billingPlan === BillingPlan.Tier0
             ? `Upgrade to add more ${title.toLocaleLowerCase()}`
             : `You've reached the ${title.toLocaleLowerCase()} limit for the ${
                   tierToPlan($organization?.billingPlan)?.name
diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte
index 404e518fc4..119cc2daeb 100644
--- a/src/lib/layout/containerHeader.svelte
+++ b/src/lib/layout/containerHeader.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Alert, DropList, Heading } from '$lib/components';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Pill } from '$lib/elements';
     import { Button } from '$lib/elements/forms';
     import {
@@ -64,7 +64,7 @@
 
     $: tier = tierToPlan($organization?.billingPlan)?.name;
     $: hasProjectLimitation =
-        checkForProjectLimitation(serviceId) && $organization?.billingPlan === BillingPlan.FREE;
+        checkForProjectLimitation(serviceId) && $organization?.billingPlan === BillingPlan.Tier0;
     $: hasUsageFees = hasProjectLimitation
         ? checkForUsageFees($organization?.billingPlan, serviceId)
         : false;
@@ -89,7 +89,7 @@
             })
             .join(', ')}
         <slot name="alert" {limit} {tier} {title} {upgradeMethod} {hasUsageFees} {services}>
-            {#if $organization?.billingPlan !== BillingPlan.FREE && hasUsageFees}
+            {#if $organization?.billingPlan !== BillingPlan.Tier0 && hasUsageFees}
                 <Alert type="info" isStandalone>
                     <span class="text">
                         You've reached the {services} limit for the {tier} plan.
@@ -136,7 +136,7 @@
                             <p class="text">
                                 You are limited to {limit}
                                 {title.toLocaleLowerCase()} per project on the {tier} plan.
-                                {#if $organization?.billingPlan === BillingPlan.FREE}<Button
+                                {#if $organization?.billingPlan === BillingPlan.Tier0}<Button
                                         link
                                         href={$upgradeURL}
                                         on:click={() =>
@@ -159,7 +159,7 @@
                             <p class="text">
                                 You are limited to {limit}
                                 {title.toLocaleLowerCase()} per organization on the {tier} plan.
-                                {#if $organization?.billingPlan === BillingPlan.FREE}
+                                {#if $organization?.billingPlan === BillingPlan.Tier0}
                                     <Button link href={$upgradeURL}>Upgrade</Button>
                                     for additional {title.toLocaleLowerCase()}.
                                 {/if}
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index a63a57818f..af0f7a6f3e 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -21,7 +21,8 @@
     import { sdk } from '$lib/stores/sdk';
     import { isCloud } from '$lib/system';
     import { Feedback } from '$lib/components/feedback';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { upgradeURL } from '$lib/stores/billing';
 
     let showDropdown = false;
@@ -100,7 +101,7 @@
 
 <div class="main-header-end">
     <nav class="u-flex is-only-desktop u-cross-center">
-        {#if isCloud && $organization?.billingPlan === BillingPlan.FREE && !$page.url.pathname.startsWith('/console/account')}
+        {#if isCloud && $organization?.billingPlan === BillingPlan.Tier0 && !$page.url.pathname.startsWith('/console/account')}
             <Button
                 disabled={$organization?.markedForDeletion}
                 href={$upgradeURL}
diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 3cecdd2773..83c123d023 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -17,7 +17,7 @@
     import { getServiceLimit, tierToPlan, upgradeURL } from '$lib/stores/billing';
     import { organization } from '$lib/stores/organization';
     import { Button } from '$lib/elements/forms';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { tooltip } from '$lib/actions/tooltip';
 
     let selectedRequest = 'parameters';
@@ -341,7 +341,7 @@
                                         <Alert>
                                             Logs are retained in rolling {hoursToDays(limit)} intervals
                                             with the {tier} plan.
-                                            {#if $organization.billingPlan === BillingPlan.FREE}
+                                            {#if $organization.billingPlan === BillingPlan.Tier0}
                                                 <Button link href={$upgradeURL}>Upgrade</Button> to increase
                                                 your log retention for a longer period.
                                             {/if}
diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte
index cda4c67a92..2ba9240cf1 100644
--- a/src/lib/layout/navigation.svelte
+++ b/src/lib/layout/navigation.svelte
@@ -3,7 +3,7 @@
     import { page } from '$app/stores';
     import { trackEvent } from '$lib/actions/analytics';
     import { tooltip } from '$lib/actions/tooltip';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { isMac } from '$lib/helpers/platform';
     import { slide } from '$lib/helpers/transition';
     import { upgradeURL } from '$lib/stores/billing';
@@ -206,7 +206,7 @@
                     </a>
 
                     <ul class="drop-list is-not-desktop">
-                        {#if isCloud && $organization?.billingPlan !== BillingPlan.SCALE}
+                        {#if isCloud && $organization?.billingPlan !== BillingPlan.Tier2}
                             <li class="drop-list-item">
                                 <a class="drop-button" href={$upgradeURL}>
                                     <span class="text">Upgrade</span>
diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index d2b407c8b3..2d9ea51260 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -1,4 +1,4 @@
-import type { Client, Models } from '@appwrite.io/console';
+import type { BillingPlan, Client, Models } from '@appwrite.io/console';
 import type { Organization, OrganizationList } from '../stores/organization';
 import type { PaymentMethod } from '@stripe/stripe-js';
 import type { Tier } from '$lib/stores/billing';
@@ -286,7 +286,7 @@ export type PlansInfo = {
     total: number;
 };
 
-export type PlansMap = Map<Tier, Plan>;
+export type PlansMap = Map<Tier, Models.BillingPlan>;
 
 export type Roles = {
     scopes: string[];
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index d5d66a4c38..8cdcec3c4f 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -2,19 +2,10 @@ import { page } from '$app/stores';
 import { derived, get, writable } from 'svelte/store';
 import { sdk } from './sdk';
 import { organization, type Organization } from './organization';
-import type {
-    InvoiceList,
-    AddressesList,
-    Invoice,
-    PaymentList,
-    PlansMap,
-    PaymentMethodData,
-    OrganizationUsage,
-    Plan
-} from '$lib/sdk/billing';
+import type { PlansMap } from '$lib/sdk/billing';
 import { isCloud } from '$lib/system';
 import { cachedStore } from '$lib/helpers/cache';
-import { Query } from '@appwrite.io/console';
+import { Query, type Models } from '@appwrite.io/console';
 import { headerAlert } from './headerAlert';
 import PaymentAuthRequired from '$lib/components/billing/alerts/paymentAuthRequired.svelte';
 import { addNotification, notifications } from './notifications';
@@ -22,7 +13,7 @@ import { goto } from '$app/navigation';
 import { base } from '$app/paths';
 import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/(console)/store';
 import MarkedForDeletion from '$lib/components/billing/alerts/markedForDeletion.svelte';
-import { BillingPlan } from '$lib/constants';
+
 import PaymentMandate from '$lib/components/billing/alerts/paymentMandate.svelte';
 import MissingPaymentMethod from '$lib/components/billing/alerts/missingPaymentMethod.svelte';
 import LimitReached from '$lib/components/billing/alerts/limitReached.svelte';
@@ -33,6 +24,7 @@ import { sizeToBytes, type Size } from '$lib/helpers/sizeConvertion';
 import { user } from './user';
 import { browser } from '$app/environment';
 import { canSeeBilling } from './roles';
+import { BillingPlan } from '@appwrite.io/console';
 
 export type Tier = 'tier-0' | 'tier-1' | 'tier-2' | 'cont-1';
 
@@ -58,9 +50,14 @@ export const roles = [
         value: 'billing'
     }
 ];
-
-export const paymentMethods = derived(page, ($page) => $page.data.paymentMethods as PaymentList);
-export const addressList = derived(page, ($page) => $page.data.addressList as AddressesList);
+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 PlansMap);
 export const daysLeftInTrial = writable<number>(0);
 export const readOnly = writable<boolean>(false);
@@ -69,40 +66,40 @@ export function getRoleLabel(role: string) {
     return roles.find((r) => r.value === role)?.label ?? role;
 }
 
-export function tierToPlan(tier: Tier) {
+export function tierToPlan(tier: BillingPlan | string) {
     switch (tier) {
-        case BillingPlan.FREE:
+        case BillingPlan.Tier0:
             return tierFree;
-        case BillingPlan.PRO:
+        case BillingPlan.Tier1:
             return tierPro;
-        case BillingPlan.SCALE:
+        case BillingPlan.Tier2:
             return tierScale;
-        case BillingPlan.CUSTOM:
+        case 'cont-1':
             return tierCustom;
         default:
             return tierFree;
     }
 }
 
-export function getNextTier(tier: Tier) {
+export function getNextTier(tier: BillingPlan | string) {
     switch (tier) {
-        case BillingPlan.FREE:
-            return BillingPlan.PRO;
-        case BillingPlan.PRO:
-            return BillingPlan.SCALE;
+        case BillingPlan.Tier0:
+            return BillingPlan.Tier1;
+        case BillingPlan.Tier1:
+            return BillingPlan.Tier2;
         default:
-            return BillingPlan.PRO;
+            return BillingPlan.Tier1;
     }
 }
 
-export function getPreviousTier(tier: Tier) {
+export function getPreviousTier(tier: BillingPlan | string) {
     switch (tier) {
-        case BillingPlan.PRO:
-            return BillingPlan.FREE;
-        case BillingPlan.SCALE:
-            return BillingPlan.PRO;
+        case BillingPlan.Tier1:
+            return BillingPlan.Tier0;
+        case BillingPlan.Tier2:
+            return BillingPlan.Tier1;
         default:
-            return BillingPlan.FREE;
+            return BillingPlan.Tier0;
     }
 }
 
@@ -138,7 +135,7 @@ export function getServiceLimit(serviceId: PlanServices, tier: Tier = null): num
 }
 
 export const failedInvoice = cachedStore<
-    Invoice,
+    Models.Invoice,
     {
         load: (orgId: string) => Promise<void>;
     }
@@ -147,7 +144,7 @@ export const failedInvoice = cachedStore<
         load: async (orgId) => {
             if (!isCloud) set(null);
             if (!get(canSeeBilling)) set(null);
-            const invoices = await sdk.forConsole.billing.listInvoices(orgId);
+            const invoices = await sdk.forConsole.organizations.listInvoices(orgId);
             const failedInvoices = invoices.invoices.filter((i) => i.status === 'failed');
             // const failedInvoices = invoices.invoices;
             if (failedInvoices?.length > 0) {
@@ -163,7 +160,7 @@ export const failedInvoice = cachedStore<
     };
 });
 
-export const actionRequiredInvoices = writable<InvoiceList>(null);
+export const actionRequiredInvoices = writable<Models.InvoiceList>(null);
 
 export type TierData = {
     name: string;
@@ -192,7 +189,7 @@ export const tierCustom: TierData = {
 export const showUsageRatesModal = writable<boolean>(false);
 
 export function checkForUsageFees(plan: Tier, id: PlanServices) {
-    if (plan === BillingPlan.PRO || plan === BillingPlan.SCALE) {
+    if (plan === BillingPlan.Tier1 || plan === BillingPlan.Tier2) {
         switch (id) {
             case 'bandwidth':
             case 'storage':
@@ -232,7 +229,7 @@ export function isServiceLimited(serviceId: PlanServices, plan: Tier, total: num
 }
 
 export function calculateTrialDay(org: Organization) {
-    if (org?.billingPlan === BillingPlan.FREE) return false;
+    if (org?.billingPlan === BillingPlan.Tier0) return false;
     const endDate = new Date(org?.billingStartDate);
     const today = new Date();
 
@@ -246,7 +243,7 @@ export function calculateTrialDay(org: Organization) {
 }
 
 export async function checkForUsageLimit(org: Organization) {
-    if (org?.billingPlan !== BillingPlan.FREE) {
+    if (org?.billingPlan !== BillingPlan.Tier0) {
         readOnly.set(false);
         return;
     }
@@ -282,9 +279,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 ${tierToPlan(BillingPlan.Tier0).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 ${tierToPlan(BillingPlan.Tier0).name} plan limit. Upgrade to ensure there are no service disruptions.`;
         }
         addNotification({
             type: 'warning',
@@ -316,9 +313,9 @@ export async function checkForUsageLimit(org: Organization) {
 }
 
 export async function checkPaymentAuthorizationRequired(org: Organization) {
-    if (org.billingPlan === BillingPlan.FREE) return;
+    if (org.billingPlan === BillingPlan.Tier0) return;
 
-    const invoices = await sdk.forConsole.billing.listInvoices(org.$id, [
+    const invoices = await sdk.forConsole.organizations.listInvoices(org.$id, [
         Query.equal('status', 'requires_authentication')
     ]);
 
@@ -337,7 +334,7 @@ export async function checkPaymentAuthorizationRequired(org: Organization) {
 
 export async function paymentExpired(org: Organization) {
     if (!org?.paymentMethodId) return;
-    const payment = await sdk.forConsole.billing.getOrganizationPaymentMethod(
+    const payment = await sdk.forConsole.organizations.getPaymentMethod(
         org.$id,
         org.paymentMethodId
     );
@@ -395,12 +392,12 @@ export function checkForMarkedForDeletion(org: Organization) {
     }
 }
 
-export const paymentMissingMandate = writable<PaymentMethodData>(null);
+export const paymentMissingMandate = writable<Models.PaymentMethod>(null);
 
 export async function checkForMandate(org: Organization) {
     const paymentId = org.paymentMethodId ?? org.backupPaymentMethodId;
     if (!paymentId) return;
-    const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentId);
+    const paymentMethod = await sdk.forConsole.account.getPaymentMethod(paymentId);
     if (paymentMethod?.mandateId === null && paymentMethod?.country.toLowerCase() === 'in') {
         headerAlert.add({
             id: 'paymentMandate',
@@ -414,13 +411,13 @@ export async function checkForMandate(org: Organization) {
 }
 
 export async function checkForMissingPaymentMethod() {
-    const orgs = await sdk.forConsole.billing.listOrganization([
-        Query.notEqual('billingPlan', BillingPlan.FREE),
+    const orgs = await sdk.forConsole.organizations.list([
+        Query.notEqual('billingPlan', BillingPlan.Tier0),
         Query.isNull('paymentMethodId'),
         Query.isNull('backupPaymentMethodId')
     ]);
     if (orgs?.total) {
-        orgMissingPaymentMethod.set(orgs.teams[0]);
+        orgMissingPaymentMethod.set(orgs.teams[0] as Organization);
         headerAlert.add({
             id: 'missingPaymentMethod',
             component: MissingPaymentMethod,
@@ -432,10 +429,10 @@ export async function checkForMissingPaymentMethod() {
 
 // Display upgrade banner for new users after 1 week for 30 days
 export async function checkForNewDevUpgradePro(org: Organization) {
-    if (org?.billingPlan !== BillingPlan.FREE || !browser) return;
+    if (org?.billingPlan !== BillingPlan.Tier0 || !browser) return;
 
-    const orgs = await sdk.forConsole.billing.listOrganization([
-        Query.notEqual('billingPlan', BillingPlan.FREE)
+    const orgs = await sdk.forConsole.organizations.list([
+        Query.notEqual('billingPlan', BillingPlan.Tier0)
     ]);
     if (orgs?.total) return;
 
@@ -461,7 +458,11 @@ export const upgradeURL = derived(
 
 export const hideBillingHeaderRoutes = ['/console/create-organization', '/console/account'];
 
-export function calculateExcess(usage: OrganizationUsage, plan: Plan, members: number) {
+export function calculateExcess(
+    usage: Models.UsageOrganization,
+    plan: Models.BillingPlan,
+    members: number
+) {
     const totBandwidth = usage?.bandwidth?.length > 0 ? last(usage.bandwidth).value : 0;
     return {
         bandwidth: calculateResourceSurplus(totBandwidth, plan.bandwidth),
diff --git a/src/lib/stores/campaigns.ts b/src/lib/stores/campaigns.ts
index a9e5247428..19fd3cb52a 100644
--- a/src/lib/stores/campaigns.ts
+++ b/src/lib/stores/campaigns.ts
@@ -1,6 +1,6 @@
 //campaign welcome and startup
 
-import { BillingPlan } from '$lib/constants';
+import { BillingPlan } from '@appwrite.io/console';
 
 export type CampaignData = {
     title: string;
@@ -57,7 +57,7 @@ campaigns
         description:
             "We're excited to have you on board. Add your credit code to your Appwrite Scale account to join.",
         onlyNewOrgs: true,
-        plan: BillingPlan.SCALE,
+        plan: BillingPlan.Tier2,
         data: {
             cta: 'Get everything out of Cloud with Scale',
             claimed: 'Your credits will be valid for 12 months.',
diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts
index f0f363d56f..7d96d8379e 100644
--- a/src/lib/stores/organization.ts
+++ b/src/lib/stores/organization.ts
@@ -1,25 +1,15 @@
 import { page } from '$app/stores';
 import { derived, writable } from 'svelte/store';
-import type { Models } from '@appwrite.io/console';
-import type { Tier } from './billing';
+import type { BillingPlan, Models } from '@appwrite.io/console';
 
-export type Organization = Models.Team<Record<string, unknown>> & {
-    billingBudget: number;
-    billingPlan: Tier;
-    budgetAlerts: number[];
-    paymentMethodId: string;
-    backupPaymentMethodId: string;
-    markedForDeletion: boolean;
+export type Organization = Omit<
+    Models.Organization<Record<string, unknown>>,
+    'billingPlanDowngrade'
+> & {
+    billingPlan: BillingPlan;
     billingLimits: BillingLimits;
-    billingCurrentInvoiceDate: string;
-    billingNextInvoiceDate: string;
-    billingTrialStartDate?: string;
-    billingStartDate?: string;
-    billingTrialDays?: number;
-    billingAddressId?: string;
-    amount: number;
-    billingTaxId?: string;
-    billingPlanDowngrade?: Tier;
+    billingPlanDowngrade: BillingPlan;
+    budgetAlerts: number[];
 };
 
 export type OrganizationList = {
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index c4b3189ddd..2d259b9614 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -4,6 +4,7 @@ import {
     Account,
     Assistant,
     Avatars,
+    Backups,
     Client,
     Console,
     Databases,
@@ -12,8 +13,8 @@ import {
     Locale,
     Messaging,
     Migrations,
+    Organizations,
     Project,
-    Project as ProjectApi,
     Projects,
     Proxy,
     Storage,
@@ -21,8 +22,6 @@ import {
     Users,
     Vcs
 } from '@appwrite.io/console';
-import { Billing } from '../sdk/billing';
-import { Backups } from '../sdk/backups';
 import { Sources } from '$lib/sdk/sources';
 
 export function getApiEndpoint(): string {
@@ -49,7 +48,6 @@ const sdkForProject = {
     locale: new Locale(clientProject),
     messaging: new Messaging(clientProject),
     project: new Project(clientProject),
-    projectApi: new ProjectApi(clientProject),
     storage: new Storage(clientProject),
     teams: new Teams(clientProject),
     users: new Users(clientProject),
@@ -76,11 +74,11 @@ export const sdk = {
         locale: new Locale(clientConsole),
         projects: new Projects(clientConsole),
         teams: new Teams(clientConsole),
+        organizations: new Organizations(clientConsole),
         users: new Users(clientConsole),
         migrations: new Migrations(clientConsole),
         console: new Console(clientConsole),
         assistant: new Assistant(clientConsole),
-        billing: new Billing(clientConsole),
         sources: new Sources(clientConsole)
     },
     get forProject() {
diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts
index 58edfd4316..d330503358 100644
--- a/src/lib/stores/stripe.ts
+++ b/src/lib/stores/stripe.ts
@@ -2,14 +2,14 @@ import type { Stripe, StripeElement, StripeElements } from '@stripe/stripe-js';
 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 type { Models } from '@appwrite.io/console';
 
 export const stripe = writable<Stripe>();
-let paymentMethod: PaymentMethodData;
+let paymentMethod: Models.PaymentMethod;
 let clientSecret: string;
 let elements: StripeElements;
 let paymentElement: StripeElement;
@@ -20,7 +20,7 @@ export async function initializeStripe() {
     if (!get(stripe)) return;
     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(
@@ -29,7 +29,7 @@ export async function initializeStripe() {
 
     // 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;
     }
 
@@ -56,7 +56,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;
         }
 
@@ -93,9 +93,9 @@ export async function submitStripeCard(name: string, organizationId?: string) {
         }
 
         if (setupIntent && setupIntent.status === 'succeeded') {
-            const method = await sdk.forConsole.billing.setPaymentMethod(
+            const method = await sdk.forConsole.account.updatePaymentMethodProvider(
                 paymentMethod.$id,
-                setupIntent.payment_method,
+                setupIntent.payment_method.toString(),
                 name
             );
             paymentElement.destroy();
@@ -123,7 +123,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 c0ba2b3436..a03973a42e 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { page } from '$app/stores';
-    import { BillingPlan, INTERVAL } from '$lib/constants';
+    import { INTERVAL } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Logs } from '$lib/layout';
     import Footer from '$lib/layout/footer.svelte';
     import Header from '$lib/layout/header.svelte';
@@ -282,12 +283,12 @@
             checkForMarkedForDeletion(org);
             await checkForNewDevUpgradePro(org);
 
-            if (org?.billingPlan !== BillingPlan.FREE) {
+            if (org?.billingPlan !== BillingPlan.Tier0) {
                 await paymentExpired(org);
                 await checkPaymentAuthorizationRequired(org);
                 await checkForMandate(org);
 
-                if ($plansInfo.get(org.billingPlan)?.trialDays) {
+                if ($plansInfo.get(org.billingPlan)?.trial) {
                     calculateTrialDay(org);
                 }
             }
diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts
index 1f5bbfc3eb..0187bc11c0 100644
--- a/src/routes/(console)/+layout.ts
+++ b/src/routes/(console)/+layout.ts
@@ -1,8 +1,8 @@
 import { Dependencies } from '$lib/constants';
-import type { Plan } from '$lib/sdk/billing';
 import type { Tier } from '$lib/stores/billing';
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
+import type { Models } from '@appwrite.io/console';
 import type { LayoutLoad } from './$types';
 
 export const load: LayoutLoad = async ({ fetch, depends, parent }) => {
@@ -22,13 +22,13 @@ export const load: LayoutLoad = async ({ fetch, depends, parent }) => {
 
     const [data, variables] = await Promise.all([versionPromise, variablesPromise]);
 
-    let plansInfo = new Map<Tier, Plan>();
+    let plansInfo = new Map<Tier, Models.BillingPlan>();
     if (isCloud) {
-        const plansArray = await sdk.forConsole.billing.getPlansInfo();
+        const plansArray = await sdk.forConsole.console.plans();
         plansInfo = plansArray.plans.reduce((map, plan) => {
             map.set(plan.$id as Tier, plan);
             return map;
-        }, new Map<Tier, Plan>());
+        }, new Map<Tier, Models.BillingPlan>());
     }
 
     return {
diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte
index 6c46e6718d..be98971583 100644
--- a/src/routes/(console)/account/organizations/+page.svelte
+++ b/src/routes/(console)/account/organizations/+page.svelte
@@ -20,7 +20,7 @@
     import { daysLeftInTrial, plansInfo } from '$lib/stores/billing';
     import { tooltip } from '$lib/actions/tooltip';
     import { toLocaleDate } from '$lib/helpers/date';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { goto } from '$app/navigation';
 
     export let data: PageData;
@@ -71,7 +71,7 @@
                     </svelte:fragment>
                     <svelte:fragment slot="status">
                         {#if isCloudOrg(organization)}
-                            {#if organization?.billingPlan === BillingPlan.FREE}
+                            {#if organization?.billingPlan === BillingPlan.Tier0}
                                 <div
                                     class="u-flex u-cross-center"
                                     use:tooltip={{
@@ -81,7 +81,7 @@
                                     <Pill class="eyebrow-heading-3">FREE</Pill>
                                 </div>
                             {/if}
-                            {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.FREE && $plansInfo.get(organization.billingPlan)?.trialDays}
+                            {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.Tier0 && $plansInfo.get(organization.billingPlan)?.trialDays}
                                 <div
                                     class="u-flex u-cross-center"
                                     use:tooltip={{
diff --git a/src/routes/(console)/account/payments/+page.ts b/src/routes/(console)/account/payments/+page.ts
index 983d611cb8..c528968a63 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] = await Promise.all([
-        sdk.forConsole.billing.listPaymentMethods(),
-        sdk.forConsole.billing.listAddresses()
+        sdk.forConsole.account.listPaymentMethods(),
+        sdk.forConsole.account.listBillingAddresses()
     ]);
     return {
         paymentMethods,
diff --git a/src/routes/(console)/account/payments/addressModal.svelte b/src/routes/(console)/account/payments/addressModal.svelte
index fbeb783aff..a26bd1a2ca 100644
--- a/src/routes/(console)/account/payments/addressModal.svelte
+++ b/src/routes/(console)/account/payments/addressModal.svelte
@@ -42,7 +42,7 @@
 
     async function handleSubmit() {
         try {
-            const response = await sdk.forConsole.billing.createAddress(
+            const response = await sdk.forConsole.account.createBillingAddress(
                 country,
                 address,
                 city,
@@ -53,7 +53,10 @@
             trackEvent(Submit.BillingAddressCreate);
             let org: Organization = null;
             if (organization) {
-                org = await sdk.forConsole.billing.setBillingAddress(organization, response.$id);
+                org = (await sdk.forConsole.organizations.setBillingAddress(
+                    organization,
+                    response.$id
+                )) as unknown as Organization;
                 trackEvent(Submit.OrganizationBillingAddressUpdate);
                 await invalidate(Dependencies.ORGANIZATION);
             }
diff --git a/src/routes/(console)/account/payments/deleteAddressModal.svelte b/src/routes/(console)/account/payments/deleteAddressModal.svelte
index e20c6948b9..fdf7412345 100644
--- a/src/routes/(console)/account/payments/deleteAddressModal.svelte
+++ b/src/routes/(console)/account/payments/deleteAddressModal.svelte
@@ -17,7 +17,7 @@
 
     async function handleDelete() {
         try {
-            await sdk.forConsole.billing.deleteAddress(selectedAddress.$id);
+            await sdk.forConsole.account.deleteBillingAddress(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 59240ec391..d83afe5645 100644
--- a/src/routes/(console)/account/payments/deletePaymentModal.svelte
+++ b/src/routes/(console)/account/payments/deletePaymentModal.svelte
@@ -15,7 +15,7 @@
 
     async function handleDelete() {
         try {
-            await sdk.forConsole.billing.deletePaymentMethod(method);
+            await sdk.forConsole.account.deletePaymentMethod(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 bea14ab0e4..d04f6bcd3e 100644
--- a/src/routes/(console)/account/payments/editAddressModal.svelte
+++ b/src/routes/(console)/account/payments/editAddressModal.svelte
@@ -36,7 +36,7 @@
 
     async function handleSubmit() {
         try {
-            await sdk.forConsole.billing.updateAddress(
+            await sdk.forConsole.account.updateBillingAddress(
                 selectedAddress.$id,
                 selectedAddress.country,
                 selectedAddress.streetAddress,
diff --git a/src/routes/(console)/account/payments/editPaymentModal.svelte b/src/routes/(console)/account/payments/editPaymentModal.svelte
index 56529fdc9a..7cf3da5454 100644
--- a/src/routes/(console)/account/payments/editPaymentModal.svelte
+++ b/src/routes/(console)/account/payments/editPaymentModal.svelte
@@ -5,23 +5,23 @@
     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 type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let selectedPaymentMethod: PaymentMethodData;
+    export let selectedPaymentMethod: Models.PaymentMethod;
     export let isLinked = false;
     const currentYear = new Date().getFullYear();
     let error: string;
-    let month: string;
+    let month: number;
     let year: number;
 
     async function handleSubmit() {
         try {
-            await sdk.forConsole.billing.updatePaymentMethod(
+            await sdk.forConsole.account.updatePaymentMethod(
                 selectedPaymentMethod.$id,
                 month,
-                year?.toString()
+                year
             );
             trackEvent(Submit.PaymentMethodUpdate);
             invalidate(Dependencies.PAYMENT_METHODS);
@@ -38,23 +38,23 @@
 
     function createMonthOptions(year: number) {
         const months = [
-            { value: '01', label: '01' },
-            { value: '02', label: '02' },
-            { value: '03', label: '03' },
-            { value: '04', label: '04' },
-            { value: '05', label: '05' },
-            { value: '06', label: '06' },
-            { value: '07', label: '07' },
-            { value: '08', label: '08' },
-            { value: '09', label: '09' },
-            { value: '10', label: '10' },
-            { value: '11', label: '11' },
-            { value: '12', label: '12' }
+            { value: 1, label: '01' },
+            { value: 2, label: '02' },
+            { value: 3, label: '03' },
+            { value: 4, label: '04' },
+            { value: 5, label: '05' },
+            { value: 6, label: '06' },
+            { value: 7, label: '07' },
+            { value: 8, label: '08' },
+            { value: 9, label: '09' },
+            { value: 10, label: '10' },
+            { value: 11, label: '11' },
+            { value: 12, label: '12' }
         ];
         if (!year) return months;
         if (year === currentYear) {
             const currentMonth = new Date().getMonth() + 1;
-            return months.filter((option) => parseInt(option.value) >= currentMonth);
+            return months.filter((option) => option.value >= currentMonth);
         } else {
             return months;
         }
diff --git a/src/routes/(console)/account/payments/paymentMethods.svelte b/src/routes/(console)/account/payments/paymentMethods.svelte
index e8f4c479a4..2d951e4a70 100644
--- a/src/routes/(console)/account/payments/paymentMethods.svelte
+++ b/src/routes/(console)/account/payments/paymentMethods.svelte
@@ -18,17 +18,17 @@
         TableRow
     } from '$lib/elements/table';
     import { paymentMethods } from '$lib/stores/billing';
-    import type { PaymentMethodData } from '$lib/sdk/billing';
     import { organizationList, type Organization } from '$lib/stores/organization';
     import { base } from '$app/paths';
     import EditPaymentModal from './editPaymentModal.svelte';
     import DeletePaymentModal from './deletePaymentModal.svelte';
     import { hasStripePublicKey, isCloud } from '$lib/system';
     import PaymentModal from '$lib/components/billing/paymentModal.svelte';
+    import type { Models } from '@appwrite.io/console';
 
     export let showPayment = false;
     let showDropdown = [];
-    let selectedMethod: PaymentMethodData;
+    let selectedMethod: Models.PaymentMethod;
     let selectedLinkedOrgs: Organization[] = [];
     let showDelete = false;
     let showEdit = false;
@@ -38,7 +38,7 @@
     $: orgList = $organizationList.teams as unknown as Organization[];
 
     $: filteredMethods = $paymentMethods?.paymentMethods.filter(
-        (method: PaymentMethodData) => !!method?.last4
+        (method: Models.PaymentMethod) => !!method?.last4
     );
 </script>
 
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index a621bff958..a200112251 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -8,7 +8,7 @@
         EstimatedTotalBox,
         SelectPaymentMethod
     } from '$lib/components/billing';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputSelect, InputTags, InputText } from '$lib/elements/forms';
     import { toLocaleDate } from '$lib/helpers/date';
     import {
@@ -16,13 +16,12 @@
         WizardSecondaryContent,
         WizardSecondaryFooter
     } from '$lib/layout';
-    import { type PaymentList } from '$lib/sdk/billing';
     import { app } from '$lib/stores/app';
     import { campaigns } from '$lib/stores/campaigns';
     import { addNotification } from '$lib/stores/notifications';
     import { organizationList, type Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
-    import { ID } from '@appwrite.io/console';
+    import { ID, BillingPlan, type Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { writable } from 'svelte/store';
 
@@ -49,7 +48,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;
@@ -69,7 +68,7 @@
     let coupon: string;
     let couponData = data?.couponData;
     let campaign = campaigns.get(data?.couponData?.campaign ?? data?.campaign);
-    let billingPlan = BillingPlan.PRO;
+    let billingPlan = BillingPlan.Tier1;
 
     onMount(async () => {
         await loadPaymentMethods();
@@ -86,7 +85,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 =
@@ -101,21 +100,21 @@
             let org: Organization;
             // Create new org
             if (selectedOrgId === newOrgId) {
-                org = await sdk.forConsole.billing.createOrganization(
+                org = (await sdk.forConsole.organizations.create(
                     newOrgId,
                     name,
                     billingPlan,
                     paymentMethodId
-                );
+                )) as unknown as Organization;
             }
             // Upgrade existing org
-            else if (selectedOrg?.billingPlan === BillingPlan.FREE) {
-                org = await sdk.forConsole.billing.updatePlan(
+            else if (selectedOrg?.billingPlan === BillingPlan.Tier0) {
+                org = (await sdk.forConsole.organizations.updatePlan(
                     selectedOrg.$id,
                     billingPlan,
                     paymentMethodId,
                     null
-                );
+                )) as unknown as Organization;
             }
             // Existing pro org
             else {
@@ -124,12 +123,12 @@
 
             // Add coupon
             if (couponData?.code) {
-                await sdk.forConsole.billing.addCredit(org.$id, couponData.code);
+                await sdk.forConsole.organizations.addCredit(org.$id, couponData.code);
             }
 
             // Add budget
             if (billingBudget) {
-                await sdk.forConsole.billing.updateBudget(org.$id, billingBudget, [75]);
+                await sdk.forConsole.organizations.updateBudget(org.$id, billingBudget, [75]);
             }
 
             // Add collaborators
@@ -148,7 +147,7 @@
 
             // Add tax ID
             if (taxId) {
-                await sdk.forConsole.billing.updateTaxId(org.$id, taxId);
+                await sdk.forConsole.organizations.setBillingTaxId(org.$id, taxId);
             }
             trackEvent(Submit.CreditRedeem, {
                 coupon: couponData.code,
@@ -172,7 +171,7 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.billing.getCoupon(coupon);
+            const response = await sdk.forConsole.console.getCopon(coupon);
             couponData = response;
             coupon = null;
             addNotification({
@@ -212,7 +211,7 @@
                         placeholder="Select organization"
                         id="organization" />
                 {/if}
-                {#if selectedOrgId && (selectedOrg?.billingPlan !== BillingPlan.PRO || !selectedOrg?.paymentMethodId)}
+                {#if selectedOrgId && (selectedOrg?.billingPlan !== BillingPlan.Tier1 || !selectedOrg?.paymentMethodId)}
                     {#if selectedOrgId === newOrgId}
                         <InputText
                             label="Organization name"
@@ -271,7 +270,7 @@
                     </div>
                 </div>
             {/if}
-            {#if selectedOrg?.$id && selectedOrg?.billingPlan !== BillingPlan.FREE}
+            {#if selectedOrg?.$id && selectedOrg?.billingPlan !== BillingPlan.Tier0}
                 <section
                     class="card u-margin-block-start-24"
                     style:--p-card-padding="1.5rem"
@@ -290,7 +289,7 @@
                 <div class:u-margin-block-start-24={campaign?.template === 'card'}>
                     <EstimatedTotalBox
                         fixedCoupon={!!data?.couponData?.code}
-                        billingPlan={BillingPlan.PRO}
+                        billingPlan={BillingPlan.Tier1}
                         {collaborators}
                         bind:couponData
                         bind:billingBudget>
diff --git a/src/routes/(console)/apply-credit/+page.ts b/src/routes/(console)/apply-credit/+page.ts
index 96b06dd30d..ed3b9a903b 100644
--- a/src/routes/(console)/apply-credit/+page.ts
+++ b/src/routes/(console)/apply-credit/+page.ts
@@ -11,7 +11,7 @@ export const load: PageLoad = async ({ url }) => {
         let couponData: Coupon;
         const code = url.searchParams.get('code');
         try {
-            couponData = await sdk.forConsole.billing.getCoupon(code);
+            couponData = await sdk.forConsole.console.getCopon(code);
         } catch (e) {
             redirect(303, base);
         }
diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
index 137ede330a..1f965a2c43 100644
--- a/src/routes/(console)/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -11,24 +11,24 @@
     } from '$lib/components/billing';
     import ValidateCreditModal from '$lib/components/billing/validateCreditModal.svelte';
     import Default from '$lib/components/roles/default.svelte';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputTags, InputText, Label } from '$lib/elements/forms';
     import {
         WizardSecondaryContainer,
         WizardSecondaryContent,
         WizardSecondaryFooter
     } from '$lib/layout';
-    import type { Coupon, PaymentList } from '$lib/sdk/billing';
+    import type { Coupon } from '$lib/sdk/billing';
     import { tierToPlan } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { organizationList, type Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
-    import { ID } from '@appwrite.io/console';
+    import { ID, BillingPlan, type Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { writable } from 'svelte/store';
 
     $: anyOrgFree = $organizationList.teams?.some(
-        (org) => (org as Organization)?.billingPlan === BillingPlan.FREE
+        (org) => (org as Organization)?.billingPlan === BillingPlan.Tier0
     );
     const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$/i;
     let previousPage: string = base;
@@ -41,9 +41,9 @@
     let formComponent: Form;
     let isSubmitting = writable(false);
 
-    let methods: PaymentList;
+    let methods: Models.PaymentMethodList;
     let name: string;
-    let billingPlan: BillingPlan = BillingPlan.FREE;
+    let billingPlan: BillingPlan = BillingPlan.Tier0;
     let paymentMethodId: string;
     let collaborators: string[] = [];
     let couponData: Partial<Coupon> = {
@@ -60,7 +60,7 @@
         if ($page.url.searchParams.has('coupon')) {
             const coupon = $page.url.searchParams.get('coupon');
             try {
-                const response = await sdk.forConsole.billing.getCoupon(coupon);
+                const response = await sdk.forConsole.console.getCopon(coupon);
                 couponData = response;
             } catch (e) {
                 couponData = {
@@ -80,12 +80,12 @@
             }
         }
         if (anyOrgFree) {
-            billingPlan = BillingPlan.PRO;
+            billingPlan = BillingPlan.Tier1;
         }
     });
 
     async function loadPaymentMethods() {
-        methods = await sdk.forConsole.billing.listPaymentMethods();
+        methods = await sdk.forConsole.account.listPaymentMethods();
         paymentMethodId = methods.paymentMethods.find((method) => !!method?.last4)?.$id ?? null;
     }
 
@@ -93,31 +93,31 @@
         try {
             let org: Organization;
 
-            if (billingPlan === BillingPlan.FREE) {
-                org = await sdk.forConsole.billing.createOrganization(
+            if (billingPlan === BillingPlan.Tier0) {
+                org = (await sdk.forConsole.organizations.create(
                     ID.unique(),
                     name,
-                    BillingPlan.FREE,
+                    BillingPlan.Tier0,
                     null,
                     null
-                );
+                )) as unknown as Organization;
             } else {
-                org = await sdk.forConsole.billing.createOrganization(
+                org = (await sdk.forConsole.organizations.create(
                     ID.unique(),
                     name,
                     billingPlan,
                     paymentMethodId,
                     null
-                );
+                )) as unknown as Organization;
 
                 //Add budget
                 if (billingBudget) {
-                    await sdk.forConsole.billing.updateBudget(org.$id, billingBudget, [75]);
+                    await sdk.forConsole.organizations.updateBudget(org.$id, billingBudget, [75]);
                 }
 
                 //Add coupon
                 if (couponData?.code) {
-                    await sdk.forConsole.billing.addCredit(org.$id, couponData.code);
+                    await sdk.forConsole.organizations.addCredit(org.$id, couponData.code);
                     trackEvent(Submit.CreditRedeem);
                 }
 
@@ -137,7 +137,7 @@
 
                 // Add tax ID
                 if (taxId) {
-                    await sdk.forConsole.billing.updateTaxId(org.$id, taxId);
+                    await sdk.forConsole.organizations.setBillingTaxId(org.$id, taxId);
                 }
             }
 
@@ -163,7 +163,7 @@
         }
     }
 
-    $: if (billingPlan !== BillingPlan.FREE) {
+    $: if (billingPlan !== BillingPlan.Tier0) {
         loadPaymentMethods();
     }
 </script>
@@ -190,7 +190,7 @@
                 <Button href="https://appwrite.io/pricing" external link>pricing page</Button>.
             </p>
             <PlanSelection bind:billingPlan {anyOrgFree} isNewOrg />
-            {#if billingPlan !== BillingPlan.FREE}
+            {#if billingPlan !== BillingPlan.Tier0}
                 <FormList class="u-margin-block-start-24">
                     <InputTags
                         bind:tags={collaborators}
@@ -200,8 +200,7 @@
                         validityRegex={emailRegex}
                         validityMessage="Invalid email address"
                         id="members" />
-                    <SelectPaymentMethod bind:methods bind:value={paymentMethodId} bind:taxId
-                    ></SelectPaymentMethod>
+                    <SelectPaymentMethod bind:methods bind:value={paymentMethodId} bind:taxId />
                 </FormList>
                 {#if !couponData?.code}
                     <Button
@@ -215,7 +214,7 @@
             {/if}
         </Form>
         <svelte:fragment slot="aside">
-            {#if billingPlan !== BillingPlan.FREE}
+            {#if billingPlan !== BillingPlan.Tier0}
                 <EstimatedTotalBox
                     {billingPlan}
                     {collaborators}
diff --git a/src/routes/(console)/onboarding/+page.svelte b/src/routes/(console)/onboarding/+page.svelte
index e714c1a5a8..4765a4fe7c 100644
--- a/src/routes/(console)/onboarding/+page.svelte
+++ b/src/routes/(console)/onboarding/+page.svelte
@@ -4,7 +4,7 @@
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Card, Heading } from '$lib/components';
     import CustomId from '$lib/components/customId.svelte';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import { Pill } from '$lib/elements';
     import { Button, Form, InputSelect, InputText } from '$lib/elements/forms';
     import FormList from '$lib/elements/forms/formList.svelte';
@@ -12,26 +12,26 @@
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { isCloud } from '$lib/system';
-    import { ID } from '@appwrite.io/console';
+    import { ID, BillingPlan } from '@appwrite.io/console';
     import { onMount } from 'svelte';
-    import { tierToPlan, type Tier, plansInfo } from '$lib/stores/billing';
+    import { tierToPlan, plansInfo } from '$lib/stores/billing';
     import { formatCurrency } from '$lib/helpers/numbers';
     import { base } from '$app/paths';
 
     let name: string;
     let id: string;
     let showCustomId = false;
-    let plan: Tier;
+    let plan: BillingPlan;
 
     const options = isCloud
         ? [
               {
-                  value: BillingPlan.FREE,
-                  label: `${tierToPlan(BillingPlan.FREE).name} - ${formatCurrency($plansInfo.get(BillingPlan.FREE).price)}/month`
+                  value: BillingPlan.Tier0,
+                  label: `${tierToPlan(BillingPlan.Tier0).name} - ${formatCurrency($plansInfo.get(BillingPlan.Tier0).price)}/month`
               },
               {
-                  value: BillingPlan.PRO,
-                  label: `${tierToPlan(BillingPlan.PRO).name} - ${formatCurrency($plansInfo.get(BillingPlan.PRO).price)}/month + add-ons`
+                  value: BillingPlan.Tier1,
+                  label: `${tierToPlan(BillingPlan.Tier1).name} - ${formatCurrency($plansInfo.get(BillingPlan.Tier1).price)}/month + add-ons`
               }
               // {
               //     value: BillingPlan.SCALE,
@@ -54,9 +54,9 @@
     async function handleSubmit() {
         const orgName = name?.length ? name : 'Personal Projects';
         if (isCloud) {
-            if (plan === BillingPlan.FREE) {
+            if (plan === BillingPlan.Tier0) {
                 try {
-                    const org = await sdk.forConsole.billing.createOrganization(
+                    const org = await sdk.forConsole.organizations.create(
                         id ?? ID.unique(),
                         orgName,
                         plan,
diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts
index ccc1c0a939..bd1f290518 100644
--- a/src/routes/(console)/organization-[organization]/+layout.ts
+++ b/src/routes/(console)/organization-[organization]/+layout.ts
@@ -22,7 +22,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
     try {
         if (isCloud) {
-            const res = await sdk.forConsole.billing.getRoles(params.organization);
+            const res = await sdk.forConsole.organizations.getScopes(params.organization);
             roles = res.roles;
             scopes = res.scopes;
             if (scopes.includes('billing.read')) {
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index d163390725..021274095e 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -28,7 +28,6 @@
     import { ID, Region } from '@appwrite.io/console';
     import { openImportWizard } from '../project-[project]/settings/migrations/(import)';
     import { readOnly } from '$lib/stores/billing';
-    import type { RegionList } from '$lib/sdk/billing';
     import { onMount } from 'svelte';
     import { organization } from '$lib/stores/organization';
     import { canWriteProjects } from '$lib/stores/roles';
@@ -119,10 +118,10 @@
         }
     };
 
-    let regions: RegionList;
+    let regions: Models.ConsoleRegionList;
     onMount(async () => {
         if (isCloud) {
-            regions = await sdk.forConsole.billing.listRegions();
+            regions = await sdk.forConsole.console.regions();
             if ($page.url.searchParams.has('type')) {
                 const paramType = $page.url.searchParams.get('type');
                 if (paramType === 'createPro') {
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte
index 30720f9125..ed71c8a2b1 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte
@@ -11,13 +11,12 @@
     import TaxId from './taxId.svelte';
     import { Alert, Heading } from '$lib/components';
     import { failedInvoice, paymentMethods, tierToPlan, upgradeURL } from '$lib/stores/billing';
-    import type { PaymentMethodData } from '$lib/sdk/billing';
     import { onMount } from 'svelte';
     import { page } from '$app/stores';
     import { confirmPayment } from '$lib/stores/stripe';
     import { sdk } from '$lib/stores/sdk';
     import { toLocaleDate } from '$lib/helpers/date';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan, type Models } from '@appwrite.io/console';
     import RetryPaymentModal from './retryPaymentModal.svelte';
     import { selectedInvoice, showRetryModal } from './store';
     import { Button } from '$lib/elements/forms';
@@ -26,11 +25,11 @@
     export let data;
 
     $: defaultPaymentMethod = $paymentMethods?.paymentMethods?.find(
-        (method: PaymentMethodData) => method.$id === $organization?.paymentMethodId
+        (method: Models.PaymentMethod) => method.$id === $organization?.paymentMethodId
     );
 
     $: backupPaymentMethod = $paymentMethods?.paymentMethods?.find(
-        (method: PaymentMethodData) => method.$id === $organization?.backupPaymentMethodId
+        (method: Models.PaymentMethod) => method.$id === $organization?.backupPaymentMethodId
     );
 
     onMount(async () => {
@@ -44,7 +43,7 @@
                 $page.url.searchParams.get('type') === 'confirmation'
             ) {
                 const invoiceId = $page.url.searchParams.get('invoice');
-                const invoice = await sdk.forConsole.billing.getInvoice(
+                const invoice = await sdk.forConsole.organizations.getInvoice(
                     $page.params.organization,
                     invoiceId
                 );
@@ -61,7 +60,7 @@
                 $page.url.searchParams.get('type') === 'retry'
             ) {
                 const invoiceId = $page.url.searchParams.get('invoice');
-                const invoice = await sdk.forConsole.billing.getInvoice(
+                const invoice = await sdk.forConsole.organizations.getInvoice(
                     $page.params.organization,
                     invoiceId
                 );
@@ -126,7 +125,7 @@
     <BillingAddress billingAddress={data?.billingAddress} />
     <TaxId />
     <BudgetCap />
-    {#if $organization?.billingPlan !== BillingPlan.FREE && !!$organization?.billingBudget}
+    {#if $organization?.billingPlan !== BillingPlan.Tier0 && !!$organization?.billingBudget}
         <BudgetAlert />
     {/if}
     <AvailableCredit />
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts
index 3d92e2e744..b1b7e355ec 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.ts
+++ b/src/routes/(console)/organization-[organization]/billing/+page.ts
@@ -19,15 +19,15 @@ export const load: PageLoad = async ({ parent, depends }) => {
 
     const billingAddressId = (organization as Organization)?.billingAddressId;
     const billingAddressPromise: Promise<Address> = billingAddressId
-        ? sdk.forConsole.billing
-              .getOrganizationBillingAddress(organization.$id, billingAddressId)
+        ? sdk.forConsole.organizations
+              .getBillingAddress(organization.$id, billingAddressId)
               .catch(() => null)
         : null;
 
     const [paymentMethods, addressList, aggregationList, billingAddress] = await Promise.all([
-        sdk.forConsole.billing.listPaymentMethods(),
-        sdk.forConsole.billing.listAddresses(),
-        sdk.forConsole.billing.listAggregation(organization.$id),
+        sdk.forConsole.account.listPaymentMethods(),
+        sdk.forConsole.account.listBillingAddresses(),
+        sdk.forConsole.organizations.listAggregations(organization.$id),
         billingAddressPromise
     ]);
 
diff --git a/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte b/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
index f0bb10ba9b..51ce00b593 100644
--- a/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/addCreditModal.svelte
@@ -16,7 +16,7 @@
 
     async function redeem() {
         try {
-            await sdk.forConsole.billing.addCredit($organization.$id, coupon);
+            await sdk.forConsole.organizations.addCredit($organization.$id, 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 5b4029d34d..faa400355d 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(
+            await sdk.forConsole.organizations.setDefaultPaymentMethod(
                 $organization.$id,
                 $addCreditWizardStore.paymentMethodId
             );
 
-            await sdk.forConsole.billing.addCredit($organization.$id, $addCreditWizardStore.coupon);
+            await sdk.forConsole.organizations.addCredit(
+                $organization.$id,
+                $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 dfd9cd9166..c4c89c672c 100644
--- a/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/availableCredit.svelte
@@ -19,7 +19,7 @@
     import { Button } from '$lib/elements/forms';
     import AddCreditModal from './addCreditModal.svelte';
     import { formatCurrency } from '$lib/helpers/numbers';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { trackEvent } from '$lib/actions/analytics';
     import { upgradeURL } from '$lib/stores/billing';
 
@@ -47,7 +47,7 @@
 
     async function request() {
         if (!$organization?.$id) return;
-        creditList = await sdk.forConsole.billing.listCredits($organization.$id, [
+        creditList = await sdk.forConsole.organizations.listCredits($organization.$id, [
             Query.limit(limit),
             Query.offset(offset)
         ]);
@@ -65,12 +65,12 @@
     }
 </script>
 
-<CardGrid hideFooter={$organization?.billingPlan !== BillingPlan.FREE}>
+<CardGrid hideFooter={$organization?.billingPlan !== BillingPlan.Tier0}>
     <Heading tag="h2" size="6">Available credit</Heading>
 
     <p class="text">Appwrite credit will automatically be applied to your next invoice.</p>
     <svelte:fragment slot="aside">
-        {#if $organization?.billingPlan === BillingPlan.FREE}
+        {#if $organization?.billingPlan === BillingPlan.Tier0}
             <Alert type="info">
                 <svelte:fragment slot="title">Upgrade to Pro to add credits</svelte:fragment>
                 Upgrade to a Pro plan to add credits to your organization. For more information on what
@@ -131,7 +131,7 @@
         {/if}
     </svelte:fragment>
     <svelte:fragment slot="actions">
-        {#if $organization?.billingPlan === BillingPlan.FREE}
+        {#if $organization?.billingPlan === BillingPlan.Tier0}
             <Button
                 secondary
                 href={$upgradeURL}
diff --git a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
index db11885d43..9fd90e2cfb 100644
--- a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
@@ -27,7 +27,7 @@
 
     async function addAddress(addressId: string) {
         try {
-            await sdk.forConsole.billing.setBillingAddress($organization.$id, addressId);
+            await sdk.forConsole.organizations.setBillingAddress($organization.$id, addressId);
 
             await invalidate(Dependencies.ADDRESS);
             await invalidate(Dependencies.ORGANIZATION);
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
index a75439aac4..b496b35493 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetAlert.svelte
@@ -48,7 +48,7 @@
 
     async function updateBudget() {
         try {
-            await sdk.forConsole.billing.updateBudget(
+            await sdk.forConsole.organizations.updateBudget(
                 $organization.$id,
                 $organization.billingBudget,
                 alerts
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
index e76bcd2ed4..805a96533f 100644
--- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte
@@ -2,7 +2,8 @@
     import { invalidate } from '$app/navigation';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Alert, CardGrid, Heading } from '$lib/components';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button, Form, FormList, InputNumber, InputSwitch } from '$lib/elements/forms';
     import { showUsageRatesModal, upgradeURL } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
@@ -20,7 +21,7 @@
 
     async function updateBudget() {
         try {
-            await sdk.forConsole.billing.updateBudget(
+            await sdk.forConsole.organizations.updateBudget(
                 $organization.$id,
                 budget,
                 $organization.budgetAlerts
@@ -59,7 +60,7 @@
                 class="link">Learn more about usage rates.</button>
         </p>
         <svelte:fragment slot="aside">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.Tier0}
                 <Alert type="info">
                     <svelte:fragment slot="title">
                         Budget caps are a Pro plan feature
@@ -92,7 +93,7 @@
         </svelte:fragment>
 
         <svelte:fragment slot="actions">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.Tier0}
                 <Button
                     secondary
                     href={$upgradeURL}
diff --git a/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte b/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
index e1e9f3ee85..aea37660c5 100644
--- a/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/deleteOrgPayment.svelte
@@ -6,7 +6,8 @@
     import { sdk } from '$lib/stores/sdk';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
 
     export let showDelete = false;
     export let isBackup = false;
@@ -16,10 +17,10 @@
     let error: string;
 
     async function removeDefaultMethod() {
-        if ($organization?.billingPlan !== BillingPlan.FREE && !hasOtherMethod) return;
+        if ($organization?.billingPlan !== BillingPlan.Tier0 && !hasOtherMethod) return;
 
         try {
-            await sdk.forConsole.billing.removeOrganizationPaymentMethod($organization.$id);
+            await sdk.forConsole.organizations.deleteDefaultPaymentMethod($organization.$id);
             addNotification({
                 type: 'success',
                 message: `The payment method has been removed from ${$organization.name}`
@@ -35,11 +36,11 @@
         }
     }
     async function removeBackuptMethod() {
-        if ($organization?.billingPlan !== BillingPlan.FREE && !hasOtherMethod) return;
+        if ($organization?.billingPlan !== BillingPlan.Tier0 && !hasOtherMethod) return;
         showDelete = false;
 
         try {
-            await sdk.forConsole.billing.removeOrganizationPaymentMethodBackup($organization.$id);
+            await sdk.forConsole.organizations.deleteBackupPaymentMethod($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 d8594d2baa..ee67ca2569 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte
@@ -22,9 +22,8 @@
     } from '$lib/elements/table';
     import { toLocaleDate } from '$lib/helpers/date';
     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 { Query, type Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { trackEvent } from '$lib/actions/analytics';
     import { selectedInvoice, showRetryModal } from './store';
@@ -34,7 +33,7 @@
     let showFailedError = false;
 
     let offset = 0;
-    let invoiceList: InvoiceList = {
+    let invoiceList: Models.InvoiceList = {
         invoices: [],
         total: 0
     };
@@ -45,7 +44,7 @@
     onMount(request);
 
     async function request() {
-        invoiceList = await sdk.forConsole.billing.listInvoices($page.params.organization, [
+        invoiceList = await sdk.forConsole.organizations.listInvoices($page.params.organization, [
             Query.limit(limit),
             Query.offset(offset),
             Query.notEqual('from', $organization.billingCurrentInvoiceDate),
@@ -53,7 +52,7 @@
         ]);
     }
 
-    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 4e7bdbcdc8..7503232807 100644
--- a/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/paymentMethods.svelte
@@ -10,19 +10,19 @@
         DropListItem,
         Heading
     } from '$lib/components';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
     import { addNotification } from '$lib/stores/notifications';
     import { organization } from '$lib/stores/organization';
     import { Button } from '$lib/elements/forms';
     import { hasStripePublicKey, isCloud } from '$lib/system';
     import { paymentMethods } from '$lib/stores/billing';
-    import type { PaymentMethodData } from '$lib/sdk/billing';
     import DeleteOrgPayment from './deleteOrgPayment.svelte';
     import ReplaceCard from './replaceCard.svelte';
     import EditPaymentModal from '$routes/(console)/account/payments/editPaymentModal.svelte';
     import { tooltip } from '$lib/actions/tooltip';
     import PaymentModal from '$lib/components/billing/paymentModal.svelte';
     import { user } from '$lib/stores/user';
+    import { BillingPlan, type Models } from '@appwrite.io/console';
 
     let showDropdown = false;
     let showDropdownBackup = false;
@@ -32,12 +32,12 @@
     let showDelete = false;
     let showReplace = false;
     let isSelectedBackup = false;
-    let defaultPaymentMethod: PaymentMethodData;
-    let backupPaymentMethod: PaymentMethodData;
+    let defaultPaymentMethod: Models.PaymentMethod;
+    let backupPaymentMethod: Models.PaymentMethod;
 
     async function addPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethod(
+            await sdk.forConsole.organizations.setDefaultPaymentMethod(
                 $organization.$id,
                 paymentMethodId
             );
@@ -58,7 +58,7 @@
 
     async function addBackupPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethodBackup(
+            await sdk.forConsole.organizations.setBackupPaymentMethod(
                 $organization.$id,
                 paymentMethodId
             );
@@ -77,14 +77,14 @@
     }
 
     $: if ($organization?.backupPaymentMethodId) {
-        sdk.forConsole.billing
-            .getOrganizationPaymentMethod($organization.$id, $organization.backupPaymentMethodId)
+        sdk.forConsole.organizations
+            .getPaymentMethod($organization.$id, $organization.backupPaymentMethodId)
             .then((res) => (backupPaymentMethod = res));
     }
 
     $: if ($organization?.paymentMethodId) {
-        sdk.forConsole.billing
-            .getOrganizationPaymentMethod($organization.$id, $organization.paymentMethodId)
+        sdk.forConsole.organizations
+            .getPaymentMethod($organization.$id, $organization.paymentMethodId)
             .then((res) => (defaultPaymentMethod = res));
     }
 
@@ -332,5 +332,5 @@
         bind:showDelete
         {hasOtherMethod}
         isBackup={isSelectedBackup}
-        disabled={$organization?.billingPlan !== BillingPlan.FREE && !hasOtherMethod} />
+        disabled={$organization?.billingPlan !== BillingPlan.Tier0 && !hasOtherMethod} />
 {/if}
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index f551afd401..8b009562b2 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -7,21 +7,20 @@
     import { organization } from '$lib/stores/organization';
     import { onMount } from 'svelte';
     import { sdk } from '$lib/stores/sdk';
-    import type { Invoice } from '$lib/sdk/billing';
-    import { Query } from '@appwrite.io/console';
+    import { Query, type Models } from '@appwrite.io/console';
     import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { trackEvent } from '$lib/actions/analytics';
     import { tooltip } from '$lib/actions/tooltip';
 
-    let currentInvoice: Invoice;
+    let currentInvoice: Models.Invoice;
     let extraMembers = 0;
-    let currentPlan;
+    let currentPlan: Models.BillingPlan;
 
     const today = new Date();
     onMount(async () => {
-        const invoices = await sdk.forConsole.billing.listInvoices($organization.$id, [
+        const invoices = await sdk.forConsole.organizations.listInvoices($organization.$id, [
             Query.limit(1),
             Query.equal('from', $organization.billingCurrentInvoiceDate)
         ]);
@@ -29,14 +28,14 @@
         const members = await sdk.forConsole.teams.listMemberships($organization.$id, []);
         extraMembers = members.total > 1 ? members.total - 1 : 0;
 
-        currentPlan = await sdk.forConsole.billing.getPlan($organization?.$id);
+        currentPlan = await sdk.forConsole.organizations.getPlan($organization?.$id);
     });
 
     $: extraUsage = (currentInvoice?.amount ?? 0) - (currentPlan?.price ?? 0);
     $: extraAddons = currentInvoice?.usage?.length ?? 0;
     $: isTrial =
         new Date($organization?.billingStartDate).getTime() - today.getTime() > 0 &&
-        $plansInfo.get($organization.billingPlan)?.trialDays;
+        $plansInfo.get($organization.billingPlan)?.trial;
 </script>
 
 {#if $organization}
@@ -61,7 +60,7 @@
                         {isTrial ? formatCurrency(0) : formatCurrency(currentPlan?.price)}
                     </div>
                 </CollapsibleItem>
-                {#if $organization?.billingPlan !== BillingPlan.FREE && extraUsage > 0}
+                {#if $organization?.billingPlan !== BillingPlan.Tier0 && extraUsage > 0}
                     <CollapsibleItem isInfo gap={8}>
                         <svelte:fragment slot="beforetitle">
                             <span class="body-text-2"><b>Add-ons</b></span><span class="inline-tag"
@@ -151,7 +150,7 @@
                             }}></span>
                     </span>
                     <div class="body-text-2 u-margin-inline-start-auto">
-                        {$organization?.billingPlan === BillingPlan.FREE
+                        {$organization?.billingPlan === BillingPlan.Tier0
                             ? formatCurrency(0)
                             : formatCurrency(currentInvoice?.amount ?? 0)}
                     </div>
@@ -159,7 +158,7 @@
             </Collapsible>
         </svelte:fragment>
         <svelte:fragment slot="actions">
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.Tier0}
                 <div class="u-flex u-gap-16 u-flex-wrap">
                     <Button text href={`${base}/organization-${$organization?.$id}/usage`}>
                         View estimated usage
diff --git a/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte b/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte
index ae83c7399a..be39b842b6 100644
--- a/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/removeAddress.svelte
@@ -14,7 +14,7 @@
 
     async function removeAddress() {
         try {
-            await sdk.forConsole.billing.removeBillingAddress($organization.$id);
+            await sdk.forConsole.organizations.deleteBillingAddress($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 0eb06bbef7..632ffcdf77 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -6,13 +6,13 @@
     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 { Pill } from '$lib/elements';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    let addresses: AddressesList;
+    let addresses: Models.BillingAddress;
     let selectedAddress: string;
     let error: string;
     let country: string;
@@ -29,7 +29,7 @@
     ];
 
     onMount(async () => {
-        addresses = await sdk.forConsole.billing.listAddresses();
+        addresses = await sdk.forConsole.account.listBillingAddresses();
 
         const firstNonCurrentAddress = addresses?.billingAddresses?.find(
             (address) => address.$id !== $organization?.billingAddressId
@@ -57,7 +57,7 @@
             if (selectedAddress === $organization.billingAddressId) {
                 show = false;
             } else if (selectedAddress === null) {
-                const address = await sdk.forConsole.billing.createAddress(
+                const address = await sdk.forConsole.account.createBillingAddress(
                     country,
                     streetAddress,
                     city,
@@ -65,7 +65,10 @@
                     postalCode ? postalCode : undefined,
                     addressLine2 ? postalCode : undefined
                 );
-                await sdk.forConsole.billing.setBillingAddress($organization.$id, address.$id);
+                await sdk.forConsole.organizations.setBillingAddress(
+                    $organization.$id,
+                    address.$id
+                );
 
                 invalidate(Dependencies.ORGANIZATION);
                 invalidate(Dependencies.ADDRESS);
@@ -80,7 +83,10 @@
                     message: `Your billing address has been updated`
                 });
             } else {
-                await sdk.forConsole.billing.setBillingAddress($organization.$id, selectedAddress);
+                await sdk.forConsole.organizations.setBillingAddress(
+                    $organization.$id,
+                    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 bf0f629169..c6e685ea4f 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceCard.svelte
@@ -7,20 +7,20 @@
     import { Dependencies } from '$lib/constants';
     import { initializeStripe, isStripeInitialized, submitStripeCard } from '$lib/stores/stripe';
     import { onMount } from 'svelte';
-    import type { PaymentList } 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 { Models } from '@appwrite.io/console';
 
     export let show = false;
     export let isBackup = false;
-    let methods: PaymentList;
+    let methods: Models.PaymentMethodList;
     let selectedPaymentMethodId: string;
     let name: string;
     let error: string;
 
     onMount(async () => {
-        methods = await sdk.forConsole.billing.listPaymentMethods();
+        methods = await sdk.forConsole.account.listPaymentMethods();
 
         if (!$organization.paymentMethodId && !$organization.backupPaymentMethodId) {
             selectedPaymentMethodId = methods?.total ? methods.paymentMethods[0].$id : null;
@@ -68,7 +68,7 @@
 
     async function addPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethod(
+            await sdk.forConsole.organizations.setDefaultPaymentMethod(
                 $organization.$id,
                 paymentMethodId
             );
@@ -79,7 +79,7 @@
 
     async function addBackupPaymentMethod(paymentMethodId: string) {
         try {
-            await sdk.forConsole.billing.setOrganizationPaymentMethodBackup(
+            await sdk.forConsole.organizations.setBackupPaymentMethod(
                 $organization.$id,
                 paymentMethodId
             );
diff --git a/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/(console)/organization-[organization]/billing/retryPaymentModal.svelte
index 2233d511c0..7eedddf602 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 } from '$lib/sdk/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { page } from '$app/stores';
@@ -20,9 +19,10 @@
     import { onMount } from 'svelte';
     import { getApiEndpoint, sdk } from '$lib/stores/sdk';
     import { formatCurrency } from '$lib/helpers/numbers';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    export let invoice: Invoice;
+    export let invoice: Models.Invoice;
     let error: string = null;
     let isButtonDisabled = false;
     let name: string;
@@ -53,7 +53,7 @@
             if (paymentMethodId === null) {
                 try {
                     const method = await submitStripeCard(name, $organization.$id);
-                    const card = await sdk.forConsole.billing.getPaymentMethod(method.$id);
+                    const card = await sdk.forConsole.account.getPaymentMethod(method.$id);
                     if (card?.last4) {
                         paymentMethodId = card.$id;
                     } else {
@@ -68,9 +68,12 @@
                 }
             }
             if (setAsDefault) {
-                await sdk.forConsole.billing.setDefaultPaymentMethod(paymentMethodId);
+                await sdk.forConsole.organizations.setDefaultPaymentMethod(
+                    $organization.$id,
+                    paymentMethodId
+                );
             }
-            const { clientSecret } = await sdk.forConsole.billing.retryPayment(
+            const { clientSecret } = await sdk.forConsole.organizations.createInvoicePayment(
                 $organization.$id,
                 invoice.$id,
                 paymentMethodId
diff --git a/src/routes/(console)/organization-[organization]/billing/store.ts b/src/routes/(console)/organization-[organization]/billing/store.ts
index ca081c2917..0f4239727e 100644
--- a/src/routes/(console)/organization-[organization]/billing/store.ts
+++ b/src/routes/(console)/organization-[organization]/billing/store.ts
@@ -1,6 +1,7 @@
 import { page } from '$app/stores';
 import type { WizardStepsType } from '$lib/layout/wizard.svelte';
-import type { AggregationList, Invoice } from '$lib/sdk/billing';
+import type { AggregationList } from '$lib/sdk/billing';
+import type { Models } from '@appwrite.io/console';
 import { derived, writable } from 'svelte/store';
 
 export const aggregationList = derived(
@@ -14,5 +15,5 @@ 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);
diff --git a/src/routes/(console)/organization-[organization]/billing/taxId.svelte b/src/routes/(console)/organization-[organization]/billing/taxId.svelte
index 003012cbbe..573f3d19d6 100644
--- a/src/routes/(console)/organization-[organization]/billing/taxId.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/taxId.svelte
@@ -17,7 +17,7 @@
 
     async function updateTaxId() {
         try {
-            await sdk.forConsole.billing.updateTaxId($organization.$id, taxId);
+            await sdk.forConsole.organizations.setBillingTaxId($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 d62ffc7ab5..58622b3e44 100644
--- a/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
@@ -17,7 +17,7 @@
     async function validateCoupon() {
         if (couponData?.status === 'active') return;
         try {
-            const response = await sdk.forConsole.billing.getCoupon(coupon);
+            const response = await sdk.forConsole.console.getCopon(coupon);
             couponData = response;
             $addCreditWizardStore.coupon = coupon;
             coupon = null;
diff --git a/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte b/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
index 8a142ac571..cb9c234e60 100644
--- a/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/wizard/paymentDetails.svelte
@@ -2,7 +2,6 @@
     import { FormList } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
     import { onMount } from 'svelte';
-    import type { PaymentList } from '$lib/sdk/billing';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { initializeStripe, isStripeInitialized, submitStripeCard } from '$lib/stores/stripe';
@@ -10,12 +9,13 @@
     import { PaymentBoxes } from '$lib/components/billing';
     import { addCreditWizardStore } from '../store';
     import { organization } from '$lib/stores/organization';
+    import type { Models } from '@appwrite.io/console';
 
-    let methods: PaymentList;
+    let methods: Models.PaymentMethodList;
     let name: string;
 
     onMount(async () => {
-        methods = await sdk.forConsole.billing.listPaymentMethods();
+        methods = await sdk.forConsole.account.listPaymentMethods();
         $addCreditWizardStore.paymentMethodId =
             methods.paymentMethods.find((method) => !!method?.last4)?.$id ?? null;
     });
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index 6b70855165..a570a0b949 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -13,7 +13,7 @@
     import PlanSelection from '$lib/components/billing/planSelection.svelte';
     import ValidateCreditModal from '$lib/components/billing/validateCreditModal.svelte';
     import Default from '$lib/components/roles/default.svelte';
-    import { BillingPlan, Dependencies, feedbackDowngradeOptions } from '$lib/constants';
+    import { Dependencies, feedbackDowngradeOptions } from '$lib/constants';
     import {
         Button,
         Form,
@@ -29,20 +29,20 @@
         WizardSecondaryContent,
         WizardSecondaryFooter
     } from '$lib/layout';
-    import { type Coupon, type PaymentList } from '$lib/sdk/billing';
-    import { plansInfo, tierToPlan, type Tier } from '$lib/stores/billing';
+    import { plansInfo, tierToPlan } from '$lib/stores/billing';
     import { addNotification } from '$lib/stores/notifications';
     import { organization, organizationList, type Organization } from '$lib/stores/organization';
     import { sdk } from '$lib/stores/sdk';
     import { user } from '$lib/stores/user';
     import { VARS } from '$lib/system';
+    import { BillingPlan, type Models } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { writable } from 'svelte/store';
 
     export let data;
 
     $: anyOrgFree = $organizationList.teams?.find(
-        (org) => (org as Organization)?.billingPlan === BillingPlan.FREE
+        (org) => (org as Organization)?.billingPlan === BillingPlan.Tier0
     );
     const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$/i;
     let previousPage: string = base;
@@ -53,8 +53,8 @@
 
     let formComponent: Form;
     let isSubmitting = writable(false);
-    let methods: PaymentList;
-    let billingPlan: Tier = $organization.billingPlan;
+    let methods: Models.PaymentMethodList;
+    let billingPlan = $organization.billingPlan;
     let paymentMethodId: string;
     let collaborators: string[] =
         data?.members?.memberships
@@ -62,7 +62,7 @@
                 if (m.userEmail !== $user.email) return m.userEmail;
             })
             ?.filter(Boolean) ?? [];
-    let couponData: Partial<Coupon> = {
+    let couponData: Partial<Models.Coupon> = {
         code: null,
         status: null,
         credits: null
@@ -79,7 +79,7 @@
         if ($page.url.searchParams.has('code')) {
             const coupon = $page.url.searchParams.get('code');
             try {
-                const response = await sdk.forConsole.billing.getCoupon(coupon);
+                const response = await sdk.forConsole.console.getCopon(coupon);
                 couponData = response;
             } catch (e) {
                 couponData = {
@@ -95,18 +95,18 @@
                 billingPlan = plan as BillingPlan;
             }
         }
-        if ($organization?.billingPlan === BillingPlan.SCALE) {
-            billingPlan = BillingPlan.SCALE;
+        if ($organization?.billingPlan === BillingPlan.Tier2) {
+            billingPlan = BillingPlan.Tier2;
         } else {
-            billingPlan = BillingPlan.PRO;
+            billingPlan = BillingPlan.Tier1;
         }
 
-        const currentPlan = await sdk.forConsole.billing.getPlan($organization?.$id);
+        const currentPlan = await sdk.forConsole.organizations.getPlan($organization?.$id);
         selfService = currentPlan.selfService;
     });
 
     async function loadPaymentMethods() {
-        methods = await sdk.forConsole.billing.listPaymentMethods();
+        methods = await sdk.forConsole.account.listPaymentMethods();
 
         paymentMethodId =
             $organization?.paymentMethodId ??
@@ -124,7 +124,7 @@
 
     async function downgrade() {
         try {
-            await sdk.forConsole.billing.updatePlan(
+            await sdk.forConsole.organizations.updatePlan(
                 $organization.$id,
                 billingPlan,
                 paymentMethodId,
@@ -173,7 +173,7 @@
 
     async function upgrade() {
         try {
-            const org = await sdk.forConsole.billing.updatePlan(
+            const org = await sdk.forConsole.organizations.updatePlan(
                 $organization.$id,
                 billingPlan,
                 paymentMethodId,
@@ -182,13 +182,13 @@
 
             //Add coupon
             if (couponData?.code) {
-                await sdk.forConsole.billing.addCredit(org.$id, couponData.code);
+                await sdk.forConsole.organizations.addCredit(org.$id, couponData.code);
                 trackEvent(Submit.CreditRedeem);
             }
 
             //Add budget
             if (billingBudget) {
-                await sdk.forConsole.billing.updateBudget(org.$id, billingBudget, [75]);
+                await sdk.forConsole.organizations.updateBudget(org.$id, billingBudget, [75]);
             }
 
             //Add collaborators
@@ -211,7 +211,7 @@
 
             //Add tax ID
             if (taxId) {
-                await sdk.forConsole.billing.updateTaxId(org.$id, taxId);
+                await sdk.forConsole.organizations.setBillingTaxId(org.$id, taxId);
             }
 
             await invalidate(Dependencies.ACCOUNT);
@@ -237,7 +237,7 @@
 
     $: isUpgrade = billingPlan > $organization.billingPlan;
     $: isDowngrade = billingPlan < $organization.billingPlan;
-    $: if (billingPlan !== BillingPlan.FREE) {
+    $: if (billingPlan !== BillingPlan.Tier0) {
         loadPaymentMethods();
     }
     $: isButtonDisabled = $organization.billingPlan === billingPlan;
@@ -265,17 +265,17 @@
                 bind:billingPlan
                 bind:selfService
                 anyOrgFree={!!anyOrgFree}
-                class={anyOrgFree && billingPlan !== BillingPlan.FREE
+                class={anyOrgFree && billingPlan !== BillingPlan.Tier0
                     ? 'u-margin-block-start-16'
                     : ''} />
 
             {#if isDowngrade}
-                {#if billingPlan === BillingPlan.FREE}
+                {#if billingPlan === BillingPlan.Tier0}
                     <PlanExcess
-                        tier={BillingPlan.FREE}
+                        tier={BillingPlan.Tier0}
                         class="u-margin-block-start-24"
                         members={data?.members?.total ?? 0} />
-                {:else if billingPlan === BillingPlan.PRO && $organization.billingPlan === BillingPlan.SCALE}
+                {:else if billingPlan === BillingPlan.Tier1 && $organization.billingPlan === BillingPlan.Tier2}
                     {@const extraMembers = collaborators?.length ?? 0}
                     <Alert type="error" class="u-margin-block-start-24">
                         <svelte:fragment slot="title">
@@ -292,7 +292,7 @@
                 {/if}
             {/if}
             <!-- Show email input if upgrading from free plan -->
-            {#if billingPlan !== BillingPlan.FREE && $organization.billingPlan === BillingPlan.FREE}
+            {#if billingPlan !== BillingPlan.Tier0 && $organization.billingPlan === BillingPlan.Tier0}
                 <FormList class="u-margin-block-start-16">
                     <InputTags
                         bind:tags={collaborators}
@@ -333,14 +333,14 @@
             {/if}
         </Form>
         <svelte:fragment slot="aside">
-            {#if billingPlan !== BillingPlan.FREE && $organization.billingPlan !== billingPlan && $organization.billingPlan !== BillingPlan.CUSTOM}
+            {#if billingPlan !== BillingPlan.Tier0 && $organization.billingPlan !== billingPlan && $organization.billingPlan.toString() !== 'cont-1'}
                 <EstimatedTotalBox
                     {billingPlan}
                     {collaborators}
                     bind:couponData
                     bind:billingBudget
                     {isDowngrade} />
-            {:else if $organization.billingPlan !== BillingPlan.CUSTOM}
+            {:else if $organization.billingPlan.toString() !== 'cont-1'}
                 <PlanComparisonBox downgrade={isDowngrade} />
             {/if}
         </svelte:fragment>
diff --git a/src/routes/(console)/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte
index b9726f6296..4123f98c06 100644
--- a/src/routes/(console)/organization-[organization]/createMember.svelte
+++ b/src/routes/(console)/organization-[organization]/createMember.svelte
@@ -8,7 +8,8 @@
     import { createEventDispatcher } from 'svelte';
     import { organization } from '$lib/stores/organization';
     import { invalidate } from '$app/navigation';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { isCloud } from '$lib/system';
     import { roles } from '$lib/stores/billing';
@@ -63,7 +64,7 @@
 
 <Modal title="Invite member" {error} size="big" bind:show={showCreate} onSubmit={create}>
     {#if isCloud}
-        {#if $organization?.billingPlan === BillingPlan.PRO}
+        {#if $organization?.billingPlan === BillingPlan.Tier1}
             <!-- <Alert type="info">
                 You can add unlimited organization members on the {plan.name} plan for
                 <b>{formatCurrency(plan.addons.member.price)} each per billing period</b>.
diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
index 71bd175370..adfe0fbbc8 100644
--- a/src/routes/(console)/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -12,7 +12,7 @@
         Tab,
         Tabs
     } from '$lib/components';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Pill } from '$lib/elements';
     import { Button } from '$lib/elements/forms';
     import { toLocaleDate } from '$lib/helpers/date';
@@ -110,10 +110,10 @@
                             <span class="u-trim">
                                 {$organization.name}
                             </span>
-                            {#if isCloud && $organization?.billingPlan === BillingPlan.FREE}
+                            {#if isCloud && $organization?.billingPlan === BillingPlan.Tier0}
                                 <Pill class="eyebrow-heading-3">FREE</Pill>
                             {/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.Tier0 && $plansInfo.get($organization.billingPlan)?.trial}
                                 <div
                                     class="u-flex u-cross-center"
                                     use:tooltip={{
@@ -156,7 +156,7 @@
                     <div
                         use:tooltip={{
                             content:
-                                $organization?.billingPlan === BillingPlan.FREE
+                                $organization?.billingPlan === BillingPlan.Tier0
                                     ? `Upgrade to add more members`
                                     : `You've reached the members limit for the ${
                                           tierToPlan($organization?.billingPlan)?.name
diff --git a/src/routes/(console)/organization-[organization]/settings/+page.ts b/src/routes/(console)/organization-[organization]/settings/+page.ts
index a434d66f9a..4042fbde69 100644
--- a/src/routes/(console)/organization-[organization]/settings/+page.ts
+++ b/src/routes/(console)/organization-[organization]/settings/+page.ts
@@ -9,7 +9,7 @@ export const load: PageLoad = async ({ depends, params }) => {
 
     const [projects, invoices] = await Promise.all([
         sdk.forConsole.projects.list([Query.equal('teamId', params.organization)]),
-        isCloud ? sdk.forConsole.billing.listInvoices(params.organization) : undefined
+        isCloud ? sdk.forConsole.organizations.listInvoices(params.organization) : undefined
     ]);
 
     return {
diff --git a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
index 3ca94e1956..e1b9b792cf 100644
--- a/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/deleteOrganizationModal.svelte
@@ -37,7 +37,7 @@
     async function deleteOrg() {
         try {
             if (isCloud) {
-                await sdk.forConsole.billing.deleteOrganization($organization.$id);
+                await sdk.forConsole.organizations.delete($organization.$id);
             } else {
                 await sdk.forConsole.teams.delete($organization.$id);
             }
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
index 5e716cfabc..3096008aa0 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte
@@ -15,7 +15,7 @@
     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 { BillingPlan } from '@appwrite.io/console';
     import { trackEvent } from '$lib/actions/analytics';
     import TotalMembers from './totalMembers.svelte';
 
@@ -46,7 +46,7 @@
     <div class="u-flex u-cross-center u-main-space-between">
         <Heading tag="h2" size="5">Usage</Heading>
 
-        {#if $organization?.billingPlan === BillingPlan.FREE}
+        {#if $organization?.billingPlan === BillingPlan.Tier0}
             <Button
                 href={$upgradeURL}
                 on:click={() => {
@@ -60,7 +60,7 @@
         {/if}
     </div>
     <div class="u-flex u-main-space-between common-section u-cross-center">
-        {#if $organization.billingPlan === BillingPlan.SCALE}
+        {#if $organization.billingPlan === BillingPlan.Tier2}
             <p class="text">
                 On the Scale plan, you'll be charged only for any usage that exceeds the thresholds
                 per resource listed below. <button
@@ -68,7 +68,7 @@
                     class="link"
                     type="button">Learn more about plan usage limits.</button>
             </p>
-        {:else if $organization.billingPlan === BillingPlan.PRO}
+        {:else if $organization.billingPlan === BillingPlan.Tier1}
             <p class="text">
                 On the Pro plan, you'll be charged only for any usage that exceeds the thresholds
                 per resource listed below. <button
@@ -76,7 +76,7 @@
                     class="link"
                     type="button">Learn more about plan usage limits.</button>
             </p>
-        {:else if $organization.billingPlan === BillingPlan.FREE}
+        {:else if $organization.billingPlan === BillingPlan.Tier0}
             <p class="text">
                 If you exceed the limits of the {plan} plan, services for your organization's projects
                 may be disrupted.
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
index 9f548dd0e6..5fb9e3aa7a 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -1,8 +1,7 @@
 import { sdk } from '$lib/stores/sdk';
-import { Query } from '@appwrite.io/console';
+import { Query, type Models } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 import type { Organization } from '$lib/stores/organization';
-import type { Invoice } from '$lib/sdk/billing';
 
 export const load: PageLoad = async ({ params, parent }) => {
     const { invoice } = params;
@@ -33,17 +32,17 @@ 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);
+        currentInvoice = await sdk.forConsole.organizations.getInvoice(org.$id, invoice);
         startDate = currentInvoice.from;
         endDate = currentInvoice.to;
     }
 
     const [invoices, usage, organizationMembers] = await Promise.all([
-        sdk.forConsole.billing.listInvoices(org.$id, [Query.orderDesc('from')]),
-        sdk.forConsole.billing.listUsage(params.organization, startDate, endDate),
+        sdk.forConsole.organizations.listInvoices(org.$id, [Query.orderDesc('from')]),
+        sdk.forConsole.organizations.getUsage(params.organization, startDate, endDate),
         sdk.forConsole.teams.listMemberships(params.organization)
     ]);
 
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
index d63585b52d..8a70a22f6c 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte
@@ -2,7 +2,7 @@
     import { tooltip } from '$lib/actions/tooltip';
     import { AvatarInitials, CardGrid, Heading, Paginator } from '$lib/components';
     import { EmptyCardCloud } from '$lib/components/billing';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import {
         TableBody,
@@ -30,7 +30,7 @@
 
     <p class="text">The number of members in your organization.</p>
     <svelte:fragment slot="aside">
-        {#if $organization.billingPlan !== BillingPlan.FREE}
+        {#if $organization.billingPlan !== BillingPlan.Tier0}
             <div class="u-flex u-flex-vertical">
                 <div class="u-flex u-main-space-between">
                     <p>
diff --git a/src/routes/(console)/organization-[organization]/wizard/step1.svelte b/src/routes/(console)/organization-[organization]/wizard/step1.svelte
index adc596fe2d..c48c86b5fd 100644
--- a/src/routes/(console)/organization-[organization]/wizard/step1.svelte
+++ b/src/routes/(console)/organization-[organization]/wizard/step1.svelte
@@ -8,7 +8,7 @@
 
     let showCustomId = false;
 
-    sdk.forConsole.billing.listRegions().then(regions.set);
+    sdk.forConsole.console.regions().then(regions.set);
 </script>
 
 <WizardStep>
diff --git a/src/routes/(console)/project-[project]/+layout.ts b/src/routes/(console)/project-[project]/+layout.ts
index ec6ce1eb2b..4f090aa6a0 100644
--- a/src/routes/(console)/project-[project]/+layout.ts
+++ b/src/routes/(console)/project-[project]/+layout.ts
@@ -20,7 +20,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         let roles = isCloud ? [] : defaultRoles;
         let scopes = isCloud ? [] : defaultScopes;
         if (isCloud) {
-            const res = await sdk.forConsole.billing.getRoles(project.teamId);
+            const res = await sdk.forConsole.organizations.getScopes(project.teamId);
             roles = res.roles;
             scopes = res.scopes;
             if (scopes.includes('billing.read')) {
diff --git a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
index 9db581f0b3..d99efb6f51 100644
--- a/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
+++ b/src/routes/(console)/project-[project]/auth/security/updateMockNumbers.svelte
@@ -10,7 +10,7 @@
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { isCloud, isSelfHosted } from '$lib/system';
     import MockNumbersLight from './mock-numbers-light.png';
     import MockNumbersDark from './mock-numbers-dark.png';
@@ -27,7 +27,7 @@
     $: isSubmitDisabled = JSON.stringify(numbers) === JSON.stringify(initialNumbers);
 
     let isComponentDisabled: boolean =
-        isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.FREE);
+        isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.Tier0);
     let emptyStateTitle: string = isSelfHosted
         ? 'Available on Appwrite Cloud'
         : 'Upgrade to add mock phone numbers';
diff --git a/src/routes/(console)/project-[project]/auth/templates/+page.svelte b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
index 369080543f..69f6c2d40f 100644
--- a/src/routes/(console)/project-[project]/auth/templates/+page.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/+page.svelte
@@ -51,7 +51,7 @@
     import { baseEmailTemplate, emailTemplate } from './store';
     import { Button } from '$lib/elements/forms';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import EmailSignature from './emailSignature.svelte';
     import { isCloud } from '$lib/system';
     import type {
@@ -268,7 +268,7 @@
             </Collapsible>
         </svelte:fragment>
     </CardGrid>-->
-    {#if isCloud && $organization?.billingPlan === BillingPlan.FREE}
+    {#if isCloud && $organization?.billingPlan === BillingPlan.Tier0}
         <EmailSignature />
     {/if}
 </Container>
diff --git a/src/routes/(console)/project-[project]/databases/create.svelte b/src/routes/(console)/project-[project]/databases/create.svelte
index 80b1bad00c..711fcf0b96 100644
--- a/src/routes/(console)/project-[project]/databases/create.svelte
+++ b/src/routes/(console)/project-[project]/databases/create.svelte
@@ -8,7 +8,7 @@
     import { ID } from '@appwrite.io/console';
     import { createEventDispatcher } from 'svelte';
     import { isCloud } from '$lib/system';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { organization } from '$lib/stores/organization';
     import { upgradeURL } from '$lib/stores/billing';
     import CreatePolicy from './database-[database]/backups/createPolicy.svelte';
@@ -126,7 +126,7 @@
 
         {#if isCloud}
             <div class="u-flex-vertical u-gap-24 u-padding-block-start-24">
-                {#if $organization?.billingPlan === BillingPlan.FREE}
+                {#if $organization?.billingPlan === BillingPlan.Tier0}
                     {#if showPlanUpgradeAlert}
                         <Alert
                             type="warning"
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
index 801dec03c3..e6e69e77d1 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/+page.svelte
@@ -11,7 +11,8 @@
     import { addNotification, dismissAllNotifications } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { invalidate } from '$app/navigation';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { isCloud, isSelfHosted } from '$lib/system';
     import { organization } from '$lib/stores/organization';
     import { onMount } from 'svelte';
@@ -24,15 +25,15 @@
 
     let policyCreateError: string;
     let totalPolicies: UserBackupPolicy[] = [];
-    let isDisabled = isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.FREE);
+    let isDisabled = isSelfHosted || (isCloud && $organization?.billingPlan === BillingPlan.Tier0);
 
     export let data: PageData;
 
     $: hasPolicyCreationLimitations = () => {
         // allow when on Pro and no policy exists
-        if ($organization?.billingPlan === BillingPlan.PRO) {
+        if ($organization?.billingPlan === BillingPlan.Tier1) {
             return data.policies.total > 0;
-        } else if ($organization?.billingPlan === BillingPlan.SCALE) {
+        } else if ($organization?.billingPlan === BillingPlan.Tier2) {
             return false;
         }
     };
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
index a01b1c5819..46cb89203b 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/containerHeader.svelte
@@ -4,7 +4,7 @@
     import { Pill } from '$lib/elements';
     import { wizard } from '$lib/stores/wizard';
     import SupportWizard from '$routes/(console)/supportWizard.svelte';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { organization } from '$lib/stores/organization';
 
     export let isFlex = true;
@@ -27,7 +27,7 @@
     <div class="u-flex u-cross-child-center u-cross-center u-gap-12">
         <div class="body-text-1 u-bold backups-title">{title}</div>
 
-        {#if hasLimitations && $organization.billingPlan === BillingPlan.PRO}
+        {#if hasLimitations && $organization.billingPlan === BillingPlan.Tier1}
             <div style="height: 40px; padding-block-start: 4px">
                 <DropList bind:show={showDropdown} width="16">
                     <Pill button on:click={() => (showDropdown = true)}>
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte
index d44a7d9d56..1947e91443 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte
@@ -22,7 +22,7 @@
     } from '$lib/helpers/backups';
     import { InputNumber } from '$lib/elements/forms/index.js';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Card } from '$lib/components';
     import { wizard } from '$lib/stores/wizard';
     import SupportWizard from '$routes/(console)/supportWizard.svelte';
@@ -146,7 +146,7 @@
         );
 
         // pre-check the hourly if on pro plan
-        if ($organization.billingPlan === BillingPlan.PRO && isFromBackupsTab) {
+        if ($organization.billingPlan === BillingPlan.Tier1 && isFromBackupsTab) {
             presetPolicies.update((all) =>
                 all.map((policy) => {
                     policy.id = ID.unique();
@@ -168,7 +168,7 @@
 </script>
 
 <div class="u-flex-vertical u-gap-16">
-    {#if $organization.billingPlan === BillingPlan.SCALE}
+    {#if $organization.billingPlan === BillingPlan.Tier2}
         {#if title || subtitle}
             <div class="body-text-2">
                 {#if title}
@@ -184,7 +184,7 @@
 
     <FormList>
         <!-- because we show a set of pre-defined ones -->
-        {#if $organization.billingPlan === BillingPlan.PRO}
+        {#if $organization.billingPlan === BillingPlan.Tier1}
             {@const dailyPolicy = $presetPolicies[1]}
 
             {#if isFromBackupsTab}
diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
index 7e0d3b4ef7..06cb9ad8e1 100644
--- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
+++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
     import { Alert, EmptySearch, PaginationWithLimit, ViewSelector } from '$lib/components';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button } from '$lib/elements/forms';
     import { hoursToDays } from '$lib/helpers/date';
     import { Container, ContainerHeader } from '$lib/layout';
@@ -171,7 +172,7 @@
                     {hoursToDays(logs)} of logs
                 </li>
             </ul>
-            {#if $organization?.billingPlan === BillingPlan.FREE}
+            {#if $organization?.billingPlan === BillingPlan.Tier0}
                 <p class="text">
                     <button class="link" type="button" on:click|preventDefault={upgradeMethod}
                         >Upgrade</button>
diff --git a/src/routes/(console)/project-[project]/settings/deleteProject.svelte b/src/routes/(console)/project-[project]/settings/deleteProject.svelte
index fbf1d4c7e6..2939af5c55 100644
--- a/src/routes/(console)/project-[project]/settings/deleteProject.svelte
+++ b/src/routes/(console)/project-[project]/settings/deleteProject.svelte
@@ -10,15 +10,15 @@
     import { isCloud } from '$lib/system';
     import { onMount } from 'svelte';
     import { project } from '../store';
-    import type { RegionList } from '$lib/sdk/billing';
+    import type { Models } from '@appwrite.io/console';
 
     let showDelete = false;
     let name: string = null;
 
-    let regions: RegionList;
+    let regions: Models.ConsoleRegionList;
     onMount(async () => {
         if (isCloud) {
-            regions = await sdk.forConsole.billing.listRegions();
+            regions = await sdk.forConsole.console.regions();
         }
     });
 
diff --git a/src/routes/(console)/project-[project]/settings/smtp/+page.svelte b/src/routes/(console)/project-[project]/settings/smtp/+page.svelte
index e735055b19..841dd2326f 100644
--- a/src/routes/(console)/project-[project]/settings/smtp/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/smtp/+page.svelte
@@ -13,7 +13,8 @@
     import InputPassword from '$lib/elements/forms/inputPassword.svelte';
     import { sdk } from '$lib/stores/sdk';
     import { invalidate } from '$app/navigation';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import InputNumber from '$lib/elements/forms/inputNumber.svelte';
@@ -132,7 +133,7 @@
                     class="link">here</a>
             </p>
             <svelte:fragment slot="aside">
-                {#if $organization.billingPlan === BillingPlan.FREE}
+                {#if $organization.billingPlan === BillingPlan.Tier0}
                     <Alert type="info">
                         Custom SMTP is a Pro plan feature. Upgrade to enable custom SMTP sever.
                         <svelte:fragment slot="action">
@@ -206,7 +207,7 @@
             <svelte:fragment slot="actions">
                 <Button
                     submit
-                    disabled={isButtonDisabled || $organization.billingPlan === BillingPlan.FREE}>
+                    disabled={isButtonDisabled || $organization.billingPlan === BillingPlan.Tier0}>
                     Update
                 </Button>
             </svelte:fragment>
diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
index ee2d2af1a6..15a623245a 100644
--- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.svelte
@@ -17,7 +17,7 @@
     import { BarChart } from '$lib/charts';
     import { formatNum } from '$lib/helpers/string';
     import { total } from '$lib/layout/usage.svelte';
-    import { BillingPlan } from '$lib/constants.js';
+    import { BillingPlan } from '@appwrite.io/console';
     import { base } from '$app/paths';
 
     export let data;
diff --git a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts
index 2cb455ae0f..141eb182ce 100644
--- a/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/project-[project]/settings/usage/[[invoice]]/+page.ts
@@ -1,7 +1,6 @@
-import type { Aggregation, Invoice } from '$lib/sdk/billing';
 import { accumulateUsage } from '$lib/sdk/usage';
 import { getSdkForProject, sdk } from '$lib/stores/sdk';
-import { Query } from '@appwrite.io/console';
+import { Query, type Models } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, parent }) => {
@@ -10,12 +9,12 @@ export const load: PageLoad = async ({ params, parent }) => {
 
     let startDate: string = organization.billingCurrentInvoiceDate;
     let endDate: string = organization.billingNextInvoiceDate;
-    let currentInvoice: Invoice = undefined;
-    let currentAggregation: Aggregation = 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(
+        currentInvoice = await sdk.forConsole.organizations.getInvoice(organization.$id, invoice);
+        currentAggregation = await sdk.forConsole.organizations.getAggregation(
             organization.$id,
             currentInvoice.aggregationId
         );
@@ -25,7 +24,7 @@ export const load: PageLoad = async ({ params, parent }) => {
     }
 
     const [invoices, usage] = await Promise.all([
-        sdk.forConsole.billing.listInvoices(organization.$id, [Query.orderDesc('from')]),
+        sdk.forConsole.organizations.listInvoices(organization.$id, [Query.orderDesc('from')]),
         /**
          * Workaround because project id might not be populated yet.
          */
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
index e9a7fc50b3..3c7c0a3f24 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.svelte
@@ -19,7 +19,8 @@
         PaginationWithLimit,
         SearchQuery
     } from '$lib/components';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { Dependencies } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Pill } from '$lib/elements';
     import { Button } from '$lib/elements/forms';
     import {
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts
index 59898b37fc..1dca89a454 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/+page.ts
@@ -19,7 +19,9 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
             [Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
             search
         ),
-        isCloud && organization?.$id ? sdk.forConsole.billing.listUsage(organization.$id) : null
+        isCloud && organization?.$id
+            ? sdk.forConsole.organizations.getUsage(organization.$id)
+            : null
     ]);
     return {
         offset,
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index ff4c02639c..518d9ddf65 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Alert, CustomId } from '$lib/components';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Pill } from '$lib/elements';
     import { Button, FormList, InputFile } from '$lib/elements/forms';
     import { humanFileSize, sizeToBytes } from '$lib/helpers/sizeConvertion';
@@ -27,12 +27,12 @@
                 The {plan.name} plan has a maximum upload file size limit of {Math.floor(
                     parseInt(size.value)
                 )}{size.unit}.
-                {#if $organization?.billingPlan === BillingPlan.FREE}
+                {#if $organization?.billingPlan === BillingPlan.Tier0}
                     Upgrade to allow files of a larger size.
                 {/if}
             </p>
             <svelte:fragment slot="action">
-                {#if $organization?.billingPlan === BillingPlan.FREE}
+                {#if $organization?.billingPlan === BillingPlan.Tier0}
                     <div class="alert-buttons u-flex">
                         <Button text href={$upgradeURL}>Upgrade plan</Button>
                     </div>
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
index 133fde6894..9ea4d51020 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Submit } from '$lib/actions/analytics';
     import { Alert, CardGrid, Heading } from '$lib/components';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import { Button, Form, FormItem, InputNumber, InputSelect } from '$lib/elements/forms';
     import { humanFileSize, sizeToBytes } from '$lib/helpers/sizeConvertion';
     import { createByteUnitPair } from '$lib/helpers/unit';
@@ -41,12 +41,12 @@
                         The {plan.name} plan has a maximum upload file size limit of {Math.floor(
                             parseInt(size.value)
                         )}{size.unit}.
-                        {#if $organization?.billingPlan === BillingPlan.FREE}
+                        {#if $organization?.billingPlan === BillingPlan.Tier0}
                             Upgrade to allow files of a larger size.
                         {/if}
                     </p>
                     <svelte:fragment slot="action">
-                        {#if $organization?.billingPlan === BillingPlan.FREE}
+                        {#if $organization?.billingPlan === BillingPlan.Tier0}
                             <div class="alert-buttons u-flex">
                                 <Button text href={$upgradeURL}>Upgrade plan</Button>
                             </div>
diff --git a/src/routes/(console)/project-[project]/updateVariables.svelte b/src/routes/(console)/project-[project]/updateVariables.svelte
index ada7911e73..4402c49912 100644
--- a/src/routes/(console)/project-[project]/updateVariables.svelte
+++ b/src/routes/(console)/project-[project]/updateVariables.svelte
@@ -127,11 +127,11 @@
             const isConflicting = globalVariable !== undefined;
 
             if (isConflicting) {
-                await sdk.forProject.projectApi.deleteVariable(globalVariable.$id);
-                await sdk.forProject.projectApi.createVariable(variable.key, variable.value);
+                await sdk.forProject.project.deleteVariable(globalVariable.$id);
+                await sdk.forProject.project.createVariable(variable.key, variable.value);
                 await sdk.forProject.functions.deleteVariable(variable.resourceId, variable.$id);
             } else {
-                await sdk.forProject.projectApi.createVariable(variable.key, variable.value);
+                await sdk.forProject.project.createVariable(variable.key, variable.value);
                 await sdk.forProject.functions.deleteVariable(variable.resourceId, variable.$id);
             }
 
diff --git a/src/routes/(public)/(guest)/login/+page.ts b/src/routes/(public)/(guest)/login/+page.ts
index e98fddfd23..361bfed5ba 100644
--- a/src/routes/(public)/(guest)/login/+page.ts
+++ b/src/routes/(public)/(guest)/login/+page.ts
@@ -8,7 +8,7 @@ export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
         try {
-            const couponData = await sdk.forConsole.billing.getCoupon(code);
+            const couponData = await sdk.forConsole.console.getCopon(code);
             if (couponData?.campaign && campaigns.has(couponData.campaign)) {
                 return {
                     couponData
diff --git a/src/routes/(public)/(guest)/register/+page.ts b/src/routes/(public)/(guest)/register/+page.ts
index 0b76cc12d4..df7a08b3ba 100644
--- a/src/routes/(public)/(guest)/register/+page.ts
+++ b/src/routes/(public)/(guest)/register/+page.ts
@@ -8,7 +8,7 @@ export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
         try {
-            const couponData = await sdk.forConsole.billing.getCoupon(code);
+            const couponData = await sdk.forConsole.console.getCopon(code);
             if (couponData?.campaign && campaigns.has(couponData.campaign)) {
                 return {
                     couponData
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 8368d619f4..099a341ec3 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -42,7 +42,7 @@
 
         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.getCopon(code).catch<null>(() => null);
             if (coupon?.campaign && campaigns.has(coupon.campaign)) {
                 if ($user) {
                     goto(`${base}/apply-credit?code=${code}`);

From bb1fdfb2c90f19e09a83a664ff135527efb43596 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Thu, 10 Oct 2024 15:24:19 +0200
Subject: [PATCH 2/2] feat: new sdk

---
 package.json                                           |  2 +-
 pnpm-lock.yaml                                         | 10 +++++-----
 src/lib/components/billing/couponInput.svelte          |  2 +-
 src/lib/components/billing/validateCreditModal.svelte  |  2 +-
 src/lib/components/roles/upgrade.svelte                |  8 ++++----
 src/lib/stores/billing.ts                              |  4 ++--
 .../(console)/account/organizations/+page.svelte       |  2 +-
 src/routes/(console)/apply-credit/+page.svelte         |  2 +-
 src/routes/(console)/apply-credit/+page.ts             |  2 +-
 src/routes/(console)/create-organization/+page.svelte  |  2 +-
 .../billing/replaceAddress.svelte                      |  2 +-
 .../billing/wizard/addCredit.svelte                    |  2 +-
 .../change-plan/+page.svelte                           |  2 +-
 src/routes/(public)/(guest)/login/+page.ts             |  2 +-
 src/routes/(public)/(guest)/register/+page.ts          |  2 +-
 src/routes/+layout.svelte                              |  2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 6efe344514..beb42a69fb 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "e2e:ui": "playwright test tests/e2e --ui"
     },
     "dependencies": {
-        "@appwrite.io/console": "^1.3.2",
+        "@appwrite.io/console": "^1.4.0",
         "@appwrite.io/pink": "0.25.0",
         "@appwrite.io/pink-icons": "0.25.0",
         "@popperjs/core": "^2.11.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f6911738dc..10a5907f57 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@appwrite.io/console':
-        specifier: ^1.3.2
-        version: 1.3.2
+        specifier: ^1.4.0
+        version: 1.4.0
       '@appwrite.io/pink':
         specifier: 0.25.0
         version: 0.25.0
@@ -193,8 +193,8 @@ packages:
   '@analytics/type-utils@0.6.2':
     resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==}
 
-  '@appwrite.io/console@1.3.2':
-    resolution: {integrity: sha512-3OKKlhXbEqgWPZxdJjmzVZkOoBbJBkOiTqqQWP9ZnuBNEXwIkaXsneMjkPYS3IEBLkJ9zNMON7rH8kkEgMnEgw==}
+  '@appwrite.io/console@1.4.0':
+    resolution: {integrity: sha512-hN4UWdXff/9Xmy53hhglTFBe7TUC7BEJXqjoiewupLWIpcMq90dY4f00t0VncVZW3amUsQUYHbCgUuAHatLA/Q==}
 
   '@appwrite.io/pink-icons@0.25.0':
     resolution: {integrity: sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q==}
@@ -3723,7 +3723,7 @@ snapshots:
 
   '@analytics/type-utils@0.6.2': {}
 
-  '@appwrite.io/console@1.3.2': {}
+  '@appwrite.io/console@1.4.0': {}
 
   '@appwrite.io/pink-icons@0.25.0': {}
 
diff --git a/src/lib/components/billing/couponInput.svelte b/src/lib/components/billing/couponInput.svelte
index 0f610046b7..2375bb5754 100644
--- a/src/lib/components/billing/couponInput.svelte
+++ b/src/lib/components/billing/couponInput.svelte
@@ -17,7 +17,7 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.console.getCopon(coupon);
+            const response = await sdk.forConsole.console.getCoupon(coupon);
             couponData = response;
             dispatch('validation', couponData);
             coupon = null;
diff --git a/src/lib/components/billing/validateCreditModal.svelte b/src/lib/components/billing/validateCreditModal.svelte
index f444e247ec..a540506dbe 100644
--- a/src/lib/components/billing/validateCreditModal.svelte
+++ b/src/lib/components/billing/validateCreditModal.svelte
@@ -18,7 +18,7 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.console.getCopon(coupon);
+            const response = await sdk.forConsole.console.getCoupon(coupon);
             couponData = response;
             dispatch('validation', couponData);
             coupon = null;
diff --git a/src/lib/components/roles/upgrade.svelte b/src/lib/components/roles/upgrade.svelte
index 9e54874762..ab0d519671 100644
--- a/src/lib/components/roles/upgrade.svelte
+++ b/src/lib/components/roles/upgrade.svelte
@@ -3,17 +3,17 @@
     import { upgradeURL } from '$lib/stores/billing';
     import { isCloud } from '$lib/system';
     import { organization } from '$lib/stores/organization';
-    import { BillingPlan } from '$lib/constants';
+    import { BillingPlan } from '@appwrite.io/console';
     import Button from '$lib/elements/forms/button.svelte';
 </script>
 
 <Base>
     {#if isCloud}
-        {#if $organization?.billingPlan !== BillingPlan.FREE}
+        {#if $organization?.billingPlan !== BillingPlan.Tier0}
             <div class="u-flex-vertical u-gap-8">
                 <p>
                     <span class="u-bold">Roles</span>
-                    {#if $organization?.billingPlan === BillingPlan.FREE}
+                    {#if $organization?.billingPlan === BillingPlan.Tier0}
                         <span class="inline-tag u-normal u-x-small">Pro plan</span>
                     {/if}
                 </p>
@@ -27,7 +27,7 @@
             <div class="u-flex-vertical u-gap-8">
                 <p>
                     <span class="u-bold">Roles</span>
-                    {#if $organization?.billingPlan === BillingPlan.FREE}
+                    {#if $organization?.billingPlan === BillingPlan.Tier0}
                         <span class="inline-tag u-normal u-x-small">Pro plan</span>
                     {/if}
                 </p>
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 8cdcec3c4f..236e5703e0 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -416,8 +416,8 @@ export async function checkForMissingPaymentMethod() {
         Query.isNull('paymentMethodId'),
         Query.isNull('backupPaymentMethodId')
     ]);
-    if (orgs?.total) {
-        orgMissingPaymentMethod.set(orgs.teams[0] as Organization);
+    if (orgs?.teams.length > 0) {
+        orgMissingPaymentMethod.set(orgs.teams[0] as unknown as Organization);
         headerAlert.add({
             id: 'missingPaymentMethod',
             component: MissingPaymentMethod,
diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte
index be98971583..553047232a 100644
--- a/src/routes/(console)/account/organizations/+page.svelte
+++ b/src/routes/(console)/account/organizations/+page.svelte
@@ -81,7 +81,7 @@
                                     <Pill class="eyebrow-heading-3">FREE</Pill>
                                 </div>
                             {/if}
-                            {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.Tier0 && $plansInfo.get(organization.billingPlan)?.trialDays}
+                            {#if organization?.billingTrialStartDate && $daysLeftInTrial > 0 && organization.billingPlan !== BillingPlan.Tier0 && $plansInfo.get(organization.billingPlan)?.trial}
                                 <div
                                     class="u-flex u-cross-center"
                                     use:tooltip={{
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index a200112251..1c7b6b8b88 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -171,7 +171,7 @@
 
     async function addCoupon() {
         try {
-            const response = await sdk.forConsole.console.getCopon(coupon);
+            const response = await sdk.forConsole.console.getCoupon(coupon);
             couponData = response;
             coupon = null;
             addNotification({
diff --git a/src/routes/(console)/apply-credit/+page.ts b/src/routes/(console)/apply-credit/+page.ts
index ed3b9a903b..6338e838af 100644
--- a/src/routes/(console)/apply-credit/+page.ts
+++ b/src/routes/(console)/apply-credit/+page.ts
@@ -11,7 +11,7 @@ export const load: PageLoad = async ({ url }) => {
         let couponData: Coupon;
         const code = url.searchParams.get('code');
         try {
-            couponData = await sdk.forConsole.console.getCopon(code);
+            couponData = await sdk.forConsole.console.getCoupon(code);
         } catch (e) {
             redirect(303, base);
         }
diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
index 1f965a2c43..463f35ab25 100644
--- a/src/routes/(console)/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -60,7 +60,7 @@
         if ($page.url.searchParams.has('coupon')) {
             const coupon = $page.url.searchParams.get('coupon');
             try {
-                const response = await sdk.forConsole.console.getCopon(coupon);
+                const response = await sdk.forConsole.console.getCoupon(coupon);
                 couponData = response;
             } catch (e) {
                 couponData = {
diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 632ffcdf77..085a7c3229 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -12,7 +12,7 @@
     import type { Models } from '@appwrite.io/console';
 
     export let show = false;
-    let addresses: Models.BillingAddress;
+    let addresses: Models.BillingAddressList;
     let selectedAddress: string;
     let error: string;
     let country: string;
diff --git a/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte b/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
index 58622b3e44..069dbff0e4 100644
--- a/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/wizard/addCredit.svelte
@@ -17,7 +17,7 @@
     async function validateCoupon() {
         if (couponData?.status === 'active') return;
         try {
-            const response = await sdk.forConsole.console.getCopon(coupon);
+            const response = await sdk.forConsole.console.getCoupon(coupon);
             couponData = response;
             $addCreditWizardStore.coupon = coupon;
             coupon = null;
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index a570a0b949..6fdd571dde 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -79,7 +79,7 @@
         if ($page.url.searchParams.has('code')) {
             const coupon = $page.url.searchParams.get('code');
             try {
-                const response = await sdk.forConsole.console.getCopon(coupon);
+                const response = await sdk.forConsole.console.getCoupon(coupon);
                 couponData = response;
             } catch (e) {
                 couponData = {
diff --git a/src/routes/(public)/(guest)/login/+page.ts b/src/routes/(public)/(guest)/login/+page.ts
index 361bfed5ba..4cc48fa8e2 100644
--- a/src/routes/(public)/(guest)/login/+page.ts
+++ b/src/routes/(public)/(guest)/login/+page.ts
@@ -8,7 +8,7 @@ export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
         try {
-            const couponData = await sdk.forConsole.console.getCopon(code);
+            const couponData = await sdk.forConsole.console.getCoupon(code);
             if (couponData?.campaign && campaigns.has(couponData.campaign)) {
                 return {
                     couponData
diff --git a/src/routes/(public)/(guest)/register/+page.ts b/src/routes/(public)/(guest)/register/+page.ts
index df7a08b3ba..b1f7d20370 100644
--- a/src/routes/(public)/(guest)/register/+page.ts
+++ b/src/routes/(public)/(guest)/register/+page.ts
@@ -8,7 +8,7 @@ export const load: PageLoad = async ({ url }) => {
     if (url.searchParams.has('code')) {
         const code = url.searchParams.get('code');
         try {
-            const couponData = await sdk.forConsole.console.getCopon(code);
+            const couponData = await sdk.forConsole.console.getCoupon(code);
             if (couponData?.campaign && campaigns.has(couponData.campaign)) {
                 return {
                     couponData
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 099a341ec3..d6e9f4084d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -42,7 +42,7 @@
 
         if ($page.url.searchParams.has('code')) {
             const code = $page.url.searchParams.get('code');
-            const coupon = await sdk.forConsole.console.getCopon(code).catch<null>(() => null);
+            const coupon = await sdk.forConsole.console.getCoupon(code).catch<null>(() => null);
             if (coupon?.campaign && campaigns.has(coupon.campaign)) {
                 if ($user) {
                     goto(`${base}/apply-credit?code=${code}`);