it probley wound be better if the usa split the FBI in two

1 A federal police force (with reduced surveillance powers) which would take over the BATF and the currency and uniformed part of the secret service.

2 A separate contra espionage organisation similar to MI5

Oh god, don't give them any ideas. We already have an alphabet soup of intelligence agencies (the IC consists of 16 at the moment), don't make it worse.

I was suggesting that you reduce the number by merging all the policeing type orgs into one FBI, BATF, TSA,DEA etc and merge all of the domestic contra espionage into a new MI5 analog