Rename files for new hierarchy