Makefile and directory updated