refactoring keys for encryption
adding per-vault keys