Moved to gradle build setup