8ac23221fe
* Code refactor according to comments * Moved to new module * Changes in pom file
* Code refactor according to comments * Moved to new module * Changes in pom file