More refinements; Adding makefile generator skeleton.