Updated Makefile and renamed some files