Method reordering and grouping in Controller and Management