changed structure hierarchy