Ontology refactored