Redo the structure