Reorganized hierarchy