Adding packaging refinements

This set of packaging changes has yet to be tested.