Minor file management. Renamed a few files and removed an obsoleted file.