RDF refactoring