reorganize structures about selection