Revert "Put various build sections underneath a single build level for ToC simplicity"

This reverts commit 38d67908e8c602f58c3d6fbd7473d7134b0f0176.