refix hierarchy structure