Rename

Fix rename and removal of duplicate files.