Re-created mvn project to obtain 'correct' directory structure.
Refactoring and tests
Problem 0016
Problem 0017
Problem 0018
Problem 0067
Problem 0019
Problem 0020