Rearrange the hiearchy