Major reorg. of ontology for new OC version