Perform renaming
Add missed files