I agree. Just hope abuse doesn't develop, but consolidation seems sensible.
Folding the CIA and FBI into the Department of Homeland Security makes it a little too easy to cover up abuses, IMHO.
Now that both agencies will have proactive investigatory powers within our borders, I think it's wise to keep these two powerful bodies clearly in our sights.