Chapter 2 begun.
Reorganised code layout.
On chapter 2.