diff --git a/.cat.sh b/.cat.sh
index bb1519e6..65f2af4e 100755
--- a/.cat.sh
+++ b/.cat.sh
@@ -6,7 +6,7 @@ cat zshrc > ~/.zshrc
 cat gitconfig > ~/.gitconfig
 cat vimrc > ~/.vimrc
 mkdir -p ~/.gnupg
-cat gnupg/gpg.conf > ~/.gnupg/gpg.conf
+cat gpg.conf > ~/.gnupg/gpg.conf
 cat xsessionrc > ~/.xsessionrc
 cat warnings > ~/.warnings
 cat pastebinit.xml > ~/.pastebinit.xml
diff --git a/gnupg/pgprules.xml.asc b/gnupg/pgprules.xml.asc
deleted file mode 100644
index 0ec022db..00000000
--- a/gnupg/pgprules.xml.asc
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP MESSAGE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: Public key: http://mkaysi.github.com/PGP/0x82A46728.txt
-Comment: gpg --fetch-keys http://mkaysi.github.com/PGP/0x82A46728.txt
-Comment: Fingerprint = 24BC 1573 B8EE D666 D10A  AA65 4DB5 3CFE 82A4 6728
-Comment: I have personal problem with PGP/MIME...
-Comment: ...so signature *IS* long. See http://git.io/6FLzWg
-Comment: Please remove PGP lines in replies. http://git.io/nvHrDg
-Comment: Charset of this message should be UTF-8.
-
-hQIMA9pqJECkJxrFAQ/+OTRcXzKkSiG0rjHDFH5DEBRMO13asNCX+iT5iTPupyjx
-PauEfR1UpyrFeNi0EMVSBVaf716pJ5I9SKD0bKj01NrxFAo2Hj/pqQmxlEi1XREs
-at+Dz7Wp2Azmk+Y39YMr4nuFC0dswykw4Cr9o8WuaIzhAyNeDG20lfLrLw0SeATn
-9UoS+PBTPeJ6T2jnNmIOgrnD3nn03UGdvhFss3iSj97cfz1avfVrt3QzaVeHUZn4
-eF9ug5kbKtuCTOGr6A6Bm0PTpK5H8ZpF0NWkJExt8wKrJKxUzAZUuNA+NEIrL13y
-uMAwd/XonnUw2WIBQdJv0vxuCC6OltuPP9we1CZBsEw7nXcpk7LyLgpOO+TKdGco
-B/6X+neeJSWRK0GnUeESzxCZhns0wbBY3xcH8XJbFWVzyrPyhUWooHuHsuT1aaBA
-ypcMpfIiO35RkOz3sP8P76/FThxqBfcpuQSCehZygzo9VmNfIm5XBbv2QwVzz4sQ
-TYSZEDiUGRuzRhEWjVSqNjVEFtwbrVfMMcUoHj7p8pnJPuozFbTvlyKtmACWAgSK
-xigWSFy2pgESPtupfZnB4yhbf6yfSgDXewCBkVyGVS7eXXp3RaMStUGQ0F7KWHBG
-07bwYNFnJHSdbfVWIshTgD042Nf3iI/l9pwGlvMLuMl4JmmC4EncQwaL9XRMBtHS
-wF0BbHf45QNKhrahABQmewrVcuBxlM1k9t+pRCeaiSRDmDTbu+v/40V/5OnQMbwH
-Etdfa9SyBjcfv85COshfHve+BulWhBGdhucQPfX3LYyD2eHBro8qzq195s5Rsutk
-m306ZOxDcrR/OPKMkYjODMucvdpbvvUS7//biPxeW36HAT1lYMNtS9vZsw5q+gZh
-n1/4X2IRCVfi7KNnUZW3s0UxPYa8IIuoeKDDErhq0LxFsD8yMGmY0zEAgDRznDIF
-gbDKyFC+45cB33fy/MV1Xlq/hj706VC5miGSsFvO+J2LUZK+2AxSKcODFHWZIv45
-b4rjygEc+ExtKwXXrIu3blt07jvEV5r7U99eWNMOXIgvBsdyNOCW5r2W4bXvb2g=
-=Mad3
------END PGP MESSAGE-----
diff --git a/gnupg/gpg.conf b/gpg.conf
similarity index 100%
rename from gnupg/gpg.conf
rename to gpg.conf