rename package
a bit of refactoring