Definitly split up hams and quads and calfs. Quads should be an entire workout themselves. I add hams usually with back and sometimes I have done them with shoulders. Calfs I throw in twice a week after chest and after shoulders.
If you do hams the same day as quads train them first. If you train quads first, and train them right, forget getting a half way decent ham workout and totally forget a good one.