Reorganizing headers