Makefile fixed, renaming some files