Long before Citizen United, "social" groups were infiltrated and transformed into beds of political activism. ACORN was a great example. Should they all be reclasified? I think I've answered that.
However, again, when Charitable Trusts become political, which they have, the more important fix comes to light. IMO one could reclasify all the groups, but leave the Trusts alone? That would be missing the objective completely.