I think FBI should be disbanded. Close the agency for corruption and lay all the employees off.
Set up counter terrorism investigations in the Military - not allowing any prior FBI to transfer. Build from scratch. Set up specialized teams in local police forces to arrest terrorists or provide local investigation.
If current FBI employees want to be in law enforcement they can put on a blue uniform and work learning about the rule of law on the street with real law enforcement heroes.
Too many FBI are lawyers. I view used car salespeople in a better light than lawyers!
Great Idea ...
Worked for Arthur Andersen. It could work here too.