We currently have 17 intelligence agencies.
That’s altogether too many; and they they have too much autonomy.
Truman disbanded the OSS because he thought it was getting out of control.
It was replaced by the CIA.
We really only need 2 agencies or 1 agency with 2 divisions.
USA internal and USA external.
With 17 agencies, there are too many turf wars and not enough real productive work. And they should report to the Pentagon and POTUS only.
But you are correct. There really only needs to be a domestic intelligence agency (FBI) and a foreign intelligence agency (CIA).
The other 16 agencies can integrated into one or the other of these two primary agencies. Streamline the process of gathering intelligence and eliminate the cross-purposes and turf wars between each of these existing agencies.
There could still be an ODNI to head up and oversee the two separate agencies, who then reports directly to the President as a cabinet member.