removed the idea of a header, does not make sense. it is only written in the xml file what it actually is
some refactoring of the class names to be more specific