Updated and refactored project to newer gradle build system version