reorganize hierarchy