restructured hierarchy