Restructure Headers section