Rename files and more clean