Renamed files
Changed names of files in makefile