Improve naming
Improve OS detection
Refactor storing storages