scaffold reorganized