- Complete structure rework