Remove unused images

These were left over from the first stab.
Reorganize templates, again

I'm still sorting out how I like things to be set up, so I keep going
back and forth.