Split up aggregated Comparators wrapper class into individual compilation units under the sort package
Fix license headers