Rearrange Hiearchy refactoring