Refactor hierarchy