Rework to a new structure.