Continue to rename files and adapt them to the new structure