maven.pom: important restucturing done