More refactoring
POM updated
Readme modified