Updated POM
Refactoring (more to come)