diff --git a/Sources/AOC2018/day06.swift b/Sources/AOC2018/day06.swift
index 4b943fb..af82bab 100644
--- a/Sources/AOC2018/day06.swift
+++ b/Sources/AOC2018/day06.swift
@@ -4,19 +4,6 @@
 
 import Foundation
 
-struct GridPoint: Equatable, Comparable {
-    var X = 0
-    var Y = 0
-
-    static func == (lhs: GridPoint, rhs: GridPoint) -> Bool {
-        return (lhs.X == rhs.X) && (lhs.Y == rhs.Y)
-    }
-
-    static func < (lhs: GridPoint, rhs: GridPoint) -> Bool {
-        return (lhs.X + lhs.Y) < (rhs.X + rhs.Y)
-    }
-}
-
 class Coordinates {
     var points: [GridPoint] = []
     var dimensions: GridPoint
diff --git a/Sources/AOC2018/tools.swift b/Sources/AOC2018/tools.swift
index 3fdd079..87ddc15 100644
--- a/Sources/AOC2018/tools.swift
+++ b/Sources/AOC2018/tools.swift
@@ -19,6 +19,19 @@ func == <T:Equatable> (tuple1:(T,T),tuple2:(T,T)) -> Bool
    return (tuple1.0 == tuple2.0) && (tuple1.1 == tuple2.1)
 }
 
+struct GridPoint: Equatable, Comparable {
+    var X = 0
+    var Y = 0
+
+    static func == (lhs: GridPoint, rhs: GridPoint) -> Bool {
+        return (lhs.X == rhs.X) && (lhs.Y == rhs.Y)
+    }
+
+    static func < (lhs: GridPoint, rhs: GridPoint) -> Bool {
+        return lhs.Y == rhs.Y ? lhs.X < rhs.X : lhs.Y < rhs.Y
+    }
+}
+
 struct Tools {
     static func readFile(fromPath path: String) -> String {
         var retVal = ""