Reorganize remaining chapters 3 and 4.