diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
index d467bb14..964144ed 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Bankroll.kt
@@ -5,13 +5,14 @@ import io.realm.RealmList
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.*
 import java.util.*
 import kotlin.collections.ArrayList
 
-open class Bankroll(name: String = "") : RealmObject(), Savable, RowRepresentableDataSource,
+open class Bankroll(name: String = "") : RealmObject(), Savable,
+    RowRepresentableDataSource,
     RowEditable, RowRepresentable {
 
     companion object {
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
index 1669fd1e..2bf0fa53 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.*
 import java.util.*
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
index fc46c6a4..7e4f49a0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt
@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.RowEditable
 import net.pokeranalytics.android.ui.view.LocationRow
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 d3c2411a..966c8c67 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
@@ -13,7 +13,7 @@ import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.extensions.SessionState
 import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.RowEditable
 import net.pokeranalytics.android.ui.view.RowRepresentable
@@ -26,7 +26,8 @@ import timber.log.Timber
 import java.util.*
 import kotlin.collections.ArrayList
 
-open class Session : RealmObject(), SessionInterface, Savable, RowRepresentableDataSource,
+open class Session : RealmObject(), SessionInterface, Savable,
+	RowRepresentableDataSource,
 	RowEditable, RowRepresentable {
 
 	@PrimaryKey
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
index 1dd03fff..4b36646f 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TournamentFeature.kt
@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.RowEditable
 import net.pokeranalytics.android.ui.view.RowRepresentable
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
index 4885c110..0d1130c7 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/TransactionType.kt
@@ -4,7 +4,7 @@ import android.text.InputType
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 import net.pokeranalytics.android.model.interfaces.Savable
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowEditableDescriptor
 import net.pokeranalytics.android.ui.view.RowEditable
 import net.pokeranalytics.android.ui.view.RowRepresentable
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/HistoryAdapter.kt
deleted file mode 100644
index f782256c..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/HistoryAdapter.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package net.pokeranalytics.android.ui.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import io.realm.RealmResults
-import kotlinx.android.synthetic.main.row_history_session.view.*
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.realm.Session
-import timber.log.Timber
-
-class HistoryAdapter(private var sessions: RealmResults<Session>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-	companion object {
-		const val ROW_SESSION: Int = 100
-		const val ROW_TOURNAMENT: Int = 101
-		const val ROW_HAND: Int = 102
-		const val ROW_TRANSACTION: Int = 103
-	}
-
-	var onClickOnSession: ((position: Int, session: Session) -> Unit)? = null
-
-	inner class RowSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-		fun bind(session: Session?) {
-			session?.let {
-				itemView.sessionRow.setData(session)
-				itemView.sessionRow.setOnClickListener {
-					onClickOnSession?.invoke(adapterPosition, session)
-				}
-			}
-		}
-	}
-
-	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-		when (viewType) {
-			ROW_SESSION -> return RowSessionViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_history_session, parent, false))
-			else -> throw IllegalStateException("Need to implement type $viewType in HistoryAdapter")
-		}
-	}
-
-	override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-		when (getItemViewType(position)) {
-			ROW_SESSION -> (holder as HistoryAdapter.RowSessionViewHolder).bind(sessions.get(position))
-		}
-	}
-
-	override fun getItemCount(): Int {
-		return sessions.size
-	}
-
-	override fun getItemViewType(position: Int): Int {
-		return ROW_SESSION
-	}
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/LimitTypesAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/LimitTypesAdapter.kt
deleted file mode 100644
index 52832cbd..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/LimitTypesAdapter.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package net.pokeranalytics.android.ui.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.row_bottom_sheet_grid_title.view.*
-import net.pokeranalytics.android.R
-
-class LimitTypesAdapter(private var tableSizes: ArrayList<String>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-	companion object {
-		const val ROW_LIMIT: Int = 100
-	}
-
-	var onClickOnItem: ((position: Int) -> Unit)? = null
-
-	inner class CellSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-		fun bind(tableSize: String) {
-			itemView.title.text = tableSize
-			itemView.container.setOnClickListener {
-				onClickOnItem?.invoke(adapterPosition)
-
-			}
-		}
-	}
-
-	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-		when (viewType) {
-			ROW_LIMIT -> return CellSessionViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_bottom_sheet_title, parent, false))
-			else -> throw IllegalStateException("Need to implement type $viewType in HistoryAdapter")
-		}
-	}
-
-	override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-		when (getItemViewType(position)) {
-			ROW_LIMIT -> (holder as LimitTypesAdapter.CellSessionViewHolder).bind(tableSizes[position])
-		}
-	}
-
-	override fun getItemCount(): Int {
-		return tableSizes.size
-	}
-
-	override fun getItemViewType(position: Int): Int {
-		return ROW_LIMIT
-	}
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/RowRepresentableAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableAdapter.kt
similarity index 95%
rename from app/src/main/java/net/pokeranalytics/android/ui/adapter/components/RowRepresentableAdapter.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableAdapter.kt
index 9977fe0b..5b13bd61 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/RowRepresentableAdapter.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/adapter/RowRepresentableAdapter.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.ui.adapter.components
+package net.pokeranalytics.android.ui.adapter
 
 import android.view.View
 import android.view.ViewGroup
