Sort this by BaseName to give a better progress feedback to the user. :ok_hand: