finish moving things around

also, adjust the Makefile so the 'run me twice' dance isn't needed
by just going with a lower-tech approach