@@ -91,8 +91,8 @@ interface DisplayableDelegate {
  * @param delegate the delegate, notified of UI actions
  */
 class RowRepresentableAdapter(
-	var dataSource: RowRepresentableDataSource,
-	var delegate: RowRepresentableDelegate? = null
+    var dataSource: RowRepresentableDataSource,
+    var delegate: RowRepresentableDelegate? = null
 ) :
 	RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/TableSizeGridAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/TableSizeGridAdapter.kt
deleted file mode 100644
index c0ea5637..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/TableSizeGridAdapter.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package net.pokeranalytics.android.ui.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.row_bottom_sheet_grid_title.view.*
-import net.pokeranalytics.android.R
-
-class TableSizeGridAdapter(private var tableSizes: ArrayList<String>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-	companion object {
-		const val ROW_TABLE_SIZE: Int = 100
-	}
-
-	var onClickOnItem: ((position: Int) -> Unit)? = null
-
-	inner class CellSessionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-		fun bind(tableSize: String) {
-			itemView.title.text = tableSize
-			itemView.container.setOnClickListener {
-				onClickOnItem?.invoke(adapterPosition)
-			}
-		}
-	}
-
-	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-		when (viewType) {
-			ROW_TABLE_SIZE -> return CellSessionViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.row_bottom_sheet_grid_title, parent, false))
-			else -> throw IllegalStateException("Need to implement type $viewType in HistoryAdapter")
-		}
-	}
-
-	override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-		when (getItemViewType(position)) {
-			ROW_TABLE_SIZE -> (holder as TableSizeGridAdapter.CellSessionViewHolder).bind(tableSizes[position])
-		}
-	}
-
-	override fun getItemCount(): Int {
-		return tableSizes.size
-	}
-
-	override fun getItemViewType(position: Int): Int {
-		return ROW_TABLE_SIZE
-	}
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/LiveDataAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/LiveDataAdapter.kt
deleted file mode 100644
index f2e3b683..00000000
--- a/app/src/main/java/net/pokeranalytics/android/ui/adapter/components/LiveDataAdapter.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package net.pokeranalytics.android.ui.adapter.components
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.appcompat.widget.AppCompatTextView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.recyclerview.widget.RecyclerView
-import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.view.RowViewType
-
-enum class LiveDataViewType {
-	DATA,
-	BOTTOM_SHEET_DATA
-}
-
-interface LiveDataDataSource {
-    val title: String
-}
-
-interface LiveDataDelegate {
-    fun data(position: Int) : LiveDataDataSource
-    fun onRowSelected(position: Int)
-    fun size() : Int
-}
-
-class LiveDataAdapter(var adapterDelegate: LiveDataDelegate, var liveDataViewType: LiveDataViewType? = LiveDataViewType.DATA) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    inner class DataViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        fun bind(row: LiveDataDataSource, listener: View.OnClickListener) {
-	        when(liveDataViewType) {
-		        LiveDataViewType.DATA -> {
-			        itemView.findViewById<AppCompatTextView>(R.id.rowTitle_title).text = row.title
-			        itemView.findViewById<ConstraintLayout>(R.id.rowTitle_container).setOnClickListener(listener)
-		        }
-		        LiveDataViewType.BOTTOM_SHEET_DATA -> {
-			        itemView.findViewById<AppCompatTextView>(R.id.title).text = row.title
-			        itemView.findViewById<ConstraintLayout>(R.id.container).setOnClickListener(listener)
-		        }
-	        }
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return RowViewType.TITLE.ordinal
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-	    val layoutToInflate = when(liveDataViewType) {
-		    LiveDataViewType.DATA -> {
-			    R.layout.row_title
-		    }
-		    LiveDataViewType.BOTTOM_SHEET_DATA -> {
-			    R.layout.row_bottom_sheet_title
-		    }
-		    else ->  R.layout.row_title
-	    }
-	    return DataViewHolder(LayoutInflater.from(parent.context).inflate(layoutToInflate, parent, false))
-    }
-
-    override fun getItemCount(): Int {
-        return adapterDelegate.size()
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-	    val listener = View.OnClickListener {
-		    adapterDelegate.onRowSelected(position)
-	    }
-        (holder as DataViewHolder).bind(this.adapterDelegate.data(position), listener)
-    }
-}
\ No newline at end of file
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 131977f5..bbe261f1 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
@@ -11,15 +11,17 @@ import kotlinx.android.synthetic.main.fragment_data_list.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.activity.EditableDataActivity
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
-import net.pokeranalytics.android.ui.view.RowEditable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.SettingRow
 import timber.log.Timber
 
