Maven modularization of the project, and model creation.
Merge remote-tracking branch 'origin/master'