Reordered the protocol structure definitions to match the draft, and left comments for empty / undefined structures.