reorganize structures about selection
wip