Split section 2.2 into modules