CSecret/CKey -> CKey/CPubKey split/refactor