Broke out PackageType and ported S3. More to do.