Refactoring table of contents.  Intermediate commit to be sure work is saved.