Ontology Updates

Added new terms and structured ontology first time as it’s getting
bigger.