Exercise 2.2: move to correct modules
fixes in ex_2_2