Chapter 2 exercises, files renamed to match book