Reorder methods into logical groups