change ontology + refactor some code
Merge branch 'master' of github.com:Luze26/Vinology