Update pom to new version
Restructure pom after POM-Code-Convention