re-giged Makefile etc. for cleaner code.