Update and rename chapter_5 to chap.5