Gradle buildfile re-shuffling. Not sure if it'll help.