Rename chapters 1 & 2 to 2 & 3
Most of chapter 4