A full restructure