shuffling into a new order and fixing file names tomatch