Reorganize.
Backout changeset 7589b5c9d2423087057bfb4c7135d22b20b36883
Minor version 7.
Version 1.16
Added tag 1.16 for changeset e954046f9c8a