The souks are the covered shopping alleys just off the Jemaa el Fna, so yes you'll more or less automatically be visiting both. The medina is the old walled inner city area that they are in. Marrakech isn't that big, you'll have plenty of time to explore lots of it in your time-frame, Have fun.