Added lots of changes to the build.gradle's