Move zip_download_url to the correct class. Cleaup private_download_url