Refactoring
Prepared POM for maven central release