Shapes of molecules is in Unit 2.
Just so you know , the syllabus/format of the exam papers has changed since 2008
the six chapters you have mentioned are the ones included in Unit 1 only.
Just study for
Unit 1 if you're taking an exam in the
Unit 1 paper