Finished the mini-restructure