Modified Makefile and the folder name