diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4945c459..6f8811d4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,12 +62,12 @@
 
         <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.NewDataMenuActivity"
+            android:name="net.pokeranalytics.android.ui.modules.feed.NewDataMenuActivity"
             android:launchMode="singleTop"
             android:theme="@style/PokerAnalyticsTheme.MenuDialog" />
 
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.BankrollActivity"
+            android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
@@ -78,7 +78,7 @@
             android:windowSoftInputMode="stateAlwaysHidden"/>
 
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.BankrollDetailsActivity"
+            android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollDetailsActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
@@ -128,7 +128,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.EditableDataActivity"
+            android:name="net.pokeranalytics.android.ui.modules.data.EditableDataActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
diff --git a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
index 6901c8c0..e31ef53a 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt
@@ -8,7 +8,7 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.realm.*
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity
 import net.pokeranalytics.android.ui.view.Localizable
 import net.pokeranalytics.android.util.extensions.findById
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 f096b0e8..8c69ee6f 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
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.*
 import kotlinx.android.synthetic.main.fragment_comparison_chart.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.activity.BankrollActivity
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity
 import net.pokeranalytics.android.ui.activity.SettingsActivity
 import net.pokeranalytics.android.ui.adapter.ComparisonChartPagerAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt
index c8750a8d..868de79f 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/MoreFragment.kt
@@ -7,7 +7,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_more.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.activity.BankrollActivity
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity
 import net.pokeranalytics.android.ui.activity.SettingsActivity
 import net.pokeranalytics.android.ui.activity.Top10Activity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
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 566fdef4..40fe71f2 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
@@ -29,6 +29,7 @@ import net.pokeranalytics.android.ui.extensions.openContactMail
 import net.pokeranalytics.android.ui.extensions.openPlayStorePage
 import net.pokeranalytics.android.ui.extensions.openUrl
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.SettingRow
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
index 8510ccf6..a241eafc 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt
@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.fragment_bottom_sheet.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt
index 8092818f..49d6b4d7 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetMultiSelectionFragment.kt
@@ -4,7 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import io.realm.RealmModel
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt
index d322d2f0..14dbc5c6 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt
@@ -13,7 +13,7 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.CustomFieldCriteria
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.ReportSetup
-import net.pokeranalytics.android.ui.fragment.data.DataManagerFragment
+import net.pokeranalytics.android.ui.modules.data.DataManagerFragment
 import net.pokeranalytics.android.ui.viewmodel.ReportViewModel
 import net.pokeranalytics.android.ui.viewmodel.ViewModelHolder
 import net.pokeranalytics.android.util.extensions.findById
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/BankrollActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollActivity.kt
similarity index 96%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/BankrollActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollActivity.kt
index 834eba85..cbd06531 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/BankrollActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/BankrollDetailsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsActivity.kt
similarity index 88%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/BankrollDetailsActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsActivity.kt
index abfa2640..d3345a62 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/BankrollDetailsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.content.Intent
 import android.os.Bundle
@@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.bankroll.BankrollReport
 import net.pokeranalytics.android.ui.activity.components.BaseActivity
