diff --git a/app/src/main/java/com/aurora/store/util/extensions/Collection.kt b/app/src/main/java/com/aurora/extensions/Collection.kt
similarity index 95%
rename from app/src/main/java/com/aurora/store/util/extensions/Collection.kt
rename to app/src/main/java/com/aurora/extensions/Collection.kt
index 6acdca890..c987fc362 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/Collection.kt
+++ b/app/src/main/java/com/aurora/extensions/Collection.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 fun <T> MutableList<T>.flushAndAdd(list: List<T>) {
     clear()
diff --git a/app/src/main/java/com/aurora/extensions/Commons.kt b/app/src/main/java/com/aurora/extensions/Commons.kt
new file mode 100644
index 000000000..f2484f75f
--- /dev/null
+++ b/app/src/main/java/com/aurora/extensions/Commons.kt
@@ -0,0 +1,29 @@
+/*
+ * Aurora Store
+ *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
+ *
+ *  Aurora Store is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Aurora Store is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.aurora.extensions
+
+import android.text.format.DateFormat
+import java.util.*
+
+fun Long.toDate(): String {
+    val calendar = Calendar.getInstance(Locale.getDefault())
+    calendar.timeInMillis = this
+    return DateFormat.format("dd/MM/yy", calendar).toString()
+}
diff --git a/app/src/main/java/com/aurora/extensions/Conditional.kt b/app/src/main/java/com/aurora/extensions/Conditional.kt
new file mode 100644
index 000000000..0e8528de7
--- /dev/null
+++ b/app/src/main/java/com/aurora/extensions/Conditional.kt
@@ -0,0 +1,32 @@
+/*
+ * Aurora Store
+ *  Copyright (C) 2021, Rahul Kumar Patel <whyorean@gmail.com>
+ *
+ *  Aurora Store is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Aurora Store is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Aurora Store.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.aurora.extensions
+
+inline fun doIf(condition: Boolean?, action: () -> Unit) {
+    if (condition == true) action()
+}
+
+inline fun doIf(condition: () -> Boolean?, action: () -> Unit) {
+    if (condition() == true) action()
+}
+
+inline fun doIf(any: Any?, action: () -> Unit) {
+    if (any != null) action()
+}
diff --git a/app/src/main/java/com/aurora/store/util/extensions/Context.kt b/app/src/main/java/com/aurora/extensions/Context.kt
similarity index 98%
rename from app/src/main/java/com/aurora/store/util/extensions/Context.kt
rename to app/src/main/java/com/aurora/extensions/Context.kt
index 7c509c7f8..08c40e02d 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/Context.kt
+++ b/app/src/main/java/com/aurora/extensions/Context.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.app.AlarmManager
 import android.app.PendingIntent
diff --git a/app/src/main/java/com/aurora/store/util/extensions/Glide.kt b/app/src/main/java/com/aurora/extensions/Glide.kt
similarity index 98%
rename from app/src/main/java/com/aurora/store/util/extensions/Glide.kt
rename to app/src/main/java/com/aurora/extensions/Glide.kt
index ab7761a3a..dd7ae9500 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/Glide.kt
+++ b/app/src/main/java/com/aurora/extensions/Glide.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
@@ -27,7 +27,6 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.RawRes
 import com.bumptech.glide.Glide
 import com.bumptech.glide.TransitionOptions
-import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.ViewTarget
diff --git a/app/src/main/java/com/aurora/store/util/extensions/Number.kt b/app/src/main/java/com/aurora/extensions/Number.kt
similarity index 96%
rename from app/src/main/java/com/aurora/store/util/extensions/Number.kt
rename to app/src/main/java/com/aurora/extensions/Number.kt
index d58817d19..95396ec8a 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/Number.kt
+++ b/app/src/main/java/com/aurora/extensions/Number.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.content.res.Resources
 
diff --git a/app/src/main/java/com/aurora/store/util/extensions/Commons.kt b/app/src/main/java/com/aurora/extensions/Platform.kt
similarity index 79%
rename from app/src/main/java/com/aurora/store/util/extensions/Commons.kt
rename to app/src/main/java/com/aurora/extensions/Platform.kt
index 22b31ce3a..01d02030f 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/Commons.kt
+++ b/app/src/main/java/com/aurora/extensions/Platform.kt
@@ -17,27 +17,27 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.os.Build
-import android.text.format.DateFormat
-import androidx.annotation.RequiresApi
-import java.util.*
 
-fun Long.toDate(): String {
-    val calendar = Calendar.getInstance(Locale.getDefault())
-    calendar.timeInMillis = this
-    return DateFormat.format("dd/MM/yy", calendar).toString()
-}
 
 fun isLAndAbove(): Boolean {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
 }
 
+fun isMAndAbove(): Boolean {
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+}
+
 fun isNAndAbove(): Boolean {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
 }
 
+fun isOAndAbove(): Boolean {
+    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+}
+
 fun isPAndAbove(): Boolean {
     return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
 }
diff --git a/app/src/main/java/com/aurora/store/util/extensions/ThemeEngine.kt b/app/src/main/java/com/aurora/extensions/ThemeEngine.kt
similarity index 99%
rename from app/src/main/java/com/aurora/store/util/extensions/ThemeEngine.kt
rename to app/src/main/java/com/aurora/extensions/ThemeEngine.kt
index 79192f10a..d734be5c0 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/ThemeEngine.kt
+++ b/app/src/main/java/com/aurora/extensions/ThemeEngine.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.content.Intent
 import android.content.res.Configuration
diff --git a/app/src/main/java/com/aurora/store/util/extensions/Threading.kt b/app/src/main/java/com/aurora/extensions/Threading.kt
similarity index 97%
rename from app/src/main/java/com/aurora/store/util/extensions/Threading.kt
rename to app/src/main/java/com/aurora/extensions/Threading.kt
index 8a6ef856d..38379b662 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/Threading.kt
+++ b/app/src/main/java/com/aurora/extensions/Threading.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.os.Handler
 import android.os.Looper
diff --git a/app/src/main/java/com/aurora/store/util/extensions/Toast.kt b/app/src/main/java/com/aurora/extensions/Toast.kt
similarity index 96%
rename from app/src/main/java/com/aurora/store/util/extensions/Toast.kt
rename to app/src/main/java/com/aurora/extensions/Toast.kt
index b83289a6e..7f8bf2e9f 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/Toast.kt
+++ b/app/src/main/java/com/aurora/extensions/Toast.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.content.Context
 import android.widget.Toast
diff --git a/app/src/main/java/com/aurora/store/util/extensions/View.kt b/app/src/main/java/com/aurora/extensions/View.kt
similarity index 98%
rename from app/src/main/java/com/aurora/store/util/extensions/View.kt
rename to app/src/main/java/com/aurora/extensions/View.kt
index 06284e99f..6b7857932 100644
--- a/app/src/main/java/com/aurora/store/util/extensions/View.kt
+++ b/app/src/main/java/com/aurora/extensions/View.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package com.aurora.store.util.extensions
+package com.aurora.extensions
 
 import android.content.Context
 import android.view.View
diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt
index 44bba4ef3..fc183bde1 100644
--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -45,9 +45,8 @@ import com.aurora.store.databinding.ActivityMainBinding
 import com.aurora.store.util.Log
 import com.aurora.store.util.ViewUtil
 import com.aurora.store.util.ViewUtil.getStyledAttribute
-import com.aurora.store.util.extensions.isRAndAbove
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.open
+import com.aurora.extensions.load
+import com.aurora.extensions.open
 import com.aurora.store.view.ui.about.AboutActivity
 import com.aurora.store.view.ui.account.AccountActivity
 import com.aurora.store.view.ui.all.AppsGamesActivity
diff --git a/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt b/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
index 438e7aea9..3e4f4a7b5 100644
--- a/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
+++ b/app/src/main/java/com/aurora/store/data/installer/RootInstaller.kt
@@ -22,8 +22,8 @@ package com.aurora.store.data.installer
 import android.content.Context
 import com.aurora.store.R
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.isLAndAbove
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.isLAndAbove
+import com.aurora.extensions.toast
 import com.topjohnwu.superuser.Shell
 import java.io.File
 import java.util.regex.Pattern
diff --git a/app/src/main/java/com/aurora/store/data/service/NotificationService.kt b/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
index 2dd2b7946..a85afa5c5 100644
--- a/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
+++ b/app/src/main/java/com/aurora/store/data/service/NotificationService.kt
@@ -39,7 +39,7 @@ import com.aurora.store.data.receiver.DownloadResumeReceiver
 import com.aurora.store.data.receiver.InstallReceiver
 import com.aurora.store.util.CommonUtil
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.isLAndAbove
 import com.aurora.store.view.ui.details.AppDetailsActivity
 import com.aurora.store.view.ui.downloads.DownloadActivity
 import com.google.gson.Gson
diff --git a/app/src/main/java/com/aurora/store/util/ApkCopier.kt b/app/src/main/java/com/aurora/store/util/ApkCopier.kt
index c1f690735..bfd8a2c74 100644
--- a/app/src/main/java/com/aurora/store/util/ApkCopier.kt
+++ b/app/src/main/java/com/aurora/store/util/ApkCopier.kt
@@ -27,7 +27,7 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.core.content.FileProvider
 import com.aurora.store.BuildConfig
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.isLAndAbove
 import org.apache.commons.io.IOUtils
 import java.io.File
 import java.io.FileOutputStream
diff --git a/app/src/main/java/com/aurora/store/util/CertUtil.kt b/app/src/main/java/com/aurora/store/util/CertUtil.kt
index e2d18353e..14efd0b76 100644
--- a/app/src/main/java/com/aurora/store/util/CertUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/CertUtil.kt
@@ -21,7 +21,7 @@ package com.aurora.store.util
 
 import android.content.Context
 import android.content.pm.PackageManager
-import com.aurora.store.util.extensions.isPAndAbove
+import com.aurora.extensions.isPAndAbove
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 import java.security.cert.CertificateFactory
diff --git a/app/src/main/java/com/aurora/store/util/PathUtil.kt b/app/src/main/java/com/aurora/store/util/PathUtil.kt
index 546094bbc..3f4f740ea 100644
--- a/app/src/main/java/com/aurora/store/util/PathUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/PathUtil.kt
@@ -23,7 +23,7 @@ import android.content.Context
 import android.os.Environment
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.File
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.isLAndAbove
 
 fun Context.getInternalBaseDirectory(): String {
     return filesDir.path
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt
index 2cac41662..2d476d5bf 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/BlackView.kt
@@ -30,8 +30,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.store.R
 import com.aurora.store.data.model.Black
 import com.aurora.store.databinding.ViewBlackBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 
 @ModelView(
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt
index 7f220207b..ac788e669 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/CategoryView.kt
@@ -29,8 +29,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Category
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewCategoryBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 
 @ModelView(
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt
index 8ed0476d9..cee566a49 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt
@@ -34,8 +34,8 @@ import com.aurora.store.databinding.ViewDownloadBinding
 import com.aurora.store.util.CommonUtil.getDownloadSpeedString
 import com.aurora.store.util.CommonUtil.getETAString
 import com.aurora.store.util.CommonUtil.humanReadableByteValue
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.google.gson.Gson
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt
index 89e79eca9..a227792ca 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/EditorImageView.kt
@@ -20,7 +20,6 @@
 package com.aurora.store.view.epoxy.views
 
 import android.content.Context
-import android.content.res.Resources
 import android.util.AttributeSet
 import android.widget.RelativeLayout
 import com.airbnb.epoxy.CallbackProp
@@ -30,9 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewEditorImageBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.px
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.px
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/SearchSuggestionView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/SearchSuggestionView.kt
index 723eb3a0e..7100cfbed 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/SearchSuggestionView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/SearchSuggestionView.kt
@@ -30,8 +30,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewSearchSuggestionBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 
 @ModelView(
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppListView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppListView.kt
index 8bfe8e6d1..28228c66b 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppListView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppListView.kt
@@ -30,9 +30,9 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppListBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.getString
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.getString
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
index 3077cee0b..1334748a7 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppUpdateView.kt
@@ -32,8 +32,8 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppUpdateBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppView.kt
index 755f35adb..28f39baf0 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/app/AppView.kt
@@ -30,8 +30,8 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/AppDependentView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/AppDependentView.kt
index 49306da25..c17a4513d 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/AppDependentView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/AppDependentView.kt
@@ -29,8 +29,8 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewAppDependentBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt
index fc682c00a..1cf280312 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/BadgeView.kt
@@ -29,7 +29,7 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.details.Badge
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewBadgeBinding
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 
 @ModelView(
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/LargeScreenshotView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/LargeScreenshotView.kt
index 7e8a2a5b8..12ae0f7c0 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/LargeScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/LargeScreenshotView.kt
@@ -31,9 +31,9 @@ import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.GlideApp
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewScreenshotLargeBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.px
-import com.aurora.store.util.extensions.runOnUiThread
+import com.aurora.extensions.clear
+import com.aurora.extensions.px
+import com.aurora.extensions.runOnUiThread
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.DiskCacheStrategy
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt
index 205006f81..8fedbfd37 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MiniScreenshotView.kt
@@ -29,9 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewScreenshotMiniBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.px
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.px
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt
index af6a3c15a..73b30e4b3 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/MoreBadgeView.kt
@@ -30,7 +30,7 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.details.Badge
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewMoreBadgeBinding
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.BaseView
 
 @ModelView(
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt
index bdac646c6..5a64d43fb 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ReviewView.kt
@@ -29,9 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Review
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewReviewBinding
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.toDate
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.toDate
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt
index 16bfa8398..15471f09b 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/details/ScreenshotView.kt
@@ -20,7 +20,6 @@
 package com.aurora.store.view.epoxy.views.details
 
 import android.content.Context
-import android.content.res.Resources
 import android.util.AttributeSet
 import android.widget.RelativeLayout
 import com.airbnb.epoxy.CallbackProp
@@ -30,10 +29,9 @@ import com.airbnb.epoxy.OnViewRecycled
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.R
 import com.aurora.store.databinding.ViewScreenshotBinding
-import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.clear
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.px
+import com.aurora.extensions.clear
+import com.aurora.extensions.load
+import com.aurora.extensions.px
 import com.aurora.store.view.epoxy.views.BaseView
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt
index 5bca62dfb..4b4b0536b 100644
--- a/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt
+++ b/app/src/main/java/com/aurora/store/view/epoxy/views/preference/LinkView.kt
@@ -28,9 +28,9 @@ import com.airbnb.epoxy.ModelView
 import com.aurora.store.R
 import com.aurora.store.data.model.Link
 import com.aurora.store.databinding.ViewLinkBinding
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.hide
+import com.aurora.extensions.load
+import com.aurora.extensions.show
 import com.aurora.store.view.epoxy.views.BaseView
 
 @ModelView(
diff --git a/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt b/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt
index 8f2eebf83..b351b0189 100644
--- a/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/about/AboutActivity.kt
@@ -26,10 +26,10 @@ import com.aurora.store.BuildConfig
 import com.aurora.store.R
 import com.aurora.store.data.model.Link
 import com.aurora.store.databinding.ActivityAboutBinding
-import com.aurora.store.util.extensions.browse
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.copyToClipBoard
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.browse
+import com.aurora.extensions.close
+import com.aurora.extensions.copyToClipBoard
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.views.preference.LinkViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
index d55ff92bd..cb5b0d9d8 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt
@@ -32,9 +32,9 @@ import com.aurora.store.data.providers.AccountProvider
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityAccountBinding
 import com.aurora.store.util.CommonUtil.getEmptyActivityBundle
-import com.aurora.store.util.extensions.browse
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.browse
+import com.aurora.extensions.close
+import com.aurora.extensions.load
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.viewmodel.auth.AuthViewModel
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
index 5f8913763..63a3e9d19 100644
--- a/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/account/GoogleActivity.kt
@@ -33,8 +33,8 @@ import com.aurora.store.databinding.ActivityGoogleBinding
 import com.aurora.store.util.AC2DMTask
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Util
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.isLAndAbove
+import com.aurora.extensions.close
+import com.aurora.extensions.isLAndAbove
 import com.aurora.store.view.ui.commons.BaseActivity
 import nl.komponents.kovenant.task
 import org.greenrobot.eventbus.EventBus
diff --git a/app/src/main/java/com/aurora/store/view/ui/all/AppsGamesActivity.kt b/app/src/main/java/com/aurora/store/view/ui/all/AppsGamesActivity.kt
index 6fdcc89ad..5ae5dbc9d 100644
--- a/app/src/main/java/com/aurora/store/view/ui/all/AppsGamesActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/all/AppsGamesActivity.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.store.R
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityGenericPagerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
index 62e99c215..a50f5013f 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt
@@ -32,7 +32,7 @@ import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
 import com.aurora.store.util.ViewUtil
-import com.aurora.store.util.extensions.applyTheme
+import com.aurora.extensions.applyTheme
 import com.aurora.store.view.ui.account.GoogleActivity
 import com.aurora.store.view.ui.details.*
 import com.aurora.store.view.ui.sheets.NetworkDialogSheet
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
index 4a894cfaa..4347b0b65 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/BlacklistActivity.kt
@@ -25,7 +25,7 @@ import com.aurora.store.R
 import com.aurora.store.data.model.Black
 import com.aurora.store.data.providers.BlacklistProvider
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.BlackViewModel_
 import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_
 import com.aurora.store.viewmodel.all.BlacklistViewModel
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
index 7ef64d098..b92105332 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseActivity.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.StreamBundle
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.data.ViewState
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.controller.CategoryCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
index ca1b3627f..4b6f5b7a0 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseActivity.kt
@@ -25,7 +25,7 @@ import com.airbnb.epoxy.EpoxyModel
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.groups.CarouselHorizontalModel_
 import com.aurora.store.view.epoxy.views.EditorHeadViewModel_
 import com.aurora.store.view.epoxy.views.HorizontalDividerViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
index c03fa5a56..dd5ba1534 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseActivity.kt
@@ -25,7 +25,7 @@ import com.airbnb.epoxy.EpoxyModel
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.groups.CarouselHorizontalModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
index 049403e1b..1bdfb40c8 100644
--- a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseActivity.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.StreamCluster
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt
index 39591de8b..9a754acac 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsActivity.kt
@@ -29,6 +29,9 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.LinearLayout
 import com.aurora.Constants
+import com.aurora.extensions.isLAndAbove
+import com.aurora.extensions.load
+import com.aurora.extensions.toast
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.AuthData
 import com.aurora.gplayapi.data.models.File
@@ -44,7 +47,7 @@ import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityDetailsBinding
 import com.aurora.store.util.*
-import com.aurora.store.util.extensions.*
+import com.aurora.extensions.*
 import com.aurora.store.view.ui.downloads.DownloadActivity
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.google.android.material.bottomsheet.BottomSheetBehavior
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
index 5f16a1bb7..8676c7b23 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/BaseDetailsActivity.kt
@@ -43,10 +43,10 @@ import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.*
 import com.aurora.store.util.CommonUtil
 import com.aurora.store.util.NavigationUtil
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.show
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.hide
+import com.aurora.extensions.load
+import com.aurora.extensions.show
+import com.aurora.extensions.toast
 import com.aurora.store.view.custom.RatingView
 import com.aurora.store.view.epoxy.controller.DetailsCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusActivity.kt
index bf3a6be75..5cc2c962b 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsExodusActivity.kt
@@ -27,8 +27,8 @@ import com.aurora.store.data.model.ExodusTracker
 import com.aurora.store.data.model.Report
 import com.aurora.store.data.providers.ExodusDataProvider
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.browse
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.browse
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.HeaderViewModel_
 import com.aurora.store.view.epoxy.views.details.ExodusViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt
index 27f492029..7891a708d 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreActivity.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.helpers.AppDetailsHelper
 import com.aurora.store.R
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityDetailsMoreBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.HeaderViewModel_
 import com.aurora.store.view.epoxy.views.app.NoAppAltViewModel_
 import com.aurora.store.view.epoxy.views.details.AppDependentViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
index c15e40a64..d7f245682 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsReviewActivity.kt
@@ -27,7 +27,7 @@ import com.aurora.gplayapi.data.models.Review
 import com.aurora.store.R
 import com.aurora.store.data.ViewState
 import com.aurora.store.databinding.ActivityDetailsReviewBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.details.ReviewViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
index b025840e3..777a6328b 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsActivity.kt
@@ -27,7 +27,7 @@ import com.aurora.Constants
 import com.aurora.gplayapi.data.models.App
 import com.aurora.gplayapi.data.models.SearchBundle
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
index f7ec2519c..24e6a3c1c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileActivity.kt
@@ -31,8 +31,8 @@ import com.aurora.store.R
 import com.aurora.store.data.ViewState
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.ActivityDevProfileBinding
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.close
+import com.aurora.extensions.load
 import com.aurora.store.view.epoxy.controller.DeveloperCarouselController
 import com.aurora.store.view.epoxy.controller.GenericCarouselController
 import com.aurora.store.view.ui.commons.BaseActivity
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotActivity.kt b/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotActivity.kt
index 2e005aedf..faee8c7db 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/ScreenshotActivity.kt
@@ -27,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.Artwork
 import com.aurora.store.databinding.ActivityScreenshotBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.epoxy.views.details.LargeScreenshotViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.gson.reflect.TypeToken
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt
index e7f71001c..8f43678d6 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/AccentFragment.kt
@@ -35,10 +35,10 @@ import com.aurora.store.databinding.FragmentOnboardingAccentBinding
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
-import com.aurora.store.util.extensions.applyTheme
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.isVisible
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.applyTheme
+import com.aurora.extensions.hide
+import com.aurora.extensions.isVisible
+import com.aurora.extensions.show
 import com.aurora.store.util.save
 import com.aurora.store.view.custom.CubicBezierInterpolator
 import com.aurora.store.view.epoxy.views.AccentViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt
index 666ef5a97..38685a627 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt
@@ -28,8 +28,8 @@ import com.aurora.store.data.model.Installer
 import com.aurora.store.databinding.FragmentOnboardingInstallerBinding
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
-import com.aurora.store.util.extensions.runOnUiThread
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.runOnUiThread
+import com.aurora.extensions.toast
 import com.aurora.store.util.save
 import com.aurora.store.view.epoxy.views.preference.InstallerViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
index 8534ae7d0..0aeb1d698 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/OnboardingActivity.kt
@@ -39,7 +39,7 @@ import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID
 import com.aurora.store.util.Preferences.PREFERENCE_INTRO
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
-import com.aurora.store.util.extensions.open
+import com.aurora.extensions.open
 import com.aurora.store.util.save
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.view.ui.splash.SplashActivity
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt
index 63783e452..1722de6b5 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/ThemeFragment.kt
@@ -35,10 +35,10 @@ import com.aurora.store.databinding.FragmentOnboardingThemeBinding
 import com.aurora.store.util.Preferences
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
 import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
-import com.aurora.store.util.extensions.applyTheme
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.isVisible
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.applyTheme
+import com.aurora.extensions.hide
+import com.aurora.extensions.isVisible
+import com.aurora.extensions.show
 import com.aurora.store.util.save
 import com.aurora.store.view.custom.CubicBezierInterpolator
 import com.aurora.store.view.epoxy.views.ThemeViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/WelcomeFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/WelcomeFragment.kt
index fdbc4e99b..5f754f8b4 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/WelcomeFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/WelcomeFragment.kt
@@ -26,7 +26,7 @@ import android.view.ViewGroup
 import com.aurora.store.R
 import com.aurora.store.data.model.Dash
 import com.aurora.store.databinding.FragmentOnboardingWelcomeBinding
-import com.aurora.store.util.extensions.browse
+import com.aurora.extensions.browse
 import com.aurora.store.view.epoxy.views.preference.DashViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
 import com.google.gson.reflect.TypeToken
diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
index 5244ebdc7..9a5d4ade6 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/InstallationPreference.kt
@@ -26,8 +26,8 @@ import androidx.preference.PreferenceFragmentCompat
 import com.aurora.store.R
 import com.aurora.store.util.CommonUtil
 import com.aurora.store.util.Preferences
-import com.aurora.store.util.extensions.runOnUiThread
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.runOnUiThread
+import com.aurora.extensions.toast
 
 
 class InstallationPreference : PreferenceFragmentCompat() {
diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt
index 94a5d39ea..386918add 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/SettingsActivity.kt
@@ -27,7 +27,7 @@ import androidx.preference.PreferenceFragmentCompat
 import com.aurora.store.R
 import com.aurora.store.databinding.ActivitySettingBinding
 import com.aurora.store.util.ViewUtil.getStyledAttribute
-import com.aurora.store.util.extensions.restartApp
+import com.aurora.extensions.restartApp
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt b/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
index cd353a2a1..f1942e11c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/preferences/UIPreference.kt
@@ -25,7 +25,7 @@ import androidx.preference.ListPreference
 import androidx.preference.PreferenceFragmentCompat
 import com.aurora.store.R
 import com.aurora.store.util.Preferences
-import com.aurora.store.util.extensions.applyTheme
+import com.aurora.extensions.applyTheme
 import com.aurora.store.util.save
 
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesActivity.kt b/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesActivity.kt
index d61cc9f00..224854081 100644
--- a/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesActivity.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.ActivityGenericRecyclerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsActivity.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsActivity.kt
index 57a49feff..cfb30b5d0 100644
--- a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsActivity.kt
@@ -30,8 +30,8 @@ import androidx.lifecycle.ViewModelProvider
 import com.aurora.Constants
 import com.aurora.gplayapi.data.models.SearchBundle
 import com.aurora.store.databinding.ActivitySearchResultBinding
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.open
+import com.aurora.extensions.close
+import com.aurora.extensions.open
 import com.aurora.store.view.custom.recycler.EndlessRecyclerOnScrollListener
 import com.aurora.store.view.epoxy.views.app.AppListViewModel_
 import com.aurora.store.view.epoxy.views.AppProgressViewModel_
diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionActivity.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionActivity.kt
index b91d96b0e..6067cd81c 100644
--- a/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionActivity.kt
@@ -31,9 +31,9 @@ import com.aurora.Constants
 import com.aurora.gplayapi.SearchSuggestEntry
 import com.aurora.store.databinding.ActivitySearchSuggestionBinding
 import com.aurora.store.util.ViewUtil
-import com.aurora.store.util.extensions.close
-import com.aurora.store.util.extensions.open
-import com.aurora.store.util.extensions.showKeyboard
+import com.aurora.extensions.close
+import com.aurora.extensions.open
+import com.aurora.extensions.showKeyboard
 import com.aurora.store.view.epoxy.views.SearchSuggestionViewModel_
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.view.ui.downloads.DownloadActivity
diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt
index 94b1d94c0..03f2978dc 100644
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/AppMenuSheet.kt
@@ -34,8 +34,8 @@ import com.aurora.store.data.providers.BlacklistProvider
 import com.aurora.store.databinding.SheetAppMenuBinding
 import com.aurora.store.util.ApkCopier
 import com.aurora.store.util.PackageUtil
-import com.aurora.store.util.extensions.openInfo
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.openInfo
+import com.aurora.extensions.toast
 import com.livinglifetechway.quickpermissions_kotlin.runWithPermissions
 import nl.komponents.kovenant.task
 import org.greenrobot.eventbus.EventBus
diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt
index 6c469e1cd..8617650d2 100644
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/AppPeekDialogSheet.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.App
 import com.aurora.store.R
 import com.aurora.store.databinding.SheetAppPeekBinding
 import com.aurora.store.util.CommonUtil
-import com.aurora.store.util.extensions.load
+import com.aurora.extensions.load
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 
 class AppPeekDialogSheet : BaseBottomSheet() {
diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt
index 25dee9d3c..7492ea119 100644
--- a/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/sheets/DownloadMenuSheet.kt
@@ -26,8 +26,8 @@ import android.view.ViewGroup
 import com.aurora.store.R
 import com.aurora.store.data.downloader.DownloadManager
 import com.aurora.store.databinding.SheetDownloadMenuBinding
-import com.aurora.store.util.extensions.copyToClipBoard
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.copyToClipBoard
+import com.aurora.extensions.toast
 import com.tonyodev.fetch2.Fetch
 import com.tonyodev.fetch2.Status
 
diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
index 7eccb4cbf..1bb932635 100644
--- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt
@@ -28,10 +28,10 @@ import com.aurora.store.R
 import com.aurora.store.data.AuthState
 import com.aurora.store.data.event.BusEvent
 import com.aurora.store.databinding.ActivitySplashBinding
-import com.aurora.store.util.extensions.hide
-import com.aurora.store.util.extensions.load
-import com.aurora.store.util.extensions.open
-import com.aurora.store.util.extensions.show
+import com.aurora.extensions.hide
+import com.aurora.extensions.load
+import com.aurora.extensions.open
+import com.aurora.extensions.show
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.aurora.store.view.ui.commons.BlacklistActivity
 import com.aurora.store.view.ui.spoof.SpoofActivity
diff --git a/app/src/main/java/com/aurora/store/view/ui/spoof/DeviceSpoofFragment.kt b/app/src/main/java/com/aurora/store/view/ui/spoof/DeviceSpoofFragment.kt
index cbe71b64a..3c1cba841 100644
--- a/app/src/main/java/com/aurora/store/view/ui/spoof/DeviceSpoofFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/spoof/DeviceSpoofFragment.kt
@@ -29,7 +29,7 @@ import com.aurora.store.data.providers.SpoofDeviceProvider
 import com.aurora.store.data.providers.SpoofProvider
 import com.aurora.store.databinding.FragmentGenericRecyclerBinding
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.toast
 import com.aurora.store.view.epoxy.views.preference.DeviceViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
 import nl.komponents.kovenant.task
diff --git a/app/src/main/java/com/aurora/store/view/ui/spoof/LocaleSpoofFragment.kt b/app/src/main/java/com/aurora/store/view/ui/spoof/LocaleSpoofFragment.kt
index 4e211ba59..917abdacf 100644
--- a/app/src/main/java/com/aurora/store/view/ui/spoof/LocaleSpoofFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/spoof/LocaleSpoofFragment.kt
@@ -27,7 +27,7 @@ import com.aurora.store.R
 import com.aurora.store.data.providers.SpoofProvider
 import com.aurora.store.databinding.FragmentGenericRecyclerBinding
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.toast
 import com.aurora.store.view.epoxy.views.preference.LocaleViewModel_
 import com.aurora.store.view.ui.commons.BaseFragment
 import nl.komponents.kovenant.task
diff --git a/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofActivity.kt b/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofActivity.kt
index 914a12e37..8deef26e6 100644
--- a/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofActivity.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/spoof/SpoofActivity.kt
@@ -26,7 +26,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.aurora.store.R
 import com.aurora.store.databinding.ActivityGenericPagerBinding
-import com.aurora.store.util.extensions.close
+import com.aurora.extensions.close
 import com.aurora.store.view.ui.commons.BaseActivity
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
index 766f98bc0..817ccd534 100644
--- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
@@ -35,8 +35,8 @@ import com.aurora.store.data.installer.AppInstaller
 import com.aurora.store.data.providers.AuthProvider
 import com.aurora.store.databinding.FragmentUpdatesBinding
 import com.aurora.store.util.Log
-import com.aurora.store.util.extensions.flushAndAdd
-import com.aurora.store.util.extensions.toast
+import com.aurora.extensions.flushAndAdd
+import com.aurora.extensions.toast
 import com.aurora.store.view.epoxy.views.app.AppUpdateViewModel_
 import com.aurora.store.view.epoxy.views.UpdateHeaderViewModel_
 import com.aurora.store.view.epoxy.views.app.NoAppViewModel_
diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
index 0e43c31ed..75c7e89e4 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/InstalledViewModel.kt
@@ -23,7 +23,7 @@ import android.app.Application
 import androidx.lifecycle.viewModelScope
 import com.aurora.store.data.RequestState
 import com.aurora.store.data.event.BusEvent
-import com.aurora.store.util.extensions.flushAndAdd
+import com.aurora.extensions.flushAndAdd
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
diff --git a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
index eea21b568..633768ed2 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/all/UpdatesViewModel.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.viewModelScope
 import com.aurora.gplayapi.data.models.App
 import com.aurora.store.data.RequestState
 import com.aurora.store.data.event.BusEvent
-import com.aurora.store.util.extensions.flushAndAdd
+import com.aurora.extensions.flushAndAdd
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
diff --git a/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
index 17efca2b4..640d5e272 100644
--- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
+++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchResultViewModel.kt
@@ -28,7 +28,7 @@ import com.aurora.gplayapi.data.models.SearchBundle
 import com.aurora.gplayapi.helpers.SearchHelper
 import com.aurora.store.data.network.HttpClient
 import com.aurora.store.data.providers.AuthProvider
-import com.aurora.store.util.extensions.flushAndAdd
+import com.aurora.extensions.flushAndAdd
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope