rename files, cleanup makefile because of this