Re-structure grunt file