Huge refactoring to get working DBpedia importer