I believe the F_I & the Company both must be disbanded. Most folks turned out permanently to pasture if not prosecuted. Maybe 15% or so might be retrainable if their values are patriotic enough. Not sure what form some org should take to replace them. Lots of intel orgs could pick up for the Company. Not sure what to do about the F_I. The evil is intense, broad & deep. Not easy to fix. Impossible without razing the whole thing to the ground.
Shouldn’t be fixed. All those stupid alphabet agencies weren’t what the Founding Fathers had in mind when they were drafting our founding documents.