Merged PublicKey, PrivateKey into Key; moved several function to Key