Reorganized the TOC, some categories expanded. Fixes #35.