Move Comparer into its own package.