More chapter 2 and helpers dir