Minor gradle restructure