upload and tidy up folder structure