Tools - sunflower, minor hierarchy changes