Finish up basic restructure