Added chapter 5, chapter 8
Sync with google code, file reorganize