Cleaned up Ontology and renamed Abstract classes