Move pgp stuff into app