Replaced HeaderManipulator.

Put it to fit better into the new structure.