649 refactor parsing

Shall fix #649. 

The tests for the OntologyParser have not been translated, yet. See #942 for that.
done with 81d0600bb60ef0ad2996ff9dd315bdb9be05369f