Organize the main dependency list a bit, no functional change. Also a missed Gradle template prop.