reorg build.gradle a bit