Updated download folder structure