redoing some hierarchy, adding content to ontology