Rename files and add comments