Pom files corrected + slight refactoring.