diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cdc6655f..516c5ff1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -72,7 +72,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="net.pokeranalytics.android.ui.activity.HandHistoryActivity"
+            android:name="net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden"/>
diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
index f5c35fee..dcf858f3 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/ComputedAction.kt
@@ -1,7 +1,7 @@
 package net.pokeranalytics.android.model.handhistory
 
 import net.pokeranalytics.android.model.realm.handhistory.Action
-import net.pokeranalytics.android.ui.adapter.HandRowType
+import net.pokeranalytics.android.ui.modules.handhistory.HandRowType
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import timber.log.Timber
 import kotlin.math.min
diff --git a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
index 46b1e6ff..e71fabf0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/handhistory/HHBuilder.kt
@@ -4,9 +4,9 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.realm.handhistory.Action
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
-import net.pokeranalytics.android.ui.adapter.HandRowType
+import net.pokeranalytics.android.ui.modules.handhistory.HandRowType
 import net.pokeranalytics.android.ui.view.RowRepresentable
-import net.pokeranalytics.android.ui.view.handhistory.StreetCardHeader
+import net.pokeranalytics.android.ui.modules.handhistory.views.StreetCardHeader
 import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
 import timber.log.Timber
 import java.util.*
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
index 7ec4e95e..9bb60524 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt
@@ -31,6 +31,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.FilterableFragment
 import net.pokeranalytics.android.ui.interfaces.FilterActivityRequestCode
 import net.pokeranalytics.android.ui.interfaces.FilterableType
+import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
 import net.pokeranalytics.android.util.Preferences
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HandHistoryActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
similarity index 91%
rename from app/src/main/java/net/pokeranalytics/android/ui/activity/HandHistoryActivity.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
index 3b8cbb9c..0c90fd2b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HandHistoryActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.activity
+package net.pokeranalytics.android.ui.modules.handhistory
 
 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.ui.activity.components.BaseActivity
 import net.pokeranalytics.android.ui.activity.components.RequestCode
