Greatly improved build.gradle

More to come