reorg older chapter 3 files and finished up the chapter