Refactoring pom.xml and imports