improve grunt task organization