restructured and changed grunt file