-class DataListFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate{
+class DataListFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
+	RowRepresentableDelegate {
 
 	private lateinit var dataType: SettingRow
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
index 724c9454..ffe71634 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
@@ -12,7 +12,9 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
@@ -164,7 +166,10 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate,
 			this.appBar.toolbar.title = "New ${this.liveDataType.name.toLowerCase().capitalize()}"
 		}
 		this.item = this.liveDataType.updateOrCreate(this.getRealm(), primaryKey)
-		this.rowRepresentableAdapter = RowRepresentableAdapter((this.item as RowRepresentableDataSource), this)
+		this.rowRepresentableAdapter = RowRepresentableAdapter(
+			(this.item as RowRepresentableDataSource),
+			this
+		)
 		this.recyclerView.adapter = rowRepresentableAdapter
 	}
 }
\ No newline at end of file
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 fa34480b..1eef93e2 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
@@ -14,15 +14,15 @@ import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.Savable
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.activity.SessionActivity
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableAdapter
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDelegate
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
-import net.pokeranalytics.android.ui.view.RowEditable
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
-class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
+class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
+	RowRepresentableDelegate {
 
 	companion object {
 		fun newInstance(): HistoryFragment {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
index 731355e2..348e33aa 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
@@ -16,8 +16,8 @@ import net.pokeranalytics.android.model.extensions.getState
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableAdapter
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDelegate
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.DateTimePickerManager
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetDelegate
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 145bf11b..78e7aad0 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
@@ -8,12 +8,15 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_settings.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.DataListActivity
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.SettingRow
 
-class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
+class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDataSource,
+    RowRepresentableDelegate {
 
 	companion object {
 
@@ -57,8 +60,8 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, R
 
 		val viewManager = LinearLayoutManager(requireContext())
 		settingsAdapterRow = RowRepresentableAdapter(
-			this, this
-		)
+            this, this
+        )
 
 		recyclerView.apply {
 			setHasFixedSize(true)
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 263616b0..a8734ab6 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
@@ -8,8 +8,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_settings.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.Stat
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableAdapter
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
index abca4c07..44558220 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetListFragment.kt
@@ -8,11 +8,14 @@ import io.realm.RealmResults
 import kotlinx.android.synthetic.main.bottom_sheet_list.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 
-class BottomSheetListFragment : BottomSheetFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
+class BottomSheetListFragment : BottomSheetFragment(), RowRepresentableDataSource,
+    RowRepresentableDelegate {
 
 	private var realmData: RealmResults<*>? = null
 	private lateinit var dataAdapter: RowRepresentableAdapter
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 1eab9bf3..da42f45c 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
@@ -10,15 +10,17 @@ import kotlinx.android.synthetic.main.bottom_sheet_game_list.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.Limit
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableAdapter
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDelegate
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import timber.log.Timber
 
 
-class BottomSheetListGameFragment : BottomSheetFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
+class BottomSheetListGameFragment : BottomSheetFragment(),
+	RowRepresentableDataSource,
+	RowRepresentableDelegate {
 
 	private var realmData: RealmResults<*>? = null
 	private lateinit var dataAdapter: RowRepresentableAdapter
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 e3a4cfd4..f97c8acf 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
@@ -7,12 +7,16 @@ import androidx.recyclerview.widget.GridLayoutManager
 import kotlinx.android.synthetic.main.bottom_sheet_grid.*
 import kotlinx.android.synthetic.main.fragment_bottom_sheet.view.*
 import net.pokeranalytics.android.model.TableSize
-import net.pokeranalytics.android.ui.adapter.components.*
+import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.view.GridSpacingItemDecoration
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.util.px
 
-class BottomSheetTableSizeGridFragment : BottomSheetFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
+class BottomSheetTableSizeGridFragment : BottomSheetFragment(),
+    RowRepresentableDataSource,
+    RowRepresentableDelegate {
 
 	private lateinit var dataAdapter: RowRepresentableAdapter
 	private var defaultSize: Int? = null
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 a0845f5d..e44d662f 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
@@ -14,8 +14,7 @@ import kotlinx.android.synthetic.main.row_title_value.view.*
 import kotlinx.android.synthetic.main.row_title_value_action.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.realm.Session
-import net.pokeranalytics.android.ui.adapter.TableSizeGridAdapter
-import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDataSource
+import net.pokeranalytics.android.ui.adapter.RowRepresentableDataSource
 
 /**
  * An interface used to factor the configuration of RecyclerView.ViewHolder