Restructure everything!