Refactor storing packages
Improve cosmetics