Move pgp classes into subpackage