Fix some mistakes of my local merges. (dont know what happened.
errorFromDataSet should be actually included)
adjust some headers to the new directory structure.