Rearrange routes grouped by controller