Refactor S3SoftwareURLs away