Some refactoring made, new packages defined, unused stuff removed from pom.xml etc.