Set some files & fix Makefile