rearange header strcture