-import net.pokeranalytics.android.ui.fragment.BankrollDetailsFragment
 
 class BankrollDetailsActivity : BaseActivity() {
 
@@ -18,7 +17,7 @@ class BankrollDetailsActivity : BaseActivity() {
 		 * Default constructor
 		 */
 		fun newInstanceForResult(fragment: Fragment, bankrollReport: BankrollReport, requestCode: Int) {
-			this.bankrollReport = bankrollReport
+			Companion.bankrollReport = bankrollReport
 			val intent = Intent(fragment.requireContext(), BankrollDetailsActivity::class.java)
 			fragment.startActivityForResult(intent, requestCode)
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDetailsFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt
index 7ebbf382..95a28fa6 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDetailsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollDetailsFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.app.Activity.RESULT_OK
 import android.content.Intent
@@ -15,7 +15,7 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
@@ -32,7 +32,8 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc
 	companion object {
 
 		fun newInstance(bankrollReport: BankrollReport): BankrollDetailsFragment {
-			val fragment = BankrollDetailsFragment()
+			val fragment =
+				BankrollDetailsFragment()
 			fragment.bankrollId = bankrollReport.setup.bankrollId
 			return fragment
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt
similarity index 96%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt
index 9c9619de..58f8b22e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/bankroll/BankrollFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.bankroll
 
 import android.app.Activity
 import android.content.Intent
@@ -19,9 +19,8 @@ import net.pokeranalytics.android.calculus.bankroll.BankrollReportManager
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.realm.Bankroll
-import net.pokeranalytics.android.ui.activity.BankrollDetailsActivity
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.GraphActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@@ -51,7 +50,8 @@ class BankrollFragment : DeletableItemFragment(), StaticRowRepresentableDataSour
 		 * Create new instance
 		 */
 		fun newInstance(): BankrollFragment {
-			val fragment = BankrollFragment()
+			val fragment =
+				BankrollFragment()
 			val bundle = Bundle()
 			fragment.arguments = bundle
 			return fragment
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt
similarity index 99%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt
index e9bc806c..32f746fa 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/BankrollDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.app.Activity.RESULT_OK
 import android.content.Context
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt
similarity index 99%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt
index 5aa4d1ae..334e97eb 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/CustomFieldDataFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import android.os.Bundle
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/DataManagerFragment.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/DataManagerFragment.kt
index e2ce2b8f..a6b34ad4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/DataManagerFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/DataManagerFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.app.Activity
 import android.content.Intent
@@ -13,7 +13,6 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.ConfigurationException
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
 import net.pokeranalytics.android.ui.viewmodel.DataManagerViewModel
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataActivity.kt
similarity index 96%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataActivity.kt
index 4cb5404d..405ba114 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/EditableDataActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import android.content.Intent
@@ -7,7 +7,6 @@ import androidx.fragment.app.Fragment
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.ui.activity.components.MediaActivity
-import net.pokeranalytics.android.ui.fragment.data.*
 import java.io.File
 import java.util.*
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt
similarity index 98%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/EditableDataFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt
index 5577c1f9..4129c9e2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/EditableDataFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt
similarity index 99%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt
index 1fd98f42..ed8e641c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/LocationDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/LocationDataFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import android.os.Bundle
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt
similarity index 99%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt
index e91ca0e6..8a8d082d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/PlayerDataFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.app.Activity.RESULT_OK
 import android.content.Context
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt
similarity index 98%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt
index 65e96639..8b860533 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionDataFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import io.realm.kotlin.where
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionTypeDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionTypeDataFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt
index 621413ef..2a316ebe 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/TransactionTypeDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/data/TransactionTypeDataFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment.data
+package net.pokeranalytics.android.ui.modules.data
 
 import android.content.Context
 import net.pokeranalytics.android.model.realm.Transaction
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
index e7294fef..6d36e830 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/datalist/DataListFragment.kt
@@ -18,7 +18,7 @@ import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.interfaces.Deletable
 import net.pokeranalytics.android.model.interfaces.Identifiable
 import net.pokeranalytics.android.model.realm.Filter
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.modules.filter.FiltersActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
index 7e71a2db..6c805c7b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt
@@ -26,6 +26,7 @@ import net.pokeranalytics.android.ui.activity.*
 import net.pokeranalytics.android.ui.activity.components.RequestCode
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.modules.filter.FilterActivityRequestCode
 import net.pokeranalytics.android.ui.modules.filter.FilterableType
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt
similarity index 98%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt
index be5e8cc8..fe32048d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/feed/NewDataMenuActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.feed
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
index de0e6f16..3d226d70 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionFragment.kt
@@ -9,9 +9,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.DiffUtil
-import androidx.work.Data
-import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.WorkManager
 import com.crashlytics.android.Crashlytics
 import kotlinx.android.synthetic.main.fragment_session.*
 import kotlinx.coroutines.Dispatchers
@@ -31,7 +28,7 @@ import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.model.realm.Location
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.utils.FavoriteSessionFinder
-import net.pokeranalytics.android.ui.activity.EditableDataActivity
+import net.pokeranalytics.android.ui.modules.data.EditableDataActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
@@ -43,14 +40,12 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableDiffCallback
 import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
 import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
-import net.pokeranalytics.android.util.NotificationSchedule
 import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.extensions.findById
 import net.pokeranalytics.android.util.extensions.formattedHourlyDuration
 import net.pokeranalytics.android.util.extensions.getNextMinuteInMilliseconds
 import timber.log.Timber
 import java.util.*
-import java.util.concurrent.TimeUnit
 import kotlin.coroutines.CoroutineContext
 
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
index 394e1871..9c111d0b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
@@ -32,7 +32,7 @@ import net.pokeranalytics.android.ui.adapter.RecyclerAdapter
 import net.pokeranalytics.android.ui.extensions.ChipGroupExtension
 import net.pokeranalytics.android.ui.extensions.px
 import net.pokeranalytics.android.ui.extensions.setTextFormat
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.graph.AxisFormatting
 import net.pokeranalytics.android.ui.graph.setStyle
 import net.pokeranalytics.android.ui.modules.handhistory.views.RowHandHistoryViewHolder
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt
index 2e1703ca..549eb53e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowViewHolder.kt
@@ -15,7 +15,7 @@ import net.pokeranalytics.android.ui.adapter.BindableHolder
 import net.pokeranalytics.android.ui.adapter.RecyclerAdapter
 import net.pokeranalytics.android.ui.extensions.addCircleRipple
 import net.pokeranalytics.android.ui.extensions.setTextFormat
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
 import timber.log.Timber
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt
index 1e42445f..7c3cd40e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/BankrollMainRow.kt
@@ -1,9 +1,10 @@
 package net.pokeranalytics.android.ui.view.rowrepresentable
 
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
-class BankrollMainRow : BankrollRowRepresentable {
+class BankrollMainRow :
+	BankrollRowRepresentable {
 
 	override var bankrollId: String? = null
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt
index b00c4ee0..7e97110c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/CustomizableRowRepresentable.kt
@@ -1,12 +1,13 @@
 package net.pokeranalytics.android.ui.view.rowrepresentable
 
 import android.content.Context
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.TextFormat
 
-class BankrollTotalRow(override var bankrollId: String?, var name: String) : BankrollRowRepresentable {
+class BankrollTotalRow(override var bankrollId: String?, var name: String) :
+	BankrollRowRepresentable {
 
 	override val viewType: Int = RowViewType.TITLE_VALUE_ARROW.ordinal
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt
index 3f8f185b..3259a331 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/GraphRow.kt
@@ -3,12 +3,13 @@ package net.pokeranalytics.android.ui.view.rowrepresentable
 import com.github.mikephil.charting.data.DataSet
 import net.pokeranalytics.android.calculus.Report
 import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.ui.fragment.BankrollRowRepresentable
+import net.pokeranalytics.android.ui.modules.bankroll.BankrollRowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
 
-class BankrollGraphRow : GraphRow(null, null, null, null), BankrollRowRepresentable {
+class BankrollGraphRow : GraphRow(null, null, null, null),
+	BankrollRowRepresentable {
 
     override var bankrollId: String? = null
 
diff --git a/app/src/main/res/layout/activity_bankroll.xml b/app/src/main/res/layout/activity_bankroll.xml
index eb1d8184..c8c49bd0 100644
--- a/app/src/main/res/layout/activity_bankroll.xml
+++ b/app/src/main/res/layout/activity_bankroll.xml
@@ -7,7 +7,7 @@
 
 	<fragment
 		android:id="@+id/bankrollFragment"
-		android:name="net.pokeranalytics.android.ui.fragment.BankrollFragment"
+		android:name="net.pokeranalytics.android.ui.modules.bankroll.BankrollFragment"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		tools:layout="@layout/fragment_bankroll"  />