I can see you put some thought into it, here's mine. Each state already has the equivalent of it's own FBI. Heck they have tanks and swat units. I don't think we need a federal police force, other than the US Marshals.
Move their headquarters to Iowa or somewhere far from Washington DC and cut the CIA size in half and move them out there too.