Rename and cleanup of some R files