Restructure ALL the things!