Simplified upload process, fixed upload for root folder