Package renaming.
POM cleanup; Java 7