Added code for problem 2.2 and moved problem 2.1 to correct package