Fix "Sorting" file renaming for RAR files that contain an extra folder level.

collapse_folder() should convert filename list accoerding to the renaming it does.
It's also its task to remove the _unpack_ markers from those filenames.
Rename this function to rename_and_collapse().