Structure answers by chapter, and add solution for 2.21