Small refactoring

regarding the placement of the HeaderManipulator class.