Moved comparators into their own file