Reorganize and include hard coded TOC.