Finished moving files into Chapter 2

Also made some minor changes