Refactor Vault class to use encryption wrapper classes
0.5.8 --pre