Reorganizing some headers