Reorganizing and implementing ontology support