Reorganize components.