do some refactorings to create a package that will eventually be spun out at a DSL over Jena