rework of structure