AW: Reorganization of the header files (GitHub #9333)

[Dr. Matthias St. Pierre]

> Go for it, the antipodean contingent aren’t busy this weekend.

Ok, since I have green light from three OMC members now, I think
there is no need to wait until tomorrow. I'll merge later this evening.

Matthias