renaming files and minor edits