Rework structure
Rework structure