First efforts to take care of directory renames