Public Keys should be stored with the private key

Private keys are less than useful without the public key. They should be stored together and validated that they match, so if you store the wrong public key, it should alert you that they don't match...