Refactoring
docs and pom