change project structure and fix espresso errors with dagger