refactoring, package properly, name change