Changed around the build.gradle file to make life easier.