some cleanup and renaming
dependencies in pom.xml
small refactoring and update