Package-info definitions, cleanup and pom correction