gnupg: Add gnupg 2.1 as default

Additionally, move all gnupg expressions into the gnupg folder.