Handle duplicate filenames during folder uploads in a better way