makefile/src dir/coverage cleanup

They all got kind of intermingled, so a single pull request for now. I can probably
split if need be.