Merge intro / TOC
rework hiarchy