Rename some files
Update readme