Renamed header files. Updated makefile.