Reorganize features for neatness