Reorganized files and updates through chapter 5