pom files and imports fixed