Refactor storing packages
Improve cosmetics
Extend use of tags