table of contents - general update and restructuring