Ontology implementation

started implementing new ontology
moved part of code to model mapper
deprecating old and unused predicates and names