remove one level of hierarchy
headers reorganization