diff --git a/bin/TODO b/bin/TODO
deleted file mode 100644
index a32885b..0000000
--- a/bin/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-02:50 < devn> <META name="description" content="This is the Google Summer of Code blog for Plan9 and Inferno projects.">
-02:50 < devn> <META name="keywords" content="google, summer of code, inferno, plan9, programming">
-
-Should add werc to certain wikipedia lists:
-* http://en.wikipedia.org/wiki/List_of_content_management_systems
-* http://en.wikipedia.org/wiki/Comparison_of_wiki_software
-
diff --git a/bin/bpst.rc b/bin/aux/bpst.rc
similarity index 100%
rename from bin/bpst.rc
rename to bin/aux/bpst.rc
diff --git a/bin/hgweb.config b/bin/contrib/hgweb.config
similarity index 100%
rename from bin/hgweb.config
rename to bin/contrib/hgweb.config
diff --git a/bin/hgwebdir.cgi b/bin/contrib/hgwebdir.cgi
similarity index 100%
rename from bin/hgwebdir.cgi
rename to bin/contrib/hgwebdir.cgi
diff --git a/bin/markdown.pl b/bin/contrib/markdown.pl
similarity index 100%
rename from bin/markdown.pl
rename to bin/contrib/markdown.pl
diff --git a/bin/urldecode.awk b/bin/contrib/urldecode.awk
similarity index 100%
rename from bin/urldecode.awk
rename to bin/contrib/urldecode.awk
diff --git a/bin/gensitemaptxt.rc b/bin/gensitemaptxt.rc
deleted file mode 100755
index 06a0a9a..0000000
--- a/bin/gensitemaptxt.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env rc
-
-for ( d in sites/*/ ) {
-echo $d
-9 du -a $d | awk '/\.(md|html)$/ { print $2 }; {}' | 9 sed -e 's/\.(md|html)$//' -e 's,/index$,/,' -e 's,^sites/,http://,' > $d/sitemap.txt
-
-if(! test -f $d/robots.txt) {
-	echo generating missing robots.txt for $d
-	echo $d|sed 's,sites/,Sitemap: http://,; s/$/sitemap.txt/;' > $d/robots.txt
-	cat $d/robots.txt
-}
-
-}
diff --git a/bin/md_cache b/bin/md_cache.rc
similarity index 100%
rename from bin/md_cache
rename to bin/md_cache.rc
diff --git a/bin/controller.rc b/bin/werc.rc
similarity index 99%
rename from bin/controller.rc
rename to bin/werc.rc
index 6a61c2b..c427055 100755
--- a/bin/controller.rc
+++ b/bin/werc.rc
@@ -274,8 +274,6 @@ for (i in ('' $args)) {
         blogDirs = () 
     }
 
-    if (test -f $fpath/_config)
-        . $fpath/_config # DEPRECATED
     if (test -f $fpath/_werc/config)
         . $fpath/_werc/config
 
@@ -289,7 +287,7 @@ if (~ $#redirectPermanent 1)
 
 if not if (~ $#redirectPermanent 2 && {echo $SERVER_NAME^$REQUEST_URI|grep -s $redirectPermanent(1) }) {
     # Experimental regexp sub-based redirect, probably should find a nicer interface
-    # For now only used at sites/harmful.cat-v.org/software/OO_programming/_config
+    # For now only used at sites/harmful.cat-v.org/software/OO_programming/_werc/config
     to=`{echo $SERVER_NAME^$REQUEST_URI|sed 's@'^$redirectPermanent(1)^'@'^$redirectPermanent(2)^'@'}
     if(! ~ $to $REQUEST_URI)
         perm_redirect $to