major reorg of grunt file & some performance improvs