Keys: Refactored to use Pubkey and Privkey and removed Keypair