Solve problem 7 and make solution modules more import-friendly