structure: reorganize the menu items