Change up some headers to better reflect what they now contain and are organised. Lots more to do.