adding another Makefile and various changes