another pass at grunt file organization