Multiple grunt, structural changes

These are practicies borrowed from jQuery

Signed-off-by: Rohan Jain <crodjer@gmail.com>