Fix grunt placement

I think this might be a better structure.  What do you think?