Down to current Gradle issues moving all classes from core back to their original place at app.