Reorganize headers slightly