Changing to gradle build