Update to new packaging guidelines.