Renamed header and source files, and updated include statements and comments accordingly.