Restructured maven pom.