chap4 updated: new report structure.
Merge branch 'new-structure' into report