reorganized hierarchy structure