Update and rename f.r to dist_and_map.r