Refactoring in dagger package