Finished restructure