Overhauled structure and deployment to Grunt