Rework structure.