Finishing chapter 1, adding chapter 2, restructing the directories