maven pom.xml reorganisation/cleanup
javadoc fixes