-import net.pokeranalytics.android.ui.fragment.HandHistoryFragment
 
 class HandHistoryActivity : BaseActivity() {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
similarity index 94%
rename from app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
index 52809ddb..06125d7b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HandHistoryAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.adapter
+package net.pokeranalytics.android.ui.modules.handhistory
 
 import android.app.Activity
 import android.content.res.ColorStateList
@@ -14,6 +14,10 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.handhistory.ComputedAction
 import net.pokeranalytics.android.model.handhistory.HHKeyboard
+import net.pokeranalytics.android.ui.adapter.BindableHolder
+import net.pokeranalytics.android.ui.adapter.RecyclerAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.extensions.hideKeyboard
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.holder.RowViewHolder
@@ -32,7 +36,8 @@ enum class HandRowType(var layoutRes: Int) : ViewIdentifier {
 class HandHistoryAdapter(
 	override var dataSource: RowRepresentableDataSource,
 	override var delegate: RowRepresentableDelegate? = null) :
-	RecyclerView.Adapter<RecyclerView.ViewHolder>(), RecyclerAdapter {
+	RecyclerView.Adapter<RecyclerView.ViewHolder>(),
+	RecyclerAdapter {
 
 	override fun getItemViewType(position: Int): Int {
 		return this.dataSource.viewTypeForPosition(position)
@@ -88,7 +93,8 @@ class HandHistoryAdapter(
 	/**
 	 * Display a hand action
 	 */
-	inner class RowHandAction(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
+	inner class RowHandAction(itemView: View) : RecyclerView.ViewHolder(itemView),
+		BindableHolder {
 
 //		private var listener = TextListener()
 		private var currentPosition = 0
@@ -239,7 +245,8 @@ class HandHistoryAdapter(
 	/**
 	 * Display a hand street
 	 */
-	inner class RowHandStreet(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder {
+	inner class RowHandStreet(itemView: View) : RecyclerView.ViewHolder(itemView),
+		BindableHolder {
 		override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) {
 
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
similarity index 94%
rename from app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
index 02bfc05b..9cd65fd9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HandHistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.fragment
+package net.pokeranalytics.android.ui.modules.handhistory
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -16,16 +16,14 @@ import net.pokeranalytics.android.model.handhistory.*
 import net.pokeranalytics.android.model.realm.handhistory.Action
 import net.pokeranalytics.android.model.realm.handhistory.Card
 import net.pokeranalytics.android.model.realm.handhistory.HandHistory
-import net.pokeranalytics.android.ui.adapter.HandHistoryAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.SmoothScrollLinearLayoutManager
-import net.pokeranalytics.android.ui.view.handhistory.KeyboardListener
-import net.pokeranalytics.android.ui.view.handhistory.NumericKey
-import net.pokeranalytics.android.ui.view.handhistory.StreetCardHeader
-import net.pokeranalytics.android.ui.viewmodel.HandHistoryViewModel
+import net.pokeranalytics.android.ui.modules.handhistory.views.KeyboardListener
+import net.pokeranalytics.android.ui.modules.handhistory.views.NumericKey
+import net.pokeranalytics.android.ui.modules.handhistory.views.StreetCardHeader
 import net.pokeranalytics.android.util.extensions.findById
 import timber.log.Timber
 
@@ -42,7 +40,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDataSource, RowRepr
 	companion object {
 
 		fun newInstance(id: String? = null): HandHistoryFragment {
-			val fragment = HandHistoryFragment()
+			val fragment =
+				HandHistoryFragment()
 			val bundle = Bundle()
 			bundle.putSerializable(BundleKey.PRIMARY_KEY.value, id)
 			fragment.arguments = bundle
@@ -101,7 +100,11 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDataSource, RowRepr
 
 //		SmoothScrollLinearLayoutManager(requireContext())
 //		val viewManager = LinearLayoutManager(requireContext())
-		this.handHistoryAdapter = HandHistoryAdapter(this, this)
+		this.handHistoryAdapter =
+			HandHistoryAdapter(
+				this,
+				this
+			)
 
 		recyclerView.apply {
 			setHasFixedSize(true)
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/HandHistoryViewModel.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryViewModel.kt
similarity index 95%
rename from app/src/main/java/net/pokeranalytics/android/ui/viewmodel/HandHistoryViewModel.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryViewModel.kt
index 0e279dc4..8c4237fb 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/viewmodel/HandHistoryViewModel.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryViewModel.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.viewmodel
+package net.pokeranalytics.android.ui.modules.handhistory
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -9,7 +9,7 @@ import net.pokeranalytics.android.model.handhistory.HHSelection
 import net.pokeranalytics.android.model.realm.handhistory.Action
 import net.pokeranalytics.android.model.realm.handhistory.Card
 import net.pokeranalytics.android.model.realm.handhistory.CardProperty
-import net.pokeranalytics.android.ui.view.handhistory.NumericKey
+import net.pokeranalytics.android.ui.modules.handhistory.views.NumericKey
 import timber.log.Timber
 
 class HandHistoryViewModel : ViewModel() {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/AbstractKeyboardView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/AbstractKeyboardView.kt
similarity index 75%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/AbstractKeyboardView.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/AbstractKeyboardView.kt
index 0d5ecb8b..8d92c700 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/AbstractKeyboardView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/AbstractKeyboardView.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.content.Context
 import android.widget.FrameLayout
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/Circle.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/Circle.kt
similarity index 93%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/Circle.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/Circle.kt
index 1853296f..2005d28d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/Circle.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/Circle.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardActionView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
similarity index 96%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardActionView.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
index 36bf1b1a..feb4d601 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardActionView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardActionView.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardAmountView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardAmountView.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
index 97a15c1a..4b4ac39b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardAmountView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardAmountView.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardCardView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
similarity index 63%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardCardView.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
index 7a7e8f8d..25eebdbb 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardCardView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.content.Context
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardContainer.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
similarity index 97%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardContainer.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
index f4b6e5ec..456d37e4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/KeyboardContainer.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardContainer.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.app.Activity
 import android.content.Context
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowHandHistoryViewHolder.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/RowHandHistoryViewHolder.kt
similarity index 92%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowHandHistoryViewHolder.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/RowHandHistoryViewHolder.kt
index 0e54e0ad..856611ac 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/holder/RowHandHistoryViewHolder.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/RowHandHistoryViewHolder.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.holder
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/StreetCardHeader.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/StreetCardHeader.kt
similarity index 81%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/StreetCardHeader.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/StreetCardHeader.kt
index cff83147..34657bf9 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/StreetCardHeader.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/StreetCardHeader.kt
@@ -1,10 +1,10 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import net.pokeranalytics.android.model.handhistory.HHKeyboard
 import net.pokeranalytics.android.model.handhistory.HandHistoryRow
 import net.pokeranalytics.android.model.handhistory.Street
 import net.pokeranalytics.android.model.realm.handhistory.Card
-import net.pokeranalytics.android.ui.adapter.HandRowType
+import net.pokeranalytics.android.ui.modules.handhistory.HandRowType
 
 class StreetCardHeader(var street: Street, var cards: List<Card>, var potSize: Double) : HandHistoryRow {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/VideoView.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt
similarity index 94%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/VideoView.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt
index 8d48d9eb..da20b18f 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/handhistory/VideoView.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/VideoView.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.view.handhistory
+package net.pokeranalytics.android.ui.modules.handhistory.views
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/res/layout/fragment_hand_history.xml b/app/src/main/res/layout/fragment_hand_history.xml
index 32a1aee0..b40bcaf7 100644
--- a/app/src/main/res/layout/fragment_hand_history.xml
+++ b/app/src/main/res/layout/fragment_hand_history.xml
@@ -34,7 +34,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/appBar" />
 
-    <net.pokeranalytics.android.ui.view.handhistory.KeyboardContainer
+    <net.pokeranalytics.android.ui.modules.handhistory.views.KeyboardContainer
         android:id="@+id/keyboard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/view_video.xml b/app/src/main/res/layout/view_video.xml
index f2fae02c..291abc2d 100644
--- a/app/src/main/res/layout/view_video.xml
+++ b/app/src/main/res/layout/view_video.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <net.pokeranalytics.android.ui.view.handhistory.Circle
+    <net.pokeranalytics.android.ui.modules.handhistory.views.Circle
         android:id="@+id/circle"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />