OBDAVocabulary refactoring complete for now