Updates for consistency with package format #8

Closed lrennels closed 5 years ago