Rename nmw.util to GenericComparator