Moar restructure. Rawr.