Reorganize headers