Generator fixed.
Refactoring.
pom.xml updated.