Go back to old grunt file structure