package rearrangements
improve .gitignore
Merge branch 'master' into dev
compact / improve the ontology & adapt core accordingly