Inserted <div> until I can't <div> no more

I think I put them all in the right spots and pulled out the right
section headings.  We'll find out soon enough.