Project structure change and integrated Dagger