Refactoring pom.xml and imports
adjust line break