added second pubkey to Peer; thoroughly reorganized directories