Pom refactoring, new package naming.