main files and modified Makefile