move sorter to new package