renamed files and fixed makefile