Reshuffle files from Main