Restructure headers