Renaming things and deleting unused files