Re-organize chapter2.