Finish up Makefile and lay things out