reorg the entire branch based on metasite and proto-site.

Please put all your work for backup/testing in your own folders.  Please
put production code in the protosite or in my case the metasite folder.