Refactor move for consistency in packaging.
Added some comments.
Increased version of POM to prevent incompatibilities with existing projects.