reorganize structures