Re-oganize Chapter 8