diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/GridIndexTransform.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/GridIndexTransform.scala
index 549cf9a70d..95b15da6b2 100644
--- a/raster/src/main/scala/geotrellis/raster/io/geotiff/GridIndexTransform.scala
+++ b/raster/src/main/scala/geotrellis/raster/io/geotiff/GridIndexTransform.scala
@@ -51,3 +51,22 @@ trait GridIndexTransform {
 
   def gridToIndex(col: Int, row: Int): Int
 }
+
+
+case class StripedSegmentTransform(segmentIndex: Int, segmentLayout: GeoTiffSegmentLayout) extends GridIndexTransform {
+  def gridToIndex(col: Int, row: Int): Int = {
+    val tileCol = col - (layoutCol * tileCols)
+    val tileRow = row - (layoutRow * tileRows)
+    tileRow * segmentCols + tileCol
+  }
+}
+
+case class TiledSegmentTransform(segmentIndex: Int, segmentLayout: GeoTiffSegmentLayout) extends GridIndexTransform {
+  def gridToIndex(col: Int, row: Int): Int = {
+    val tileCol = col - (layoutCol * tileCols)
+    val tileRow = row - (layoutRow * tileRows)
+    tileRow * tileCols + tileCol
+  }
+}
+
+
diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/StripedSegmentTransform.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/StripedSegmentTransform.scala
deleted file mode 100644
index c6739c1d0e..0000000000
--- a/raster/src/main/scala/geotrellis/raster/io/geotiff/StripedSegmentTransform.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package geotrellis.raster.io.geotiff
-
-class StripedSegmentTransform(val segmentIndex: Int,
-  val segmentLayout: GeoTiffSegmentLayout) extends GridIndexTransform {
-
-  def gridToIndex(col: Int, row: Int): Int = {
-    val tileCol = col - (layoutCol * tileCols)
-    val tileRow = row - (layoutRow * tileRows)
-    tileRow * segmentCols + tileCol
-  }
-}
-
-object StripedSegmentTransform {
-  def apply(segmentId: Int, segmentLayout: GeoTiffSegmentLayout): StripedSegmentTransform =
-    new StripedSegmentTransform(segmentId, segmentLayout)
-}
diff --git a/raster/src/main/scala/geotrellis/raster/io/geotiff/TiledSegmentTransform.scala b/raster/src/main/scala/geotrellis/raster/io/geotiff/TiledSegmentTransform.scala
deleted file mode 100644
index df82dd8a7e..0000000000
--- a/raster/src/main/scala/geotrellis/raster/io/geotiff/TiledSegmentTransform.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package geotrellis.raster.io.geotiff
-
-class TiledSegmentTransform(val segmentIndex: Int,
-  val segmentLayout: GeoTiffSegmentLayout) extends GridIndexTransform {
-
-  def gridToIndex(col: Int, row: Int): Int = {
-    val tileCol = col - (layoutCol * tileCols)
-    val tileRow = row - (layoutRow * tileRows)
-    tileRow * tileCols + tileCol
-  }
-}
-
-object TiledSegmentTransform {
-  def apply(segmentId: Int, segmentLayout: GeoTiffSegmentLayout): TiledSegmentTransform =
-    new TiledSegmentTransform(segmentId, segmentLayout)
-}