diff --git a/KEYS b/KEYS
deleted file mode 100644
index 7231f62..0000000
--- a/KEYS
+++ /dev/null
@@ -1,105 +0,0 @@
-This file contains the PGP keys of various developers that work on
-the Apache YOKO project.
-
-Please don't use these keys for email unless you have asked the owner
-because some keys are only used for code signing.
-
-Please realize that this file itself or the public key servers may be
-compromised.  You are encouraged to validate the authenticity of these keys in
-an out-of-band manner.
-
-Apache users: pgp < KEYS
-Apache developers: 
-        (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
-      or
-        (gpg --fingerprint --list-sigs <your name>
-             && gpg --armor --export <your name>) >> this file.
-
-Apache developers: please ensure that your key is also available via the
-PGP keyservers (such as pgpkeys.mit.edu).
-
-pub   1024D/DE4106EA 2007-03-05
-      Key fingerprint = 7EF8 6C4C 3126 CFDD 3FD9  912C FE2F 1344 DE41 06EA
-uid                  Rick McGuire (Yoko CODE SIGNING KEY) <rickmcguire@apache.org>
-sig 3        DE4106EA 2007-03-05  Rick McGuire (Yoko CODE SIGNING KEY) <rickmcguire@apache.org>
-sub   2048g/5BD933CA 2007-03-05
-sig          DE4106EA 2007-03-05  Rick McGuire (Yoko CODE SIGNING KEY) <rickmcguire@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQGiBEXsPU4RBACQs5VRhdSNC9PjxLgLmJsbisbjm/vmAfFATIrxPIsi8UMvVz2e
-toTbrtEZRWP8RY+XmJn4fMKlk/bFmCpw4lRxLGS6Lofkwdb3Y/35YWNjTWtSKfTw
-VbVsOoQdI1qRxVgmeBG7MYkEnONIHa3rRrOPfRRycrcBW5bY/LB4SqBzgwCg/khB
-SREhYrqtv4okakNqLID/DBsD/2+wJLr5qeioYCzMqUQomaWbMfC/3QwETD3m9zmt
-Wf3+iShMqFByUYefMOHYq+smprHicD7JSsPcB4dxmYIJy1liihbn9mdO9O8U/IjP
-XPB4UT6nkEVvBJB7OWfZgsKbtyjOEEh8RMS4VZUn2vK6CybytEU8meygeiHg/+5M
-Ur4RA/sGlfoGlj3ZSuhIyZHvBCq80GomAyro91uxueIuTY8yLwGzlmevBQCE8xNo
-YRF3w6GID/i5tpC/xNyfi47O8OICbifs3U5CK12fgK5kXYRb1W8IoNqIzX/tRl0z
-k1FXYwr4qYn/Py3VNgacGTgQNlAQdBNu2Tv2XPrEF1eql6b6GrQ9UmljayBNY0d1
-aXJlIChZb2tvIENPREUgU0lHTklORyBLRVkpIDxyaWNrbWNndWlyZUBhcGFjaGUu
-b3JnPohgBBMRAgAgBQJF7D1OAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ
-/i8TRN5BBuoiMQCeNIGaugkC3jFzIFoP3HqKz3wXnesAoIENYdUe709nO+Kq70FY
-4SnmMVQ6uQINBEXsPWAQCADNLScSrkIyG2iLfQ4dM3VA7QDI0YczJRKn5YDlELcN
-YLy7mlVhOSIU1TEVZJArRHdz4cU3XiKBnwHs/bHGGHbK9pTOX0ZDbdK6o1Pn7uNZ
-PX2WchOW7vt190gg4BijyuTqKDarqa+FxDyBtYVk9I6wG9WCBW128yGc6OsjGl+8
-yUcHgxyPT1iuG0clX+znTAHaANVXQ8YzVh/htPDdDHcxeWeTgVAIRHinCkvOIZZG
-Py+QmgGOYIGQLLHD8JCWYF9SaDSMco9E8BYtgsaLoj07oohuDP5CzLjyitxRkIKK
-IZPCD/zeaHsS58ONWlknr5n2a8rwMdk9MiFKeXaLWTQjAAMFCACQSYfIjxi87w78
-RTAjVXZXXuRVl5WWy5qQF+zgJDF8SiTz5qq4RVLodOFiSt+mAW4+kDkjUtSDk1mB
-z+SHAq1nwjjj29+5WQ12rS4NYz/mdhl62ysQpfr2WMDGarMVSlog7XpBpUthvE66
-rWnd3BSdPlFD/nOnYXXkbRcb+XyCKTGi5m1FLyMgGmwKn9bm3jeGib/StrgiKeBy
-U9QL1ItPsphNoPFKx/B9uwC+n6kyzLdDBCLt3KriTCRmtaqKzwRByYTbsetgA7VK
-yVniNH0f0JbAqEE8izCfPu+Vy+m6bJE4LtZdcOJPts5S96LgWpOSCOSaEIWKH1oS
-G3GwDZdBiEkEGBECAAkFAkXsPWACGwwACgkQ/i8TRN5BBurA3ACdE/LDs9fMtC3k
-Us0lQUx8cozLrVEAnj8Z9GhLc1wQhNRTcnnv8cbWuT7B
-=kRj9
------END PGP PUBLIC KEY BLOCK-----
-
-pub   1024D/7BE01498 2008-01-15
-uid                  Alan D. Cabrera <adc@apache.org>
-sig 3        7BE01498 2008-01-15  Alan D. Cabrera <adc@apache.org>
-sub   4096g/24D0D205 2008-01-15
-sig          7BE01498 2008-01-15  Alan D. Cabrera <adc@apache.org>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.8 (Darwin)
-
-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
-=4MkG
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/LICENSE b/LICENSE.txt
similarity index 100%
rename from LICENSE
rename to LICENSE.txt
diff --git a/NOTICE b/NOTICE.txt
similarity index 100%
rename from NOTICE
rename to NOTICE.txt
diff --git a/README.txt b/README.txt
index 28df12b..d5281de 100644
--- a/README.txt
+++ b/README.txt
@@ -14,7 +14,7 @@
 *  limitations under the License.
 
                           Instructions to build Apache Yoko
-			             ===================================
+                          ===================================
 
 Build Requirements
 ------------------