Tweak Prob 5 module path
Refactor Problem 6
Refactor Problem 7