Moved sort classes to collection.sort package