Move Vault to utils where it belongs