Reorganize, add operators, and annotate spec section headers