I can never stop digging for info. I found the Homeland Security current org chart. The Secret Service and Coast Guard are part of HS, but the FBI is not. Interestingly, the President appoints both the FBI Director and the Secret Service Director. In Washington, this means they have independence from the Secretary of Homeland Security if they want to exercise it. It's more of a coordination effort than direct command by the Secretary.
The FBI was and is under the Attorney General in the Department of Justice (DOJ). A great site, better than the FBI site, is this:
http://people.howstuffworks.com/fbi1.htm See below:
r/
Artemis