diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
index 97b0fde8..70303218 100644
--- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
+++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt
@@ -136,7 +136,10 @@ class PokerAnalyticsApplication : Application() {
         // Test endedSessions
         val sessions = realm.where<Session>().findAll()
         if (sessions.size < 10) {
-            for (index in 0..50) {
+
+            val numberOfSessions = 1000
+            Timber.d("Creating ${numberOfSessions} fake sessions...")
+            for (index in 0..numberOfSessions) {
 
                 realm.executeTransaction {
                     val session = Session.newInstance(realm, false)
@@ -184,6 +187,8 @@ class PokerAnalyticsApplication : Application() {
                     realm.copyToRealmOrUpdate(session)
                 }
             }
+            Timber.d("Creation of sessions ended")
+
         }
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
index ce774dac..3fc798a5 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
@@ -7,8 +7,8 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.FormatUtils
 import net.pokeranalytics.android.util.NULL_TEXT
-import net.pokeranalytics.android.util.formatted
-import net.pokeranalytics.android.util.formattedHourlyDuration
+import net.pokeranalytics.android.util.extensions.formatted
+import net.pokeranalytics.android.util.extensions.formattedHourlyDuration
 
 /**
  * An enum representing all the types of Session statistics
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 42d91b9d..d8edbfe4 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -31,7 +31,7 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.HeaderRowRepresentabl
 import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
 import net.pokeranalytics.android.util.*
-import timber.log.Timber
+import net.pokeranalytics.android.util.extensions.*
 import java.util.*
 import java.util.Currency
 import kotlin.collections.ArrayList
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
index c6492cf2..38b724d7 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
@@ -23,7 +23,7 @@ import net.pokeranalytics.android.ui.helpers.SwipeToDeleteCallback
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow
-import net.pokeranalytics.android.util.showAlertDialog
+import net.pokeranalytics.android.util.extensions.showAlertDialog
 
 
 class DataListFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
index 5cb2b52d..1adaf2d9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
@@ -25,10 +25,10 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
 import net.pokeranalytics.android.ui.view.rowrepresentable.HeaderRowRepresentable
-import net.pokeranalytics.android.util.getMonthAndYear
-import net.pokeranalytics.android.util.isSameDay
-import net.pokeranalytics.android.util.isSameMonth
-import net.pokeranalytics.android.util.longDate
+import net.pokeranalytics.android.util.extensions.getMonthAndYear
+import net.pokeranalytics.android.util.extensions.isSameDay
+import net.pokeranalytics.android.util.extensions.isSameMonth
+import net.pokeranalytics.android.util.extensions.longDate
 import java.util.*
 
 class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
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 e70815bf..2fbe5ea6 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
@@ -21,6 +21,9 @@ import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow
 import net.pokeranalytics.android.util.*
+import net.pokeranalytics.android.util.extensions.openContactMail
+import net.pokeranalytics.android.util.extensions.openPlayStorePage
+import net.pokeranalytics.android.util.extensions.openUrl
 import java.util.*
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
index 684a1172..af446bb4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/StatsFragment.kt
@@ -18,6 +18,8 @@ import net.pokeranalytics.android.ui.fragment.components.SessionObserverFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.HeaderRowRepresentable
 import net.pokeranalytics.android.util.NULL_TEXT
+import timber.log.Timber
+import java.util.*
 
 class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSource {
 
@@ -102,6 +104,8 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc
 
         var results = listOf<ComputedResults>()
 
+        val s = Date()
+        Timber.d(">>> start...")
         runBlocking {
 
             val cgSessions = mutableListOf<Session>()
@@ -125,6 +129,9 @@ class StatsFragment : SessionObserverFragment(), StaticRowRepresentableDataSourc
             results = Calculator.computeGroups(listOf(allSessionGroup, cgSessionGroup, tSessionGroup), Calculator.Options())
 
         }
+        val e = Date()
+        val duration = (e.time - s.time) / 1000.0
+        Timber.d(">>> ended in ${duration} seconds")
 
         this.rowRepresentables = this.convertResultsIntoRepresentables(results)
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
index 1c98f209..8be103ef 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
@@ -10,7 +10,7 @@ import kotlinx.android.synthetic.main.bottom_sheet_double_edit_text.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
-import net.pokeranalytics.android.util.round
+import net.pokeranalytics.android.util.extensions.round
 
 
 class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
index 5c24e532..3f81b1b2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
@@ -9,8 +9,8 @@ import androidx.core.widget.addTextChangedListener
 import kotlinx.android.synthetic.main.bottom_sheet_sum.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.util.round
-import net.pokeranalytics.android.util.toCurrency
+import net.pokeranalytics.android.util.extensions.round
+import net.pokeranalytics.android.util.extensions.toCurrency
 
 
 class BottomSheetSumFragment : BottomSheetFragment() {
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 af16dc04..bd2080f3 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
@@ -12,7 +12,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.util.px
+import net.pokeranalytics.android.util.extensions.px
 
 class BottomSheetTableSizeGridFragment : BottomSheetFragment(),
 	StaticRowRepresentableDataSource,
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt
index 31cfce79..90b3df10 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt
@@ -14,7 +14,10 @@ import net.pokeranalytics.android.model.TableSize
 import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.util.*
+import net.pokeranalytics.android.util.extensions.getDayNumber
+import net.pokeranalytics.android.util.extensions.getShortDayName
+import net.pokeranalytics.android.util.extensions.shortTime
+import net.pokeranalytics.android.util.extensions.toCurrency
 
 /**
  * Display a row session
diff --git a/app/src/main/java/net/pokeranalytics/android/util/DateExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt
similarity index 98%
rename from app/src/main/java/net/pokeranalytics/android/util/DateExtension.kt
rename to app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt
index 36c0a677..3b098126 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/DateExtension.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.util.extensions
 
 import java.text.DateFormat
 import java.text.SimpleDateFormat
diff --git a/app/src/main/java/net/pokeranalytics/android/util/NumbersExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt
similarity index 95%
rename from app/src/main/java/net/pokeranalytics/android/util/NumbersExtension.kt
rename to app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt
index d4d4bfda..d9a7c87a 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/NumbersExtension.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.util.extensions
 
 import java.text.DecimalFormat
 import java.text.NumberFormat
diff --git a/app/src/main/java/net/pokeranalytics/android/util/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/UIExtensions.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/util/UIExtensions.kt
rename to app/src/main/java/net/pokeranalytics/android/util/extensions/UIExtensions.kt
index 563afad1..2ac3093f 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/UIExtensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/UIExtensions.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.util
+package net.pokeranalytics.android.util.extensions
 
 import android.content.ActivityNotFoundException
 import android.content.Context
@@ -13,6 +13,7 @@ import net.pokeranalytics.android.BuildConfig
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
+import net.pokeranalytics.android.util.URL
 
 
 // Sizes