Update and rename ch2 to 1. Short program