649 refactor parsing

Shall fix #649. 

The tests for the OntologyParser have not been translated, yet. See #942 for that.
everything in this block but this line is nicely aligned