Rename files, add some features