refactoring digger package