Updated to gradle build system