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 8722f4f9..eba8afc5 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
@@ -30,7 +30,7 @@ import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.ui.view.rowrepresentable.CustomizableRowRepresentable
-import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRowRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.SessionRow
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.UserDefaults
@@ -584,7 +584,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 						computedStat = ComputedStat(Stat.NETRESULT, result?.net ?: 0.0, currency)
 					)
 				)
-				rows.add(SeparatorRowRepresentable())
+				rows.add(SeparatorRow())
 			}
 			SessionState.PAUSED -> {
 				rows.add(
@@ -594,7 +594,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 						computedStat = ComputedStat(Stat.NETRESULT, result?.net ?: 0.0, currency)
 					)
 				)
-				rows.add(SeparatorRowRepresentable())
+				rows.add(SeparatorRow())
 			}
 			SessionState.FINISHED -> {
 				rows.add(
@@ -621,7 +621,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 //						)
 //					)
 //				}
-				rows.add(SeparatorRowRepresentable())
+				rows.add(SeparatorRow())
 			}
 			else -> {
 			}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt
index 4a53d724..76d552e3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt
@@ -16,7 +16,7 @@ import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
-import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRowRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.SeparatorRow
 import java.util.*
 
 class CurrenciesFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
@@ -28,7 +28,7 @@ class CurrenciesFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataS
         val rowRepresentation : List<RowRepresentable> by lazy {
             val rows = ArrayList<RowRepresentable>()
             rows.addAll(mostUsedCurrencies)
-            rows.add(SeparatorRowRepresentable())
+            rows.add(SeparatorRow())
             rows.addAll(availableCurrencies)
             rows
         }
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 4c0c34e2..1c09199c 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
@@ -10,7 +10,7 @@ import kotlinx.android.synthetic.main.fragment_stats.*
 import kotlinx.coroutines.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.calculus.*
-import net.pokeranalytics.android.model.StatRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.StatRepresentable
 import net.pokeranalytics.android.model.filter.QueryCondition
 import net.pokeranalytics.android.ui.activity.StatisticDetailsActivity
 import net.pokeranalytics.android.ui.adapter.DisplayDescriptor
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 387756b9..42865a4b 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
@@ -13,7 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.row_history_session.view.*
 import kotlinx.android.synthetic.main.row_transaction.view.*
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.model.StatRepresentable
+import net.pokeranalytics.android.ui.view.rowrepresentable.StatRepresentable
 import net.pokeranalytics.android.model.realm.Session
 import net.pokeranalytics.android.model.realm.Transaction
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRowRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRow.kt
similarity index 75%
rename from app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRowRepresentable.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRow.kt
index 7497d908..a45bfb04 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRowRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SeparatorRow.kt
@@ -6,6 +6,6 @@ import net.pokeranalytics.android.ui.view.RowViewType
 /**
  * A class to display separator as row representable
  */
-class SeparatorRowRepresentable(customViewType: RowViewType? = RowViewType.SEPARATOR) : RowRepresentable {
+class SeparatorRow(customViewType: RowViewType? = RowViewType.SEPARATOR) : RowRepresentable {
     override val viewType: Int = customViewType?.ordinal ?: RowViewType.SEPARATOR.ordinal
 }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
index 27b2c73f..40a49efe 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SessionRow.kt
@@ -68,7 +68,7 @@ enum class SessionRow : RowRepresentable {
 								POSITION,
 								PLAYERS,
 								TIPS,
-								SeparatorRowRepresentable(),
+								SeparatorRow(),
 								GAME,
 								INITIAL_BUY_IN,
 								LOCATION,
@@ -77,7 +77,7 @@ enum class SessionRow : RowRepresentable {
 								TOURNAMENT_TYPE,
 								TOURNAMENT_NAME,
 								TOURNAMENT_FEATURE,
-								SeparatorRowRepresentable(),
+								SeparatorRow(),
 								START_DATE,
 								END_DATE,
 								BREAK_TIME,
@@ -98,7 +98,7 @@ enum class SessionRow : RowRepresentable {
 									CASHED_OUT,
 									BUY_IN,
 									TIPS,
-									SeparatorRowRepresentable(),
+									SeparatorRow(),
 									GAME,
 									BLINDS,
 									LOCATION,
@@ -112,7 +112,7 @@ enum class SessionRow : RowRepresentable {
 							} else {
 								arrayListOf(
 									NET_RESULT,
-									SeparatorRowRepresentable(),
+									SeparatorRow(),
 									GAME,
 									BLINDS,
 									LOCATION,
diff --git a/app/src/main/java/net/pokeranalytics/android/model/StatRepresentable.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/StatRepresentable.kt
similarity index 90%
rename from app/src/main/java/net/pokeranalytics/android/model/StatRepresentable.kt
rename to app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/StatRepresentable.kt
index 25829c3a..ac081a20 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/StatRepresentable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/StatRepresentable.kt
@@ -1,4 +1,4 @@
-package net.pokeranalytics.android.model
+package net.pokeranalytics.android.ui.view.rowrepresentable
 
 import net.pokeranalytics.android.calculus.ComputedStat
 import net.pokeranalytics.android.calculus.Stat