Initial renaming and refactoring of vault_manager.