Reorganise fields in value_pair_tmpl_t