better organized the grunt tasks