Revert "Reorganizing and implementing ontology support"

This reverts commit b8bd36da994bf69e877e375f05beba8e3995dba4.