Renamed files, updated makefile