Reorganised toctree
refs #867