diff --git a/README.md b/README.md
index 258809c..a473e44 100644
--- a/README.md
+++ b/README.md
@@ -42,12 +42,12 @@ private val billingManager by lazy { BillingManager(context) }
 
 ### Step # 2 (Billing Connection)
 
-Retrieve a debugging ID for testing purposes by utilizing the `debugProductId` method. Ensure that the parameter `purchaseDetailList` represents a list containing all active purchases along with their respective details.
+Retrieve a debugging ID for testing purposes by utilizing the `getDebugProductIDList()` method. Ensure that the parameter `purchaseDetailList` represents a list containing all active purchases along with their respective details.
 
 ```
 val subsProductIdList = listOf("subs_product_id_1", "subs_product_id_2", "subs_product_id_3")
 val inAppProductIdList = when (BuildConfig.DEBUG) {
-    true -> listOf(billingManager.debugProductId)
+    true -> listOf(billingManager.getDebugProductIDList())
     false -> listOf("inapp_product_id_1", "inapp_product_id_2")
 }
 
@@ -110,7 +110,7 @@ This observer monitors all active in-app and subscription products.
 val subsProductIdList = listOf("subs_product_id_1", "subs_product_id_2", "subs_product_id_3")
 val subsPlanIdList = listOf("subs_plan_id_1", "subs_plan_id_2", "subs_plan_id_3")
 
-billingManager.observeQueryProducts().observe(viewLifecycleOwner) { productDetailList ->
+billingManager.productDetailsLiveData.observe(viewLifecycleOwner) { productDetailList ->
     Log.d(TAG, "Billing: initObservers: $productDetailList")
 
     productDetailList.forEach { productDetail ->
diff --git a/app/build.gradle b/app/build.gradle
index 78823ec..790b081 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,9 @@ android {
     kotlinOptions {
         jvmTarget = '17'
     }
+    buildFeatures{
+        buildConfig true
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/hypersoft/inappbilling/MainActivity.kt b/app/src/main/java/com/hypersoft/inappbilling/MainActivity.kt
index f025014..4bac8a1 100644
--- a/app/src/main/java/com/hypersoft/inappbilling/MainActivity.kt
+++ b/app/src/main/java/com/hypersoft/inappbilling/MainActivity.kt
@@ -3,18 +3,12 @@ package com.hypersoft.inappbilling
 import android.os.Bundle
 import android.util.Log
 import android.widget.Button
-import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.hypersoft.billing.BillingManager
-import com.hypersoft.billing.common.interfaces.OnPurchaseListener
-import com.hypersoft.billing.latest.dataClasses.PurchaseDetail
-import com.hypersoft.billing.latest.interfaces.BillingListener
-import com.hypersoft.billing.oldest.constants.SubscriptionPlans
-import com.hypersoft.billing.oldest.constants.SubscriptionProductIds
-import com.hypersoft.billing.oldest.dataClasses.ProductDetail
-import com.hypersoft.billing.oldest.interfaces.OnConnectionListener
-import com.hypersoft.billing.oldest.status.State
+import com.hypersoft.billing.dataClasses.PurchaseDetail
+import com.hypersoft.billing.interfaces.BillingListener
+import com.hypersoft.billing.interfaces.OnPurchaseListener
 
 const val TAG = "MyTag"
 
@@ -22,16 +16,14 @@ class MainActivity : AppCompatActivity() {
 
     private val billingManager by lazy { BillingManager(this) }
 
-    // Old way
-    private lateinit var tvTitle: TextView
-    private val productId: String = "Paste your original Product ID"
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        newWay()
-        oldWay()
+        initBilling()
+        initObserver()
+
+        findViewById<Button>(R.id.btn_purchase).setOnClickListener { onPurchaseClick() }
     }
 
     /* -------------------------------------------------- New Way -------------------------------------------------- */
@@ -60,9 +52,9 @@ class MainActivity : AppCompatActivity() {
      *      -- Yearly
      */
 
-    private fun newWay() {
+    private fun initBilling() {
         val productIds = when (BuildConfig.DEBUG) {
-            true -> listOf(billingManager.debugProductId)
+            true -> listOf(billingManager.getDebugProductIDList())
             false -> listOf("abc", "def")
         }
 
@@ -71,11 +63,10 @@ class MainActivity : AppCompatActivity() {
             productSubscriptions = listOf("Bronze", "Silver", "Gold", "Yearly"),
             billingListener = billingListener
         )
-        initNewObserver()
     }
 
-    private fun initNewObserver() {
-        billingManager.observeQueryProducts().observe(this) { productDetailList ->
+    private fun initObserver() {
+        billingManager.productDetailsLiveData.observe(this) { productDetailList ->
             Log.d(TAG, "initNewObserver: --------------------------------------")
             productDetailList.forEach { productDetail ->
                 Log.d(TAG, "---: $productDetail")
@@ -100,15 +91,15 @@ class MainActivity : AppCompatActivity() {
         // your code here...
     }
 
-    private fun onPurchaseNewClick() {
+    private fun onPurchaseClick() {
         // In-App
-        billingManager.makeInAppPurchase(this, billingManager.debugProductId, newPurchaseListener)
+        billingManager.makeInAppPurchase(this, billingManager.getDebugProductIDList(), onPurchaseListener)
 
         // Subscription
-        billingManager.makeSubPurchase(this, "product_abc", "plan_abc", newPurchaseListener)
+        //billingManager.makeSubPurchase(this, "product_abc", "plan_abc", onPurchaseListener)
     }
 
-    private val newPurchaseListener = object : OnPurchaseListener {
+    private val onPurchaseListener = object : OnPurchaseListener {
         override fun onPurchaseResult(isPurchaseSuccess: Boolean, message: String) {
             showMessage(message)
         }
@@ -119,110 +110,6 @@ class MainActivity : AppCompatActivity() {
         billingManager.destroyBilling()
     }
 
-    /* -------------------------------------------------- Old Way -------------------------------------------------- */
-
-    private fun oldWay() {
-        initBilling()
-        initOldObserver()
-
-        tvTitle = findViewById(R.id.tv_title)
-        findViewById<Button>(R.id.btn_purchase).setOnClickListener {
-            onPurchaseClick()
-        }
-    }
-
-    private fun initOldObserver() {
-        State.billingState.observe(this) {
-            Log.d("BillingManager", "initObserver: $it")
-            tvTitle.text = it.toString()
-        }
-
-        //Observe Your Products
-        billingManager.productDetailsLiveData.observe(this) { list ->
-            var month = 0L
-            var year = 0L
-            list.forEach { productDetail: ProductDetail ->
-                Log.d(TAG, "initObservers: $productDetail")
-                when (productDetail.productId) {
-                    SubscriptionProductIds.basicProductMonthly -> {
-                        //binding.mtvOfferPrice1.text = productDetail.price
-                        month = productDetail.priceAmountMicros / 1000000
-                    }
-
-                    SubscriptionProductIds.basicProductYearly -> {
-                        //binding.mtvOfferPrice2.text = productDetail.price
-                        year = productDetail.priceAmountMicros / 1000000
-                    }
-
-                    SubscriptionProductIds.basicProductSemiYearly -> {
-                        //binding.mtvOfferPrice3Premium.text = productDetail.price
-                    }
-
-                    productId -> {
-                        //binding.mtvOfferPrice3Premium.text = productDetail.price
-                    }
-                }
-            }
-            // Best Offer
-            if (month == 0L || year == 0L) return@observe
-            val result = 100 - (year * 100 / (12 * month))
-            val text = "Save $result%"
-            //binding.mtvBestOffer.text = text
-
-            val perMonth = (year / 12L).toString()
-            //binding.mtvOffer.text = perMonth
-        }
-    }
-
-    private fun initBilling() {
-        billingManager.setCheckForSubscription(true)
-        val productIds = when (BuildConfig.DEBUG) {
-            true -> billingManager.getDebugProductIDList()
-            false -> listOf(productId)
-        }
-
-        if (BuildConfig.DEBUG) {
-            billingManager.startConnection(productIds, object : OnConnectionListener {
-                override fun onConnectionResult(isSuccess: Boolean, message: String) {
-                    showMessage(message)
-                    Log.d("TAG", "onConnectionResult: $isSuccess - $message")
-                }
-
-                override fun onOldPurchaseResult(isPurchased: Boolean, purchaseDetail: com.hypersoft.billing.oldest.dataClasses.PurchaseDetail?) {
-                    // Update your shared-preferences here!
-                    Log.d("TAG", "onOldPurchaseResult: $isPurchased")
-                }
-            })
-        } else {
-            billingManager.startConnection(productIds, object : OnConnectionListener {
-                override fun onConnectionResult(isSuccess: Boolean, message: String) {
-                    showMessage(message)
-                    Log.d("TAG", "onConnectionResult: $isSuccess - $message")
-                }
-
-                override fun onOldPurchaseResult(isPurchased: Boolean, purchaseDetail: com.hypersoft.billing.oldest.dataClasses.PurchaseDetail?) {
-                    // Update your shared-preferences here!
-                    Log.d("TAG", "onOldPurchaseResult: $isPurchased")
-                }
-            })
-        }
-    }
-
-
-    private fun onPurchaseClick() {
-        // In-App
-        billingManager.makeInAppPurchase(this, oldPurchaseListener)
-
-        // Subscription
-        billingManager.makeSubPurchase(this, SubscriptionPlans.basicPlanMonthly, oldPurchaseListener)
-    }
-
-    private val oldPurchaseListener = object : OnPurchaseListener {
-        override fun onPurchaseResult(isPurchaseSuccess: Boolean, message: String) {
-            showMessage(message)
-        }
-    }
-
     private fun showMessage(message: String) {
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 668f037..3f733a3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,9 +10,9 @@
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        android:padding="10dp"
         android:layout_marginHorizontal="10dp"
+        android:padding="10dp"
+        android:text="Hello World!"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,12 +22,11 @@
         android:id="@+id/btn_purchase"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Purchase"
         android:layout_marginHorizontal="20dp"
         android:layout_marginBottom="20dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:text="Purchase"
         app:layout_constraintBottom_toBottomOf="parent"
-        />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/billing/consumer-rules.pro b/billing/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/billing/src/main/java/com/hypersoft/billing/BillingManager.kt b/billing/src/main/java/com/hypersoft/billing/BillingManager.kt
index 7222a16..46e253f 100644
--- a/billing/src/main/java/com/hypersoft/billing/BillingManager.kt
+++ b/billing/src/main/java/com/hypersoft/billing/BillingManager.kt
@@ -2,23 +2,15 @@ package com.hypersoft.billing
 
 import android.app.Activity
 import android.content.Context
-import androidx.lifecycle.LiveData
-import com.hypersoft.billing.latest.BillingController
-import com.hypersoft.billing.latest.interfaces.BillingListener
-import com.hypersoft.billing.oldest.helper.BillingHelper
-import com.hypersoft.billing.oldest.interfaces.OnConnectionListener
-import com.hypersoft.billing.common.interfaces.OnPurchaseListener
-import com.hypersoft.billing.latest.dataClasses.ProductDetail
+import com.hypersoft.billing.controller.BillingController
+import com.hypersoft.billing.interfaces.BillingListener
+import com.hypersoft.billing.interfaces.OnPurchaseListener
 
 /**
  * @param context: Context can be of Application class
  */
 
-class BillingManager(private val context: Context) : BillingHelper(context) {
-
-    private val billingController by lazy { BillingController(context) }
-
-    val debugProductId =  billingController.debugProductId
+class BillingManager(private val context: Context) : BillingController(context) {
 
     /**
      *  @param productInAppPurchases: Pass list of in-app product's ID
@@ -30,69 +22,28 @@ class BillingManager(private val context: Context) : BillingHelper(context) {
         productSubscriptions: List<String>,
         billingListener: BillingListener? = null
     ) {
-        billingController.startBillingConnection(
+        startBillingConnection(
             userInAppPurchases = productInAppPurchases,
             userSubsPurchases = productSubscriptions,
             billingListener = billingListener
         )
     }
 
-    fun observeQueryProducts(): LiveData<List<ProductDetail>> {
-        return billingController.productsObserver
-    }
-
     fun makeInAppPurchase(activity: Activity?, productId: String, onPurchaseListener: OnPurchaseListener) {
-        billingController.makePurchaseInApp(activity = activity, productId = productId, onPurchaseListener = onPurchaseListener)
+        makePurchaseInApp(activity = activity, productId = productId, onPurchaseListener = onPurchaseListener)
     }
 
     fun makeSubPurchase(activity: Activity?, productId: String, planId: String, onPurchaseListener: OnPurchaseListener) {
-        billingController.makePurchaseSub(activity = activity, productId = productId, planId = planId, onPurchaseListener = onPurchaseListener)
+        makePurchaseSub(activity = activity, productId = productId, planId = planId, onPurchaseListener = onPurchaseListener)
     }
 
     fun updateSubPurchase(activity: Activity?, oldProductId: String, oldPlanId: String, productId: String, planId: String, onPurchaseListener: OnPurchaseListener) {
-        billingController.updatePurchaseSub(activity = activity, oldProductId = oldProductId, oldPlanId = oldPlanId, productId = productId, planId = planId, onPurchaseListener = onPurchaseListener)
+        updatePurchaseSub(activity = activity, oldProductId = oldProductId, oldPlanId = oldPlanId, productId = productId, planId = planId, onPurchaseListener = onPurchaseListener)
     }
 
-    fun destroyBilling() = billingController.cleanBilling()
+    fun destroyBilling() = cleanBilling()
 
-    @Deprecated(
-        "Skip this method with new approach",
-        ReplaceWith("null"),
-        DeprecationLevel.WARNING
-    )
-    override fun setCheckForSubscription(isCheckRequired: Boolean) {
-        checkForSubscription = isCheckRequired
+    companion object {
+        const val TAG = "BillingManager"
     }
-
-
-    /**
-     * Deprecated. Use [initialize] with individual productId parameters instead.
-     */
-    @Deprecated(
-        "Use initialize with individual productId and plan ids parameters instead.",
-        ReplaceWith("initialize(productInAppPurchases, productSubscriptions, billingListener)"),
-        DeprecationLevel.WARNING
-    )
-    override fun startConnection(productIdsList: List<String>, onConnectionListener: OnConnectionListener) = startBillingConnection(productIdsList, onConnectionListener)
-
-
-    /**
-     * Deprecated. Use [makeInAppPurchase] with individual productId parameters instead.
-     */
-    @Deprecated(
-        "Use makeInAppPurchase with individual productId parameters instead.",
-        ReplaceWith("makeInAppPurchase(activity, productId, onPurchaseListener)"),
-        DeprecationLevel.WARNING
-    )
-    fun makeInAppPurchase(activity: Activity?, onPurchaseListener: OnPurchaseListener) = purchaseInApp(activity, onPurchaseListener)
-
-    /**
-     * Deprecated. Use [makeSubPurchase] with individual productId and planId parameters instead.
-     */
-    @Deprecated(
-        "Use makeSubPurchase with individual productId and planId parameters instead.",
-        ReplaceWith("makeSubPurchase(activity, productId, planId, onPurchaseListener)"),
-        DeprecationLevel.WARNING
-    )
-    fun makeSubPurchase(activity: Activity?, subscriptionPlans: String, onPurchaseListener: OnPurchaseListener) = purchaseSub(activity, subscriptionPlans, onPurchaseListener)
 }
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/BillingController.kt b/billing/src/main/java/com/hypersoft/billing/controller/BillingController.kt
similarity index 78%
rename from billing/src/main/java/com/hypersoft/billing/latest/BillingController.kt
rename to billing/src/main/java/com/hypersoft/billing/controller/BillingController.kt
index 7976667..3be441f 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/BillingController.kt
+++ b/billing/src/main/java/com/hypersoft/billing/controller/BillingController.kt
@@ -1,10 +1,10 @@
-package com.hypersoft.billing.latest
+package com.hypersoft.billing.controller
 
 import android.app.Activity
 import android.content.Context
-import com.hypersoft.billing.latest.interfaces.BillingListener
-import com.hypersoft.billing.latest.repository.BillingRepository
-import com.hypersoft.billing.common.interfaces.OnPurchaseListener
+import com.hypersoft.billing.interfaces.BillingListener
+import com.hypersoft.billing.interfaces.OnPurchaseListener
+import com.hypersoft.billing.repository.BillingRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -18,15 +18,12 @@ import kotlinx.coroutines.launch
  *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
  */
 
-internal class BillingController(context: Context) : BillingRepository(context) {
+open class BillingController(context: Context) : BillingRepository(context) {
 
     private var billingListener: BillingListener? = null
 
     private var job: Job? = null
 
-    val debugProductId =  getDebugProductIDList()
-    val productsObserver get() =   productDetailsLiveData
-
     fun startBillingConnection(
         userInAppPurchases: List<String>,
         userSubsPurchases: List<String>,
@@ -37,12 +34,12 @@ internal class BillingController(context: Context) : BillingRepository(context)
         startConnection { isSuccess, message ->
             billingListener?.onConnectionResult(isSuccess, message)
             if (isSuccess) {
-                fetchPurchases(userInAppPurchases, userSubsPurchases)
+                fetchData(userInAppPurchases, userSubsPurchases)
             }
         }
     }
 
-    private fun fetchPurchases(userInAppPurchases: List<String>, userSubsPurchases: List<String>) {
+    private fun fetchData(userInAppPurchases: List<String>, userSubsPurchases: List<String>) {
         setUserQueries(userInAppPurchases, userSubsPurchases)
         fetchPurchases()
         fetchStoreProducts()
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/BestPlan.kt b/billing/src/main/java/com/hypersoft/billing/dataClasses/BestPlan.kt
similarity index 80%
rename from billing/src/main/java/com/hypersoft/billing/latest/dataClasses/BestPlan.kt
rename to billing/src/main/java/com/hypersoft/billing/dataClasses/BestPlan.kt
index f27ea02..95824f7 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/BestPlan.kt
+++ b/billing/src/main/java/com/hypersoft/billing/dataClasses/BestPlan.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.latest.dataClasses
+package com.hypersoft.billing.dataClasses
 
 import com.android.billingclient.api.ProductDetails.PricingPhase
 
@@ -10,7 +10,7 @@ import com.android.billingclient.api.ProductDetails.PricingPhase
  *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
  */
 
-data class BestPlan(
+internal data class BestPlan(
     val trialDays: Int,
     val pricingPhase: PricingPhase?
 )
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/CompletePurchase.kt b/billing/src/main/java/com/hypersoft/billing/dataClasses/CompletePurchase.kt
similarity index 85%
rename from billing/src/main/java/com/hypersoft/billing/latest/dataClasses/CompletePurchase.kt
rename to billing/src/main/java/com/hypersoft/billing/dataClasses/CompletePurchase.kt
index 4973694..73ae3ff 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/CompletePurchase.kt
+++ b/billing/src/main/java/com/hypersoft/billing/dataClasses/CompletePurchase.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.latest.dataClasses
+package com.hypersoft.billing.dataClasses
 
 import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.Purchase
@@ -17,7 +17,7 @@ import com.android.billingclient.api.Purchase
  *      product detail as per purchase.
  */
 
-internal data class CompletePurchase(
+data class CompletePurchase(
     val purchase: Purchase,
     val productDetailList: List<ProductDetails>
 )
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/ProductDetail.kt b/billing/src/main/java/com/hypersoft/billing/dataClasses/ProductDetail.kt
similarity index 93%
rename from billing/src/main/java/com/hypersoft/billing/latest/dataClasses/ProductDetail.kt
rename to billing/src/main/java/com/hypersoft/billing/dataClasses/ProductDetail.kt
index 9c927d6..1f46b9b 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/ProductDetail.kt
+++ b/billing/src/main/java/com/hypersoft/billing/dataClasses/ProductDetail.kt
@@ -1,6 +1,4 @@
-package com.hypersoft.billing.latest.dataClasses
-
-import com.hypersoft.billing.common.dataClasses.ProductType
+package com.hypersoft.billing.dataClasses
 
 /**
  * @Author: SOHAIB AHMED
diff --git a/billing/src/main/java/com/hypersoft/billing/common/dataClasses/ProductType.kt b/billing/src/main/java/com/hypersoft/billing/dataClasses/ProductType.kt
similarity index 81%
rename from billing/src/main/java/com/hypersoft/billing/common/dataClasses/ProductType.kt
rename to billing/src/main/java/com/hypersoft/billing/dataClasses/ProductType.kt
index 0465bc6..e8235fc 100644
--- a/billing/src/main/java/com/hypersoft/billing/common/dataClasses/ProductType.kt
+++ b/billing/src/main/java/com/hypersoft/billing/dataClasses/ProductType.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.common.dataClasses
+package com.hypersoft.billing.dataClasses
 
 /**
  * @Author: SOHAIB AHMED
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/PurchaseDetail.kt b/billing/src/main/java/com/hypersoft/billing/dataClasses/PurchaseDetail.kt
similarity index 90%
rename from billing/src/main/java/com/hypersoft/billing/latest/dataClasses/PurchaseDetail.kt
rename to billing/src/main/java/com/hypersoft/billing/dataClasses/PurchaseDetail.kt
index 2c954a9..2e9122c 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/PurchaseDetail.kt
+++ b/billing/src/main/java/com/hypersoft/billing/dataClasses/PurchaseDetail.kt
@@ -1,6 +1,4 @@
-package com.hypersoft.billing.latest.dataClasses
-
-import com.hypersoft.billing.common.dataClasses.ProductType
+package com.hypersoft.billing.dataClasses
 
 /**
  * @Author: SOHAIB AHMED
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/QueryProductDetail.kt b/billing/src/main/java/com/hypersoft/billing/dataClasses/QueryProductDetail.kt
similarity index 67%
rename from billing/src/main/java/com/hypersoft/billing/latest/dataClasses/QueryProductDetail.kt
rename to billing/src/main/java/com/hypersoft/billing/dataClasses/QueryProductDetail.kt
index 683e7ee..aa15acc 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/dataClasses/QueryProductDetail.kt
+++ b/billing/src/main/java/com/hypersoft/billing/dataClasses/QueryProductDetail.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.latest.dataClasses
+package com.hypersoft.billing.dataClasses
 
 import com.android.billingclient.api.ProductDetails
 
@@ -12,5 +12,6 @@ import com.android.billingclient.api.ProductDetails
 
 internal data class QueryProductDetail(
     val productDetail: ProductDetail,
-    val productDetails: ProductDetails
+    val productDetails: ProductDetails,
+    val offerDetails: ProductDetails.SubscriptionOfferDetails?
 )
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/enums/ResultState.kt b/billing/src/main/java/com/hypersoft/billing/enums/ResultState.kt
similarity index 98%
rename from billing/src/main/java/com/hypersoft/billing/latest/enums/ResultState.kt
rename to billing/src/main/java/com/hypersoft/billing/enums/ResultState.kt
index 2b37d92..5e8a5be 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/enums/ResultState.kt
+++ b/billing/src/main/java/com/hypersoft/billing/enums/ResultState.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.latest.enums
+package com.hypersoft.billing.enums
 
 /**
  * @Author: SOHAIB AHMED
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/extensions/DateExtension.kt b/billing/src/main/java/com/hypersoft/billing/extensions/DateExtension.kt
similarity index 90%
rename from billing/src/main/java/com/hypersoft/billing/latest/extensions/DateExtension.kt
rename to billing/src/main/java/com/hypersoft/billing/extensions/DateExtension.kt
index 9844d19..2ec58d4 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/extensions/DateExtension.kt
+++ b/billing/src/main/java/com/hypersoft/billing/extensions/DateExtension.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.latest.extensions
+package com.hypersoft.billing.extensions
 
 import java.text.SimpleDateFormat
 import java.util.Date
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/interfaces/BillingListener.kt b/billing/src/main/java/com/hypersoft/billing/interfaces/BillingListener.kt
similarity index 74%
rename from billing/src/main/java/com/hypersoft/billing/latest/interfaces/BillingListener.kt
rename to billing/src/main/java/com/hypersoft/billing/interfaces/BillingListener.kt
index 1fff801..de645ba 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/interfaces/BillingListener.kt
+++ b/billing/src/main/java/com/hypersoft/billing/interfaces/BillingListener.kt
@@ -1,6 +1,6 @@
-package com.hypersoft.billing.latest.interfaces
+package com.hypersoft.billing.interfaces
 
-import com.hypersoft.billing.latest.dataClasses.PurchaseDetail
+import com.hypersoft.billing.dataClasses.PurchaseDetail
 
 /**
  * @Author: SOHAIB AHMED
diff --git a/billing/src/main/java/com/hypersoft/billing/common/interfaces/OnPurchaseListener.kt b/billing/src/main/java/com/hypersoft/billing/interfaces/OnPurchaseListener.kt
similarity index 85%
rename from billing/src/main/java/com/hypersoft/billing/common/interfaces/OnPurchaseListener.kt
rename to billing/src/main/java/com/hypersoft/billing/interfaces/OnPurchaseListener.kt
index c5e2b04..121699e 100644
--- a/billing/src/main/java/com/hypersoft/billing/common/interfaces/OnPurchaseListener.kt
+++ b/billing/src/main/java/com/hypersoft/billing/interfaces/OnPurchaseListener.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.common.interfaces
+package com.hypersoft.billing.interfaces
 
 /**
  * @Author: SOHAIB AHMED
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/utils/Result.kt b/billing/src/main/java/com/hypersoft/billing/latest/utils/Result.kt
deleted file mode 100644
index 596957b..0000000
--- a/billing/src/main/java/com/hypersoft/billing/latest/utils/Result.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-    package com.hypersoft.billing.latest.utils
-
-    import android.util.Log
-    import androidx.lifecycle.LiveData
-    import androidx.lifecycle.MutableLiveData
-    import com.hypersoft.billing.latest.enums.ResultState
-
-    /**
-     * @Author: SOHAIB AHMED
-     * @Date: 21/02/2024
-     * @Accounts
-     *      -> https://github.com/epegasus
-     *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
-     */
-
-    object Result {
-
-        private var RESULT_STATE = ResultState.NONE
-
-        private var _resultState = MutableLiveData<ResultState>()
-        val resultState: LiveData<ResultState> get() = _resultState
-
-        fun setResultState(resultState: ResultState) {
-            Log.d("BillingManager", "setResultState: $resultState")
-            RESULT_STATE = resultState
-            _resultState.postValue(RESULT_STATE)
-        }
-
-        fun getResultState(): ResultState {
-            return RESULT_STATE
-        }
-
-        override fun toString(): String {
-            return when (RESULT_STATE) {
-                ResultState.NONE -> ResultState.NONE.message
-
-                ResultState.CONNECTION_INVALID -> ResultState.CONNECTION_INVALID.message
-                ResultState.CONNECTION_ESTABLISHING -> ResultState.CONNECTION_ESTABLISHING.message
-                ResultState.CONNECTION_ESTABLISHING_IN_PROGRESS -> ResultState.CONNECTION_ESTABLISHING_IN_PROGRESS.message
-                ResultState.CONNECTION_ALREADY_ESTABLISHED -> ResultState.CONNECTION_ALREADY_ESTABLISHED.message
-                ResultState.CONNECTION_DISCONNECTED -> ResultState.CONNECTION_DISCONNECTED.message
-                ResultState.CONNECTION_ESTABLISHED -> ResultState.CONNECTION_ESTABLISHED.message
-                ResultState.CONNECTION_FAILED -> ResultState.CONNECTION_FAILED.message
-                ResultState.ACTIVITY_REFERENCE_NOT_FOUND -> ResultState.ACTIVITY_REFERENCE_NOT_FOUND.message
-
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING -> ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING.message
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_FAILED -> ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_FAILED.message
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_SUCCESS -> ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_SUCCESS.message
-
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING -> ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING.message
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_FAILED -> ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_FAILED.message
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_SUCCESS -> ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_SUCCESS.message
-
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_PROCESSING -> ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_PROCESSING.message
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_COMPLETE -> ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_COMPLETE.message
-                ResultState.CONSOLE_PURCHASE_PRODUCTS_CHECKED_FOR_ACKNOWLEDGEMENT -> ResultState.CONSOLE_PURCHASE_PRODUCTS_CHECKED_FOR_ACKNOWLEDGEMENT.message
-
-                ResultState.CONSOLE_QUERY_PRODUCTS_INAPP_FETCHING -> ResultState.CONSOLE_QUERY_PRODUCTS_INAPP_FETCHING.message
-                ResultState.CONSOLE_QUERY_PRODUCTS_SUB_FETCHING -> ResultState.CONSOLE_QUERY_PRODUCTS_SUB_FETCHING.message
-                ResultState.CONSOLE_QUERY_PRODUCTS_COMPLETED -> ResultState.CONSOLE_QUERY_PRODUCTS_COMPLETED.message
-
-                ResultState.CONSOLE_BUY_PRODUCT_EMPTY_ID -> ResultState.CONSOLE_BUY_PRODUCT_EMPTY_ID.message
-                ResultState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST -> ResultState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST.message
-                ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST -> ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST.message
-
-                ResultState.CONSOLE_PRODUCTS_OLD_SUB_NOT_FOUND -> ResultState.CONSOLE_PRODUCTS_OLD_SUB_NOT_FOUND.message
-
-                ResultState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY -> ResultState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY.message
-                ResultState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED -> ResultState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED.message
-                ResultState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND -> ResultState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND.message
-
-                ResultState.PURCHASING_SUCCESSFULLY -> ResultState.PURCHASING_SUCCESSFULLY.message
-                ResultState.PURCHASING_ALREADY_OWNED -> ResultState.PURCHASING_ALREADY_OWNED.message
-                ResultState.PURCHASING_NO_PURCHASES_FOUND -> ResultState.PURCHASING_NO_PURCHASES_FOUND.message
-                ResultState.PURCHASING_FAILURE -> ResultState.PURCHASING_FAILURE.message
-            }
-        }
-    }
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/constants/SubscriptionPlans.kt b/billing/src/main/java/com/hypersoft/billing/oldest/constants/SubscriptionPlans.kt
deleted file mode 100644
index 9904cc8..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/constants/SubscriptionPlans.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.hypersoft.billing.oldest.constants
-
-/**
- * @Author: SOHAIB AHMED
- * @Date: 08,May,2023
- * @Accounts
- *      -> https://github.com/epegasus
- *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
- */
-
-object SubscriptionPlans {
-
-    const val basicPlanWeekly = "basic-plan-weekly"
-    const val basicPlanFourWeeks = "basic-plan-four-weeks"
-    const val basicPlanMonthly = "basic-plan-monthly"
-    const val basicPlanQuarterly = "basic-plan-quarterly"
-    const val basicPlanSemiYearly = "basic-plan-semi-yearly"
-    const val basicPlanYearly = "basic-plan-yearly"
-    const val basicPlanLifeTime = "basic-plan-lifetime"
-
-    /*const val premiumPlanWeekly = "premium-weekly"
-    const val premiumPlanMonthly = "premium-monthly"
-    const val premiumPlanQuarterly = "premium-quarterly"
-    const val premiumPlanSemiYearly = "premium-semi-yearly"
-    const val premiumPlanYearly = "premium-yearly"*/
-
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/constants/SubscriptionProductIds.kt b/billing/src/main/java/com/hypersoft/billing/oldest/constants/SubscriptionProductIds.kt
deleted file mode 100644
index cfdb9b5..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/constants/SubscriptionProductIds.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.hypersoft.billing.oldest.constants
-
-/**
- * @Author: SOHAIB AHMED
- * @Date: 12,May,2023
- * @Accounts
- *      -> https://github.com/epegasus
- *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
- */
-
-object SubscriptionProductIds {
-
-    const val basicProductWeekly = "basic_product_weekly"
-    const val basicProductFourWeeks = "basic_product_four_weeks"
-    const val basicProductMonthly = "basic_product_monthly"
-    const val basicProductQuarterly = "basic_product_quarterly"
-    const val basicProductSemiYearly = "basic_product_semi_yearly"
-    const val basicProductYearly = "basic_product_yearly"
-    const val basicProductLifeTime = "basic_product_lifetime"
-
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/dataClasses/ProductDetail.kt b/billing/src/main/java/com/hypersoft/billing/oldest/dataClasses/ProductDetail.kt
deleted file mode 100644
index c0d47e0..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/dataClasses/ProductDetail.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.hypersoft.billing.oldest.dataClasses
-
-import com.hypersoft.billing.common.dataClasses.ProductType
-
-/**
- * @Author: SOHAIB AHMED
- * @Date: 13,June,2023
- * @Accounts
- *      -> https://github.com/epegasus
- *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
- */
-
-/**
- * @property productId: Unique ID (Console's ID)
- * @property price: e.g. Rs 750.00
- * @property currencyCode: e.g. USD, PKR, etc
- * @property freeTrialPeriod: e.g. 3, 5, 7
- * @property priceAmountMicros: e.g. 750000000
- * @property freeTrial: isAvailable or not
- */
-
-data class ProductDetail(
-    var productId: String,
-    var price: String,
-    var currencyCode: String,
-    var freeTrialPeriod: Int,
-    var priceAmountMicros: Long = 0,
-    var freeTrial: Boolean = false,
-    var productType: ProductType = ProductType.subs
-) {
-    constructor() : this(productId = "", price = "", currencyCode = "", 0, 0, false)
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/dataClasses/PurchaseDetail.kt b/billing/src/main/java/com/hypersoft/billing/oldest/dataClasses/PurchaseDetail.kt
deleted file mode 100644
index 1f48689..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/dataClasses/PurchaseDetail.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hypersoft.billing.oldest.dataClasses
-
-import com.hypersoft.billing.common.dataClasses.ProductType
-
-/**
- * @Author: SOHAIB AHMED
- * @Date: 8/1/2023
- * @Accounts
- *      -> https://github.com/epegasus
- *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
- */
-
-data class PurchaseDetail (
-    val productType: ProductType,
-    val purchaseType: String,
-    val purchaseTime: String
-)
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/dataProvider/DataProviderInApp.kt b/billing/src/main/java/com/hypersoft/billing/oldest/dataProvider/DataProviderInApp.kt
deleted file mode 100644
index 2b9c0e1..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/dataProvider/DataProviderInApp.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.hypersoft.billing.oldest.dataProvider
-
-
-import com.android.billingclient.api.BillingClient
-import com.android.billingclient.api.ProductDetails
-import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.QueryProductDetailsParams
-import com.hypersoft.billing.oldest.dataClasses.PurchaseDetail
-import com.hypersoft.billing.common.dataClasses.ProductType
-import java.text.SimpleDateFormat
-import java.util.Date
-
-internal class DataProviderInApp {
-
-    private var productIdsList: List<String> = listOf()
-    private var productDetailsList: List<ProductDetails> = listOf()
-
-    /* ------------------------------------------------------ Product ID ------------------------------------------------------ */
-
-    /**
-     * @param productIdsList:   List of product Id's providing by the developer to check/retrieve-details if these products are existing in Google Play Console
-     */
-
-    fun setProductIdsList(productIdsList: List<String>) {
-        this.productIdsList = productIdsList
-    }
-
-    fun getProductIdsList(): List<String> {
-        return productIdsList
-    }
-
-    fun getProductList(): List<QueryProductDetailsParams.Product> {
-        val arrayList = ArrayList<QueryProductDetailsParams.Product>()
-        productIdsList.forEach {
-            arrayList.add(QueryProductDetailsParams.Product.newBuilder().setProductId(it).setProductType(BillingClient.ProductType.INAPP).build())
-        }
-        return arrayList.toList()
-    }
-
-    fun getDebugProductIDList(): List<String> = listOf(
-        "android.test.item_unavailable"
-    )
-
-    fun getDebugProductIDsList(): List<String> = listOf(
-        "android.test.item_unavailable",
-        "android.test.refunded",
-        "android.test.canceled",
-        "android.test.purchased"
-    )
-
-    /* ---------------------------------------------------- Product Details ---------------------------------------------------- */
-
-    fun setProductDetailsList(productDetailsList: List<ProductDetails>) {
-        this.productDetailsList = productDetailsList
-    }
-
-    fun getProductDetail(): ProductDetails? {
-        if (productDetailsList.isEmpty())
-            return null
-        return productDetailsList[0]
-    }
-
-    fun getProductDetailsList(): List<ProductDetails> {
-        return productDetailsList
-    }
-
-    /* ---------------------------------------------------- Purchase Details ---------------------------------------------------- */
-
-    fun getPurchaseDetail(simpleDateFormat: SimpleDateFormat, purchase: Purchase): PurchaseDetail {
-        return PurchaseDetail(productType = ProductType.inapp, purchaseType = "Lifetime", purchaseTime = simpleDateFormat.format(Date(purchase.purchaseTime)))
-    }
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/dataProvider/DataProviderSub.kt b/billing/src/main/java/com/hypersoft/billing/oldest/dataProvider/DataProviderSub.kt
deleted file mode 100644
index 187c988..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/dataProvider/DataProviderSub.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.hypersoft.billing.oldest.dataProvider
-
-import com.android.billingclient.api.BillingClient
-import com.android.billingclient.api.ProductDetails
-import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.QueryProductDetailsParams
-import com.hypersoft.billing.oldest.constants.SubscriptionProductIds
-import com.hypersoft.billing.oldest.dataClasses.PurchaseDetail
-import com.hypersoft.billing.common.dataClasses.ProductType
-import java.text.SimpleDateFormat
-import java.util.Date
-
-internal class DataProviderSub {
-
-    private var productDetailsList: List<ProductDetails> = listOf()
-
-    /* ------------------------------------------------------ Product ID ------------------------------------------------------ */
-
-    /**
-     * @field productIdsList:   List of product Id's providing by the developer to check/retrieve-details if these products are existing in Google Play Console
-     */
-
-    val productIdsList = listOf(
-        SubscriptionProductIds.basicProductWeekly,
-        SubscriptionProductIds.basicProductFourWeeks,
-        SubscriptionProductIds.basicProductMonthly,
-        SubscriptionProductIds.basicProductQuarterly,
-        SubscriptionProductIds.basicProductSemiYearly,
-        SubscriptionProductIds.basicProductYearly,
-        SubscriptionProductIds.basicProductLifeTime,
-    )
-
-    fun getProductList(): List<QueryProductDetailsParams.Product> {
-        val arrayList = ArrayList<QueryProductDetailsParams.Product>()
-        productIdsList.forEach {
-            arrayList.add(QueryProductDetailsParams.Product.newBuilder().setProductId(it).setProductType(BillingClient.ProductType.SUBS).build())
-        }
-        return arrayList.toList()
-    }
-
-    /* ---------------------------------------------------- Product Details ---------------------------------------------------- */
-
-    fun setProductDetailsList(productDetailsList: List<ProductDetails>) {
-        this.productDetailsList = productDetailsList
-    }
-
-    fun getProductDetailsList(): List<ProductDetails> {
-        return productDetailsList
-    }
-
-
-    /* ---------------------------------------------------- Purchase Details ---------------------------------------------------- */
-
-    fun getPurchaseDetail(simpleDateFormat: SimpleDateFormat, purchase: Purchase): PurchaseDetail {
-        val purchaseType = when (purchase.products[0]) {
-            SubscriptionProductIds.basicProductWeekly -> "Weekly"
-            SubscriptionProductIds.basicProductFourWeeks -> "Four Weeks"
-            SubscriptionProductIds.basicProductMonthly -> "Monthly"
-            SubscriptionProductIds.basicProductQuarterly -> "Quarterly"
-            SubscriptionProductIds.basicProductSemiYearly -> "06 Months"
-            SubscriptionProductIds.basicProductYearly -> "Yearly"
-            else -> "-"
-        }
-        return PurchaseDetail(productType = ProductType.subs, purchaseType = purchaseType, purchaseTime = simpleDateFormat.format(Date(purchase.purchaseTime)))
-    }
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/enums/BillingState.kt b/billing/src/main/java/com/hypersoft/billing/oldest/enums/BillingState.kt
deleted file mode 100644
index ef9a64d..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/enums/BillingState.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.hypersoft.billing.oldest.enums
-
-/**
- * @Author: SOHAIB AHMED
- * @Date: 08,May,2023
- * @Accounts
- *      -> https://github.com/epegasus
- *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
- */
-
-enum class BillingState(val message: String) {
-    NONE("Not Stated"),
-    NO_INTERNET_CONNECTION("No Internet Connection"),
-    EMPTY_PRODUCT_ID_LIST("Product Ids list cannot be empty"),
-    CONNECTION_ESTABLISHING("Connecting to Google Play Console"),
-    CONNECTION_ALREADY_ESTABLISHING("Already connected to Google Play Console"),
-    CONNECTION_DISCONNECTED("Connection disconnected to Google Play Console"),
-    CONNECTION_ESTABLISHED("Connection has been established to Google Play Console"),
-    CONNECTION_FAILED("Failed to connect Google Play Console"),
-    FEATURE_NOT_SUPPORTED("Feature is not Supported! Cannot buy Subscription"),
-    ACTIVITY_REFERENCE_NOT_FOUND("Activity reference is null"),
-
-    CONSOLE_OLD_PRODUCTS_INAPP_FETCHING("InApp -> Fetching old products from google play console."),
-    CONSOLE_OLD_PRODUCTS_INAPP_NOT_FOUND("InApp -> User hasn't owned any product yet."),
-    CONSOLE_OLD_PRODUCTS_INAPP_OWNED("InApp -> Already owned requested products"),
-    CONSOLE_OLD_PRODUCTS_INAPP_NOT_OWNED("InApp -> Doesn't owned requested products"),
-    CONSOLE_OLD_PRODUCTS_INAPP_OWNED_BUT_NOT_ACKNOWLEDGE("InApp -> Product is owned but is not acknowledged yet"),
-    CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_ACKNOWLEDGE("InApp -> Product is owned and is acknowledged as well"),
-    CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_FAILED_TO_ACKNOWLEDGE("InApp -> Product is owned and is failed to acknowledged"),
-
-    CONSOLE_OLD_PRODUCTS_SUB_FETCHING("SUB -> Fetching old products from google play console."),
-    CONSOLE_OLD_PRODUCTS_SUB_NOT_FOUND("SUB -> User hasn't owned any product yet."),
-    CONSOLE_OLD_PRODUCTS_SUB_OWNED("SUB -> Already owned requested products"),
-    CONSOLE_OLD_PRODUCTS_SUB_NOT_OWNED("SUB -> Doesn't owned requested products"),
-    CONSOLE_OLD_PRODUCTS_SUB_OWNED_BUT_NOT_ACKNOWLEDGE("SUB -> Product is owned but is not acknowledged yet"),
-    CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_ACKNOWLEDGE("SUB-> Product is owned and is acknowledged as well"),
-    CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_FAILED_TO_ACKNOWLEDGE("SUB -> Product is owned and is failed to acknowledged"),
-
-    CONSOLE_PRODUCTS_IN_APP_FETCHING("InApp -> Fetching all products from google play console. Try again in few moments"),
-    CONSOLE_PRODUCTS_IN_APP_FETCHED_SUCCESSFULLY("InApp -> Successfully fetched queried products details"),
-    CONSOLE_PRODUCTS_IN_APP_FETCHING_FAILED("InApp -> Failed to fetch products, response is not okay!"),
-    CONSOLE_PRODUCTS_IN_APP_AVAILABLE("InApp -> Products list is not empty"),
-    CONSOLE_PRODUCTS_IN_APP_NOT_EXIST("InApp -> No product has been found"),
-    CONSOLE_PRODUCTS_IN_APP_NOT_FOUND("InApp -> All products are not found"),
-
-    CONSOLE_PRODUCTS_SUB_FETCHING("SUB -> Fetching all products from google play console. Try again in few moments"),
-    CONSOLE_PRODUCTS_SUB_FETCHED_SUCCESSFULLY("SUB -> Successfully fetched queried products details"),
-    CONSOLE_PRODUCTS_SUB_FETCHING_FAILED("SUB -> Failed to fetch products, response is not okay!"),
-    CONSOLE_PRODUCTS_SUB_AVAILABLE("SUB -> Products list is not empty"),
-    CONSOLE_PRODUCTS_SUB_NOT_EXIST("SUB -> No product has been found"),
-    CONSOLE_PRODUCTS_SUB_NOT_FOUND("SUB -> All products are not found"),
-
-    LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY("Google Play Billing has been launched successfully"),
-    LAUNCHING_FLOW_INVOCATION_USER_CANCELLED("Cancelled by user"),
-    LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND("Exception Found, launching Google billing sheet"),
-    PURCHASED_SUCCESSFULLY("Successfully Purchased"),
-    PURCHASING_ALREADY_OWNED("Already owned this product! No need to purchase"),
-    PURCHASING_USER_CANCELLED("Purchasing product has been cancelled by user"),
-    PURCHASING_FAILURE("Failed to make transaction"),
-    PURCHASING_ERROR("Error found while purchasing")
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/helper/BillingHelper.kt b/billing/src/main/java/com/hypersoft/billing/oldest/helper/BillingHelper.kt
deleted file mode 100644
index a5b96ae..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/helper/BillingHelper.kt
+++ /dev/null
@@ -1,682 +0,0 @@
-package com.hypersoft.billing.oldest.helper
-
-import android.app.Activity
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.android.billingclient.api.AcknowledgePurchaseParams
-import com.android.billingclient.api.AcknowledgePurchaseResponseListener
-import com.android.billingclient.api.BillingClient
-import com.android.billingclient.api.BillingClientStateListener
-import com.android.billingclient.api.BillingFlowParams
-import com.android.billingclient.api.BillingResult
-import com.android.billingclient.api.ProductDetails
-import com.android.billingclient.api.Purchase
-import com.android.billingclient.api.PurchasesUpdatedListener
-import com.android.billingclient.api.QueryProductDetailsParams
-import com.android.billingclient.api.QueryPurchasesParams
-import com.android.billingclient.api.queryProductDetails
-import com.hypersoft.billing.oldest.constants.SubscriptionPlans
-import com.hypersoft.billing.oldest.constants.SubscriptionProductIds
-import com.hypersoft.billing.oldest.dataClasses.ProductDetail
-import com.hypersoft.billing.oldest.dataClasses.PurchaseDetail
-import com.hypersoft.billing.oldest.dataProvider.DataProviderInApp
-import com.hypersoft.billing.oldest.dataProvider.DataProviderSub
-import com.hypersoft.billing.oldest.enums.BillingState
-import com.hypersoft.billing.common.dataClasses.ProductType
-import com.hypersoft.billing.oldest.interfaces.OnConnectionListener
-import com.hypersoft.billing.common.interfaces.OnPurchaseListener
-import com.hypersoft.billing.oldest.status.State.getBillingState
-import com.hypersoft.billing.oldest.status.State.setBillingState
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-abstract class BillingHelper(private val context: Context) {
-
-    private val dataProviderInApp by lazy { DataProviderInApp() }
-    private val dataProviderSub by lazy { DataProviderSub() }
-    private val simpleDateFormat by lazy { SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()) }
-
-    private var onConnectionListener: OnConnectionListener? = null
-    private var onPurchaseListener: OnPurchaseListener? = null
-    private var purchaseDetail: PurchaseDetail? = null
-
-    @JvmField
-    protected var checkForSubscription = false
-    private var isPurchasedFound = false
-
-    private val _productDetailList = ArrayList<ProductDetail>()
-    private val productDetailList: List<ProductDetail> get() = _productDetailList.toList()
-
-    private val _productDetailsLiveData = MutableLiveData<List<ProductDetail>>()
-    @Deprecated("deprecated", ReplaceWith("Use this instead [BillingManager#observeQueryProducts]"))
-    val productDetailsLiveData: LiveData<List<ProductDetail>> = _productDetailsLiveData
-
-
-    /* ------------------------------------------------ Initializations ------------------------------------------------ */
-
-    private val billingClient by lazy {
-        BillingClient.newBuilder(context).setListener(purchasesUpdatedListener).enablePendingPurchases().build()
-    }
-
-    /* ------------------------------------------------ Establish Connection ------------------------------------------------ */
-    abstract fun setCheckForSubscription(isCheckRequired: Boolean)
-
-    abstract fun startConnection(productIdsList: List<String>, onConnectionListener: OnConnectionListener)
-
-    /**
-     *  Get a single testing product_id ("android.test.purchased")
-     */
-    @Deprecated("")
-    fun getDebugProductIDList() = dataProviderInApp.getDebugProductIDList()
-
-    /**
-     *  Get multiple testing product_ids
-     */
-    fun getDebugProductIDsList() = dataProviderInApp.getDebugProductIDsList()
-
-    protected fun startBillingConnection(productIdsList: List<String>, onConnectionListener: OnConnectionListener) {
-        this.onConnectionListener = onConnectionListener
-        if (productIdsList.isEmpty()) {
-            setBillingState(BillingState.EMPTY_PRODUCT_ID_LIST)
-            onConnectionListener.onConnectionResult(false, BillingState.EMPTY_PRODUCT_ID_LIST.message)
-            return
-        }
-        dataProviderInApp.setProductIdsList(productIdsList)
-        setBillingState(BillingState.CONNECTION_ESTABLISHING)
-
-        if (billingClient.isReady) {
-            setBillingState(BillingState.CONNECTION_ALREADY_ESTABLISHING)
-            proceedBilling()
-            return
-        }
-
-        billingClient.startConnection(object : BillingClientStateListener {
-            override fun onBillingServiceDisconnected() {
-                setBillingState(BillingState.CONNECTION_DISCONNECTED)
-                CoroutineScope(Dispatchers.Main).launch {
-                    onConnectionListener.onConnectionResult(false, BillingState.CONNECTION_DISCONNECTED.message)
-                }
-            }
-
-            override fun onBillingSetupFinished(billingResult: BillingResult) {
-                val isBillingReady = billingResult.responseCode == BillingClient.BillingResponseCode.OK
-                if (isBillingReady) {
-                    proceedBilling()
-                } else {
-                    setBillingState(BillingState.CONNECTION_FAILED)
-                    CoroutineScope(Dispatchers.Main).launch {
-                        onConnectionListener.onConnectionResult(false, billingResult.debugMessage)
-                    }
-                }
-            }
-        })
-    }
-
-    private fun proceedBilling() {
-        setBillingState(BillingState.CONNECTION_ESTABLISHED)
-        getInAppOldPurchases()
-        queryForAvailableInAppProducts()
-        queryForAvailableSubProducts()
-        Handler(Looper.getMainLooper()).post {
-            onConnectionListener?.onConnectionResult(true, BillingState.CONNECTION_ESTABLISHED.message)
-        }
-    }
-
-    private fun getPurchaseTime(purchaseTime: Long): String {
-        return simpleDateFormat.format(Date(purchaseTime))
-    }
-
-    private fun getInAppOldPurchases() = CoroutineScope(Dispatchers.Main).launch {
-        setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_INAPP_FETCHING)
-        val queryPurchasesParams = QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.INAPP).build()
-        billingClient.queryPurchasesAsync(queryPurchasesParams) { _, purchases ->
-            Log.d(TAG, " --------------------------- old purchase (In-App)  --------------------------- ")
-            Log.d(TAG, "getInAppOldPurchases: Object: $purchases")
-            purchases.forEach { purchase ->
-                Log.d(TAG, "getInAppOldPurchases: Object: $purchase")
-                Log.d(TAG, "getInAppOldPurchases: Products: ${purchase.products}")
-                Log.d(TAG, "getInAppOldPurchases: Original JSON: ${purchase.originalJson}")
-                Log.d(TAG, "getInAppOldPurchases: Developer Payload: ${purchase.developerPayload}")
-
-                if (purchase.products.isEmpty()) {
-                    setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_INAPP_NOT_FOUND)
-                    checkForSubscriptionIfAvailable()
-                    return@forEach
-                }
-
-                // getting the  single  product-id of every purchase in the list = sku
-                val compareSKU = purchase.products[0]
-
-                if (purchase.isAcknowledged) {
-                    dataProviderInApp.getProductIdsList().forEach {
-                        if (it.contains(compareSKU, true)) {
-                            isPurchasedFound = true
-                            purchaseDetail = dataProviderInApp.getPurchaseDetail(simpleDateFormat, purchase)
-                            setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED)
-                        }
-                    }
-                    checkForSubscriptionIfAvailable()
-                } else {
-                    if (purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
-                        for (i in 0 until dataProviderInApp.getProductIdsList().size) {
-                            setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_BUT_NOT_ACKNOWLEDGE)
-
-                            val acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder()
-                                .setPurchaseToken(purchase.purchaseToken)
-                                .build()
-
-                            billingClient.acknowledgePurchase(acknowledgePurchaseParams) { billingResult: BillingResult ->
-                                if (billingResult.responseCode == BillingClient.BillingResponseCode.OK || purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
-                                    setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_ACKNOWLEDGE)
-                                    purchaseDetail = dataProviderInApp.getPurchaseDetail(simpleDateFormat, purchase)
-                                    isPurchasedFound = true
-                                } else {
-                                    setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_FAILED_TO_ACKNOWLEDGE)
-                                }
-                                checkForSubscriptionIfAvailable()
-                            }
-                        }
-                    } else {
-                        checkForSubscriptionIfAvailable()
-                    }
-                }
-            }
-            if (purchases.isEmpty()) {
-                setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_INAPP_NOT_FOUND)
-                checkForSubscriptionIfAvailable()
-            }
-        }
-    }
-
-    private fun checkForSubscriptionIfAvailable() {
-        if (!checkForSubscription || isPurchasedFound) {
-            CoroutineScope(Dispatchers.Main).launch {
-                onConnectionListener?.onOldPurchaseResult(isPurchasedFound, purchaseDetail)
-            }
-            if (isPurchasedFound) return
-        }
-        getSubscriptionOldPurchases()
-    }
-
-    private fun getSubscriptionOldPurchases() = CoroutineScope(Dispatchers.Main).launch {
-        setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_SUB_FETCHING)
-        val queryPurchasesParams = QueryPurchasesParams.newBuilder().setProductType(BillingClient.ProductType.SUBS).build()
-
-        billingClient.queryPurchasesAsync(queryPurchasesParams) { billingResult, purchases ->
-            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
-                Log.d(TAG, " --------------------------- old purchase (Sub)   --------------------------- ")
-                Log.d(TAG, "getSubscriptionOldPurchases: List: $purchases")
-                purchases.forEach { purchase ->
-                    Log.d(TAG, "getSubscriptionOldPurchases: Object: $purchase")
-                    Log.d(TAG, "getSubscriptionOldPurchases: Products: ${purchase.products}")
-                    Log.d(TAG, "getSubscriptionOldPurchases: Original JSON: ${purchase.originalJson}")
-                    Log.d(TAG, "getSubscriptionOldPurchases: Developer Payload: ${purchase.developerPayload}")
-
-                    if (purchase.products.isEmpty()) {
-                        setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_SUB_NOT_FOUND)
-                        return@forEach
-                    }
-
-                    // getting the  single  product-id of every purchase in the list = sku
-                    val compareSKU = purchase.products[0]
-
-                    if (purchase.isAcknowledged) {
-                        for (i in 0 until dataProviderSub.productIdsList.size) {
-                            if (dataProviderSub.productIdsList[i].contains(compareSKU)) {
-                                setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED)
-                                isPurchasedFound = true
-                                purchaseDetail = dataProviderSub.getPurchaseDetail(simpleDateFormat, purchase)
-                                calculateResult()
-                                return@forEach
-                            }
-                        }
-                    } else {
-                        if (purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
-                            setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_BUT_NOT_ACKNOWLEDGE)
-                            for (i in 0 until dataProviderSub.productIdsList.size) {
-                                val acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder()
-                                    .setPurchaseToken(purchase.purchaseToken)
-                                    .build()
-                                billingClient.acknowledgePurchase(acknowledgePurchaseParams) { billingResult: BillingResult ->
-                                    if (billingResult.responseCode == BillingClient.BillingResponseCode.OK || purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
-                                        setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_ACKNOWLEDGE)
-                                        isPurchasedFound = true
-                                        purchaseDetail = dataProviderSub.getPurchaseDetail(simpleDateFormat, purchase)
-                                    } else {
-                                        setBillingState(BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_FAILED_TO_ACKNOWLEDGE)
-                                    }
-                                    calculateResult()
-                                }
-                            }
-                        } else {
-                            calculateResult()
-                        }
-                    }
-                }
-                if (purchases.isEmpty())
-                    calculateResult()
-            }
-        }
-    }
-
-    private fun calculateResult() {
-        CoroutineScope(Dispatchers.Main).launch {
-            onConnectionListener?.onOldPurchaseResult(isPurchasedFound, purchaseDetail)
-        }
-    }
-
-    /* -------------------------------------------- Query available console products  -------------------------------------------- */
-
-    private fun queryForAvailableInAppProducts() = CoroutineScope(Dispatchers.Main).launch {
-        setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING)
-        val productDetailsResult = withContext(Dispatchers.IO) {
-            billingClient.queryProductDetails(QueryProductDetailsParams.newBuilder().setProductList(dataProviderInApp.getProductList()).build())
-        }
-        // Process the result.
-        if (productDetailsResult.billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHED_SUCCESSFULLY)
-            if (productDetailsResult.productDetailsList.isNullOrEmpty()) {
-                setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST)
-            } else {
-                productDetailsResult.productDetailsList?.forEach {
-                    val item = ProductDetail()
-                    item.productId = it.productId
-                    item.price = it.oneTimePurchaseOfferDetails?.formattedPrice.toString().removeSuffix(".00")
-                    item.currencyCode = it.oneTimePurchaseOfferDetails?.priceCurrencyCode.toString()
-                    item.productType = ProductType.inapp
-                    item.priceAmountMicros = it.oneTimePurchaseOfferDetails?.priceAmountMicros ?: 0L
-
-                    _productDetailList.add(item)
-                    _productDetailsLiveData.postValue(productDetailList)
-                }
-                dataProviderInApp.setProductDetailsList(productDetailsResult.productDetailsList!!)
-                setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_AVAILABLE)
-            }
-        } else {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING_FAILED)
-        }
-    }
-
-    private fun queryForAvailableSubProducts() = CoroutineScope(Dispatchers.Main).launch {
-        setBillingState(BillingState.CONSOLE_PRODUCTS_SUB_FETCHING)
-        val productDetailsResult = withContext(Dispatchers.IO) {
-            billingClient.queryProductDetails(QueryProductDetailsParams.newBuilder().setProductList(dataProviderSub.getProductList()).build())
-        }
-        // Process the result.
-        if (productDetailsResult.billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_SUB_FETCHED_SUCCESSFULLY)
-            if (productDetailsResult.productDetailsList.isNullOrEmpty()) {
-                setBillingState(BillingState.CONSOLE_PRODUCTS_SUB_NOT_EXIST)
-            } else {
-                productDetailsResult.productDetailsList?.forEach { productDetails ->
-                    if (!productDetails.subscriptionOfferDetails.isNullOrEmpty()) {
-                        val purchaseList = productDetails.subscriptionOfferDetails!![0].pricingPhases.pricingPhaseList
-
-                        val item = ProductDetail()
-                        item.productId = productDetails.productId
-
-                        purchaseList.forEach { temp ->
-                            if (temp.priceAmountMicros == 0L) {
-                                item.freeTrial = true
-                                item.freeTrialPeriod = when (temp.billingPeriod) {
-                                    "P3D" -> 3
-                                    "P5D" -> 5
-                                    "P7D" -> 7
-                                    "P1M" -> 30
-                                    else -> 1
-                                }
-                            } else {
-                                item.currencyCode = temp.priceCurrencyCode
-                                item.price = temp.formattedPrice.removeSuffix(".00")
-                                item.priceAmountMicros = temp.priceAmountMicros
-                            }
-                        }
-                        _productDetailList.add(item)
-                    }
-                }
-                _productDetailsLiveData.postValue(productDetailList)
-                dataProviderSub.setProductDetailsList(productDetailsResult.productDetailsList!!)
-                setBillingState(BillingState.CONSOLE_PRODUCTS_SUB_AVAILABLE)
-            }
-        } else {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_SUB_FETCHING_FAILED)
-        }
-    }
-
-
-    /* --------------------------------------------------- Make Purchase  --------------------------------------------------- */
-
-    protected fun purchaseInApp(activity: Activity?, onPurchaseListener: OnPurchaseListener) {
-        this.onPurchaseListener = onPurchaseListener
-        if (checkValidationsInApp(activity)) return
-
-        dataProviderInApp.getProductDetail()?.let { productDetail ->
-            val productDetailsParamsList = listOf(BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(productDetail).build())
-            val billingFlowParams = BillingFlowParams.newBuilder().setProductDetailsParamsList(productDetailsParamsList).build()
-
-            // Launch the billing flow
-            val billingResult = billingClient.launchBillingFlow(activity!!, billingFlowParams)
-
-            when (billingResult.responseCode) {
-                BillingClient.BillingResponseCode.OK -> setBillingState(BillingState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY)
-                BillingClient.BillingResponseCode.USER_CANCELED -> setBillingState(BillingState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED)
-                else -> setBillingState(BillingState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND)
-            }
-        } ?: run {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST)
-        }
-    }
-
-    private fun checkValidationsInApp(activity: Activity?): Boolean {
-        if (activity == null) {
-            setBillingState(BillingState.ACTIVITY_REFERENCE_NOT_FOUND)
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (getBillingState() == BillingState.EMPTY_PRODUCT_ID_LIST) {
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (getBillingState() == BillingState.NO_INTERNET_CONNECTION) {
-            if (isInternetConnected && onConnectionListener != null) {
-                startBillingConnection(productIdsList = dataProviderInApp.getProductIdsList(), onConnectionListener!!)
-                return true
-            }
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-
-        if (getBillingState() == BillingState.CONNECTION_FAILED || getBillingState() == BillingState.CONNECTION_DISCONNECTED || getBillingState() == BillingState.CONNECTION_ESTABLISHING) {
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (getBillingState() == BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING || getBillingState() == BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING_FAILED) {
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (dataProviderInApp.getProductDetail() == null) {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST)
-        }
-
-        if (getBillingState() == BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST) {
-            onPurchaseListener?.onPurchaseResult(false, BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST.message)
-            return true
-        }
-
-        dataProviderInApp.getProductIdsList().forEach { id ->
-            dataProviderInApp.getProductDetailsList().forEach { productDetails ->
-                if (id != productDetails.productId) {
-                    setBillingState(BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_FOUND)
-                    onPurchaseListener?.onPurchaseResult(false, BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_FOUND.message)
-                    return true
-                }
-            }
-        }
-
-        if (billingClient.isFeatureSupported(BillingClient.FeatureType.PRODUCT_DETAILS).responseCode != BillingClient.BillingResponseCode.OK) {
-            setBillingState(BillingState.FEATURE_NOT_SUPPORTED)
-            return true
-        }
-        return false
-    }
-
-    protected fun purchaseSub(activity: Activity?, subscriptionPlans: String, onPurchaseListener: OnPurchaseListener) {
-        Log.d(TAG, "purchaseSub: in")
-        if (checkValidationsSub(activity)) return
-
-        this.onPurchaseListener = onPurchaseListener
-
-        Log.d(TAG, "purchaseSub: Starting: ${dataProviderSub.getProductDetailsList()}")
-
-        var prodDetails: ProductDetails? = null
-
-        dataProviderSub.getProductDetailsList().forEach { productDetails ->
-            if (productDetails.productId == SubscriptionProductIds.basicProductWeekly && subscriptionPlans == SubscriptionPlans.basicPlanWeekly) {
-                prodDetails = productDetails
-                return@forEach
-            } else if (productDetails.productId == SubscriptionProductIds.basicProductFourWeeks && subscriptionPlans == SubscriptionPlans.basicPlanFourWeeks) {
-                prodDetails = productDetails
-                return@forEach
-            } else if (productDetails.productId == SubscriptionProductIds.basicProductMonthly && subscriptionPlans == SubscriptionPlans.basicPlanMonthly) {
-                prodDetails = productDetails
-                return@forEach
-            } else if (productDetails.productId == SubscriptionProductIds.basicProductQuarterly && subscriptionPlans == SubscriptionPlans.basicPlanQuarterly) {
-                prodDetails = productDetails
-                return@forEach
-            } else if (productDetails.productId == SubscriptionProductIds.basicProductSemiYearly && subscriptionPlans == SubscriptionPlans.basicPlanSemiYearly) {
-                prodDetails = productDetails
-                return@forEach
-            } else if (productDetails.productId == SubscriptionProductIds.basicProductYearly && subscriptionPlans == SubscriptionPlans.basicPlanYearly) {
-                prodDetails = productDetails
-                return@forEach
-            }
-        }
-
-        Log.d(TAG, "purchaseSub: prodDetails : $prodDetails")
-
-        if (prodDetails == null) {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_SUB_NOT_FOUND)
-            return
-        }
-
-        // Retrieve all offers the user is eligible for.
-        val offers = prodDetails!!.subscriptionOfferDetails?.let {
-            retrieveEligibleOffers(offerDetails = it, tag = subscriptionPlans)
-        }
-
-        //  Get the offer id token of the lowest priced offer.
-        val offerToken = offers?.let { leastPricedOfferToken(it) }
-
-        offerToken?.let { token ->
-            val productDetailsParamsList = listOf(BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(prodDetails!!).setOfferToken(token).build())
-            val billingFlowParams = BillingFlowParams.newBuilder().setProductDetailsParamsList(productDetailsParamsList).build()
-
-            // Launch the billing flow
-            val billingResult = billingClient.launchBillingFlow(activity!!, billingFlowParams)
-
-            when (billingResult.responseCode) {
-                BillingClient.BillingResponseCode.OK -> setBillingState(BillingState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY)
-                BillingClient.BillingResponseCode.USER_CANCELED -> setBillingState(BillingState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED)
-                else -> setBillingState(BillingState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND)
-            }
-        }
-    }
-
-    private fun checkValidationsSub(activity: Activity?): Boolean {
-        if (activity == null) {
-            setBillingState(BillingState.ACTIVITY_REFERENCE_NOT_FOUND)
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (getBillingState() == BillingState.NO_INTERNET_CONNECTION) {
-            if (isInternetConnected && onConnectionListener != null) {
-                startBillingConnection(productIdsList = dataProviderInApp.getProductIdsList(), onConnectionListener!!)
-                return true
-            }
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (getBillingState() == BillingState.CONNECTION_FAILED || getBillingState() == BillingState.CONNECTION_DISCONNECTED || getBillingState() == BillingState.CONNECTION_ESTABLISHING) {
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (getBillingState() == BillingState.CONSOLE_PRODUCTS_SUB_FETCHING || getBillingState() == BillingState.CONSOLE_PRODUCTS_SUB_FETCHING_FAILED) {
-            onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-            return true
-        }
-
-        if (getBillingState() == BillingState.CONSOLE_PRODUCTS_SUB_NOT_EXIST) {
-            onPurchaseListener?.onPurchaseResult(false, BillingState.CONSOLE_PRODUCTS_SUB_NOT_EXIST.message)
-            return true
-        }
-
-        if (dataProviderSub.getProductDetailsList().isEmpty()) {
-            setBillingState(BillingState.CONSOLE_PRODUCTS_SUB_NOT_FOUND)
-            onPurchaseListener?.onPurchaseResult(false, BillingState.CONSOLE_PRODUCTS_SUB_NOT_FOUND.message)
-            return true
-        }
-
-        if (billingClient.isFeatureSupported(BillingClient.FeatureType.PRODUCT_DETAILS).responseCode != BillingClient.BillingResponseCode.OK) {
-            setBillingState(BillingState.FEATURE_NOT_SUPPORTED)
-            return true
-        }
-        return false
-    }
-
-    /**
-     * Retrieves all eligible base plans and offers using tags from ProductDetails.
-     *
-     * @param offerDetails offerDetails from a ProductDetails returned by the library.
-     * @param tag string representing tags associated with offers and base plans.
-     *
-     * @return the eligible offers and base plans in a list.
-     *
-     */
-    private fun retrieveEligibleOffers(offerDetails: MutableList<ProductDetails.SubscriptionOfferDetails>, tag: String): List<ProductDetails.SubscriptionOfferDetails> {
-        val eligibleOffers = emptyList<ProductDetails.SubscriptionOfferDetails>().toMutableList()
-        offerDetails.forEach { offerDetail ->
-            if (offerDetail.offerTags.contains(tag)) {
-                eligibleOffers.add(offerDetail)
-            }
-        }
-        return eligibleOffers
-    }
-
-    /**
-     * Calculates the lowest priced offer amongst all eligible offers.
-     * In this implementation the lowest price of all offers' pricing phases is returned.
-     * It's possible the logic can be implemented differently.
-     * For example, the lowest average price in terms of month could be returned instead.
-     *
-     * @param offerDetails List of of eligible offers and base plans.
-     *
-     * @return the offer id token of the lowest priced offer.
-     *
-     */
-    private fun leastPricedOfferToken(offerDetails: List<ProductDetails.SubscriptionOfferDetails>): String {
-        var offerToken = String()
-        var leastPricedOffer: ProductDetails.SubscriptionOfferDetails
-        var lowestPrice = Int.MAX_VALUE
-
-        if (offerDetails.isNotEmpty()) {
-            for (offer in offerDetails) {
-                for (price in offer.pricingPhases.pricingPhaseList) {
-                    if (price.priceAmountMicros < lowestPrice) {
-                        lowestPrice = price.priceAmountMicros.toInt()
-                        leastPricedOffer = offer
-                        offerToken = leastPricedOffer.offerToken
-                    }
-                }
-            }
-        }
-        return offerToken
-    }
-
-    /* --------------------------------------------------- Purchase Response  --------------------------------------------------- */
-
-    private val purchasesUpdatedListener: PurchasesUpdatedListener = PurchasesUpdatedListener { billingResult: BillingResult, purchaseMutableList: MutableList<Purchase>? ->
-        Log.d(TAG, "purchasesUpdatedListener: $purchaseMutableList")
-
-        when (billingResult.responseCode) {
-            BillingClient.BillingResponseCode.OK -> {
-                setBillingState(BillingState.PURCHASED_SUCCESSFULLY)
-                handlePurchase(purchaseMutableList)
-                return@PurchasesUpdatedListener
-            }
-
-            BillingClient.BillingResponseCode.BILLING_UNAVAILABLE -> {}
-            BillingClient.BillingResponseCode.DEVELOPER_ERROR -> {}
-            BillingClient.BillingResponseCode.ERROR -> setBillingState(BillingState.PURCHASING_ERROR)
-            BillingClient.BillingResponseCode.FEATURE_NOT_SUPPORTED -> {}
-            BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
-                setBillingState(BillingState.PURCHASING_ALREADY_OWNED)
-                onPurchaseListener?.onPurchaseResult(true, BillingState.PURCHASING_ALREADY_OWNED.message)
-                return@PurchasesUpdatedListener
-            }
-
-            BillingClient.BillingResponseCode.ITEM_NOT_OWNED -> {}
-            BillingClient.BillingResponseCode.ITEM_UNAVAILABLE -> {}
-            BillingClient.BillingResponseCode.SERVICE_DISCONNECTED -> {}
-            BillingClient.BillingResponseCode.SERVICE_TIMEOUT -> {}
-            BillingClient.BillingResponseCode.USER_CANCELED -> setBillingState(BillingState.PURCHASING_USER_CANCELLED)
-        }
-        onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-    }
-
-    private fun handlePurchase(purchases: MutableList<Purchase>?) = CoroutineScope(Dispatchers.Main).launch {
-        purchases?.forEach { purchase ->
-            if (purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
-                if (purchase.isAcknowledged) {
-                    setBillingState(BillingState.PURCHASED_SUCCESSFULLY)
-                    onPurchaseListener?.onPurchaseResult(true, BillingState.PURCHASED_SUCCESSFULLY.message)
-                } else {
-                    val acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder().setPurchaseToken(purchase.purchaseToken).build()
-                    withContext(Dispatchers.IO) {
-                        billingClient.acknowledgePurchase(acknowledgePurchaseParams, acknowledgePurchaseResponseListener)
-                    }
-                }
-                return@launch
-            } else {
-                setBillingState(BillingState.PURCHASING_FAILURE)
-            }
-        } ?: kotlin.run {
-            setBillingState(BillingState.PURCHASING_USER_CANCELLED)
-        }
-        onPurchaseListener?.onPurchaseResult(false, getBillingState().message)
-    }
-
-    private val acknowledgePurchaseResponseListener = AcknowledgePurchaseResponseListener {
-        if (it.responseCode == BillingClient.BillingResponseCode.OK) {
-            setBillingState(BillingState.PURCHASED_SUCCESSFULLY)
-            CoroutineScope(Dispatchers.Main).launch {
-                onPurchaseListener?.onPurchaseResult(true, BillingState.PURCHASED_SUCCESSFULLY.message)
-            }
-            Log.d(TAG, "acknowledgePurchaseResponseListener: Acknowledged successfully")
-        } else {
-            Log.d(TAG, "acknowledgePurchaseResponseListener: Acknowledgment failure")
-        }
-    }
-
-    /* ------------------------------------- Internet Connection ------------------------------------- */
-
-    private val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-    private val isInternetConnected: Boolean
-        get() {
-            try {
-                val network = connectivityManager.activeNetwork ?: return false
-                val networkCapabilities = connectivityManager.getNetworkCapabilities(network) ?: return false
-                return when {
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
-                    networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
-                    else -> false
-                }
-            } catch (ex: Exception) {
-                return false
-            }
-        }
-
-    companion object {
-        const val TAG = "BillingManager"
-    }
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/interfaces/OnConnectionListener.kt b/billing/src/main/java/com/hypersoft/billing/oldest/interfaces/OnConnectionListener.kt
deleted file mode 100644
index 554a3ad..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/interfaces/OnConnectionListener.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.hypersoft.billing.oldest.interfaces
-
-import com.hypersoft.billing.oldest.dataClasses.PurchaseDetail
-
-/**
- * @Author: SOHAIB AHMED
- * @Date: 16,April,2023
- * @Accounts
- *      -> https://github.com/epegasus
- *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
- */
-
-interface OnConnectionListener {
-
-    fun onConnectionResult(isSuccess: Boolean, message: String) {}
-    fun onOldPurchaseResult(isPurchased: Boolean, purchaseDetail: PurchaseDetail?)
-
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/oldest/status/State.kt b/billing/src/main/java/com/hypersoft/billing/oldest/status/State.kt
deleted file mode 100644
index 5f297a3..0000000
--- a/billing/src/main/java/com/hypersoft/billing/oldest/status/State.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.hypersoft.billing.oldest.status
-
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.hypersoft.billing.oldest.enums.BillingState
-
-object State {
-
-    private var BILLING_STATE = BillingState.NONE
-
-    private var _billingState = MutableLiveData<BillingState>()
-    val billingState: LiveData<BillingState> get() = _billingState
-
-    fun setBillingState(billingState: BillingState) {
-        Log.d("BillingManager", "setBillingState: $billingState")
-        BILLING_STATE = billingState
-        _billingState.postValue(BILLING_STATE)
-    }
-
-    fun getBillingState(): BillingState {
-        return BILLING_STATE
-    }
-
-    override fun toString(): String {
-        return when (BILLING_STATE) {
-            BillingState.NONE -> BillingState.NONE.message
-            BillingState.NO_INTERNET_CONNECTION -> BillingState.NO_INTERNET_CONNECTION.message
-            BillingState.EMPTY_PRODUCT_ID_LIST -> BillingState.EMPTY_PRODUCT_ID_LIST.message
-            BillingState.CONNECTION_ESTABLISHING -> BillingState.CONNECTION_ESTABLISHING.message
-            BillingState.CONNECTION_ALREADY_ESTABLISHING -> BillingState.CONNECTION_ALREADY_ESTABLISHING.message
-            BillingState.CONNECTION_DISCONNECTED -> BillingState.CONNECTION_DISCONNECTED.message
-            BillingState.CONNECTION_ESTABLISHED -> BillingState.CONNECTION_ESTABLISHED.message
-            BillingState.CONNECTION_FAILED -> BillingState.CONNECTION_FAILED.message
-            BillingState.FEATURE_NOT_SUPPORTED -> BillingState.FEATURE_NOT_SUPPORTED.message
-            BillingState.ACTIVITY_REFERENCE_NOT_FOUND -> BillingState.ACTIVITY_REFERENCE_NOT_FOUND.message
-
-            BillingState.CONSOLE_OLD_PRODUCTS_INAPP_FETCHING -> BillingState.CONSOLE_OLD_PRODUCTS_INAPP_FETCHING.message
-            BillingState.CONSOLE_OLD_PRODUCTS_INAPP_NOT_FOUND -> BillingState.CONSOLE_OLD_PRODUCTS_INAPP_NOT_FOUND.message
-            BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED -> BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED.message
-            BillingState.CONSOLE_OLD_PRODUCTS_INAPP_NOT_OWNED -> BillingState.CONSOLE_OLD_PRODUCTS_INAPP_NOT_OWNED.message
-            BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_BUT_NOT_ACKNOWLEDGE -> BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_BUT_NOT_ACKNOWLEDGE.message
-            BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_ACKNOWLEDGE -> BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_ACKNOWLEDGE.message
-            BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_FAILED_TO_ACKNOWLEDGE -> BillingState.CONSOLE_OLD_PRODUCTS_INAPP_OWNED_AND_FAILED_TO_ACKNOWLEDGE.message
-
-            BillingState.CONSOLE_OLD_PRODUCTS_SUB_FETCHING -> BillingState.CONSOLE_OLD_PRODUCTS_SUB_FETCHING.message
-            BillingState.CONSOLE_OLD_PRODUCTS_SUB_NOT_FOUND -> BillingState.CONSOLE_OLD_PRODUCTS_SUB_NOT_FOUND.message
-            BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED -> BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED.message
-            BillingState.CONSOLE_OLD_PRODUCTS_SUB_NOT_OWNED -> BillingState.CONSOLE_OLD_PRODUCTS_SUB_NOT_OWNED.message
-            BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_BUT_NOT_ACKNOWLEDGE -> BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_BUT_NOT_ACKNOWLEDGE.message
-            BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_ACKNOWLEDGE -> BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_ACKNOWLEDGE.message
-            BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_FAILED_TO_ACKNOWLEDGE -> BillingState.CONSOLE_OLD_PRODUCTS_SUB_OWNED_AND_FAILED_TO_ACKNOWLEDGE.message
-
-            BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING -> BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING.message
-            BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHED_SUCCESSFULLY -> BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHED_SUCCESSFULLY.message
-            BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING_FAILED -> BillingState.CONSOLE_PRODUCTS_IN_APP_FETCHING_FAILED.message
-            BillingState.CONSOLE_PRODUCTS_IN_APP_AVAILABLE -> BillingState.CONSOLE_PRODUCTS_IN_APP_AVAILABLE.message
-            BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST -> BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST.message
-            BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_FOUND -> BillingState.CONSOLE_PRODUCTS_IN_APP_NOT_FOUND.message
-
-            BillingState.CONSOLE_PRODUCTS_SUB_FETCHING -> BillingState.CONSOLE_PRODUCTS_SUB_FETCHING.message
-            BillingState.CONSOLE_PRODUCTS_SUB_FETCHED_SUCCESSFULLY -> BillingState.CONSOLE_PRODUCTS_SUB_FETCHED_SUCCESSFULLY.message
-            BillingState.CONSOLE_PRODUCTS_SUB_FETCHING_FAILED -> BillingState.CONSOLE_PRODUCTS_SUB_FETCHING_FAILED.message
-            BillingState.CONSOLE_PRODUCTS_SUB_AVAILABLE -> BillingState.CONSOLE_PRODUCTS_SUB_AVAILABLE.message
-            BillingState.CONSOLE_PRODUCTS_SUB_NOT_EXIST -> BillingState.CONSOLE_PRODUCTS_SUB_NOT_EXIST.message
-            BillingState.CONSOLE_PRODUCTS_SUB_NOT_FOUND -> BillingState.CONSOLE_PRODUCTS_SUB_NOT_FOUND.message
-
-            BillingState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY -> BillingState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY.message
-            BillingState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED -> BillingState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED.message
-            BillingState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND -> BillingState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND.message
-            BillingState.PURCHASED_SUCCESSFULLY -> BillingState.PURCHASED_SUCCESSFULLY.message
-            BillingState.PURCHASING_ALREADY_OWNED -> BillingState.PURCHASING_ALREADY_OWNED.message
-            BillingState.PURCHASING_USER_CANCELLED -> BillingState.PURCHASING_USER_CANCELLED.message
-            BillingState.PURCHASING_FAILURE -> BillingState.PURCHASING_FAILURE.message
-            BillingState.PURCHASING_ERROR -> BillingState.PURCHASING_ERROR.message
-        }
-    }
-}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/repository/BillingRepository.kt b/billing/src/main/java/com/hypersoft/billing/repository/BillingRepository.kt
similarity index 91%
rename from billing/src/main/java/com/hypersoft/billing/latest/repository/BillingRepository.kt
rename to billing/src/main/java/com/hypersoft/billing/repository/BillingRepository.kt
index 32f3fb7..6a400d0 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/repository/BillingRepository.kt
+++ b/billing/src/main/java/com/hypersoft/billing/repository/BillingRepository.kt
@@ -1,9 +1,8 @@
-package com.hypersoft.billing.latest.repository
+package com.hypersoft.billing.repository
 
 import android.app.Activity
 import android.content.Context
 import android.util.Log
-import androidx.core.os.BundleCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.android.billingclient.api.BillingClient
@@ -14,18 +13,17 @@ import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.QueryPurchasesParams
-import com.hypersoft.billing.common.dataClasses.ProductType
-import com.hypersoft.billing.latest.dataClasses.CompletePurchase
-import com.hypersoft.billing.latest.dataClasses.ProductDetail
-import com.hypersoft.billing.latest.dataClasses.PurchaseDetail
-import com.hypersoft.billing.latest.dataClasses.QueryProductDetail
-import com.hypersoft.billing.latest.enums.ResultState
-import com.hypersoft.billing.latest.extensions.toFormattedDate
-import com.hypersoft.billing.latest.utils.Result
-import com.hypersoft.billing.oldest.helper.BillingHelper.Companion.TAG
-import com.hypersoft.billing.common.interfaces.OnPurchaseListener
-import com.hypersoft.billing.latest.utils.QueryUtils
-import com.hypersoft.billing.latest.utils.ValidationUtils
+import com.hypersoft.billing.BillingManager.Companion.TAG
+import com.hypersoft.billing.dataClasses.CompletePurchase
+import com.hypersoft.billing.dataClasses.ProductDetail
+import com.hypersoft.billing.dataClasses.ProductType
+import com.hypersoft.billing.dataClasses.PurchaseDetail
+import com.hypersoft.billing.dataClasses.QueryProductDetail
+import com.hypersoft.billing.enums.ResultState
+import com.hypersoft.billing.extensions.toFormattedDate
+import com.hypersoft.billing.interfaces.OnPurchaseListener
+import com.hypersoft.billing.utils.QueryUtils
+import com.hypersoft.billing.utils.Result
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -34,7 +32,6 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-
 /**
  * @Author: SOHAIB AHMED
  * @Date: 21/02/2024
@@ -43,7 +40,7 @@ import kotlinx.coroutines.withContext
  *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
  */
 
-internal open class BillingRepository(context: Context) {
+open class BillingRepository(context: Context) {
 
     private val billingClient by lazy {
         BillingClient.newBuilder(context)
@@ -53,7 +50,7 @@ internal open class BillingRepository(context: Context) {
     }
 
     private val queryUtils: QueryUtils by lazy { QueryUtils(billingClient) }
-    private val validationUtils: ValidationUtils by lazy { ValidationUtils(billingClient) }
+    private val validationUtils: com.hypersoft.billing.utils.ValidationUtils by lazy { com.hypersoft.billing.utils.ValidationUtils(billingClient) }
 
     /**
      * @property _purchasesSharedFlow: Collect (observe) this, to get user's purchase list currently owns
@@ -126,7 +123,7 @@ internal open class BillingRepository(context: Context) {
      *  Get a single testing product_id ("android.test.purchased")
      *  Get a single testing product_id ("android.test.item_unavailable")
      */
-    protected fun getDebugProductIDList() = "android.test.purchased"
+    fun getDebugProductIDList() = "android.test.purchased"
 
     /* ---------------------------------------------------------------------------------------------------- */
     /* ---------------------------------------- Billing Connection ---------------------------------------- */
@@ -368,7 +365,7 @@ internal open class BillingRepository(context: Context) {
                         billingPeriod = ""
                     )
                     productDetailList.add(productDetail)
-                    queryProductDetail.add(QueryProductDetail(productDetail, productDetails))
+                    queryProductDetail.add(QueryProductDetail(productDetail, productDetails, null))
                 }
 
                 BillingClient.ProductType.SUBS -> {
@@ -400,7 +397,7 @@ internal open class BillingRepository(context: Context) {
                             }
 
                             productDetailList.add(productDetail)
-                            queryProductDetail.add(QueryProductDetail(productDetail, productDetails))
+                            queryProductDetail.add(QueryProductDetail(productDetail, productDetails, offer))
                         }
                     }
                 }
@@ -451,18 +448,18 @@ internal open class BillingRepository(context: Context) {
             return
         }
 
-        val productDetail = storeProductDetailsList.find {
+        val queryProductDetail = storeProductDetailsList.find {
             it.productDetail.productId == productId
                     && it.productDetail.planId == planId
                     && it.productDetail.productType == ProductType.subs
         }
-        productDetail?.let {
-            val offerToken = queryUtils.getOfferToken(it.productDetails.subscriptionOfferDetails, planId)
-            launchFlow(activity = activity!!, it.productDetails, offerToken = offerToken)
-        } ?: run {
+        if (queryProductDetail?.offerDetails == null) {
             Result.setResultState(ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST)
             onPurchaseListener.onPurchaseResult(false, message = ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST.message)
+            return
         }
+
+        launchFlow(activity = activity!!, queryProductDetail.productDetails, offerToken = queryProductDetail.offerDetails.offerToken)
     }
 
     private fun launchFlow(activity: Activity, productDetails: ProductDetails, offerToken: String?) {
@@ -491,7 +488,7 @@ internal open class BillingRepository(context: Context) {
         this.onPurchaseListener = onPurchaseListener
 
         val errorMessage = validationUtils.checkForSubs(activity, productId)
-        val oldPurchase= purchaseDetailList.find { it.productId == oldProductId && it.planId == oldPlanId }
+        val oldPurchase = purchaseDetailList.find { it.productId == oldProductId && it.planId == oldPlanId }
 
         if (errorMessage != null) {
             onPurchaseListener.onPurchaseResult(false, message = errorMessage)
@@ -504,33 +501,38 @@ internal open class BillingRepository(context: Context) {
             return
         }
 
-        val productDetail = storeProductDetailsList.find {
+        val queryProductDetail = storeProductDetailsList.find {
             it.productDetail.productId == productId
                     && it.productDetail.planId == planId
                     && it.productDetail.productType == ProductType.subs
         }
 
-        productDetail?.let {
-            val offerToken = queryUtils.getOfferToken(it.productDetails.subscriptionOfferDetails, planId)
-            val paramsList = listOf(BillingFlowParams.ProductDetailsParams.newBuilder().setProductDetails(it.productDetails).setOfferToken(offerToken).build())
+        if (queryProductDetail?.offerDetails == null) {
+            Result.setResultState(ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST)
+            onPurchaseListener.onPurchaseResult(false, message = ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST.message)
+            return
+        }
 
-            val updateParams = BillingFlowParams.SubscriptionUpdateParams.newBuilder()
-                .setOldPurchaseToken(oldPurchase.purchaseToken)
-                .setSubscriptionReplacementMode(BillingFlowParams.SubscriptionUpdateParams.ReplacementMode.CHARGE_FULL_PRICE)
+        val paramsList = listOf(
+            BillingFlowParams.ProductDetailsParams.newBuilder()
+                .setProductDetails(queryProductDetail.productDetails)
+                .setOfferToken(queryProductDetail.offerDetails.offerToken)
                 .build()
+        )
 
-            val flowParams =
-                BillingFlowParams.newBuilder()
-                    .setProductDetailsParamsList(paramsList)
-                    .setSubscriptionUpdateParams(updateParams)
-                    .build()
+        val updateParams = BillingFlowParams.SubscriptionUpdateParams.newBuilder()
+            .setOldPurchaseToken(oldPurchase.purchaseToken)
+            .setSubscriptionReplacementMode(BillingFlowParams.SubscriptionUpdateParams.ReplacementMode.CHARGE_FULL_PRICE)
+            .build()
 
-            billingClient.launchBillingFlow(activity!!, flowParams)
-            Result.setResultState(ResultState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY)
-        } ?: run {
-            Result.setResultState(ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST)
-            onPurchaseListener.onPurchaseResult(false, message = ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST.message)
-        }
+        val flowParams =
+            BillingFlowParams.newBuilder()
+                .setProductDetailsParamsList(paramsList)
+                .setSubscriptionUpdateParams(updateParams)
+                .build()
+
+        billingClient.launchBillingFlow(activity!!, flowParams)
+        Result.setResultState(ResultState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY)
     }
 
     private val purchasesListener = PurchasesUpdatedListener { billingResult, purchasesList ->
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/utils/QueryUtils.kt b/billing/src/main/java/com/hypersoft/billing/utils/QueryUtils.kt
similarity index 97%
rename from billing/src/main/java/com/hypersoft/billing/latest/utils/QueryUtils.kt
rename to billing/src/main/java/com/hypersoft/billing/utils/QueryUtils.kt
index cc3fb06..7390a31 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/utils/QueryUtils.kt
+++ b/billing/src/main/java/com/hypersoft/billing/utils/QueryUtils.kt
@@ -1,4 +1,4 @@
-package com.hypersoft.billing.latest.utils
+package com.hypersoft.billing.utils
 
 import android.util.Log
 import com.android.billingclient.api.AcknowledgePurchaseParams
@@ -6,10 +6,10 @@ import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.ProductDetails
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.QueryProductDetailsParams
-import com.hypersoft.billing.latest.dataClasses.BestPlan
-import com.hypersoft.billing.latest.enums.ResultState
-import com.hypersoft.billing.latest.repository.BillingResponse
-import com.hypersoft.billing.oldest.helper.BillingHelper.Companion.TAG
+import com.hypersoft.billing.dataClasses.BestPlan
+import com.hypersoft.billing.enums.ResultState
+import com.hypersoft.billing.repository.BillingResponse
+import com.hypersoft.billing.BillingManager.Companion.TAG
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
diff --git a/billing/src/main/java/com/hypersoft/billing/utils/Result.kt b/billing/src/main/java/com/hypersoft/billing/utils/Result.kt
new file mode 100644
index 0000000..33a648a
--- /dev/null
+++ b/billing/src/main/java/com/hypersoft/billing/utils/Result.kt
@@ -0,0 +1,78 @@
+package com.hypersoft.billing.utils
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.hypersoft.billing.enums.ResultState
+
+/**
+ * @Author: SOHAIB AHMED
+ * @Date: 21/02/2024
+ * @Accounts
+ *      -> https://github.com/epegasus
+ *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
+ */
+
+object Result {
+
+    private var RESULT_STATE = ResultState.NONE
+
+    private var _resultState = MutableLiveData<ResultState>()
+    val resultState: LiveData<ResultState> get() = _resultState
+
+    fun setResultState(resultState: ResultState) {
+        Log.d("BillingManager", "setResultState: $resultState")
+        RESULT_STATE = resultState
+        _resultState.postValue(RESULT_STATE)
+    }
+
+    fun getResultState(): ResultState {
+        return RESULT_STATE
+    }
+
+    override fun toString(): String {
+        return when (RESULT_STATE) {
+            ResultState.NONE -> ResultState.NONE.message
+
+            ResultState.CONNECTION_INVALID -> ResultState.CONNECTION_INVALID.message
+            ResultState.CONNECTION_ESTABLISHING -> ResultState.CONNECTION_ESTABLISHING.message
+            ResultState.CONNECTION_ESTABLISHING_IN_PROGRESS -> ResultState.CONNECTION_ESTABLISHING_IN_PROGRESS.message
+            ResultState.CONNECTION_ALREADY_ESTABLISHED -> ResultState.CONNECTION_ALREADY_ESTABLISHED.message
+            ResultState.CONNECTION_DISCONNECTED -> ResultState.CONNECTION_DISCONNECTED.message
+            ResultState.CONNECTION_ESTABLISHED -> ResultState.CONNECTION_ESTABLISHED.message
+            ResultState.CONNECTION_FAILED -> ResultState.CONNECTION_FAILED.message
+            ResultState.ACTIVITY_REFERENCE_NOT_FOUND -> ResultState.ACTIVITY_REFERENCE_NOT_FOUND.message
+
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING -> ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING.message
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_FAILED -> ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_FAILED.message
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_SUCCESS -> ResultState.CONSOLE_PURCHASE_PRODUCTS_INAPP_FETCHING_SUCCESS.message
+
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING -> ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING.message
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_FAILED -> ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_FAILED.message
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_SUCCESS -> ResultState.CONSOLE_PURCHASE_PRODUCTS_SUB_FETCHING_SUCCESS.message
+
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_PROCESSING -> ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_PROCESSING.message
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_COMPLETE -> ResultState.CONSOLE_PURCHASE_PRODUCTS_RESPONSE_COMPLETE.message
+            ResultState.CONSOLE_PURCHASE_PRODUCTS_CHECKED_FOR_ACKNOWLEDGEMENT -> ResultState.CONSOLE_PURCHASE_PRODUCTS_CHECKED_FOR_ACKNOWLEDGEMENT.message
+
+            ResultState.CONSOLE_QUERY_PRODUCTS_INAPP_FETCHING -> ResultState.CONSOLE_QUERY_PRODUCTS_INAPP_FETCHING.message
+            ResultState.CONSOLE_QUERY_PRODUCTS_SUB_FETCHING -> ResultState.CONSOLE_QUERY_PRODUCTS_SUB_FETCHING.message
+            ResultState.CONSOLE_QUERY_PRODUCTS_COMPLETED -> ResultState.CONSOLE_QUERY_PRODUCTS_COMPLETED.message
+
+            ResultState.CONSOLE_BUY_PRODUCT_EMPTY_ID -> ResultState.CONSOLE_BUY_PRODUCT_EMPTY_ID.message
+            ResultState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST -> ResultState.CONSOLE_PRODUCTS_IN_APP_NOT_EXIST.message
+            ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST -> ResultState.CONSOLE_PRODUCTS_SUB_NOT_EXIST.message
+
+            ResultState.CONSOLE_PRODUCTS_OLD_SUB_NOT_FOUND -> ResultState.CONSOLE_PRODUCTS_OLD_SUB_NOT_FOUND.message
+
+            ResultState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY -> ResultState.LAUNCHING_FLOW_INVOCATION_SUCCESSFULLY.message
+            ResultState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED -> ResultState.LAUNCHING_FLOW_INVOCATION_USER_CANCELLED.message
+            ResultState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND -> ResultState.LAUNCHING_FLOW_INVOCATION_EXCEPTION_FOUND.message
+
+            ResultState.PURCHASING_SUCCESSFULLY -> ResultState.PURCHASING_SUCCESSFULLY.message
+            ResultState.PURCHASING_ALREADY_OWNED -> ResultState.PURCHASING_ALREADY_OWNED.message
+            ResultState.PURCHASING_NO_PURCHASES_FOUND -> ResultState.PURCHASING_NO_PURCHASES_FOUND.message
+            ResultState.PURCHASING_FAILURE -> ResultState.PURCHASING_FAILURE.message
+        }
+    }
+}
\ No newline at end of file
diff --git a/billing/src/main/java/com/hypersoft/billing/latest/utils/ValidationUtils.kt b/billing/src/main/java/com/hypersoft/billing/utils/ValidationUtils.kt
similarity index 82%
rename from billing/src/main/java/com/hypersoft/billing/latest/utils/ValidationUtils.kt
rename to billing/src/main/java/com/hypersoft/billing/utils/ValidationUtils.kt
index 8a2827b..cca82da 100644
--- a/billing/src/main/java/com/hypersoft/billing/latest/utils/ValidationUtils.kt
+++ b/billing/src/main/java/com/hypersoft/billing/utils/ValidationUtils.kt
@@ -1,8 +1,8 @@
-package com.hypersoft.billing.latest.utils
+package com.hypersoft.billing.utils
 
 import android.app.Activity
 import com.android.billingclient.api.BillingClient
-import com.hypersoft.billing.latest.enums.ResultState
+import com.hypersoft.billing.enums.ResultState
 
 /**
  * @Author: SOHAIB AHMED
@@ -12,9 +12,9 @@ import com.hypersoft.billing.latest.enums.ResultState
  *      -> https://stackoverflow.com/users/20440272/sohaib-ahmed
  */
 
-class ValidationUtils(private val billingClient: BillingClient) {
+internal class ValidationUtils(private val billingClient: BillingClient) {
 
-    fun checkForInApp(activity: Activity?, productId: String) : String?{
+    fun checkForInApp(activity: Activity?, productId: String): String? {
         if (activity == null) {
             Result.setResultState(ResultState.ACTIVITY_REFERENCE_NOT_FOUND)
             return ResultState.ACTIVITY_REFERENCE_NOT_FOUND.message
@@ -33,7 +33,7 @@ class ValidationUtils(private val billingClient: BillingClient) {
         return null
     }
 
-    fun checkForSubs(activity: Activity?, productId: String) : String?{
+    fun checkForSubs(activity: Activity?, productId: String): String? {
         if (activity == null) {
             Result.setResultState(ResultState.ACTIVITY_REFERENCE_NOT_FOUND)
             return ResultState.ACTIVITY_REFERENCE_NOT_FOUND.message