Updates Makefile and structure of chapter 4.