Restructures headers