finished restructure