Reorganize code; create pgp-sig.c