Updated grunt to match new structure