Qa/encoding

#### Reviewers
@flopezag @hmunfru @alberts-tid 

#### Description
 FIX a problem in jenkins (file encoding)
 FIX import problem due to previous refactoring
 ADD header and method comments in the affected files