Reorganize features