diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/ChipGroupExtension.kt b/app/src/main/java/net/pokeranalytics/android/ui/extensions/ChipGroupExtension.kt
similarity index 88%
rename from app/src/main/java/net/pokeranalytics/android/util/extensions/ChipGroupExtension.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/extensions/ChipGroupExtension.kt
index 8a642069..e860242e 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/extensions/ChipGroupExtension.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/extensions/ChipGroupExtension.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util.extensions
+package net.pokeranalytics.android.ui.extensions
 
 import com.google.android.material.chip.ChipGroup
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt
similarity index 98%
rename from app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt
index 20b26d1a..e7535db1 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/UIExtensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui
+package net.pokeranalytics.android.ui.extensions
 
 import android.content.ActivityNotFoundException
 import android.content.Context
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt
index 2b6648bb..eb2d3041 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ComparisonChartFragment.kt
@@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.MoreTabRow
-import net.pokeranalytics.android.ui.toast
+import net.pokeranalytics.android.ui.extensions.toast
 
 class ComparisonChartFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
index eceea2f8..3e220e22 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/GraphFragment.kt
@@ -23,9 +23,9 @@ import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.graph.PALineDataSet
 import net.pokeranalytics.android.ui.graph.setStyle
 import net.pokeranalytics.android.ui.view.LegendView
-import net.pokeranalytics.android.util.extensions.ChipGroupExtension
-import net.pokeranalytics.android.ui.px
-import net.pokeranalytics.android.ui.toast
+import net.pokeranalytics.android.ui.extensions.ChipGroupExtension
+import net.pokeranalytics.android.ui.extensions.px
+import net.pokeranalytics.android.ui.extensions.toast
 import java.text.DateFormat
 
 class GraphFragment : PokerAnalyticsFragment(), OnChartValueSelectedListener {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
index a61e1238..3d681cee 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
@@ -25,9 +25,9 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow
 import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.URL
 import net.pokeranalytics.android.util.UserDefaults
-import net.pokeranalytics.android.ui.openContactMail
-import net.pokeranalytics.android.ui.openPlayStorePage
-import net.pokeranalytics.android.ui.openUrl
+import net.pokeranalytics.android.ui.extensions.openContactMail
+import net.pokeranalytics.android.ui.extensions.openPlayStorePage
+import net.pokeranalytics.android.ui.extensions.openUrl
 import java.util.*
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt
index 0b8da921..3782f246 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListGameFragment.kt
@@ -14,7 +14,7 @@ import net.pokeranalytics.android.exceptions.RowRepresentableEditDescriptorExcep
 import net.pokeranalytics.android.model.Limit
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.px
+import net.pokeranalytics.android.ui.extensions.px
 
 /**
  * Bottom Sheet List Game Fragment
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt
index 50625def..7c199c09 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetTableSizeGridFragment.kt
@@ -13,7 +13,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.px
+import net.pokeranalytics.android.ui.extensions.px
 
 class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt
index dbacb7be..e5f6e8a9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/graph/GraphExtensions.kt
@@ -6,7 +6,7 @@ import androidx.core.content.ContextCompat
 import com.github.mikephil.charting.charts.BarLineChartBase
 import com.github.mikephil.charting.components.XAxis
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.px
+import net.pokeranalytics.android.ui.extensions.px
 
 fun BarLineChartBase<*>.setStyle(small: Boolean, context: Context) {