Updates to ex 2.1 and 2.2
Indented sub-modules correctly