windows had issues with renames so doing it in stages