WIP.  Doc cleanup for new structure.