rename the files and cleanup unused files
 cleanup unused files