restructure TOC

This just look much more structured.