fixed directory issues
fixed copying directories and files in the end plus reactivated shuffling