There are a couple of travel agencies in town, I'm not a big fan of them as they seem to make quite a few mistakes. If you do want to go that way, got to C ring just south of Hamad Hospital to Regency Travel.

I prefer to use expedia.com and book a package tour. Never had a problem and almost always cheaper.

Good luck!