#11 reorder and sectionize functions and types in document