reorganized hierarchy