correct pom file + change structure of project