Restore old manually sorted TOC sections.

Move content so toc-XX pages aren't just stub chapters.