Move to Grunt architecture