Reorganize chapter 3 and chapter 4