Improve OS detection
Refactor storing packages
Improve cosmetics