refactor datastructures.Headers