diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/AggregationType.kt b/app/src/main/java/net/pokeranalytics/android/calculus/AggregationType.kt
new file mode 100644
index 00000000..d29e7049
--- /dev/null
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/AggregationType.kt
@@ -0,0 +1,40 @@
+package net.pokeranalytics.android.calculus
+
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.model.Criteria
+import net.pokeranalytics.android.ui.graph.AxisFormatting
+
+enum class AggregationType {
+	SESSION,
+	MONTH,
+	YEAR,
+	DURATION;
+
+	val resId: Int
+		get() {
+			return when (this) {
+				SESSION -> R.string.session
+				MONTH -> R.string.month
+				YEAR -> R.string.year
+				DURATION -> R.string.duration
+			}
+		}
+
+	val axisFormatting: AxisFormatting
+		get() {
+			return when (this) {
+				DURATION -> AxisFormatting.X_DURATION
+				else -> AxisFormatting.DEFAULT
+			}
+		}
+
+	val criterias: List<Criteria>
+		get() {
+			return when (this) {
+				MONTH -> listOf(Criteria.AllMonthsUpToNow)
+				YEAR -> listOf(Criteria.Years)
+				else -> listOf()
+			}
+		}
+
+}
\ No newline at end of file
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 2d204891..cb4c42dc 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
@@ -3,9 +3,7 @@ package net.pokeranalytics.android.calculus
 import android.content.Context
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.FormattingException
-import net.pokeranalytics.android.model.Criteria
 import net.pokeranalytics.android.model.interfaces.Timed
-import net.pokeranalytics.android.ui.graph.AxisFormatting
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.NULL_TEXT
@@ -23,41 +21,6 @@ class ObjectIdentifier(var id: String, var clazz: Class<out Timed>) {
 
 }
 
-enum class AggregationType {
-	SESSION,
-	MONTH,
-	YEAR,
-	DURATION;
-
-	val resId: Int
-		get() {
-			return when (this) {
-				SESSION -> R.string.session
-				MONTH -> R.string.month
-				YEAR -> R.string.year
-				DURATION -> R.string.duration
-			}
-		}
-
-	val axisFormatting: AxisFormatting
-		get() {
-			return when (this) {
-				DURATION -> AxisFormatting.X_DURATION
-				else -> AxisFormatting.DEFAULT
-			}
-		}
-
-	val criterias: List<Criteria>
-		get() {
-			return when (this) {
-				MONTH -> listOf(Criteria.AllMonthsUpToNow)
-				YEAR -> listOf(Criteria.Years)
-				else -> listOf()
-			}
-		}
-
-}
-
 /**
  * An enum representing all the types of Session statistics
  */