Move Comparator implementation to it's own class file.