Reorder fields in Directives and Guidelines