new structure to use grunt