Reorder fields to xt-related and nt-related