Reorganize header structure