Moved Comparator support classes into appropriate package.