better hierarchy in S3 dist & patch buckets

Fixes #65.