Finalised ontology objects, revised structure and used more traits.