Re-order Org variables