restructure feature list for symmetry