Re-arrange fields to match new required / optional policy.

Plus, group them in a logical sequence instead of a type-specific one by
following the order being used in the new example files.

This commit should not introduce any functional changes!

Refers to #29