Reorganize and add titles
Documentation