Move some things out of BelRdfVocabulary