SONAR fix: reorganise code to match code conventions. Update javadoc and add developer names to pom.