Reorder object defs