Begin reorganizing headers