Improve multiple upload with folder