more hierarchy reorganizing