restructure

restructure