Restructured hierarchy