Rename more2.c to more1.c (avoiding nasty merge conflicts)