Update license, move Sorter to java src