Reorganize hierarchy