refactoring packages on demo sparql queries