Move exercises 6 and 7 to separate dir