Renamed the files for Issue #5 and Issue #7.