Tidied up the gradle build mechanism
Updated build process to norms